[libfolia] 01/03: Imported Upstream version 1.3.1
Maarten van Gompel
proycon-guest at moszumanska.debian.org
Fri Jul 29 17:50:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
proycon-guest pushed a commit to branch master
in repository libfolia.
commit bf465e0a9a2bdac3c0544a24a5ec581db225b1a9
Author: proycon <proycon at anaproy.nl>
Date: Fri Jul 29 19:40:08 2016 +0200
Imported Upstream version 1.3.1
---
COPYING | 2 +-
ChangeLog | 3502 +++++++++----
Makefile.am | 5 +-
Makefile.in | 61 +-
NEWS | 57 +-
README | 95 +-
aclocal.m4 | 65 +-
bootstrap.sh | 2 +
compile | 2 +-
config.guess | 201 +-
config.h.in | 3 +-
config.sub | 40 +-
configure | 3446 +++++++------
configure.ac | 10 +-
depcomp | 2 +-
include/Makefile.in | 27 +-
include/libfolia/Makefile.am | 3 +-
include/libfolia/Makefile.in | 33 +-
include/libfolia/folia.h | 1747 +------
include/libfolia/{document.h => folia_document.h} | 57 +-
include/libfolia/folia_impl.h | 2290 +++++++++
include/libfolia/folia_properties.h | 61 +
include/libfolia/folia_types.h | 84 +
include/libfolia/folia_utils.h | 163 +
include/libfolia/foliautils.h | 270 -
install-sh | 366 +-
ltmain.sh | 5508 +++++++++++++--------
m4/Makefile.in | 27 +-
m4/libtool.m4 | 2826 ++++++-----
m4/ltoptions.m4 | 140 +-
m4/ltsugar.m4 | 7 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 7 +-
m4/pkg.m4 | 230 +-
missing | 2 +-
src/Makefile.am | 11 +-
src/Makefile.in | 53 +-
src/folia.cxx | 3823 --------------
src/{document.cxx => folia_document.cxx} | 634 ++-
src/folia_impl.cxx | 3757 ++++++++++++++
src/folia_properties.cxx | 1433 ++++++
src/folia_types.cxx | 93 +
src/folia_utils.cxx | 480 ++
src/folialint.cxx | 100 +-
src/foliautils.cxx | 1195 -----
src/simpletest.cxx | 31 +-
test-driver | 15 +-
47 files changed, 19383 insertions(+), 13595 deletions(-)
diff --git a/COPYING b/COPYING
old mode 100644
new mode 100755
index 94a9ed0..20d40b6
--- a/COPYING
+++ b/COPYING
@@ -671,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index f0887df..8e1ac66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1741 +1,3201 @@
-2014-05-26 14:34 sloot
+2016-07-29 Maarten van Gompel <proycon at anaproy.nl>
- * [r17259] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: noteref ==> ref
+ * configure.ac: version v1.3.1 (small rollback), copying Joost's
+ commit necessary for debian packaging
-2014-05-26 14:20 sloot
+2016-07-29 Maarten van Gompel <proycon at anaproy.nl>
- * [r17257] src/folia.cxx: a cell may contains entities
+ * README.md: added link to source repo in readme
-2014-05-26 13:14 sloot
+2016-07-29 Maarten van Gompel <proycon at anaproy.nl>
- * [r17254] src/document.cxx: Don't exclude Note in sentence count
+ * README.md: updated README to be a bit more in line with software
+ quality guidelines
-2014-05-23 09:08 sloot
+2016-07-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17246] src/folia.cxx: fixed id handling in Note
+ * configure.ac: bump versionn after release
-2014-05-22 15:41 sloot
+2016-07-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17243] COPYING: and reinstated
+ * configure.ac: missed a version bump?
-2014-05-22 15:41 sloot
+2016-07-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17242] COPYING, src/foliautils.cxx: deleted COPYING (stupid
- soft link)
+ * NEWS, src/folia_impl.cxx: NEWS!!!
-2014-05-22 15:32 sloot
+2016-06-22 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17240] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: first
- implementation of Note en NoteReference
+ * src/folialint.cxx: added --help and --version
-2014-05-22 14:26 sloot
+2016-05-27 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17238] COPYING, include/libfolia/document.h,
- include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/Makefile.am, src/document.cxx, src/folia.cxx,
- src/folialint.cxx, src/foliautils.cxx: added code for External
- and Note.
- Not completed yet
+ * : commit 860c50f720a9625f5c843b75d9cdb200ae6cd8f6 Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Wed May 25 17:27:39 2016
+ +0200
-2014-05-06 13:34 sloot
+2016-05-25 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17201] include/libfolia/document.h, src/document.cxx,
- src/folia.cxx: added an init procedure which MUST be called
- before running MT applications
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: Linebreak sends
+ a newline as 'text()' now
-2014-04-30 10:47 sloot
+2016-05-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17174] COPYING, include/libfolia/folia.h, src/folia.cxx: added
- 2 helper functions
+ * NEWS: NEWS for the release
-2014-04-30 10:38 sloot
+2016-05-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17172] Makefile.am: fixed 'make dist'
+ * : commit fb0b165b7092ad634559cc54abbc6e0b4b0bdbf2 Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Mon May 23 09:41:13 2016
+ +0200
-2014-03-13 13:30 sloot
+2016-05-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r17030] src/folia.cxx: allow nested Morphemes
+ * src/folia_document.cxx, src/folia_impl.cxx: use xmlCopyNode for
+ all foreign_data stuff. Not xmlCopyNodeList.
-2014-02-05 10:31 sloot
+2016-05-19 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16921] src/document.cxx: 2 typos and a sanity check
+ * src/folia_document.cxx: fix
-2014-01-06 10:01 sloot
+2016-05-19 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16816] include/libfolia/document.h, include/libfolia/folia.h,
- include/libfolia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/folialint.cxx, src/foliautils.cxx, src/simpletest.cxx: Happy
- Newyear!
+ * include/libfolia/folia_impl.h, src/folia_document.cxx,
+ src/folia_impl.cxx: reimplemented the reimplementation of
+ ForeignData
-2013-11-18 11:59 sloot
+2016-05-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16714] src/folia.cxx: fixed stupid bug. looping to 0 is
- difficult with unsigned ints.
+ * src/folia_impl.cxx: removed useless statement
-2013-10-28 15:44 sloot
+2016-05-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16655] include/libfolia/document.h, src/document.cxx: added
- code to handle 'non-standard' meta tags.
+ * src/folia_impl.cxx: fix
-2013-10-24 13:01 sloot
+2016-05-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16649] include/libfolia/folia.h, src/folia.cxx,
- src/foliautils.cxx: hacks to please the compiler
+ * src/folia_impl.cxx: cleanup redundant namespace definitions.
+ (introduces a memory leak?)
-2013-10-24 10:49 sloot
+2016-05-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16644] include/libfolia/folia.h, include/libfolia/foliautils.h:
- less warings on '-pedantic' compiler
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: allow
+ namespaces on ForeignData elements
-2013-10-17 12:13 sloot
+2016-05-18 Maarten van Gompel <proycon at anaproy.nl>
- * [r16613] bootstrap, bootstrap.sh, config.h.in, configure.ac:
- modernized
+ * src/folia_properties.cxx: regenerated foliaspec
-2013-10-15 08:10 sloot
+2016-05-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16580] src/folia.cxx: no more Text in a List please!
+ * src/folia_document.cxx: fixed memeory leak
-2013-08-19 08:57 sloot
+2016-05-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16458] src/folia.cxx: eeeeek
+ * include/libfolia/folia_document.h, src/folia_document.cxx,
+ src/folia_impl.cxx: some code cleanup. avoid doing the same thing
+ twice
-2013-08-19 08:48 sloot
+2016-05-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16456] src/folia.cxx: refactored appending a bit. addable() now
- tests illegal reconnection of parents.
+ * src/folialint.cxx: enhanced folialint: --output and --nooutput
+ options added
-2013-08-15 17:01 sloot
+2016-05-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16443] src/folia.cxx: added a test for 'empty' t nodes under
- <w>
- attempt also to check connecting a node twice.
- But this is difficult. Needs thinking
+ * include/libfolia/folia_document.h, src/folia_document.cxx: attempt
+ to fix foreign-data metadata
-2013-07-11 10:07 sloot
+2016-05-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16346] src/folia.cxx: fixed occurences problem
+ * src/folia_impl.cxx: oesp, namespace check on wrong node
-2013-07-10 09:59 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16335] include/libfolia/document.h, include/libfolia/folia.h,
- src/document.cxx: fixed toktext()
- added convinient function
+ * src/folia_impl.cxx: fixed setter for ForeignData
-2013-07-08 15:26 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16329] include/libfolia/folia.h, src/folia.cxx: fix. The ABI is
- borken :{
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: added
+ getter/setter tot ForeignData
-2013-07-08 14:25 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16327] include/libfolia/folia.h, src/folia.cxx: keep fixing
- text() stuff
+ * src/folia_impl.cxx: added a namespace check to foreign data
-2013-07-08 13:24 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16325] include/libfolia/folia.h, src/folia.cxx: fixing text()
- stuff. Quite a mess
+ * src/folia_properties.cxx, src/folia_utils.cxx: move private_create
+ element to folia_properties
-2013-07-04 16:46 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16313] include/libfolia/folia.h, src/folia.cxx: fix
- TextMarkupCorrection text()
+ * src/folia_impl.cxx: removed debug lines
-2013-07-04 15:48 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16311] src/document.cxx: version bumped!
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: ForeignData now
+ works
-2013-07-04 15:32 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16310] include/libfolia/folia.h, src/folia.cxx: hmpff. stil
- small 'id' problem
+ * include/libfolia/folia_impl.h, src/folia_document.cxx,
+ src/folia_impl.cxx, src/folia_utils.cxx: implementing ForeignData
-2013-07-04 15:08 sloot
+2016-05-12 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16309] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: totally
- reworked TextContent class, using extre <xml-text> pseudo nodes
- also better handle difference betweed xml:id and id attributes.
- Some cleanup is needed, but it works
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: added stubs for
+ ForeignData. compiles and runs as long as no real ForeignData comes
+ along :)
-2013-07-03 15:10 mvgompel
+2016-05-12 Maarten van Gompel <proycon at anaproy.nl>
- * [r16302] src/foliautils.cxx: small patch, div-annotation should
- be division-annotation, documentation and libraries didn't match,
- now allowing both when reading to prevent issues
+ * include/libfolia/folia_types.h, src/folia_properties.cxx:
+ Regenerated accordint to latest foliaspec (adds ForeignData)
-2013-07-03 10:17 sloot
+2016-05-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16300] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: started implementing Markup
+ * src/folia_document.cxx, src/folialint.cxx: added a 'strip' mode to
+ Document which strips version dependencies added this as an option
+ to folialint
-2013-07-02 13:59 sloot
+2016-05-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16298] include/libfolia/folia.h, src/folia.cxx: some
- refactoring of text(). added a deeptext() as complement of
- stricttext()
+ * src/folia_document.cxx: fixed declaration orde of annotations
-2013-07-01 15:53 sloot
+2016-05-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16289] include/libfolia/folia.h, src/Makefile.am,
- src/folia.cxx: attampt to repair gettextDelimitter in a ABI
- preserving way
+ * include/libfolia/folia_document.h, src/folia_document.cxx:
+ annotation set definitions are now output in order of input
-2013-07-01 13:02 sloot
+2016-05-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16288] include/libfolia/folia.h: unfix the last fix
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: don't output
+ the set for AnnotationLayers
-2013-07-01 12:43 sloot
+2016-05-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16287] include/libfolia/folia.h: small fix
+ * src/folia_impl.cxx: xlink:type="simple" might be implicit
-2013-06-27 14:06 sloot
+2016-05-11 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16277] src/document.cxx: small chage to avoid unexpected
- attribute order in metadata nodes
+ * src/folia_impl.cxx: fully implemented xlink:type="simple" and
+ xlink:type="locator"
-2013-06-26 14:42 sloot
+2016-05-10 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16272] src/folia.cxx: smarter solution (and thread-safe)
+ * src/folia_impl.cxx: start adding stuff to xlink (not complete yet)
-2013-06-26 09:18 sloot
+2016-05-10 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16266] include/libfolia/folia.h, src/folia.cxx: some
- refactoring to get things a bit more generic
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: throw XmlEerror
+ instead of ValueError started implementing more xlink options
-2013-06-25 12:17 sloot
+2016-05-10 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16263] include/libfolia/folia.h, src/folia.cxx: added
- isSubClass() functions to the interface
+ * src/folia_impl.cxx: somewhat more specific error message
-2013-06-25 09:47 sloot
+2016-05-10 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16262] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: Some refactoring. More generic
- solution for Folia Class Hiearchy
+ * src/folia_utils.cxx: alien namespaces on attributes are ignored
+ now, just like alien tags. probably they should be stored 'as-is'
+ in the future
-2013-06-24 09:49 sloot
+2016-05-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16259] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: changed and improved handling
- of XML comment nodes
+ * src/folia_impl.cxx: removed restrictions on aref/@type and
+ ref at type
-2013-06-20 15:51 sloot
+2016-05-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16257] src/document.cxx, src/folia.cxx: added experimental
- support for XML comment nodes
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx:
+ AbstractTextMarkup lacked some useful functions
-2013-06-18 14:17 sloot
+2016-05-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16251] src/folia.cxx: clearer message
+ * src/folia_properties.cxx: reverted handcrafted edit of
+ folia_properties.cxx
-2013-06-18 10:57 sloot
+2016-05-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16249] include/libfolia/folia.h, src/folia.cxx: xml:lang is
- unsupported now :{
+ * configure.ac, src/folia_properties.cxx: bumped version to 1,2
+ added a handcrafted update of the properties (evil!)
-2013-06-18 10:37 sloot
+2016-05-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16248] include/libfolia/document.h, include/libfolia/folia.h,
- include/libfolia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: fixed a bug in document parsing (meta nodes
- were ignored)
- added lang node and LANG token annotation
- some provision for comment nodes added
+ * : commit b5c14ce181d83e08699e51871a399f040ceac384 Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Tue May 3 13:14:27 2016
+ +0200
-2013-06-17 14:01 sloot
+2016-05-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r16241] src/document.cxx: oesp. 1 bit to optimistic about
- version
+ * src/folia_properties.cxx: Regenerated foliaspec for FoLiA v1.2
+ (not final, more may change later)
-2013-06-17 13:56 sloot
+2016-05-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16239] include/libfolia/folia.h, include/libfolia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: added table
- stuff
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: working om ref
+ stuff
-2013-05-23 10:19 sloot
+2016-05-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16118] include/libfolia/folia.h, src/folia.cxx: implemented
- findspans().
- bit clumsy rethinking required
+ * src/folia_impl.cxx: check for adding <t> within the same textclass
+ (and set)
-2013-05-22 15:52 sloot
+2016-05-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16116] include/libfolia/folia.h, src/document.cxx,
- src/folia.cxx: some refactoring.
- also implemented findspan() and wref()
+ * include/libfolia/folia_impl.h: get XmlText API more in line with
+ all other API's
-2013-05-14 15:13 sloot
+2016-05-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16077] include/libfolia/document.h, src/document.cxx: let
- isDeclared ignore the date
+ * src/folia_impl.cxx: fixed a problem: when outputting FoLIa with
+ multiple 'current' TextContent nodes, the order was reversed!
-2013-05-14 13:30 sloot
+2016-05-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r16076] include/libfolia/folia.h, src/folia.cxx: some
- refactoring to enable corrections for Str nodes
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: added format
+ attribute to Alignment
-2013-04-13 21:42 mvgompel
+2016-04-29 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15991] include/libfolia/folia.h: added
- FoliaElement::printable()
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: implemented
+ newpage attribute on Linebreak
-2013-04-09 13:44 sloot
+2016-04-29 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15967] configure.ac: signal our needs
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: implemented
+ linenr and pagenr attributes on Linebreak
-2013-04-09 13:43 sloot
+2016-04-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15966] src/document.cxx: use new ticcutils stuff
+ * .gitignore: ignore README
-2013-04-08 15:47 sloot
+2016-04-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15960] src/document.cxx: added GZ support
+ * include/libfolia/folia_document.h, src/folia_document.cxx: added a
+ function to append foreign metadata to a document
-2013-04-08 14:27 sloot
+2016-04-22 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15957] configure.ac, src/document.cxx: added read/write of .bz2
- files
+ * src/folia_document.cxx: fixed duplicate namespace problem
-2013-04-04 11:49 sloot
+2016-04-22 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15942] configure.ac: bump version after release
+ * src/folia_document.cxx: oesp. src attribute was missing for imdi
+ and cmdi
-2013-04-03 15:53 sloot
+2016-04-21 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15924] src/Makefile.am: increment current library version
+ * include/libfolia/folia_document.h,
+ include/libfolia/folia_types.h, src/folia_document.cxx: more generic
+ 'foreign' metadata scheme. 1 flaw remains...
-2013-04-03 13:52 sloot
+2016-03-14 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15909] include/Makefile.am, include/libfolia/document.h,
- include/libfolia/folia.h, src/document.cxx, src/folia.cxx,
- src/folialint.cxx, src/foliautils.cxx, src/simpletest.cxx: ok,
- reverted the plan to name the package 'folia'
- it is 'libfolia' now everywhere
+ * include/libfolia/folia_impl.h, src/folia_document.cxx,
+ src/folia_impl.cxx, src/folia_utils.cxx: some refactoring:
+ fixupDoc() ==> assignDoc() (sounds less hackery) reversed arguments
+ of createElement(). The Document can be 0.
-2013-04-03 13:45 sloot
+2016-03-14 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15908] include/libfolia/folia: hmm
+ * include/libfolia/folia_impl.h: oesp, Document may be 0
-2013-04-03 13:43 sloot
+2016-03-14 Maarten van Gompel <proycon at anaproy.nl>
- * [r15907] configure.ac, include/folia, include/libfolia,
- include/libfolia/folia: rename dir
+ * configure.ac: version bump after 1.0.1 release
-2013-04-03 12:56 sloot
+2016-03-14 Maarten van Gompel <proycon at anaproy.nl>
- * [r15904] NEWS: news
+ * configure.ac: rewinding version to 1.0.1 for bugfix release issue
+ #3
-2013-04-03 08:50 sloot
+2016-03-14 Maarten van Gompel <proycon at anaproy.nl>
- * [r15893] include/folia/foliautils.h, src/document.cxx,
- src/foliautils.cxx: XPath stuff is moved to ticcutils
+ * src/folia_impl.cxx: removed inline to test whether this caused Mac
+ OS X issue #3
-2013-04-02 16:09 sloot
+2016-03-13 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15884] configure.ac: also most recent ticcutils needed
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: renamed local
+ resolve() function. Might circumvent strange warning on OSX
-2013-04-02 15:44 sloot
+2016-03-10 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15873] configure.ac, include/folia/document.h,
- include/folia/folia.h, include/folia/foliautils.h,
- src/Makefile.am, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: changed install directory!
- moved some XML stuff to ticcutils
+ * configure.ac: bumped version after release
-2013-04-02 10:31 sloot
+2016-03-09 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15861] src/foliautils.cxx: numb change
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: some small
+ optimizatin before the release
-2013-04-02 08:14 sloot
+2016-03-09 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15850] include/folia/Makefile.am, src/Makefile.am,
- src/folialint.cxx: tags
+ * include/libfolia/Makefile.am, include/libfolia/folia.h,
+ include/libfolia/foliautils.h: last minute cleanup before release
-2013-04-02 08:13 sloot
+2016-03-09 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15849] include/folia/foliautils.h, src/folialint.cxx: removed
- unused functions
- added copyright stuff
+ * include/libfolia/folia_impl.h: reverted the not-su-numb change
-2013-03-28 17:41 sloot
+2016-03-09 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15845] include/folia/foliautils.h, src/folia.cxx,
- src/foliautils.cxx: removed stuff that is present in ticcutils
+ * : commit c51dfd7ea85b1f811b59203ab6d836ec00b12f83 Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Wed Mar 9 11:42:42 2016
+ +0100
-2013-03-07 15:10 sloot
+2016-03-09 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15786] include/folia/folia.h: oesp, parameter is const
+ * NEWS: there is NEWS
-2013-03-07 15:06 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15784] include/folia/folia.h, src/folia.cxx,
- src/foliautils.cxx: implemeneted _lang attribute for TextContent
+ * src/folia_impl.cxx: added a fix for Realy empty XML_TEXT
+ (meaning:only whitespace)
-2013-03-07 09:32 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15778] src/folia.cxx: be more picky on the 'type' atribute in
- AlignReference
+ * include/libfolia/folia_impl.h, src/folia_document.cxx,
+ src/folia_impl.cxx, src/simpletest.cxx: big API change and
+ simplification too
-2013-03-07 09:13 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15777] src/foliautils.cxx: fixed NCname checking. A ':' may not
- be part of it.
+ * src/folia_impl.cxx, src/folia_types.cxx: better handling of alien
+ namespaces abort on NON-folia tags. except when '--permissive' is
+ specified
-2013-03-06 09:21 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15763] src/folia.cxx: added some comments
+ * src/folia_document.cxx, src/folia_impl.cxx: canonical output works
+ again. just sort backwards :)
-2013-02-28 14:54 sloot
+2016-03-08 Maarten van Gompel <proycon at anaproy.nl>
- * [r15747] src/folia.cxx: add xlink support for href in Alignment
+ * src/folia_properties.cxx: [foliaspec] Version bump to 1.0.0
-2013-02-28 13:27 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15745] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: String class updated. it an
- Annotation now
+ * configure.ac, include/libfolia/folia_impl.h, src/folia_impl.cxx:
+ bumped lib version to 1.0
-2013-02-26 16:49 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15733] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: New Substring class. Not
- finished
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: smarter init()
+ solution. added accepted_data() function, for completeness, because
+ it isn't used (yet)
-2013-01-07 14:53 sloot
+2016-03-08 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15570] include/folia/document.h, include/folia/folia.h,
- include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx, src/simpletest.cxx: Bump year
+ * : commit d99dd11bfc6a5edd5dd85de71d548ba28ef58c6c Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Mon Mar 7 18:34:47 2016
+ +0100
-2012-12-05 22:21 sloot
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15527] src/document.cxx: added 'now()' default for datetime
- declaration
+ * include/libfolia/folia_impl.h: remove unused has_base() function
+ from all classes
-2012-12-05 13:43 sloot
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15517] src/document.cxx: fixed a problem with NO_ANN nodes
+ * src/folia_impl.cxx: even better fix
-2012-12-05 08:55 sloot
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15515] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx: adapted to some of Maarten's changed. not all
- yet..
+ * src/folia_impl.cxx: fix headfeature again
-2012-11-29 13:21 sloot
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15482] include/folia/foliautils.h, src/foliautils.cxx: add
- convenient function
+ * include/libfolia/folia_impl.h,
+ include/libfolia/folia_properties.h, src/folia_impl.cxx: add
+ auto_generate_id stubs
-2012-11-13 10:14 sloot
+2016-03-07 Maarten van Gompel <proycon at anaproy.nl>
- * [r15420] include/folia/folia.h, src/folia.cxx: added a (set)
- parameter to pos() and lemma() functions
+ * src/folia_properties.cxx: enabled AUTO_GENERATE_ID
-2012-10-30 12:50 mvgompel
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15368] bootstrap: bootstrap fix
+ * src/folia_impl.cxx: handle multiple features with same subset
+ correctly
-2012-10-30 09:55 sloot
+2016-03-07 Maarten van Gompel <proycon at anaproy.nl>
- * [r15354] include/folia/document.h, src/document.cxx: improved
- handling of style-sheet processing instructions
- for now we REJECT multiple test/xsl types.
+ * src/folia_properties.cxx: AttributeFeatures is now in foliaspec
-2012-10-29 14:46 sloot
+2016-03-07 Maarten van Gompel <proycon at anaproy.nl>
- * [r15348] src/folia.cxx: relax constraints on Content node
+ * src/folia_properties.cxx: headfeature in string<-->element maps
-2012-10-22 15:08 sloot
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15303] include/folia/folia.h: modified addAlternative()
+ * include/libfolia/folia_properties.h, src/folia_impl.cxx,
+ src/folia_properties.cxx: moved const set around
-2012-10-22 14:23 sloot
+2016-03-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15301] include/folia/folia.h, src/folia.cxx: fiddle with
- addable atletnatives and morhological layers.
- It is a bit messy!
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: simplified
+ Feaure handling.
-2012-10-10 12:50 sloot
+2016-03-06 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15276] include/folia/document.h, include/folia/foliautils.h:
- safeguards
+ * src/folia_types.cxx: added code to support (very?) old and
+ erroneous FoLiA 'div' syntax.
-2012-10-08 14:20 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15259] src/document.cxx: make sure we produce UTF-8
+ * : commit 41b2aee408a139bebb6dea66a862dfd39af09744 Author: Maarten
+ van Gompel <proycon at anaproy.nl> Date: Fri Mar 4 17:44:42 2016
+ +0100
-2012-10-02 09:33 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15239] NEWS: some NEWS
+ * : commit 53eeda4a52884ddd71273a72917eee1ca5e5c1d6 Author: Maarten
+ van Gompel <proycon at anaproy.nl> Date: Fri Mar 4 17:19:00 2016
+ +0100
-2012-10-02 09:18 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15237] include/folia/folia.h, src/folia.cxx: some fixes to get
- all working
+ * : commit 4ca838e5513b729a8fd7bc776e483f784adb1663 Author: Maarten
+ van Gompel <proycon at anaproy.nl> Date: Fri Mar 4 17:14:43 2016
+ +0100
-2012-10-01 15:44 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r15234] include/folia/folia.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: started
- implementing new FoLiA features like coreference etc.
+ * src/folia_document.cxx: for the time being we reject canonical
+ output attempts
-2012-09-27 12:34 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r15225] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: small fixes in Metric stuff
+ * src/folia_properties.cxx: Added External to Text and Speech
-2012-09-27 12:14 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r15223] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: added metric stuff
+ * src/folia_properties.cxx: flatten default_ignore lists, no
+ abstract elements and always included all children
-2012-09-27 10:00 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r15222] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: added ValueFeature. Not
- completed yet.
+ * src/folia_properties.cxx: External requires SRC attrib
-2012-09-04 14:45 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r15159] src/folia.cxx: added comment
+ * src/folia_properties.cxx: use XMLTAG for holding subset name for
+ Features
-2012-08-09 12:44 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r15090] configure.ac, include/folia/document.h,
- include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: more TiCC suff used
+ * src/folia_properties.cxx: inheritance fix, get PROPS from
+ immediate parent
-2012-08-08 09:05 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r15063] src/folia.cxx: accept more
+ * src/folia_properties.cxx: Add Word, Morpheme and Phoneme in
+ accepted_data whereever WordReference occurs
-2012-07-12 15:24 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14982] src/folia.cxx: fix
+ * src/folia_impl.cxx: SETONLY fix
-2012-07-11 15:14 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14977] include/folia/foliautils.h, src/document.cxx,
- src/folia.cxx, src/foliautils.cxx: added validity check for
- xml:id's
- Also ALL libxml2 Parser warnings wil handled as an eror!
+ * src/folia_utils.cxx: missing SpanRole
-2012-07-11 08:13 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14974] src/folia.cxx: small change in PlaceHolder stuff
+ * src/folia_properties.cxx: in elementtype<->string list, use subset
+ names for features
-2012-07-09 13:11 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14967] include/folia/folia.h, src/folia.cxx: fixed PlaceHolder
- stuff
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx,
+ src/folia_properties.cxx, src/folia_types.cxx: fixes for xml-text
+ xml-comment en placeholder
-2012-07-04 09:11 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14948] include/folia/document.h, include/folia/folia.h,
- src/document.cxx, src/folia.cxx: added methods to extract all
- sentenceParts from a document. And to extract Words and
- Placeholders from sentences.
+ * include/libfolia/folia_impl.h: added has_base for
+ AbstractExtendedTokenAnnotation
-2012-07-02 10:04 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14938] include/folia/folia.h, src/folia.cxx: added
- abstractionlayer. alloe N attribute foro suggestion.
+ * src/folia_properties.cxx: removed duplicates in s_ant_map
-2012-06-20 10:24 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14899] include/folia/foliautils.h, src/document.cxx,
- src/folia.cxx, src/foliautils.cxx: cleaner datetime handling, and
- without leaks!
+ * src/folia_properties.cxx: fix for string<-->annotationtype map (is
+ NOT a map to xml tags)
-2012-06-19 08:20 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14887] include/folia/folia.h, src/folia.cxx: simplified
- datetime handling
+ * src/folia_properties.cxx: Missing textdelimiter for Word... make
+ check now passes! \o/
-2012-06-18 16:36 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14885] include/folia/document.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: added
- datetime defaults
+ * src/simpletest.cxx: more verbose output in simpletest (make check)
-2012-06-14 14:22 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14870] include/folia/document.h, include/folia/folia.h,
- include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: revoked smart idea about accept
- added a canonical option to xml generation, to make comparisions
- easy
+ * src/folia_properties.cxx: Inherit properties from parent class
-2012-06-13 15:53 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14859] src/folia.cxx: more generic and less error-prone
- solution for filling _accepted_data
- (until everyone has a modern compiler)
+ * src/folia_properties.cxx: [foliaspec] updated element<->string map
+ with non-generic types
-2012-06-13 15:08 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14857] include/folia/folia.h, src/folia.cxx: some fixes.
+ * : commit da60048d725611b3924b2d969d5327cd9974a51e Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Fri Mar 4 10:26:44 2016
+ +0100
-2012-06-13 09:30 sloot
+2016-03-04 Maarten van Gompel <proycon at anaproy.nl>
- * [r14855] src/document.cxx, src/folia.cxx: fixed timedevent stuff
+ * include/libfolia/folia_types.h, src/folia_properties.cxx:
+ [foliaspec regenerated] fixes in annotationtype and element<->string
+ map
-2012-06-12 15:55 sloot
+2016-03-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14854] include/folia/folia.h, src/folia.cxx: a bit of cleaning
- done
+ * src/folia_utils.cxx: improved test
-2012-06-12 15:27 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14852] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: first, somewhat clumsy,
- implementation of Alignment
+ * src/folia_properties.cxx: type hierarchy fix .. everything now
+ compiles again after breaking stuff in commit 5859025
-2012-06-12 11:01 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14851] include/folia/folia.h, src/folia.cxx: implemented
- toktext()
+ * include/libfolia/folia_impl.h: Implemented
+ AbstractExtendedTokenAnnotation , even though it makes no functional
+ difference and I don't like the name.... but at least the libraries
+ have the exact same hierarchy now.. 1 compiler error left..
-2012-06-12 09:08 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14848] include/folia/folia.h, src/document.cxx, src/folia.cxx:
- removed error attribute from ErrorDetection
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: Implemented
+ StyleFeature (was missing)
-2012-04-23 12:14 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14680] src/folia.cxx, src/foliautils.cxx: headfeat ==>
- headfeature
+ * src/folia_properties.cxx: removed fill functions, now obsolete
-2012-04-23 09:49 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14679] include/folia/folia.h, src/folia.cxx: so we postpone
- checking of required attributes until we append the node.
- This makes construction more flexible
+ * include/libfolia/folia_properties.h,
+ include/libfolia/folia_types.h, src/folia_properties.cxx: first
+ commit of foliaspec-generated code (does not compile yet!!) ..
+ properties now has a constructor which sets the (auto generated)
+ defaults, s_et_map and s_ant_map are not generated on the fly
+ anymore but pre-generated by foliaspec
-2012-04-23 08:07 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14677] src/folia.cxx: reverted change because Maarten reverted
- his thoughts
+ * src/folia_utils.cxx: Item -> ListItem (part 2)
-2012-04-20 12:40 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14673] src/folia.cxx: avoid appending nodes without ID. same
- should be done voor _set and maybe more.
- later...
+ * include/libfolia/folia_impl.h: Item -> ListItem
-2012-04-18 16:14 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14667] include/folia/document.h, src/document.cxx: improved
- namespace handling
+ * include/libfolia/folia_impl.h, include/libfolia/folia_types.h,
+ src/folia_impl.cxx, src/folia_properties.cxx, src/folia_utils.cxx:
+ fixed Class names
-2012-04-18 15:45 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14666] src/document.cxx: attempt to fix identation of
- annotations.
+ * src/folia_properties.cxx: Moved XmlText out of foliaspec block
-2012-04-18 14:54 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14665] src/document.cxx, src/folia.cxx: more maarten-compliant
+ * include/libfolia/folia_impl.h,
+ include/libfolia/folia_properties.h, src/folia_impl.cxx,
+ src/folia_properties.cxx: SETONLY woes
-2012-04-18 14:12 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14664] include/folia/document.h, src/document.cxx,
- src/folialint.cxx: no real change, except for folialint
+ * src/folia_properties.cxx: moved PlaceHolder and XmlComment out of
+ foliaspec block
-2012-04-18 11:11 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14663] include/folia/foliautils.h, src/folia.cxx,
- src/foliautils.cxx: DOMAIN ==> DOMEIN
- It seems to be a 'special' or 'reserved' word
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: changed auth()
+ and subset() functions
-2012-04-18 10:52 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14662] src/folialint.cxx: fix 1
+ * include/libfolia/folia_properties.h, src/folia_properties.cxx:
+ added AUTH en SUBSET properties
-2012-04-18 10:44 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14660] include/folia/folia.h, src/Makefile.am, src/folia.cxx,
- src/folialint.cxx: lots of adaptations to new insights.
- started to implement a 'folialint' program for simple checking.
+ * : commit 098709dcc86b36f1f1700b0e315cac9b3b3e04d4 Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Thu Mar 3 16:08:20 2016
+ +0100
-2012-04-17 16:13 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14659] include/folia/folia.h, include/folia/foliautils.h,
- src/document.cxx, src/foliautils.cxx: beterder
+ * include/libfolia/folia_types.h: added foliaspec decorator comments
+ in folia_types.h
-2012-04-17 16:00 sloot
+2016-03-03 Maarten van Gompel <proycon at anaproy.nl>
- * [r14658] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: some cleanup and refactoring
+ * src/folia_properties.cxx: added foliaspec:hierarchy comment in
+ preparation for autogenerated map
-2012-04-17 14:25 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14656] include/folia/folia.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx,
- src/simpletest.cxx: added some sanity tests, an used them to weed
- out problems that were never a problem yet
+ * include/libfolia/folia_impl.h, include/libfolia/folia_types.h,
+ src/folia_properties.cxx, src/folia_utils.cxx: removed slack. get
+ more inline with folia.py
-2012-03-29 08:42 sloot
+2016-03-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14584] configure.ac: bump version after release
+ * include/libfolia/folia_impl.h, include/libfolia/folia_types.h,
+ src/folia_impl.cxx, src/folia_properties.cxx, src/folia_utils.cxx:
+ added AbstractSpanRole layer Headwords ==> Headspan
-2012-03-29 08:23 sloot
+2016-02-29 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14582] NEWS: get ready for release
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx: more cleansing
-2012-03-19 15:48 sloot
+2016-02-29 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14476] include/folia/folia.h, src/folia.cxx: cleaning up the
- interface (breaks API)
+ * include/libfolia/foliautils.h: added empty file, to be sure old
+ version is overwritten
-2012-03-19 13:04 sloot
+2016-02-29 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14474] include/folia/document.h, src/document.cxx: avoid
- duplicate annotation declarations
+ * include/libfolia/Makefile.am, include/libfolia/folia_impl.h,
+ src/folia_document.cxx, src/folia_impl.cxx, src/simpletest.cxx:
+ major cleanup of the interface. all constructors don't accept string
+ parameters anymore. use KWargs instead. This will shake the
+ tree....
-2012-03-14 16:06 sloot
+2016-02-25 Maarten van Gompel <proycon at anaproy.nl>
- * [r14466] include/folia/document.h, src/document.cxx: more cleanup
- be more picky on declarations
+ * src/folia_properties.cxx: more foliaspec
-2012-03-14 13:42 sloot
+2016-02-25 Maarten van Gompel <proycon at anaproy.nl>
- * [r14463] src/document.cxx: fixed defaultannotatortype
+ * src/folia_properties.cxx: more foliaspec comments
-2012-03-14 11:36 sloot
+2016-02-25 Maarten van Gompel <proycon at anaproy.nl>
- * [r14461] include/folia/document.h, src/document.cxx,
- src/folia.cxx: small fix
+ * src/folia_properties.cxx: minor reshuffling for foliaspec later on
-2012-03-13 17:05 sloot
+2016-02-25 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14458] include/folia/document.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx: attempt to sort out annotation
- defaults stuff.
- waiting for maarten to give a ruling
+ * src/folia_impl.cxx: typo
-2012-02-29 10:50 sloot
+2016-02-25 proycon <proycon at anaproy.nl>
- * [r14354] configure.ac: bump version after release
+ * src/folia_properties.cxx: addes some foliaspecs during brainstorm
-2012-02-29 10:47 sloot
+2016-02-25 proycon <proycon at anaproy.nl>
- * [r14352] NEWS: typo
+ * src/folia_properties.cxx: decorating part of folia_properties.cxx
+ with foliaspec comments
-2012-02-27 15:46 sloot
+2016-02-25 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14341] NEWS: news updated
+ * include/libfolia/folia_properties.h, src/folia_properties.cxx,
+ src/folia_types.cxx: moved type<-->string translations to properties
-2012-02-27 11:54 sloot
+2016-02-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14337] src/folia.cxx: be more strict on 'set' and 'class'
- attributes. They need a document!
+ * src/folia_impl.cxx: don't use an integer as a bool
-2012-02-27 10:10 sloot
+2016-02-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14335] src/document.cxx: small memoryleak fixed
+ * include/libfolia/folia_impl.h: signature of hasannotation is
+ changed (returns an int now)
-2012-02-23 16:31 sloot
+2016-02-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14329] src/folia.cxx: fixed
+ * src/folia_properties.cxx: bumped version
-2012-02-23 13:11 sloot
+2016-02-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14320] src/document.cxx: hmm. This too
+ * include/libfolia/folia_impl.h, include/libfolia/folia_types.h,
+ src/folia_properties.cxx, src/folia_types.cxx, src/folia_utils.cxx:
+ added ComplexAligment and ComplexAlignmentLayer
-2012-02-23 12:54 sloot
+2016-02-22 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14319] src/document.cxx: allow empty set names in declarations.
- Handle as set="undefined"
+ * src/Makefile.am: removed useless lines
-2012-02-23 10:04 sloot
+2016-02-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14316] include/folia/document.h, src/document.cxx,
- src/folia.cxx, src/foliautils.cxx: fixed problem with missing
- (default) sets
+ * include/libfolia/folia_document.h, include/libfolia/folia_impl.h,
+ src/Makefile.am, src/folia_document.cxx, src/folia_impl.cxx: working
+ on the Quality
-2012-02-22 16:27 sloot
+2016-02-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14313] src/document.cxx: parsering of multiple set definitions
- for same atrtibute works now
+ * include/libfolia/folia_document.h, include/libfolia/folia_impl.h,
+ src/folia_document.cxx, src/folia_impl.cxx: more gcc4.6 backwar
+ compatibility woes
-2012-02-22 15:10 sloot
+2016-02-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14307] src/folia.cxx: relax div and gap
+ * .travis.yml: test generic btranch too
-2012-02-22 14:52 sloot
+2016-02-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14305] include/folia/folia.h: cleaning up
+ * .travis.yml, include/libfolia/folia_impl.h: reverted to code that
+ should compile with gcc4.6
-2012-02-21 17:19 sloot
+2016-02-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14303] src/folia.cxx: work around argument parser inside
- libfolia
+ * .travis.yml: just stick to the 'generic' branch
-2012-02-21 13:13 sloot
+2016-02-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14298] src/folia.cxx: oesp
+ * .travis.yml: ok, for now don't build 'generic' branch
-2012-02-21 13:05 sloot
+2016-02-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14297] src/folia.cxx: fix the fix
+ * .travis.yml: build generic too. (fingers crossed)
-2012-02-21 13:02 mvgompel
+2016-02-17 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14296] src/folia.cxx: event accepts feature
+ * .travis.yml: build generic too (might fail grossly)
-2012-02-21 11:57 sloot
+2016-02-17 Maarten van Gompel <proycon at anaproy.nl>
- * [r14290] include/folia/document.h, src/document.cxx: small
- refactoring
+ * README => README.md, bootstrap.sh: Converted README to markdown,
+ added lamabadge and travis badge
-2012-02-21 11:34 sloot
+2016-02-17 Maarten van Gompel <proycon at anaproy.nl>
- * [r14289] include/folia/document.h, include/folia/folia.h,
- src/document.cxx, src/folia.cxx: fixed CMDI stuff
+ * : commit 2a13ac1d345dd28bed654ea9c8ccb9eb52fb1d64 Author: Maarten
+ van Gompel <proycon at anaproy.nl> Date: Wed Feb 17 14:11:05 2016
+ +0100
-2012-02-20 17:00 sloot
+2016-02-16 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14281] include/folia/folia.h, src/document.cxx, src/folia.cxx:
- some small refactoring.
+ * include/libfolia/folia.h: make it a bit more backward compatible
-2012-02-15 17:37 sloot
+2016-02-15 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14270] include/folia/folia.h, src/folia.cxx: fixed problem witg
- const char parameters to string template.
+ * src/folia_document.cxx, src/folia_impl.cxx,
+ src/folia_properties.cxx, src/folia_types.cxx: more code cleanup
-2012-02-15 16:04 sloot
+2016-02-15 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14268] src/document.cxx, src/folia.cxx: fixed annotation
- defaults stuff
+ * src/folia_impl.cxx, src/folia_utils.cxx: refactoring....
-2012-02-13 09:33 sloot
+2016-02-15 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r14254] NEWS, configure.ac: bumped version after release
+ * src/folia_impl.cxx, src/folia_utils.cxx: more refactoring.
+ 'embracing" the if's
-2012-01-12 17:02 sloot
+2016-02-15 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13996] NEWS: Some news
+ * src/folia_utils.cxx: small refactoring
-2012-01-12 13:40 sloot
+2016-02-15 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13979] configure.ac, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: Added GAP
- annotation
- made the gap-annotation mandatory for GAP nodes
- made the div-annotation mandatory for DIV nodes
- now correctly complain when 'set' attribute is missing in a
- *-annotations declaration
+ * src/folia_utils.cxx: small edit. Also test Git-IRC hook
-2012-01-10 17:12 sloot
+2016-02-05 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13943] config.h.in, configure.ac, src/folia.cxx,
- src/foliautils.cxx: cleanup the configuration
+ * include/libfolia/folia_document.h, src/folia_document.cxx: removed
+ duplicate code using delegation
-2012-01-10 15:24 sloot
+2016-02-05 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13932] configure.ac: bumped version after release
+ * include/libfolia/folia_properties.h, src/folia_document.cxx,
+ src/folia_properties.cxx: some more 'constants' added to properties
-2012-01-09 11:33 sloot
+2016-02-05 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13911] NEWS, src/foliautils.cxx: fixed argument parsing problem
+ * include/libfolia/folia.h: OESP file was lost in transition
-2012-01-03 08:48 sloot
+2016-02-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13851] include/folia/document.h, include/folia/folia.h,
- include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx, src/simpletest.cxx: added copyright stuff
+ * include/libfolia/folia_properties.h, src/folia_impl.cxx,
+ src/folia_properties.cxx: All properties in UPPERCASE
-2011-12-21 11:28 sloot
+2016-02-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13761] configure.ac: Bumped version after releas
+ * include/libfolia/folia_impl.h,
+ include/libfolia/folia_properties.h,
+ include/libfolia/folia_types.h, src/folia_impl.cxx,
+ src/folia_properties.cxx, src/folia_types.cxx: misc fixes
-2011-12-21 09:24 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13754] NEWS: NEWS
+ * src/folia_properties.cxx: updated properties
-2011-12-21 09:16 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13753] src/simpletest.cxx: fixed 'make check'
+ * src/folia_impl.cxx: small edit
-2011-12-14 11:00 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13697] include/folia/folia.h, src/folia.cxx: ok, to be
- complete, add ad Version() function too
+ * include/libfolia/folia_impl.h, include/libfolia/folia_utils.h:
+ more cleanup
-2011-12-13 10:55 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13680] include/folia/folia.h, src/folia.cxx: added
- VersionName() function to get in line with other modules
+ * src/folia_impl.cxx, src/folia_properties.cxx: Description and
+ XmlComment may occure everywhere don't throw on a missing
+ description
-2011-12-13 08:48 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13676] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: added a HeadFeature
+ * src/folia_impl.cxx: added some comment
-2011-12-12 15:57 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13671] include/folia/folia.h: better
+ * include/libfolia/folia_impl.h, src/folia_impl.cxx,
+ src/folia_properties.cxx: more cleanup
-2011-12-12 14:26 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13670] include/folia/folia.h, src/folia.cxx: implemented an
- AllowGeneretaeID class, te get more inline with the Python
- version
+ * include/libfolia/Makefile.am, include/libfolia/{document.h =>
+ folia_document.h}, include/libfolia/folia_impl.h,
+ include/libfolia/{foliaproperties.h => folia_properties.h},
+ include/libfolia/{foliatypes.h => folia_types.h},
+ include/libfolia/{foliautils.h => folia_utils.h}, src/Makefile.am,
+ src/{document.cxx => folia_document.cxx}, src/{folia.cxx =>
+ folia_impl.cxx}, src/{foliaproperties.cxx => folia_properties.cxx},
+ src/{foliatypes.cxx => folia_types.cxx}, src/{foliautils.cxx =>
+ folia_utils.cxx}: cleanup, renaming etc will shake the tree!
-2011-12-08 16:56 sloot
+2016-02-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13665] include/folia/folia.h: last second fix.
- I should check the whole class hierarchy soon!
+ * include/libfolia/Makefile.am, include/libfolia/document.h,
+ include/libfolia/{folia.h => folia_impl.h}, src/document.cxx,
+ src/folia.cxx, src/folialint.cxx, src/foliaproperties.cxx,
+ src/foliatypes.cxx, src/foliautils.cxx, src/simpletest.cxx: reshufle
+ headers. We wil provide a unified "folia.h" header for external
+ usage in the future.
-2011-12-08 16:20 sloot
+2016-02-01 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13664] include/folia/folia.h: small improvement
+ * include/libfolia/folia.h: refactoring the constructors using
+ delegation (c++11 feature)
-2011-12-08 15:01 sloot
+2016-02-01 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13662] include/folia/folia.h, src/folia.cxx: more cleaning up
- in the interface
+ * include/libfolia/Makefile.am, include/libfolia/{properties.h =>
+ foliaproperties.h}, include/libfolia/foliatypes.h,
+ include/libfolia/foliautils.h, src/Makefile.am, src/document.cxx,
+ src/folia.cxx, src/folialint.cxx, src/{folia_properties.cxx =>
+ foliaproperties.cxx}, src/foliatypes.cxx, src/foliautils.cxx,
+ src/simpletest.cxx: some code reshuffling folia.cxx is still very
+ large
-2011-12-08 10:50 sloot
+2016-01-28 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13660] include/folia/folia.h, src/folia.cxx: more refactoring
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/folia_properties.cxx, src/foliautils.cxx: added
+ some code to do poor-mans introspection
-2011-12-08 09:35 sloot
+2016-01-27 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13658] include/folia/folia.h, src/folia.cxx: more refactoring.
- Nor done yet!
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/folia_properties.cxx, src/foliautils.cxx: a lot
+ of reactoring to get the class names and type names inline (Pos_t
+ ==> PosAnnotation_t and such) This will break some stuff!
-2011-12-07 11:13 sloot
+2016-01-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13656] include/folia/document.h, include/folia/folia.h,
- src/document.cxx, src/folia.cxx: more improvements
+ * src/folia_properties.cxx: improved properties stuff
-2011-12-06 17:20 sloot
+2016-01-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13654] include/folia/folia.h, src/folia.cxx: more API
- improvements
+ * src/folia.cxx: satisfy foliatest
-2011-12-06 16:43 sloot
+2016-01-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13650] include/folia/document.h, include/folia/folia.h,
- src/document.cxx, src/folia.cxx: started to implement a template
- based select<>() function.
- This enables us to return vectors of the desired type.
- Makes the API more readable and robust
+ * include/libfolia/folia.h, src/folia.cxx, src/folia_properties.cxx:
+ some cleanup. Moving more stuff to properties
-2011-12-06 14:52 sloot
+2016-01-25 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13643] configure.ac, include/folia/document.h,
- include/folia/folia.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: AbstractElement is renamed to FoliaElement.
- Big shock :0
+ * include/libfolia/folia.h: another refactoring step
-2011-11-28 14:29 sloot
+2016-01-25 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13606] src/document.cxx, src/folia.cxx:
+ * include/libfolia/folia.h, src/folia.cxx: code cleanup
-2011-11-28 10:35 sloot
+2016-01-25 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13602] include/folia/folia.h, src/folia.cxx: fixed stricttext()
+ * src/foliautils.cxx: ok, this may work again
-2011-11-28 09:10 sloot
+2016-01-23 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13594] src/folia.cxx: small fix to remove compiler warning
+ * include/libfolia/folia.h, src/foliautils.cxx: added function to
+ the interface
-2011-11-25 21:45 mvgompel
+2016-01-21 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13584] src/folia.cxx: small fix: Event allowed in Text
+ * include/libfolia/folia.h, src/folia.cxx, src/folia_properties.cxx:
+ small updates
-2011-11-25 15:30 mvgompel
+2016-01-21 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13581] include/folia/folia.h, src/folia.cxx: added stricttext()
- and some minor refactoring, text() and hastext() now call
- textcontent().. However, todo: stricttext() does not work as
- expected yet on corrections
+ * include/libfolia/folia.h, include/libfolia/properties.h,
+ src/folia.cxx, src/folia_properties.cxx: saved current state: a lot
+ is configurable now. also add more const where possible.
-2011-11-21 10:36 sloot
+2016-01-21 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13558] include/folia/folia.h, src/foliautils.cxx: more
- modifications to make Frog happy
+ * include/libfolia/folia.h, src/folia.cxx, src/folia_properties.cxx:
+ save state
-2011-11-17 15:03 sloot
+2016-01-20 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13555] src/folia.cxx: typos
+ * include/libfolia/folia.h, include/libfolia/properties.h,
+ src/folia.cxx, src/folia_properties.cxx, src/foliautils.cxx: getting
+ there almost
-2011-11-17 14:54 sloot
+2016-01-19 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13553] include/folia/folia.h, src/folia.cxx: when appending a
- documentless node, attach the parent document AND
- check set declartions. Maybe other stuff can be checkced too?
+ * include/libfolia/foliautils.h, include/libfolia/properties.h,
+ src/folia.cxx, src/folia_properties.cxx: save current state of work
-2011-11-17 13:26 sloot
+2016-01-19 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13551] include/folia/folia.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: implemented
- new stuff like Dependecies, TimedEvents and such
+ * include/libfolia/Makefile.am, include/libfolia/folia.h,
+ src/foliautils.cxx: some progress
-2011-11-14 14:24 sloot
+2016-01-19 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13543] src/document.cxx, src/folia.cxx: small fixes. words() is
- more cosequent now
+ * .travis.yml: only build the master!
-2011-11-10 15:36 sloot
+2016-01-19 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13539] src/folia.cxx, src/foliautils.cxx: oesp in EntityLayer
- added 'escape' possibility to argument parser
+ * .travis.yml: only build master
-2011-11-02 11:47 sloot
+2016-01-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13504] folia.pc.in: cleaner
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/Makefile.am, src/folia.cxx: started a branch 'generic' to
+ implement (more) generic initalization.
-2011-11-02 09:36 sloot
+2016-01-18 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13499] NEWS, configure.ac: Bumped version after releasing
+ * configure.ac: Bumped version after release
-2011-11-02 09:01 sloot
+2016-01-14 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13498] NEWS, configure.ac: we have a lift off!
+ * Makefile.am, NEWS: finished transition to GIT NEWS!
-2011-11-01 16:39 sloot
+2016-01-05 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13497] include/folia/foliautils.h, src/simpletest.cxx: improve
- includes
+ * : commit f7073344a573ca1d743f354523a67f0be72feba1 Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Tue Jan 5 10:58:14 2016
+ +0100
-2011-10-25 15:59 sloot
+2016-01-04 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13464] include/folia/document.h, include/folia/folia.h,
- include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: pua all stuff in own folia namespace
+ * README, configure.ac, include/libfolia/document.h,
+ include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/folialint.cxx,
+ src/foliautils.cxx, src/simpletest.cxx: Enter 2016 Modified
+ copyright message
-2011-10-19 12:34 sloot
+2015-12-21 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13441] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx: added auth attribute
+ * config.h.in: this file shouldn't be in git
-2011-10-18 16:09 sloot
+2015-12-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13437] include/folia/document.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: some cleanup
- and such
+ * src/folia.cxx: avoid potential memory leak
-2011-10-17 15:46 sloot
+2015-12-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13432] include/folia/folia.h, src/folia.cxx: added missing
- function
+ * include/libfolia/document.h, src/document.cxx, src/folia.cxx:
+ removed strange variant of Document constructor that keeped the
+ original XML is directly solved in External class now
-2011-10-17 15:11 sloot
+2015-12-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13431] src/folia.cxx: fix?
+ * include/libfolia/document.h, include/libfolia/foliautils.h,
+ src/document.cxx: attempt to fix includes minimalistic
-2011-10-13 15:30 sloot
+2015-12-07 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13411] src/folia.cxx: vergeten in te checken ooit
+ * : commit 1ae779a361695f9f910db0242d28ebfd4dfdbdeb Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Mon Dec 7 15:42:11 2015
+ +0100
-2011-09-29 10:45 sloot
+2015-12-07 Maarten van Gompel <proycon at anaproy.nl>
- * [r13324] include/folia/folia.h, src/folia.cxx: Ok, now all tests
- work again, except issubclass()
- issubclass function removed. Only worked for compiletime
- expressions.
- needs thinking
+ * config.h.in, include/libfolia/document.h,
+ include/libfolia/folia.h, include/libfolia/foliautils.h: reverted
+ part of commit 2b0bb9a to resolve issue #1: added some includes back
+ in header files.
-2011-09-27 11:39 sloot
+2015-12-03 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13314] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: update to newest maarten level
- not done yet (see failing tests)
+ * src/document.cxx: speed up Document deletion
-2011-09-21 12:12 sloot
+2015-12-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13262] include/folia/folia.h: added an issubclass() function
- nice hackery!
+ * include/libfolia/document.h, src/document.cxx: added code to safe
+ XML directly to a file. handles bigger XML documents, i hope. also
+ safes memory.
-2011-09-21 10:14 sloot
+2015-12-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13257] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: fixes, added classes and such
+ * .gitignore: added .gitignore
-2011-09-21 08:19 sloot
+2015-12-02 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13256] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: removed TextCorrection stuff
+ * include/libfolia/document.h, src/document.cxx, src/folia.cxx:
+ Added code to delete the incoming XML when creating a Document().
+ Smaller memory footprint! Can be overridden by a parameter in
+ special cases...
-2011-09-20 15:49 sloot
+2015-11-30 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13250] include/folia/folia.h, include/folia/foliautils.h,
- src/document.cxx, src/folia.cxx, src/foliautils.cxx: implemented
- most of folia 0.6
- A bit rough yet
+ * src/simpletest.cxx: fix include
-2011-09-15 14:32 sloot
+2015-11-30 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r13190] config.h.in, include/folia/foliautils.h, src,
- src/Makefile.am, src/simpletest.cxx: 'make check' en 'make
- distcheck' work!
+ * : commit 2b0bb9a865aa8a32cb1292609e034dec7f7ce47a Author: Ko van
+ der Sloot <K.vanderSloot at let.ru.nl> Date: Mon Nov 30 17:27:29 2015
+ +0100
-2011-08-18 13:32 sloot
+2015-11-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r12907] include/folia/folia.h, src/folia.cxx: more refactoring
- alternatives() uses class now, not AnnotationType
+ * .travis.yml: don't build and run foliatest. It has its own .travis
+ file. Just do a make check.
-2011-08-18 10:33 sloot
+2015-11-26 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r12901] include/folia/document.h, include/folia/folia.h,
- src/document.cxx, src/folia.cxx: some refactoring.
- added some functions.
+ * include/libfolia/folia.h, src/document.cxx, src/folia.cxx:
+ replaced all dynamic initializing by static. This should speed up a
+ little bit, and make initMT() unneeded. Didn't test the latter
+ yet....
-2011-08-18 08:50 sloot
+2015-11-24 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r12899] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: added whitespace and linebreak
- classes
+ * src/document.cxx: we use the XML_PARSE_HUGE option so we can parse
+ REALY BIG files
-2011-08-16 16:18 sloot
+2015-11-24 Ko van der Sloot <K.vanderSloot at let.ru.nl>
- * [r12891] src/document.cxx, src/folia.cxx: some fixes
+ * README: some additions
-2011-08-16 15:02 sloot
+2015-11-24 Maarten van Gompel <proycon at anaproy.nl>
- * [r12889] include/folia/folia.h, src/folia.cxx: argl
+ * README: README update
-2011-08-16 13:12 sloot
+2015-11-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12886] include/folia/document.h, src/document.cxx: added
- possability to add a namespace name ont output of a document
+ * src/folia.cxx: get more in line with Python lib. not done yest git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18844
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-16 12:36 sloot
+2015-11-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12883] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: TextCorrection levels have
- changed
- some member added, like division() and incorrection()
+ * src/folia.cxx: allow Feature in a Correction git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18823
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-10 13:48 sloot
+2015-09-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12841] include/folia/folia.h, src/folia.cxx: more const added.
+ * : props git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18631
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-10 13:21 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12840] include/folia/folia.h, src/folia.cxx: working on cost
- correctness
+ * src/folia.cxx, src/foliautils.cxx: finished refeactoring for now git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18472
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-10 10:59 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12834] include/folia/folia.h, src/document.cxx, src/folia.cxx:
- simplified XML output
+ * src/document.cxx, src/folia.cxx: advanced refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18471
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-10 10:43 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12833] src/folia.cxx: fixed memoryleaks
+ * src/document.cxx: also some refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18470
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-10 10:32 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12832] include/folia/folia.h, src/folia.cxx: reshuffled code.
- xmlstring() is much simpler now!
+ * src/folia.cxx: finished extermination of data[] stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18469
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-09 15:22 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12821] include/folia/foliautils.h, src/document.cxx,
- src/folia.cxx, src/foliautils.cxx: working on better const
- correctness
+ * src/folia.cxx: next step git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18468
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-09 15:01 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12819] include/folia/Makefile.am, include/folia/document.h,
- include/folia/folia.h, include/folia/foliautils.h,
- src/Makefile.am, src/document.cxx, src/folia.cxx,
- src/foliautils.cxx: refactored: split in more managable parts
+ * src/folia.cxx: more refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18467
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-09 14:07 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12818] include/folia/folia.h, src/folia.cxx: more refeactoring.
- attempt to make some stuff less public
+ * src/folia.cxx: more modernizing git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18466
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-09 12:18 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12813] include/folia/folia.h, src/folia.cxx: - xml-stylesheet
- info is stored on Parsing and output in the XML
- - some refactoring.
+ * src/folia.cxx: more refeactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18465
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-08 15:19 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12808] src/folia.cxx: slimmerder
+ * src/folia.cxx: modernized git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18464
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-08 14:28 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12807] include/folia/foliautils.h, src/folia.cxx: small fixes:
- - added include
- - make compiler happy
+ * include/libfolia/folia.h, src/folia.cxx: code cleanup git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18463
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-04 13:06 sloot
+2015-05-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12790] configure.ac, include/folia/folia.h,
- include/folia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
- removed boost stuff. use DIY poor mans datetime parser
+ * src/folia.cxx: typo git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18462
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-03 12:40 sloot
+2015-05-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12787] src/folia.cxx: small edit
+ * include/libfolia/folia.h, src/folia.cxx: added more functionality git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18459
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-03 11:48 sloot
+2015-05-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12786] src/folia.cxx: refactored again
+ * include/libfolia/folia.h, src/document.cxx, src/folia.cxx: started
+ implementing Phon stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18457
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-03 10:14 sloot
+2015-05-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12783] src/folia.cxx: more refactoring
+ * src/folia.cxx: fixed ste inference from Correction git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18453
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-03 09:52 sloot
+2015-05-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12782] include/folia/folia.h, src/folia.cxx: some refactoring
+ * include/libfolia/folia.h, src/folia.cxx: refactored git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18449
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-02 09:17 sloot
+2015-05-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12777] include/folia/folia.h, src/folia.cxx: implemented the
- 'space=' attribute for Word
+ * src/folia.cxx: all systems green again! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18447
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-08-01 12:19 sloot
+2015-05-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12770] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx: added operator << Document
- const correctness improved
+ * include/libfolia/folia.h, src/folia.cxx: started to fix append()
+ for SpanAnnotation. Works but clumsy yet git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18445
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-28 16:04 sloot
+2015-05-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12757] src/folia.cxx: cleaner and meaner
+ * src/folia.cxx: code modernization git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18436
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-28 15:09 sloot
+2015-05-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12755] include/folia/folia.h, src/folia.cxx: refactored a lot.
- Head to set MINTEXTCORRECTIONLEVEL = CORRECTED; for Original and
- Morpheme
- Why doesn't Maarten need that? strange
+ * src/folia.cxx: some code cleanup git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18435
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-27 15:10 sloot
+2015-05-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12738] include/folia/folia.h, src/folia.cxx,
- src/foliautils.cxx: getting more compliant with proycon
+ * src/folia.cxx: got textcontent() text() etc. inline with Python
+ version. code is quite ugly. Needs attention. Might break some
+ stuff build upon this. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18431
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-27 14:45 sloot
+2015-05-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12737] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: added more classes.
- Disclaimer: zonder tests/voorbeelden is alles erg vaag nog
+ * include/libfolia/folia.h, src/Makefile.am, src/folia.cxx: hmm.
+ stop working on text() stuff for now. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18398
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-27 13:25 sloot
+2015-05-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12736] include/folia/folia.h, include/folia/foliautils.h,
- src/folia.cxx, src/foliautils.cxx: added missing classes
+ * include/libfolia/folia.h, src/folia.cxx: start with redoeing
+ text() stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18397
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-27 09:07 sloot
+2015-05-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12734] src/folia.cxx, src/foliautils.cxx: problem in argument
- parsing solved
+ * include/libfolia/folia.h, src/folia.cxx: added wrefs() member git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18394
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-26 15:27 sloot
+2015-05-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12726] include/folia/folia.h, src/folia.cxx: some refactoring.
- datetime is a pita still
+ * include/libfolia/folia.h, src/folia.cxx: added som convenient
+ stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18392
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-26 10:34 sloot
+2015-05-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12723] src/folia.cxx: fixed previous fix
+ * include/libfolia/folia.h: added convenient function git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18388
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-26 10:24 sloot
+2015-05-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12722] include/folia/folia.h, src/folia.cxx: fixed small memory
- leak
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: allow href on all nodes with the
+ XLINK property git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18383
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-25 10:34 sloot
+2015-05-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12711] include/folia/folia.h, src/folia.cxx: some refactoring
+ * src/folia.cxx: better errormessage git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18382
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-25 09:49 sloot
+2015-05-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12709] include/folia/folia.h, src/folia.cxx: added version
- stuff
+ * include/libfolia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
+ sorted out phonetics <==> phonology stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18380
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-21 13:28 sloot
+2015-05-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12669] include/folia/folia.h, src/folia.cxx: added
- setDateTime() function
- datetime is very picky atm. needs work.
+ * include/libfolia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
+ 'fixed' begintime and endtime parsing git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18378
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-21 12:59 sloot
+2015-04-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12668] configure.ac, include/folia/folia.h,
- include/folia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
- added date_time stuff. Needs boost_date_time
+ * src/folia.cxx, src/foliautils.cxx: some progress git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18376
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-21 08:42 sloot
+2015-04-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12656] include/folia/folia.h, src/folia.cxx,
- src/foliautils.cxx: soem reactoring and cleanup.
- fixed problem with undeclared sets
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: added PhonologyLayer git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18375
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-20 16:33 sloot
+2015-04-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12637] include/folia/folia.h, src/folia.cxx: fixed problems
- with defaul sets and such.
- Ugly! Please refactor!
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: working on PhonContent stuff not
+ usable yet! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18374
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-20 13:15 sloot
+2015-04-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12628] src/folia.cxx: fix
+ * include/libfolia/folia.h, src/folia.cxx: attribute fixes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18373
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-20 12:22 sloot
+2015-04-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12625] src/folia.cxx: *blush*
- oh, that was bad
+ * include/libfolia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: added more Annotation Types git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18371
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-20 10:49 sloot
+2015-04-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12622] include/folia/folia.h, src/folia.cxx: added xmlstring()
- member
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/Makefile.am, src/folia.cxx: added new Attributes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18370
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-19 15:18 sloot
+2015-04-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12605] include/folia/folia.h, src/folia.cxx,
- src/foliautils.cxx: added == ans != operators.
- fixed tests, using xmldiff. Needed a bugfix too
+ * src/document.cxx: OMG git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18366
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-18 08:37 sloot
+2015-04-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12548] TODO: to do
+ * configure.ac, src/foliautils.cxx: "modernize" git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18329
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 15:24 sloot
+2015-04-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12520] bootstrap: oesp
+ * include/libfolia/folia.h, src/folia.cxx: added cls parameter to
+ str() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18322
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 15:24 sloot
+2015-03-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12519] m4/Makefile.am, static.cxx: fix
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx: some refactoring. prelude to implementing Phon stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18280
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 15:19 sloot
+2015-03-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12518] .: shuffle
+ * src/Makefile.am: fall back to c++0x git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18267
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 15:18 sloot
+2015-03-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12516] shuffle
+ * src/folia.cxx: avoid adding ref to a word git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18230
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 15:14 sloot
+2015-03-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12515] props
+ * src/folia.cxx: allow more tags inside a <text> git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18214
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 15:08 sloot
+2015-02-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12514] tests are moved
+ * src/folia.cxx: cool! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18074
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 13:36 sloot
+2015-02-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12509] more cleanup
+ * src/folia.cxx: Ok, be a bit more modern. using unitializer list
+ now git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18073
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 12:02 sloot
+2015-02-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12504] pompdiedom
+ * include/libfolia/document.h, include/libfolia/folia.h,
+ src/document.cxx, src/folia.cxx: be more strict on
+ unknown/unsupported attributes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18058
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 11:36 sloot
+2015-02-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12503] added sanity checks
+ * src/Makefile.am: c++11 aware git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@18034
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 11:18 sloot
+2015-01-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12501] refactoring
+ * include/libfolia/document.h, include/libfolia/folia.h,
+ include/libfolia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/folialint.cxx, src/foliautils.cxx, src/simpletest.cxx: 2015 git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17987
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-14 10:30 sloot
+2015-01-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12498] refactoring...
+ * src/folia.cxx: allow more atributes on String git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17951
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-13 16:03 sloot
+2014-11-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12494] some refactoring
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: added Part tag
+ and annotation git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17869
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-13 14:12 sloot
+2014-11-21 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12488] cleaned up tests, and added missign dir
+ * .travis.yml: added dependency for travis git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17859
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-13 12:22 sloot
+2014-11-21 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12485] 74 tests pass (except 2 that must fail)
-
- Valgrinded. No problems, no leaks.
+ * .travis.yml: yet another fix for travis git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17858
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-12 15:40 sloot
+2014-11-21 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12474] pattern conjunctie works (but not sure that it does what
- Maarten intended)
+ * .travis.yml: travis fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17855
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-12 15:06 sloot
+2014-11-21 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12473] wildcard expansion now worls for overlap too. Please
- don't look at the code. it's ugly
+ * .travis.yml: added travis-ci git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17853
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-12 12:29 sloot
+2014-11-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12464] added regexp handling to findnodes()
+ * include/libfolia/folia.h, src/folia.cxx: addPosAnnotation and
+ addLemmaAnnotation are now applicable to all AllowAnnotation types.
+ addMorphology seems te be restricted to words. should be sorted out
+ some day... git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17821
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-12 09:48 sloot
+2014-11-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12460] multiple wildcards seem to work now
+ * src/folia.cxx: allow generate_id on add*() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17819
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-11 15:58 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12453] saving WIP
- another test (find_nodes with context) works now
+ * src/folia.cxx: fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17816
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-11 13:08 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12450] bit cleaner and faster code
+ * src/folia.cxx: fix for set names git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17815
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-11 12:29 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12445] small step ahead. 1 more test works
+ * include/libfolia/folia.h, src/folia.cxx: added functions to
+ collect all Annotations in a certain set (including alternatives) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17813
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-07 16:01 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12345] more tests
+ * include/libfolia/folia.h, src/folia.cxx: added
+ addMorphologyLayer() addMorphologyLayer(), addLemmaAnnotation() and
+ addPosAnnotation() now label the Alternatives with distinctive
+ names. (alt-mor, alt-lem, alt-pos) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17810
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-07 14:41 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12344] improved context() functions. Using a PlaceHolder class
- now.
- Added some extreme tests too!
+ * src/folia.cxx: much simpler. multiple Anternatives are OK! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17807
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-07 09:57 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12336] implemented previous(), next(), leftcontext() and
- rightcontext()
+ * configure.ac: bumped version git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17805
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-06 16:11 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12329] started implementing findnodes()
- now wait for Maarten to finish prototyping
+ * src/folia.cxx: addPosAnnotation and addLemmaAnnotation now create
+ an Alternative when possible git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17802
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-06 12:47 sloot
+2014-11-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12314] got it working again
+ * config.h.in, include/libfolia/folia.h, src/folia.cxx: small fix:
+ addLemmaAnnotation and addPosAnnotation are only meant for Word git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17800
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-05 16:29 sloot
+2014-10-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r12296] defaultset mess not completed yet
- 8 errors left
+ * COPYING: terug git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17745
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-04 15:34 sloot
+2014-10-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10865] next step
+ * COPYING: weg git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17744
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-04 15:01 sloot
+2014-10-20 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10864] more cleanup
+ * COPYING, config.h.in, configure.ac, src/document.cxx: fixes for
+ clang++ git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17740
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-04 15:01 sloot
+2014-10-19 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10863] cleanup
+ * COPYING, configure.ac: added compiler fallback git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17736
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-07-04 14:18 sloot
+2014-09-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10862] bug fixed in attribute parsring
- fixed test
- some cleanup
+ * NEWS, configure.ac: bumping! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17693
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-23 14:56 sloot
+2014-09-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10751] small improvement
+ * src/Makefile.am: bumped lib version git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17692
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-23 14:38 sloot
+2014-09-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10750] all tests work!
+ * src/folialint.cxx: folialint now has opttions --debug and
+ --permissive git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17689
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-23 13:50 sloot
+2014-09-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10749] lots of cleanup, without breaking the tests
+ * include/libfolia/document.h, src/document.cxx: removed unused
+ "load" option on Document. added a "mode" option. At the moment
+ only 'permissive' value is hounour. Only fixup missing namespace
+ declaration for 'permissive' git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17688
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-23 12:32 sloot
+2014-09-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10747] test ok now
+ * src/document.cxx: accept folia docs without namespaces
+ declarations and silently add the default then. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17681
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-23 07:51 sloot
+2014-09-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10737] some cleanup
- broke 1 test :{
+ * src/document.cxx: more clear error message on missing/wrong
+ namespace. It is unclear of that is really an error. :{ git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17679
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-22 15:03 sloot
+2014-09-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10726] insert test \o/
+ * NEWS: updated NEWS git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17675
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-22 13:59 sloot
+2014-09-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10723] delete test works
+ * include/libfolia/folia.h: OEPS! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17632
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-22 13:27 sloot
+2014-08-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10721] merge test works
+ * include/libfolia/folia.h, src/folia.cxx: more refctoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17524
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-22 10:04 sloot
+2014-08-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10712] another test succeeds
+ * include/libfolia/folia.h, src/folia.cxx: some reshuffling of
+ functions. Alse sharpend the signature of some. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17523
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-21 13:59 sloot
+2014-08-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10677] Split works!
+ * src/folia.cxx: allow Correction at more places git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17521
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-21 13:46 sloot
+2014-08-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10676] fixed some namespave stuff
+ * include/libfolia/document.h: added backward compatible
+ doc.append(). git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17512
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-16 16:22 sloot
+2014-08-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10592] major rework for corrections. Not OK yet :{
+ * include/libfolia/document.h: removed declared but not longer
+ implemented function git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17509
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-15 14:28 sloot
+2014-08-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10573] progres++
+ * include/libfolia/document.h, include/libfolia/folia.h,
+ src/document.cxx, src/foliautils.cxx, src/simpletest.cxx: more
+ cleanup git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17507
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-15 10:34 sloot
+2014-08-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10569] taking the next step forward
+ * include/libfolia/folia.h: small fixes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17505
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-10 14:20 sloot
+2014-08-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10535] and another test gives OK
+ * include/libfolia/folia.h, src/folia.cxx: more cleaning up. API
+ change too :) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17504
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-10 14:02 sloot
+2014-08-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10534] streamlined
+ * include/libfolia/folia.h, src/folia.cxx: more cleanup git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17503
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-10 13:31 sloot
+2014-08-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10532] 410 OK!
+ * include/libfolia/folia.h, src/folia.cxx: cleaned up correct() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17502
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-09 16:11 sloot
+2014-08-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10477] another one bites the dust
+ * include/libfolia/folia.h, src/folia.cxx: start simplification of
+ correct(). Now the diamond is tamed... git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17501
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-09 12:56 sloot
+2014-08-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10475] 2 more tests
+ * include/libfolia/folia.h: more cleanup. using virtual inheritanve
+ even more. We don't fear the "deadly diamond of death"... git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17500
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-07 15:39 sloot
+2014-08-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10448] the 2 TO DO tests are done now
+ * include/libfolia/folia.h, src/document.cxx, src/folia.cxx: started
+ big refactoring. FoliaElement is a virtual base class now. Breaks
+ the ABI, not the API. should to a cleaner interface.... git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17498
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-07 14:04 sloot
+2014-08-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10446] 36 tests pass
+ * include/libfolia/folia.h, src/folia.cxx: attemt to sort out
+ correct(). Code is convoluted now. (still) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17495
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-06-07 09:56 sloot
+2014-08-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10445] some progress. Lets hope proycon is almost done
- refactoring
+ * src/document.cxx, src/folia.cxx: allow Correction om more nodes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17481
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-30 15:37 sloot
+2014-08-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10359] added a stub
+ * include/libfolia/folia.h, src/folia.cxx: fixed ID generation. use
+ parent ID when needed git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17478
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-30 15:18 sloot
+2014-08-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10358] test program now based on libcppunit
+ * include/libfolia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
+ allow correcion in entity allow spanannotaion in correction children git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17477
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-26 10:53 sloot
+2014-07-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10286] KWargs handling improved.
- correctAnnotation is a pita, still
+ * include/libfolia/folia.h, src/folia.cxx: fixed problem with
+ External node. Is was used after deletion. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17462
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-25 15:42 sloot
+2014-07-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10278] next test also works.
- Code gets a bit uglier ;{
+ * src/folia.cxx: amother small fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17455
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-25 10:42 sloot
+2014-07-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10270] another test bites the dust
+ * src/folia.cxx: fixed problems with text(). git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17454
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-24 15:36 sloot
+2014-07-15 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10241] more tests work
+ * include/libfolia/folia.h, src/folia.cxx: fixed test() for markup git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17452
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-24 14:23 sloot
+2014-07-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10239] refactored. IMHO all <tag> 's should be first class
- citizens
-
+ * COPYING: add git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17402
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-23 15:19 sloot
+2014-07-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10186] next step
+ * COPYING: del git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17401
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-23 09:05 sloot
+2014-06-27 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10157] KWargs are more pythonic now
+ * COPYING, src/folia.cxx: Accepted data for Note was wrong git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17392
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-19 15:42 sloot
+2014-06-25 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10112] small step again
- it's sometimes confusing…
+ * src/folia.cxx: event may now contain all kind of structure
+ elements git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17389
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-19 14:33 sloot
+2014-06-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10104] some progresss
+ * AUTHORS: courtesy git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17377
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-19 12:58 sloot
+2014-06-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10101] more progress
- now leakproof too
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: listitem ==> item git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17375
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-18 15:26 sloot
+2014-06-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10081] making some progress
+ * NEWS, src/folia.cxx: oesp, forgotten a checkin and some NEWS git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17329
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-17 14:58 sloot
+2014-05-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10041] next step. Editing annotations
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: noteref ==> ref git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17259
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-17 12:16 sloot
+2014-05-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10028] editing works (passes tests, that is)
+ * src/folia.cxx: a cell may contains entities git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17257
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-17 10:15 sloot
+2014-05-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10022] polishing
+ * src/document.cxx: Don't exclude Note in sentence count git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17254
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-17 08:57 sloot
+2014-05-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10018] more cleanup
+ * src/folia.cxx: fixed id handling in Note git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17246
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-16 15:41 sloot
+2014-05-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r10004] start polishing before next steps
+ * COPYING: and reinstated git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17243
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-12 16:52 sloot
+2014-05-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9911] small step.
- bit ugly
- \
+ * COPYING, src/foliautils.cxx: deleted COPYING (stupid soft link) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17242
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-10 13:03 sloot
+2014-05-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9850] testSanity is a complete succes now.
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: first
+ implementation of Note en NoteReference git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17240
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-10 12:27 sloot
+2014-05-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9849] test 11 OK
+ * COPYING, include/libfolia/document.h, include/libfolia/folia.h,
+ include/libfolia/foliautils.h, src/Makefile.am, src/document.cxx,
+ src/folia.cxx, src/folialint.cxx, src/foliautils.cxx: added code for
+ External and Note. Not completed yet git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17238
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-05-10 12:19 sloot
+2014-05-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9848] upto test010 done
+ * include/libfolia/document.h, src/document.cxx, src/folia.cxx:
+ added an init procedure which MUST be called before running MT
+ applications git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17201
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-29 13:42 sloot
+2014-04-30 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9766] test 008
+ * COPYING, include/libfolia/folia.h, src/folia.cxx: added 2 helper
+ functions git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17174
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-29 13:18 sloot
+2014-04-30 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9765] Test 006 works
+ * Makefile.am: fixed 'make dist' git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17172
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-29 10:57 sloot
+2014-03-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9764] marched to test005 now
+ * src/folia.cxx: allow nested Morphemes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@17030
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-29 10:03 sloot
+2014-02-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9762] Word count work too
+ * src/document.cxx: 2 typos and a sanity check git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16921
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-29 09:37 sloot
+2014-01-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9761] sentences() works
+ * include/libfolia/document.h, include/libfolia/folia.h,
+ include/libfolia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/folialint.cxx, src/foliautils.cxx, src/simpletest.cxx: Happy
+ Newyear! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16816
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-29 09:22 sloot
+2013-11-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9760] document indexing works
+ * src/folia.cxx: fixed stupid bug. looping to 0 is difficult with
+ unsigned ints. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16714
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-27 15:59 sloot
+2013-10-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9727] wref sort of works now
+ * include/libfolia/document.h, src/document.cxx: added code to
+ handle 'non-standard' meta tags. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16655
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-27 14:14 sloot
+2013-10-24 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9721] TextContent is a first class citizen now
+ * include/libfolia/folia.h, src/folia.cxx, src/foliautils.cxx: hacks
+ to please the compiler git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16649
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-27 08:35 sloot
+2013-10-24 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9683] 4 tests work.
- Adapting program to data ;)
+ * include/libfolia/folia.h, include/libfolia/foliautils.h: less
+ warings on '-pedantic' compiler git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16644
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-26 12:14 sloot
+2013-10-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9656] step by step
+ * bootstrap => bootstrap.sh, config.h.in, configure.ac: modernized git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16613
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-21 16:12 sloot
+2013-10-15 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9638] ok, wref and su are parsed and spit. But not OK yet
+ * src/folia.cxx: no more Text in a List please! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16580
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-21 15:54 sloot
+2013-08-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9637] small steps…
+ * src/folia.cxx: eeeeek git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16458
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-21 15:09 sloot
+2013-08-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9636] some reshufling. FoLiA Namespaces are actively checked
- now
+ * src/folia.cxx: refactored appending a bit. addable() now tests
+ illegal reconnection of parents. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16456
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-21 12:57 sloot
+2013-08-15 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9623] moved stuff to foliautils
+ * src/folia.cxx: added a test for 'empty' t nodes under <w> attempt
+ also to check connecting a node twice. But this is difficult. Needs
+ thinking git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16443
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-21 11:02 sloot
+2013-07-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9621] small cleanup
+ * src/folia.cxx: fixed occurences problem git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16346
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-21 10:14 sloot
+2013-07-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9620] fixed some namespace problems
+ * include/libfolia/document.h, include/libfolia/folia.h,
+ src/document.cxx: fixed toktext() added convinient function git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16335
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-20 15:28 sloot
+2013-07-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9603] genoeg voor vandaag
+ * include/libfolia/folia.h, src/folia.cxx: fix. The ABI is borken :{ git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16329
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-20 15:20 sloot
+2013-07-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9602] a small step
+ * include/libfolia/folia.h, src/folia.cxx: keep fixing text() stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16327
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-20 14:38 sloot
+2013-07-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9601] it is a mess
- but is reads some XML and spits most of it out
+ * include/libfolia/folia.h, src/folia.cxx: fixing text() stuff.
+ Quite a mess git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16325
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-14 16:30 sloot
+2013-07-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9518] not in SVN please
+ * include/libfolia/folia.h, src/folia.cxx: fix TextMarkupCorrection
+ text() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16313
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-14 16:29 sloot
+2013-07-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9517] some progress
+ * src/document.cxx: version bumped! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16311
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-13 15:55 sloot
+2013-07-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9487] it compiles!
+ * include/libfolia/folia.h, src/folia.cxx: hmpff. stil small 'id'
+ problem git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16310
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-13 15:36 sloot
+2013-07-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9486] added autoconfig stuff
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: totally
+ reworked TextContent class, using extre <xml-text> pseudo nodes also
+ better handle difference betweed xml:id and id attributes. Some
+ cleanup is needed, but it works git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16309
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-13 14:37 sloot
+2013-07-03 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9483] cleanup
+ * src/foliautils.cxx: small patch, div-annotation should be
+ division-annotation, documentation and libraries didn't match, now
+ allowing both when reading to prevent issues git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16302
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-13 12:56 sloot
+2013-07-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9479] small step ahead
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: started implementing Markup git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16300
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
-2011-04-13 12:36 sloot
+2013-07-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
- * [r9477] 'it compiles'
+ * include/libfolia/folia.h, src/folia.cxx: some refactoring of
+ text(). added a deeptext() as complement of stricttext() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16298
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-07-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/Makefile.am, src/folia.cxx: attampt
+ to repair gettextDelimitter in a ABI preserving way git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16289
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-07-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h: unfix the last fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16288
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-07-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h: small fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16287
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: small chage to avoid unexpected attribute order
+ in metadata nodes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16277
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: smarter solution (and thread-safe) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16272
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/folia.cxx: some refactoring to get
+ things a bit more generic git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16266
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-25 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/folia.cxx: added isSubClass()
+ functions to the interface git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16263
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-25 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: Some refactoring. More generic
+ solution for Folia Class Hiearchy git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16262
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-24 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: changed and improved handling of
+ XML comment nodes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16259
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: added experimental support for
+ XML comment nodes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16257
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: clearer message git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16251
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/folia.cxx: xml:lang is unsupported
+ now :{ git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16249
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/document.h, include/libfolia/folia.h,
+ include/libfolia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: fixed a bug in document parsing (meta nodes were
+ ignored) added lang node and LANG token annotation some provision
+ for comment nodes added git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16248
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: oesp. 1 bit to optimistic about version git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16241
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-06-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, include/libfolia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: added table
+ stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16239
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-05-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/folia.cxx: implemented findspans().
+ bit clumsy rethinking required git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16118
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-05-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/document.cxx, src/folia.cxx: some
+ refactoring. also implemented findspan() and wref() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16116
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-05-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/document.h, src/document.cxx: let isDeclared
+ ignore the date git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16077
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-05-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h, src/folia.cxx: some refactoring to
+ enable corrections for Str nodes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@16076
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-13 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia.h: added FoliaElement::printable() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15991
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: signal our needs git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15967
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: use new ticcutils stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15966
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: added GZ support git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15960
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, src/document.cxx: added read/write of .bz2 files git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15957
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: bump version after release git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15942
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/Makefile.am: increment current library version git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15924
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/Makefile.am, include/libfolia/document.h,
+ include/libfolia/folia.h, src/document.cxx, src/folia.cxx,
+ src/folialint.cxx, src/foliautils.cxx, src/simpletest.cxx: ok,
+ reverted the plan to name the package 'folia' it is 'libfolia' now
+ everywhere git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15909
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/libfolia/folia/Makefile.am,
+ include/libfolia/folia/document.h, include/libfolia/folia/folia.h,
+ include/libfolia/folia/foliautils.h: hmm git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15908
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/{folia => libfolia}/Makefile.am,
+ include/{folia => libfolia}/document.h, include/{folia =>
+ libfolia}/folia.h, include/libfolia/folia/Makefile.am,
+ include/libfolia/folia/document.h, include/libfolia/folia/folia.h,
+ include/{ => libfolia}/folia/foliautils.h,
+ include/libfolia/foliautils.h: rename dir git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15907
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: news git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15904
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/document.cxx, src/foliautils.cxx:
+ XPath stuff is moved to ticcutils git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15893
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: also most recent ticcutils needed git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15884
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/folia/document.h, include/folia/folia.h,
+ include/folia/foliautils.h, src/Makefile.am, src/document.cxx,
+ src/folia.cxx, src/foliautils.cxx: changed install directory! moved
+ some XML stuff to ticcutils git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15873
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/foliautils.cxx: numb change git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15861
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/Makefile.am, src/folialint.cxx: tags git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15850
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-04-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/folialint.cxx: removed unused
+ functions added copyright stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15849
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-03-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
+ removed stuff that is present in ticcutils git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15845
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-03-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: oesp, parameter is const git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15786
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-03-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx, src/foliautils.cxx:
+ implemeneted _lang attribute for TextContent git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15784
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-03-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: be more picky on the 'type' atribute in
+ AlignReference git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15778
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-03-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/foliautils.cxx: fixed NCname checking. A ':' may not be part
+ of it. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15777
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-03-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: added some comments git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15763
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-02-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: add xlink support for href in Alignment git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15747
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-02-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: String class updated. it an Annotation now git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15745
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-02-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: New Substring class. Not finished git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15733
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2013-01-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx, src/simpletest.cxx: Bump year git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15570
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-12-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: added 'now()' default for datetime declaration git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15527
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-12-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: fixed a problem with NO_ANN nodes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15517
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-12-05 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx:
+ adapted to some of Maarten's changed. not all yet.. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15515
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-11-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/foliautils.cxx: add convenient
+ function git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15482
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-11-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added a (set) parameter to
+ pos() and lemma() functions git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15420
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-30 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * bootstrap: bootstrap fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15368
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-30 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx: improved handling of
+ style-sheet processing instructions for now we REJECT multiple
+ test/xsl types. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15354
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: relax constraints on Content node git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15348
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: modified addAlternative() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15303
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: fiddle with addable
+ atletnatives and morhological layers. It is a bit messy! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15301
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/foliautils.h: safeguards git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15276
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: make sure we produce UTF-8 git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15259
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: some NEWS git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15239
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: some fixes to get all
+ working git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15237
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-10-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: started
+ implementing new FoLiA features like coreference etc. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15234
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-09-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: small fixes in Metric stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15225
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-09-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: added metric stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15223
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-09-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: added ValueFeature. Not completed yet. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15222
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-09-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: added comment git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15159
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-08-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/folia/document.h,
+ include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: more TiCC suff used git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15090
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-08-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: accept more git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@15063
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-07-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14982
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-07-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: added validity check for xml:id's Also ALL
+ libxml2 Parser warnings wil handled as an eror! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14977
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-07-11 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: small change in PlaceHolder stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14974
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-07-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: fixed PlaceHolder stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14967
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-07-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ src/document.cxx, src/folia.cxx: added methods to extract all
+ sentenceParts from a document. And to extract Words and Placeholders
+ from sentences. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14948
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-07-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added abstractionlayer.
+ alloe N attribute foro suggestion. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14938
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: cleaner datetime handling, and without leaks! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14899
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: simplified datetime handling git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14887
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: added datetime
+ defaults git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14885
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: revoked smart idea about accept added a
+ canonical option to xml generation, to make comparisions easy git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14870
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: more generic and less error-prone solution for
+ filling _accepted_data (until everyone has a modern compiler) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14859
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: some fixes. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14857
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: fixed timedevent stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14855
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: a bit of cleaning done git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14854
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: first, somewhat clumsy, implementation of
+ Alignment git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14852
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: implemented toktext() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14851
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-06-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/document.cxx, src/folia.cxx: removed
+ error attribute from ErrorDetection git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14848
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx, src/foliautils.cxx: headfeat ==> headfeature git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14680
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: so we postpone checking of
+ required attributes until we append the node. This makes
+ construction more flexible git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14679
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: reverted change because Maarten reverted his
+ thoughts git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14677
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: avoid appending nodes without ID. same should be
+ done voor _set and maybe more. later... git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14673
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx: improved namespace
+ handling git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14667
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: attempt to fix identation of annotations. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14666
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: more maarten-compliant git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14665
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx, src/folialint.cxx: no
+ real change, except for folialint git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14664
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/folia.cxx, src/foliautils.cxx:
+ DOMAIN ==> DOMEIN It seems to be a 'special' or 'reserved' word git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14663
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folialint.cxx: fix 1 git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14662
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/Makefile.am, src/folia.cxx,
+ src/folialint.cxx: lots of adaptations to new insights. started to
+ implement a 'folialint' program for simple checking. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14660
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h,
+ src/document.cxx, src/foliautils.cxx: beterder git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14659
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: some cleanup and refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14658
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-04-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx,
+ src/simpletest.cxx: added some sanity tests, an used them to weed
+ out problems that were never a problem yet git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14656
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: bump version after release git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14584
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: get ready for release git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14582
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: cleaning up the interface
+ (breaks API) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14476
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx: avoid duplicate
+ annotation declarations git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14474
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx: more cleanup be more
+ picky on declarations git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14466
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: fixed defaultannotatortype git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14463
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx, src/folia.cxx: small
+ fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14461
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-03-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx: attempt to sort out annotation
+ defaults stuff. waiting for maarten to give a ruling git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14458
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: bump version after release git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14354
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: typo git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14352
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: news updated git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14341
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: be more strict on 'set' and 'class' attributes.
+ They need a document! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14337
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: small memoryleak fixed git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14335
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fixed git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14329
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: hmm. This too git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14320
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: allow empty set names in declarations. Handle as
+ set="undefined" git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14319
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-23 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: fixed problem with missing (default) sets git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14316
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx: parsering of multiple set definitions for same
+ atrtibute works now git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14313
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: relax div and gap git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14307
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-22 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: cleaning up git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14305
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: work around argument parser inside libfolia git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14303
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: oesp git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14298
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fix the fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14297
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-21 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: event accepts feature git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14296
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx: small refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14290
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ src/document.cxx, src/folia.cxx: fixed CMDI stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14289
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/document.cxx, src/folia.cxx: some small
+ refactoring. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14281
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-15 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: fixed problem witg const
+ char parameters to string template. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14270
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-15 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: fixed annotation defaults stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14268
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-02-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS, configure.ac: bumped version after release git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@14254
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-01-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: Some news git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13996
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-01-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/folia/foliautils.h, src/document.cxx,
+ src/folia.cxx, src/foliautils.cxx: Added GAP annotation made the
+ gap-annotation mandatory for GAP nodes made the div-annotation
+ mandatory for DIV nodes now correctly complain when 'set' attribute
+ is missing in a *-annotations declaration git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13979
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-01-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * config.h.in, configure.ac, src/folia.cxx, src/foliautils.cxx:
+ cleanup the configuration git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13943
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-01-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: bumped version after release git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13932
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-01-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS, src/foliautils.cxx: fixed argument parsing problem git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13911
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2012-01-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx, src/simpletest.cxx: added copyright stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13851
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac: Bumped version after releas git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13761
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS: NEWS git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13754
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/simpletest.cxx: fixed 'make check' git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13753
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: ok, to be complete, add ad
+ Version() function too git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13697
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added VersionName() function
+ to get in line with other modules git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13680
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: added a HeadFeature git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13676
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: better git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13671
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-12 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: implemented an
+ AllowGeneretaeID class, te get more inline with the Python version git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13670
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: last second fix. I should check the whole
+ class hierarchy soon! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13665
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: small improvement git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13664
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more cleaning up in the
+ interface git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13662
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13660
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more refactoring. Nor done
+ yet! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13658
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-07 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ src/document.cxx, src/folia.cxx: more improvements git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13656
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more API improvements git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13654
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ src/document.cxx, src/folia.cxx: started to implement a template
+ based select<>() function. This enables us to return vectors of the
+ desired type. Makes the API more readable and robust git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13650
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-12-06 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/folia/document.h, include/folia/folia.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: AbstractElement
+ is renamed to FoliaElement. Big shock :0 git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13643
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: git-svn-id:
+ https://ilk.uvt.nl/svn/sources/libfolia/trunk@13606
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: fixed stricttext() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13602
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: small fix to remove compiler warning git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13594
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-25 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: small fix: Event allowed in Text git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13584
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-25 mvgompel <mvgompel at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added stricttext() and some
+ minor refactoring, text() and hastext() now call textcontent()..
+ However, todo: stricttext() does not work as expected yet on
+ corrections git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13581
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/foliautils.cxx: more modifications to
+ make Frog happy git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13558
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: typos git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13555
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: when appending a
+ documentless node, attach the parent document AND check set
+ declartions. Maybe other stuff can be checkced too? git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13553
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: implemented new
+ stuff like Dependecies, TimedEvents and such git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13551
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: small fixes. words() is more
+ cosequent now git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13543
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx, src/foliautils.cxx: oesp in EntityLayer added
+ 'escape' possibility to argument parser git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13539
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * folia.pc.in: cleaner git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13504
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS, configure.ac: Bumped version after releasing git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13499
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * NEWS, configure.ac: we have a lift off! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13498
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-11-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/simpletest.cxx: improve includes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13497
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-10-25 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: pua all stuff in own folia namespace git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13464
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-10-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx:
+ added auth attribute git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13441
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-10-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: some cleanup
+ and such git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13437
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-10-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added missing function git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13432
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-10-17 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fix? git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13431
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-10-13 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: vergeten in te checken ooit git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13411
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-29 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: Ok, now all tests work
+ again, except issubclass() issubclass function removed. Only worked
+ for compiletime expressions. needs thinking git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13324
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: update to newest maarten level not done yet (see
+ failing tests) git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13314
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h: added an issubclass() function nice
+ hackery! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13262
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: fixes, added classes and such git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13257
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: removed TextCorrection stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13256
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: implemented
+ most of folia 0.6 A bit rough yet git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13250
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-09-15 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * config.h.in, include/folia/foliautils.h, src/Makefile.am,
+ src/simpletest.cxx: 'make check' en 'make distcheck' work! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@13190
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more refactoring
+ alternatives() uses class now, not AnnotationType git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12907
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, include/folia/folia.h,
+ src/document.cxx, src/folia.cxx: some refactoring. added some
+ functions. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12901
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: added whitespace and linebreak classes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12899
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/document.cxx, src/folia.cxx: some fixes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12891
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: argl git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12889
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/document.h, src/document.cxx: added possability to
+ add a namespace name ont output of a document git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12886
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-16 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: TextCorrection levels have changed some member
+ added, like division() and incorrection() git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12883
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more const added. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12841
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: working on cost correctness git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12840
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/document.cxx, src/folia.cxx: simplified
+ XML output git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12834
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fixed memoryleaks git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12833
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-10 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: reshuffled code.
+ xmlstring() is much simpler now! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12832
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/document.cxx, src/folia.cxx,
+ src/foliautils.cxx: working on better const correctness git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12821
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/Makefile.am, include/folia/document.h,
+ include/folia/folia.h, include/folia/foliautils.h, src/Makefile.am,
+ src/document.cxx, src/folia.cxx, src/foliautils.cxx: refactored:
+ split in more managable parts git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12819
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: more refeactoring. attempt
+ to make some stuff less public git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12818
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-09 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: - xml-stylesheet info is stored on Parsing and output in the XML - some refactoring. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12813
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: slimmerder git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12808
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-08 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/foliautils.h, src/folia.cxx: small fixes: - added include - make compiler happy git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12807
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-04 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/folia/folia.h, include/folia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: removed boost stuff. use DIY poor
+ mans datetime parser git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12790
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: small edit git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12787
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: refactored again git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12786
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: more refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12783
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-03 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: some refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12782
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-02 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: implemented the 'space='
+ attribute for Word git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12777
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-08-01 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx:
+ added operator << Document const correctness improved git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12770
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: cleaner and meaner git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12757
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-28 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: refactored a lot. Head to
+ set MINTEXTCORRECTIONLEVEL = CORRECTED; for Original and Morpheme
+ Why doesn't Maarten need that? strange git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12755
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx, src/foliautils.cxx: getting
+ more compliant with proycon git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12738
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: added more classes. Disclaimer: zonder
+ tests/voorbeelden is alles erg vaag nog git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12737
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, include/folia/foliautils.h, src/folia.cxx,
+ src/foliautils.cxx: added missing classes git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12736
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-27 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx, src/foliautils.cxx: problem in argument parsing
+ solved git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12734
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: some refactoring. datetime
+ is a pita still git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12726
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fixed previous fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12723
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-26 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: fixed small memory leak git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12722
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-25 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: some refactoring git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12711
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-25 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added version stuff git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12709
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added setDateTime() function
+ datetime is very picky atm. needs work. git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12669
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * configure.ac, include/folia/folia.h, include/folia/foliautils.h,
+ src/folia.cxx, src/foliautils.cxx: added date_time stuff. Needs
+ boost_date_time git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12668
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-21 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx, src/foliautils.cxx: soem
+ reactoring and cleanup. fixed problem with undeclared sets git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12656
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: fixed problems with defaul
+ sets and such. Ugly! Please refactor! git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12637
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12628
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * src/folia.cxx: *blush* oh, that was bad git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12625
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-20 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx: added xmlstring() member git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12622
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-19 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * include/folia/folia.h, src/folia.cxx, src/foliautils.cxx: added
+ == ans != operators. fixed tests, using xmldiff. Needed a bugfix
+ too git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12605
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-18 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * TODO: to do git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12548
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * bootstrap: oesp git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12520
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * m4/Makefile.am, static.cxx: fix git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12519
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
+
+2011-07-14 sloot <sloot at 12f355fe-0486-481a-ad91-c297ab22b4e3>
+
+ * shuffle git-svn-id: https://ilk.uvt.nl/svn/sources/libfolia/trunk@12518
+ 12f355fe-0486-481a-ad91-c297ab22b4e3
diff --git a/Makefile.am b/Makefile.am
index ccef7c8..ab36c51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,3 @@
-# $Id: Makefile.am 8053 2011-01-27 16:06:19Z joostvb $
-# $URL: https://ilk.uvt.nl/svn/trunk/sources/ucto/trunk/Makefile.am $
-
ACLOCAL_AMFLAGS = -I m4 --install
SUBDIRS = src include m4
@@ -11,4 +8,4 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = folia.pc
ChangeLog: NEWS
- svn update; svn2cl --include-rev
+ git pull; git2cl > ChangeLog
diff --git a/Makefile.in b/Makefile.in
index 6c3e6b2..3c3a6ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,11 +14,18 @@
@SET_MAKE@
-# $Id: Makefile.am 8053 2011-01-27 16:06:19Z joostvb $
-# $URL: https://ilk.uvt.nl/svn/trunk/sources/ucto/trunk/Makefile.am $
-
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -82,12 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in $(srcdir)/folia.pc.in COPYING TODO \
- compile config.guess config.sub depcomp install-sh missing \
- ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -96,6 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -188,6 +191,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/folia.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+ README TODO compile config.guess config.sub depcomp install-sh \
+ ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -281,6 +288,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -379,16 +387,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
+ $(AUTOMAKE) --foreign Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -642,15 +649,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -686,17 +693,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -876,9 +883,11 @@ uninstall-am: uninstall-pkgconfigDATA
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-pkgconfigDATA
+.PRECIOUS: Makefile
+
ChangeLog: NEWS
- svn update; svn2cl --include-rev
+ git pull; git2cl > ChangeLog
# 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.
diff --git a/NEWS b/NEWS
index 856c202..2b5e9ce 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,66 @@
-0.11 2014-06-xx
+1.3 2016-07-11
+[Ko van der Sloot]
+Maintenance release:
+- long options --help aan --version added
+- fix in LineBreak: text() generates a newline
+
+1.2 2016-05-23
+[Ko van der Sloot]
+ * now based on Folia spec 1.2
+ - ForeignData node added
+ - Foreign metadata in document
+ - relaxed aref and ref type, implementing full xlink syntax for
+ 'simple' and 'locator' type.
+ - Linebreak nows supports 'linenr', 'pagenr' and 'newpage' attributes
+ - enhanced folialint:
+ - added a '--strip' option to strip 'instable'
+ information like dates and version numbers.
+ - added '--output' option to speciy an file
+ - added '--nooutput'option to suppres output
+ - document outputs annotations in same order as read in.
+ - we no longer output the set for AnnotationLayers
+ - alien atributes are totally ignored now.
+ - small bug fixes
+
+1.0 2016-03-09
+[Ko van der Sloot]
+ * totally reworked the implementation:
+ it is based on code generated from generic definitions that
+ assure that the Python and C++ versions are always inline
+ (Most of that work done by Maarten van Gompel)
+ * simplified and overhauld the class API.
+ * a lot of bug fixes for cornercases
+
+0.13 2016-01-14
+[Ko van der Sloot]
+ * repository moved to GitHub
+ * added Travis support
+ * much smaller memory footprint
+ * Document deletion was very slow due to a brainfarth
+ * no more initialization problems in MT cases
+ * use XML_PARSE_HUGE to be able to handle VERY LARGE documents
+ * text() functions in line with the Python version
+ * added new "tags" to keep in sync with the Python version
+ * a lot of small code updates and refactorings
+
+0.12 2014-09-23
+[Ko van der Sloot]
+ * release 0.12
+ * library version bumped to 3.0.0 because ABI and API have heavily changed
+
+0.11 2014-09-16
* now implements nodes like: Ref, Note, External
+ * Correction may be added to a lot more nodes
* several bug fixes
* better MT safe
+ * major API and ABI changes: Added a true virtual base,
+ using virtual inheritance.
0.10
* some XML stuff is moved to ticcutils
* also use some other goodies form ticcutils
* now implements new nodes like Metric, Coreferences and Semroles
- (follwing the FoLiA 0.9 specs)
+ (following the FoLiA 0.9 specs)
* a lot of code improvement too, including some bug fixes
0.9
diff --git a/README b/README
index 258cd57..0fdedba 100644
--- a/README
+++ b/README
@@ -1 +1,94 @@
-todo
+[](https://travis-ci.org/LanguageMachines/libfolia) [](http://applejack.science.ru.nl/languagemachines/)
+
+===================================
+Libfolia: FoLiA Library for C++
+===================================
+
+ Libfolia (c) CLS/ILK 1998 - 2016
+ Centre for Language Studies, Radboud University Nijmegen
+ Induction of Linguistic Knowledge Research Group, Tilburg University
+
+**Website:** https://proycon.github.io/folia/
+**Source repository:** https://LanguageMachines.github.io/libfolia
+**Contact**: lamasoftware AT science DOT ru DOT nl
+
+This is a C++ Library, developed by Ko van der Sloot, for working with the
+[Format for Linguistic Annotation (FoLiA)](https://proycon.github.io/folia/).
+The software is intended for C++ developers, and provides a high-level
+API to read, manipulate, and create FoLiA documents. This software is a
+necessary dependency for various other tools that use FoLiA.
+
+libfolia is distributed under the GNU Public Licence v3 (see the file COPYING).
+
+-----------------------------------------------------------------------
+Installation
+-----------------------------------------------------------------------
+
+This software has been tested to compile with Gcc or Clang, and runs on the
+following platforms:
+- Intel platforms running several versions of Linux, including Ubuntu, Debian,
+ Arch Linux, Fedora (both 32 and 64 bits)
+- MacOS X 10.10 or higher, FreeBSD
+
+*Contents of this distribution:*
+- Sources
+- Licensing information ( COPYING )
+- Build system based on GNU Autotools
+
+*Dependencies:*
+
+To be able to succesfully build libfolia from source, you need the following dependencies:
+- [ticcutils](https://github.com/LanguageMachines/ticcutils)
+- ``libxml2-dev`` (use your distribution's package manager)
+- ``libicu-dev``
+- A sane C++ build environment with autoconf, automake, autoconf-archive, make, gcc or clang, libtool, pkg-config
+
+To install libfolia, *first consult whether your distribution's package manager
+has an up-to-date package for it*. If not, for easy installation of libfolia
+and all dependencies, it is included as part of our software distribution
+LaMachine: https://proycon.github.io/LaMachine .
+
+To compile and install manually from source, provided you have all the
+dependencies installed:
+
+ $ bash bootstrap.sh
+ $ ./configure
+ $ make
+ $ make install
+
+and, optionally:
+ $ make check
+
+-----------------------------------------------------------------------
+Documentation
+-----------------------------------------------------------------------
+
+An API reference or tutorial is currently lacking. Contact us if you're
+intending to use libfolia and are in need of documentation.
+
+-----------------------------------------------------------------------
+Related software
+-----------------------------------------------------------------------
+
+
+This software is developed in parallel to the FoLiA library for Python (part of
+[PyNLPl](https://github.com/proycon/pynlpl)), and draws from the same external specification.
+
+Libfolia is used by various in-house projects:
+ * [ucto](https://LanguageMachines.github.io/ucto)
+ * [frog](https://LanguageMachines.github.io/frog)
+ * [foliautils](https://github.com/LanguageMachines/foliautils)
+ * [colibri-core](https://proycon.github.io/colibri-core)
+ * [wopr](https://github.com/LanguageMachines/wopr)
+
+Libfolia is tested (unit and integration tests) using the following extensive test suite:
+ * [foliatest](https://github.com/LanguageMachines/foliatest)
+
+For more information on FoLiA itself, consult the [FoLiA website](https://proycon.github.io/folia/)
+
+-----------------------------------------------------------------------
+Acknowledgements
+-----------------------------------------------------------------------
+
+This software is funded in the scope of [CLARIAH](http:/www.clariah.nl)
+project.
diff --git a/aclocal.m4 b/aclocal.m4
index 06cd71a..3fcffa8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -644,7 +647,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -694,7 +697,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -733,7 +736,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -762,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -809,7 +812,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -828,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -909,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -969,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -997,7 +1000,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1016,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/bootstrap.sh b/bootstrap.sh
index 5b0ae8a..9d29508 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -21,6 +21,8 @@
automake=automake
aclocal=aclocal
+ln -s README.md README
+
# if you want to autogenerate a ChangeLog form svn:
#
# svn2cl, a python script, as used in the GNU Enterprise project.
diff --git a/compile b/compile
index 531136b..a85b723 100755
--- a/compile
+++ b/compile
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/config.guess b/config.guess
index b79252d..6c32c86 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2014-11-04'
# 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
@@ -24,12 +24,12 @@ timestamp='2013-06-10'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 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."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
@@ -579,8 +579,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
@@ -826,7 +827,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -969,10 +970,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
@@ -1260,16 +1261,26 @@ EOF
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
@@ -1361,154 +1372,6 @@ EOF
exit ;;
esac
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff --git a/config.h.in b/config.h.in
index 1fecbed..2f7bcd0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -42,8 +42,7 @@
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
diff --git a/config.sub b/config.sub
index 9633db7..7ffe373 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2013-08-10'
+timestamp='2014-12-03'
# 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
@@ -25,7 +25,7 @@ timestamp='2013-08-10'
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+# Please send patches to <config-patches at gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 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."
@@ -265,6 +265,7 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -295,11 +298,11 @@ case $basic_machine in
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or1k | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -310,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -324,7 +328,10 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -381,6 +388,7 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +408,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -413,6 +423,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -430,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -767,6 +779,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -822,6 +837,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1367,14 +1386,14 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1592,9 +1611,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/configure b/configure
index 38f8ae7..354c7e8 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libfolia 0.11.
+# Generated by GNU Autoconf 2.69 for libfolia 1.3.1.
#
-# Report bugs to <timbl at uvt.nl>.
+# Report bugs to <lamasoftware at science.ru.nl>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -274,10 +274,11 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf at gnu.org and timbl at uvt.nl about
-$0: your system, including any error possibly output before
-$0: this message. Then install a modern shell, or manually
-$0: run the script under such a shell if you do have one."
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: lamasoftware at science.ru.nl about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
fi
exit 1
fi
@@ -589,9 +590,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libfolia'
PACKAGE_TARNAME='libfolia'
-PACKAGE_VERSION='0.11'
-PACKAGE_STRING='libfolia 0.11'
-PACKAGE_BUGREPORT='timbl at uvt.nl'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='libfolia 1.3.1'
+PACKAGE_BUGREPORT='lamasoftware at science.ru.nl'
PACKAGE_URL=''
ac_unique_file="configure.ac"
@@ -652,6 +653,7 @@ PKG_CONFIG_PATH
PKG_CONFIG
CXXCPP
CPP
+LT_SYS_LIBRARY_PATH
OTOOL64
OTOOL
LIPO
@@ -778,6 +780,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -795,6 +798,7 @@ CPPFLAGS
CCC
CC
CFLAGS
+LT_SYS_LIBRARY_PATH
CPP
CXXCPP
PKG_CONFIG
@@ -1344,7 +1348,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 libfolia 0.11 to adapt to many kinds of systems.
+\`configure' configures libfolia 1.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1414,7 +1418,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libfolia 0.11:";;
+ short | recursive ) echo "Configuration of libfolia 1.3.1:";;
esac
cat <<\_ACEOF
@@ -1437,11 +1441,14 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-pic try to use only PIC/non-PIC objects [default=use
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--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-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
--with-icu=DIR use ICU installed in <DIR>
--with-ticcutils=DIR use ticcutils installed in <DIR>;
note that you can install ticcutils in a non-default directory with
@@ -1457,6 +1464,8 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CC C compiler command
CFLAGS C compiler flags
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
CPP C preprocessor
CXXCPP C++ preprocessor
PKG_CONFIG path to pkg-config utility
@@ -1474,7 +1483,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <timbl at uvt.nl>.
+Report bugs to <lamasoftware at science.ru.nl>.
_ACEOF
ac_status=$?
fi
@@ -1537,7 +1546,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libfolia configure 0.11
+libfolia configure 1.3.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2057,7 +2066,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 libfolia $as_me 0.11, which was
+It was created by libfolia $as_me 1.3.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2405,7 +2414,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.14'
+am__api_version='1.15'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2606,8 +2615,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2626,7 +2635,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2920,7 +2929,7 @@ fi
# Define the identity of the package.
PACKAGE='libfolia'
- VERSION='0.11'
+ VERSION='1.3.1'
cat >>confdefs.h <<_ACEOF
@@ -2954,8 +2963,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3014,6 +3023,7 @@ END
fi
+
ac_config_headers="$ac_config_headers config.h"
@@ -3035,7 +3045,7 @@ if test -z "$CXX"; then
CXX=$CCC
else
if test -n "$ac_tool_prefix"; then
- for ac_prog in g++
+ for ac_prog in g++ c++
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
@@ -3079,7 +3089,7 @@ fi
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in g++
+ for ac_prog in g++ c++
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3737,8 +3747,8 @@ esac
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
@@ -3752,7 +3762,7 @@ macro_revision='1.3337'
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -3872,7 +3882,7 @@ func_echo_all ()
$ECHO ""
}
-case "$ECHO" in
+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
@@ -4921,19 +4931,19 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -4947,7 +4957,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -4958,7 +4968,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -4969,32 +4979,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -5037,33 +5047,38 @@ if ${lt_cv_path_NM+:} false; then :
else
if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -5074,15 +5089,15 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
@@ -5188,9 +5203,9 @@ esac
fi
fi
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -5198,8 +5213,8 @@ fi
esac
fi
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -5250,7 +5265,7 @@ if ${lt_cv_sys_max_cmd_len+:} false; then :
$as_echo_n "(cached) " >&6
else
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -5290,7 +5305,7 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5309,6 +5324,11 @@ 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
@@ -5335,22 +5355,23 @@ else
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -5368,7 +5389,7 @@ else
fi
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
else
@@ -5386,30 +5407,6 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$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, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
@@ -5532,13 +5529,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -5666,13 +5663,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[4-9]*)
@@ -5699,8 +5696,7 @@ 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
@@ -5736,10 +5732,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -5777,12 +5769,12 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | 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
@@ -5800,8 +5792,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -5854,6 +5846,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -6011,8 +6006,8 @@ else
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
+ # two different shell functions defined in ltmain.sh;
+ # decide which one 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
@@ -6024,7 +6019,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
@@ -6179,7 +6174,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; 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
@@ -6187,7 +6182,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -6200,7 +6195,7 @@ 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
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -6417,14 +6412,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ bitrig* | openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -6507,7 +6502,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[ABCDGISTW]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[ABCDEGRST]'
fi
;;
@@ -6540,14 +6535,44 @@ case `$NM -V 2>&1` in
symcode='[ABCDGIRSTW]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$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"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -6565,20 +6590,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# 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};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -6626,11 +6655,11 @@ _LT_EOF
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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
@@ -6656,7 +6685,7 @@ lt__PROGRAM__LTX_preloaded_symbols[] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -6676,13 +6705,13 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -6703,7 +6732,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -6756,6 +6785,16 @@ fi
+
+
+
+
+
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; }
@@ -6768,9 +6807,9 @@ fi
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -6780,8 +6819,8 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $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
@@ -6793,18 +6832,99 @@ $as_echo "${lt_sysroot:-no}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
fi
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6813,24 +6933,25 @@ ia64-*-hpux*)
test $ac_status = 0; }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '#line '$LINENO' "configure"' > conftest.$ac_ext
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; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -6859,9 +6980,50 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ 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; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6875,9 +7037,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
+ ;;
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -6896,7 +7068,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -6914,7 +7089,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -6954,13 +7129,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
$as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
+*-*solaris*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
@@ -6970,7 +7146,20 @@ sparc*-*solaris*)
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*|x86_64-*-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
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
@@ -6984,7 +7173,7 @@ sparc*-*solaris*)
;;
esac
-need_locks="$enable_libtool_lock"
+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.
@@ -7095,7 +7284,7 @@ else
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
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
@@ -7598,7 +7787,7 @@ if ${lt_cv_apple_cc_single_mod+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -7610,7 +7799,13 @@ else
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
_lt_result=$?
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # 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 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&5
@@ -7621,6 +7816,7 @@ 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 :
@@ -7648,11 +7844,12 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
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 :
@@ -7674,7 +7871,9 @@ _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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&5
@@ -7687,32 +7886,32 @@ fi
$as_echo "$lt_cv_ld_force_load" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _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" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -7720,6 +7919,41 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
;;
esac
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8005,9 +8239,9 @@ 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}\$%%"`;;
+ 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
@@ -8034,14 +8268,14 @@ if test "${enable_shared+set}" = set; then :
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8065,14 +8299,14 @@ if test "${enable_static+set}" = set; then :
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8090,14 +8324,27 @@ fi
# Check whether --with-pic was given.
if test "${with_pic+set}" = set; then :
- withval=$with_pic; pic_mode="$withval"
+ 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
else
pic_mode=default
fi
-test -z "$pic_mode" && pic_mode=default
-
@@ -8113,14 +8360,14 @@ if test "${enable_fast_install+set}" = set; then :
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac
else
@@ -8134,11 +8381,63 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8168,6 +8467,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
test -z "$LN_S" && LN_S="ln -s"
@@ -8183,7 +8486,7 @@ test -z "$LN_S" && LN_S="ln -s"
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -8222,7 +8525,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -8233,14 +8536,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -8249,15 +8552,8 @@ test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
test -z "$LD" && LD=ld
test -z "$ac_objext" && ac_objext=o
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
# Only perform the check for file, if the check method requires it
@@ -8272,22 +8568,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -8310,13 +8606,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8338,22 +8634,22 @@ if ${lt_cv_path_MAGIC_CMD+:} false; then :
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -8376,13 +8672,13 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac
fi
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
$as_echo "$MAGIC_CMD" >&6; }
@@ -8403,7 +8699,7 @@ esac
# Use C for the default configuration in the libtool script
-lt_save_CC="$CC"
+lt_save_CC=$CC
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8465,7 +8761,7 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -8481,7 +8777,7 @@ else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -8511,7 +8807,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
else
:
@@ -8529,17 +8825,18 @@ lt_prog_compiler_pic=
lt_prog_compiler_static=
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_static='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -8550,8 +8847,8 @@ lt_prog_compiler_static=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -8567,6 +8864,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -8627,7 +8929,9 @@ lt_prog_compiler_static=
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
lt_prog_compiler_wl='-Xlinker '
- lt_prog_compiler_pic='-Xcompiler -fPIC'
+ if test -n "$lt_prog_compiler_pic"; then
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+ fi
;;
esac
else
@@ -8635,7 +8939,7 @@ lt_prog_compiler_static=
case $host_os in
aix*)
lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
else
@@ -8643,10 +8947,29 @@ lt_prog_compiler_static=
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | 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='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -8662,7 +8985,7 @@ lt_prog_compiler_static=
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -8671,9 +8994,9 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -8698,6 +9021,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-PIC'
lt_prog_compiler_static='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -8718,18 +9047,33 @@ lt_prog_compiler_static=
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *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'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
esac
;;
esac
@@ -8780,7 +9124,7 @@ lt_prog_compiler_static=
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
lt_prog_compiler_pic='-Kconform_pic'
lt_prog_compiler_static='-Bstatic'
fi
@@ -8809,7 +9153,7 @@ lt_prog_compiler_static=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
;;
@@ -8841,7 +9185,7 @@ else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -8871,7 +9215,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -8903,7 +9247,7 @@ if ${lt_cv_prog_compiler_static_works+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -8922,13 +9266,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
:
else
lt_prog_compiler_static=
@@ -9048,8 +9392,8 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -9061,9 +9405,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -9091,7 +9435,6 @@ $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
@@ -9107,9 +9450,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# included in the symbol list
include_expsyms=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -9124,7 +9467,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -9132,12 +9475,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- link_all_deplibs=no
- ;;
esac
ld_shlibs=yes
@@ -9145,7 +9485,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# 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
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -9167,24 +9507,24 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 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 ...
@@ -9197,7 +9537,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[3-9]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -9216,7 +9556,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9232,7 +9572,7 @@ _LT_EOF
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs=no
fi
@@ -9242,7 +9582,7 @@ _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'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -9250,61 +9590,89 @@ _LT_EOF
exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
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'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $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, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs=no
fi
;;
haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- 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'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ 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)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
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; func_echo_all \"$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'
+ 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'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -9315,43 +9683,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[cC]* | bgxl[cC]* | mpixl[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'
+ 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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; 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~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# 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=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; 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'
+ 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'
fi
;;
esac
@@ -9360,13 +9732,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 $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'
fi
;;
@@ -9384,8 +9756,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 $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'
else
ld_shlibs=no
fi
@@ -9397,7 +9769,7 @@ _LT_EOF
ld_shlibs=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -9412,9 +9784,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- 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'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ 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
@@ -9431,15 +9803,15 @@ _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 $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'
else
ld_shlibs=no
fi
;;
esac
- if test "$ld_shlibs" = no; then
+ if test no = "$ld_shlibs"; then
runpath_var=
hardcode_libdir_flag_spec=
export_dynamic_flag_spec=
@@ -9455,7 +9827,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
@@ -9463,34 +9835,57 @@ _LT_EOF
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
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".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
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") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -9509,13 +9904,21 @@ _LT_EOF
hardcode_direct_absolute=yes
hardcode_libdir_separator=':'
link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -9534,36 +9937,42 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
- link_all_deplibs=no
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
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
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9598,7 +10007,7 @@ 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"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9606,17 +10015,17 @@ fi
aix_libpath=$lt_cv_aix_libpath_
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"
+ 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath_+:} false; then :
@@ -9651,7 +10060,7 @@ 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"
+ lt_cv_aix_libpath_=/usr/lib:/lib
fi
fi
@@ -9659,21 +10068,33 @@ fi
aix_libpath=$lt_cv_aix_libpath_
fi
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 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
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; 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'
+ 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
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'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > [...]
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -9682,7 +10103,7 @@ fi
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
archive_expsym_cmds=''
;;
m68k)
@@ -9712,35 +10133,37 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ 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='
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $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'
+ 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
@@ -9749,7 +10172,7 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ 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.
@@ -9768,23 +10191,24 @@ 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\"`'
+ if test yes = "$lt_cv_ld_force_load"; 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
link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- 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}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ 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"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
else
ld_shlibs=no
@@ -9798,10 +10222,6 @@ 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
@@ -9814,7 +10234,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
@@ -9830,34 +10250,33 @@ 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'
+ if test yes = "$GCC"; 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 "x$output_objdir/$soname" = "x$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'
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
;;
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 yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $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'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
@@ -9865,25 +10284,25 @@ fi
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ 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 $pic_flag $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 $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -9895,7 +10314,7 @@ if ${lt_cv_prog_compiler__b+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ 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
@@ -9914,14 +10333,14 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ 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'
+if test yes = "$lt_cv_prog_compiler__b"; 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
@@ -9929,8 +10348,8 @@ fi
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
hardcode_libdir_separator=:
case $host_cpu in
@@ -9941,7 +10360,7 @@ fi
*)
hardcode_direct=yes
hardcode_direct_absolute=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -9952,8 +10371,8 @@ 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'
+ if test yes = "$GCC"; 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'
# 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.
@@ -9963,8 +10382,8 @@ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >
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"
+ 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; }
@@ -9976,25 +10395,35 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ 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'
+ if test yes = "$lt_cv_irix_exported_symbol"; 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
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" && 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'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
inherit_rpath=yes
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -10008,7 +10437,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
newsos6)
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
hardcode_shlibpath_var=no
;;
@@ -10016,27 +10445,19 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
hardcode_shlibpath_var=no
hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
else
- case $host_os in
- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- ;;
- *)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
- esac
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
fi
else
ld_shlibs=no
@@ -10047,33 +10468,53 @@ $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'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
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'
+ if test yes = "$GCC"; 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'
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" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
hardcode_libdir_separator=:
;;
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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; 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'
+ 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" && func_echo_all "-set_version $verstring"` -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 "-set_version $verstring"` -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'
@@ -10084,24 +10525,24 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris*)
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'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $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 $pic_flag $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"*)
wlarc=''
- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -10111,11 +10552,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
fi
@@ -10125,10 +10566,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -10177,43 +10618,43 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
hardcode_libdir_separator=':'
link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -10228,10 +10669,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- export_dynamic_flag_spec='${wl}-Blargedynsym'
+ export_dynamic_flag_spec='$wl-Blargedynsym'
;;
esac
fi
@@ -10239,7 +10680,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
with_gnu_ld=$with_gnu_ld
@@ -10265,7 +10706,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -10477,22 +10918,17 @@ esac
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ 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" ;;
+ 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
@@ -10508,28 +10944,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
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 '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -10543,7 +10986,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# 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'` ;;
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -10552,7 +10995,7 @@ fi
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -10569,56 +11012,108 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -10628,27 +11123,27 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
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=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -10660,7 +11155,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -10669,8 +11164,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# 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'\''`~
+ 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~
@@ -10686,17 +11181,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
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}'
+ 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"
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ 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}'
+ 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'
@@ -10705,8 +11200,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -10733,7 +11228,7 @@ cygwin* | mingw* | pw32* | cegcc*)
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=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -10746,8 +11241,8 @@ cygwin* | mingw* | pw32* | cegcc*)
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'\''`~
+ 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'
@@ -10760,7 +11255,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -10773,8 +11268,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -10784,18 +11279,14 @@ darwin* | rhapsody*)
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -10803,25 +11294,26 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10840,26 +11332,15 @@ freebsd* | dragonfly*)
esac
;;
-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
- ;;
-
haiku*)
- version_type=linux
+ 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'
+ 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
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -10877,14 +11358,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -10892,8 +11374,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -10902,8 +11384,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -10913,11 +11395,11 @@ hpux9* | hpux10* | hpux11*)
;;
interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -10928,16 +11410,16 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ if test yes = "$lt_cv_prog_gnu_ld"; then
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -10956,8 +11438,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -10966,13 +11448,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11016,7 +11518,12 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -11031,29 +11538,17 @@ 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
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -11062,8 +11557,8 @@ netbsd*)
;;
newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
;;
@@ -11072,58 +11567,68 @@ newsos6)
version_type=qnx
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'
+ 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='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -11131,11 +11636,11 @@ rdos*)
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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=yes
hardcode_into_libs=yes
@@ -11145,20 +11650,20 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
;;
sysv4 | sysv4.3*)
- 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'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
case $host_vendor in
sni)
@@ -11179,24 +11684,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ if test -d /usr/nec; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -11211,19 +11716,19 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
uts4*)
- 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'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
;;
@@ -11233,20 +11738,35 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
@@ -11343,15 +11863,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
# Linking always hardcodes the temporary library directory.
hardcode_action=relink
else
@@ -11366,12 +11886,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
$as_echo "$hardcode_action" >&6; }
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -11381,7 +11901,7 @@ fi
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -11391,23 +11911,23 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -11445,10 +11965,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
@@ -11456,10 +11976,18 @@ fi
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
$as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -11498,11 +12026,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
else
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -11541,7 +12069,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
$as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -11580,7 +12108,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
$as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -11619,7 +12147,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
fi
@@ -11640,21 +12168,21 @@ fi
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -11662,7 +12190,7 @@ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11709,9 +12237,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11741,7 +12269,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11761,14 +12289,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
$as_echo "$lt_cv_dlopen_self" >&6; }
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
if ${lt_cv_dlopen_self_static+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
+ if test yes = "$cross_compiling"; then :
lt_cv_dlopen_self_static=cross
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -11815,9 +12343,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -11847,7 +12375,7 @@ _LT_EOF
(eval $ac_link) 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -11868,9 +12396,9 @@ fi
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -11914,7 +12442,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -11942,7 +12470,7 @@ fi
- # Report which library types will actually be built
+ # Report what library types will actually be built
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
$as_echo_n "checking if libtool supports shared libraries... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -11950,13 +12478,13 @@ $as_echo "$can_build_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
$as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -11964,8 +12492,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -11975,7 +12507,7 @@ $as_echo "$enable_shared" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
$as_echo_n "checking whether to build static libraries... " >&6; }
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
$as_echo "$enable_static" >&6; }
@@ -11989,11 +12521,11 @@ 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
-CC="$lt_save_CC"
+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
+ if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12146,7 +12678,6 @@ 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
@@ -12173,7 +12704,7 @@ objext_CXX=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -12234,46 +12765,39 @@ $RM -r conftest*
CFLAGS=$CXXFLAGS
compiler=$CC
compiler_CXX=$CC
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
- distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
else
lt_prog_compiler_no_builtin_flag_CXX=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
with_gnu_ld=no
fi
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -12287,7 +12811,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -12298,7 +12822,7 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
$as_echo_n "checking for GNU ld... " >&6; }
else
@@ -12309,32 +12833,32 @@ if ${lt_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi
fi
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
$as_echo "$LD" >&6; }
@@ -12370,22 +12894,22 @@ 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'
+ if test yes = "$with_gnu_ld"; 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'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
whole_archive_flag_spec_CXX=
fi
@@ -12422,18 +12946,30 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs_CXX=no
;;
aix[4-9]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -12443,6 +12979,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -12461,13 +13004,21 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_direct_absolute_CXX=yes
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- file_list_spec_CXX='${wl}-f,'
+ file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[012]|aix4.[012].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -12485,36 +13036,44 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ export_dynamic_flag_spec_CXX='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -12549,7 +13108,7 @@ 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"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -12557,18 +13116,18 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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'
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -12603,7 +13162,7 @@ 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"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
fi
fi
@@ -12611,22 +13170,34 @@ fi
aix_libpath=$lt_cv_aix_libpath__CXX
fi
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 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
+ no_undefined_flag_CXX=' $wl-bernotok'
+ allow_undefined_flag_CXX=' $wl-berok'
+ if test yes = "$with_gnu_ld"; 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'
+ 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
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- archive_expsym_cmds_CXX="\$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'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_sy [...]
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -12636,7 +13207,7 @@ fi
allow_undefined_flag_CXX=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
ld_shlibs_CXX=no
fi
@@ -12664,57 +13235,58 @@ fi
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ 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='
+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $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'
+ 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'
+ 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'
+ 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, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; 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
@@ -12728,26 +13300,27 @@ 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\"`'
+ if test yes = "$lt_cv_ld_force_load"; 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
link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ allow_undefined_flag_CXX=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- 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}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ 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"
+ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
else
@@ -12756,6 +13329,34 @@ fi
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -12774,7 +13375,7 @@ fi
esac
;;
- freebsd[12]*)
+ freebsd2.*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
ld_shlibs_CXX=no
@@ -12790,18 +13391,15 @@ fi
ld_shlibs_CXX=yes
;;
- gnu*)
- ;;
-
haiku*)
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 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_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
hardcode_direct_CXX=yes
hardcode_minus_L_CXX=yes # Not in the search PATH,
# but as the default
@@ -12813,7 +13411,7 @@ fi
ld_shlibs_CXX=no
;;
aCC*)
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${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 -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -12822,11 +13420,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; func_echo_all "$list"'
;;
*)
- 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'
+ if test yes = "$GXX"; 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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -12836,15 +13434,15 @@ fi
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
hardcode_libdir_separator_CXX=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
;;
esac
fi
@@ -12870,13 +13468,13 @@ fi
aCC*)
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -12887,20 +13485,20 @@ 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; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 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 $pic_flag $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 $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -12915,22 +13513,22 @@ fi
interix[3-9]*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}-E'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_CXX='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'
+ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds_CXX='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'
;;
irix5* | irix6*)
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" && func_echo_all "-set_version $verstring"` -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
@@ -12939,22 +13537,22 @@ fi
old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- 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'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; 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'
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 $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'
fi
fi
link_all_deplibs_CXX=yes
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
inherit_rpath_CXX=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -12962,8 +13560,8 @@ fi
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -12972,10 +13570,10 @@ 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; func_echo_all "$list"'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -12989,59 +13587,59 @@ fi
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
archive_cmds_need_lc_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*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`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $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`~
- $RANLIB $oldlib'
+ 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`~
+ $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'
+ 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'
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'
+ 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'
;;
*) # Version 6 and above 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'
+ 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'
;;
esac
- 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'
+ 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'
;;
cxx*)
# Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -13055,18 +13653,18 @@ 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=`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'
;;
xl* | mpixl* | bgxl*)
# 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'
- archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+ archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -13074,10 +13672,10 @@ fi
*Sun\ C*)
# Sun C++ 5.9
no_undefined_flag_CXX=' -zdefs'
- 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'
+ 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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
compiler_needs_object_CXX=yes
# Not sure whether something based on
@@ -13135,22 +13733,17 @@ fi
ld_shlibs_CXX=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- ld_shlibs_CXX=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
hardcode_direct_absolute_CXX=yes
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ 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
else
@@ -13166,9 +13759,9 @@ fi
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
hardcode_libdir_separator_CXX=:
# Archives containing C++ object files must be created using
@@ -13186,17 +13779,17 @@ fi
cxx*)
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'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ 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'
+ 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" && func_echo_all "-set_version $verstring"` -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~
- $RM $lib.exp'
+ 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~
+ $RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
;;
esac
@@ -13211,21 +13804,21 @@ 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=`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"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; 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" && func_echo_all "$wl-set_version $wl$verstring"` $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 $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'
;;
esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
hardcode_libdir_separator_CXX=:
# Commands to make compiler produce verbose output that lists
@@ -13271,9 +13864,9 @@ fi
# Sun C++ 4.2, 5.x and Centerline C++
archive_cmds_need_lc_CXX=yes
no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
@@ -13281,7 +13874,7 @@ fi
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
@@ -13298,30 +13891,30 @@ fi
;;
gcx*)
# Green Hills C++ Compiler
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; 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 $pic_flag -nostdlib $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 $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -G -nostdlib $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 -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
@@ -13329,11 +13922,11 @@ fi
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -13342,52 +13935,52 @@ fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_CXX='${wl}-z,text'
+ no_undefined_flag_CXX='$wl-z,text'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
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'
+ 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'
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- no_undefined_flag_CXX='${wl}-z,text'
- allow_undefined_flag_CXX='${wl}-z,nodefs'
+ no_undefined_flag_CXX='$wl-z,text'
+ allow_undefined_flag_CXX='$wl-z,nodefs'
archive_cmds_need_lc_CXX=no
hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
- export_dynamic_flag_spec_CXX='${wl}-Bexport'
+ export_dynamic_flag_spec_CXX='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
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'
+ 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"
+ '"$old_archive_cmds_CXX"
reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
- '"$reload_cmds_CXX"
+ '"$reload_cmds_CXX"
;;
*)
- archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -13419,10 +14012,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test no = "$ld_shlibs_CXX" && can_build_shared=no
- GCC_CXX="$GXX"
- LD_CXX="$LD"
+ GCC_CXX=$GXX
+ LD_CXX=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -13450,6 +14043,7 @@ _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
@@ -13465,13 +14059,13 @@ 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 $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -13487,16 +14081,16 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
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
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev 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.
if test -z "$compiler_lib_search_path_CXX"; then
- compiler_lib_search_path_CXX="${prev}${p}"
+ compiler_lib_search_path_CXX=$prev$p
else
- compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+ compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -13504,9 +14098,9 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
esac
else
if test -z "$postdeps_CXX"; then
- postdeps_CXX="${prev}${p}"
+ postdeps_CXX=$prev$p
else
- postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+ postdeps_CXX="${postdeps_CXX} $prev$p"
fi
fi
prev=
@@ -13521,15 +14115,15 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$predep_objects_CXX"; then
- predep_objects_CXX="$p"
+ predep_objects_CXX=$p
else
predep_objects_CXX="$predep_objects_CXX $p"
fi
else
if test -z "$postdep_objects_CXX"; then
- postdep_objects_CXX="$p"
+ postdep_objects_CXX=$p
else
postdep_objects_CXX="$postdep_objects_CXX $p"
fi
@@ -13559,51 +14153,6 @@ interix[3-9]*)
postdep_objects_CXX=
postdeps_CXX=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
@@ -13612,7 +14161,7 @@ case " $postdeps_CXX " in
esac
compiler_lib_search_dirs_CXX=
if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
@@ -13651,17 +14200,18 @@ lt_prog_compiler_static_CXX=
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
fi
+ lt_prog_compiler_pic_CXX='-fPIC'
;;
amigaos*)
@@ -13672,8 +14222,8 @@ lt_prog_compiler_static_CXX=
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -13688,6 +14238,11 @@ lt_prog_compiler_static_CXX=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -13737,7 +14292,7 @@ lt_prog_compiler_static_CXX=
case $host_os in
aix[4-9]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
lt_prog_compiler_static_CXX='-Bstatic'
else
@@ -13777,14 +14332,14 @@ lt_prog_compiler_static_CXX=
case $cc_basename in
CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
lt_prog_compiler_pic_CXX='+Z'
fi
;;
aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -13813,7 +14368,7 @@ lt_prog_compiler_static_CXX=
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -13821,7 +14376,7 @@ lt_prog_compiler_static_CXX=
lt_prog_compiler_pic_CXX='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
@@ -13877,7 +14432,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
@@ -13966,7 +14521,7 @@ lt_prog_compiler_static_CXX=
fi
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
;;
@@ -13998,7 +14553,7 @@ else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -14028,7 +14583,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -14054,7 +14609,7 @@ if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -14073,13 +14628,13 @@ else
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
:
else
lt_prog_compiler_static_CXX=
@@ -14193,8 +14748,8 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
$as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -14206,9 +14761,9 @@ $as_echo_n "checking if we can lock with hard links... " >&6; }
ln conftest.a conftest.b 2>/dev/null && hard_links=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
$as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
need_locks=warn
fi
else
@@ -14225,30 +14780,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
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".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
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") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
+ export_symbols_cmds_CXX=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*) ;;
+ 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 '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -14256,7 +14814,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
with_gnu_ld_CXX=$with_gnu_ld
@@ -14273,7 +14831,7 @@ x|xyes)
# Assume -lc should be added
archive_cmds_need_lc_CXX=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $archive_cmds_CXX in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -14395,15 +14953,13 @@ esac
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -14420,56 +14976,108 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+
+
case $host_os in
aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[4-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[01] | aix4.[01].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -14479,27 +15087,27 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
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=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
bsdi[45]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -14511,7 +15119,7 @@ bsdi[45]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -14520,8 +15128,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# 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'\''`~
+ 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~
@@ -14537,16 +15145,16 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
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}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+ 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}'
+ 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'
@@ -14555,8 +15163,8 @@ cygwin* | mingw* | pw32* | cegcc*)
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -14583,7 +15191,7 @@ cygwin* | mingw* | pw32* | cegcc*)
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=$LIB
if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -14596,8 +15204,8 @@ cygwin* | mingw* | pw32* | cegcc*)
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'\''`~
+ 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'
@@ -14610,7 +15218,7 @@ cygwin* | mingw* | pw32* | cegcc*)
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -14623,8 +15231,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -14633,18 +15241,14 @@ darwin* | rhapsody*)
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -14652,25 +15256,26 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14689,26 +15294,15 @@ freebsd* | dragonfly*)
esac
;;
-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
- ;;
-
haiku*)
- version_type=linux
+ 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'
+ 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
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -14726,14 +15320,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -14741,8 +15336,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -14751,8 +15346,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -14762,11 +15357,11 @@ hpux9* | hpux10* | hpux11*)
;;
interix[3-9]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -14777,16 +15372,16 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ if test yes = "$lt_cv_prog_gnu_ld"; then
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -14805,8 +15400,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -14815,13 +15410,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
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'
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -14865,7 +15480,12 @@ fi
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -14880,29 +15500,17 @@ 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
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -14911,8 +15519,8 @@ netbsd*)
;;
newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
;;
@@ -14921,58 +15529,68 @@ newsos6)
version_type=qnx
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'
+ 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='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[89] | openbsd2.[89].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -14980,11 +15598,11 @@ rdos*)
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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=yes
hardcode_into_libs=yes
@@ -14994,20 +15612,20 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
;;
sysv4 | sysv4.3*)
- 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'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
case $host_vendor in
sni)
@@ -15028,24 +15646,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ if test -d /usr/nec; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -15060,19 +15678,19 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
uts4*)
- 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'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
;;
@@ -15082,20 +15700,32 @@ uts4*)
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
@@ -15138,15 +15768,15 @@ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
test -n "$runpath_var_CXX" ||
- test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ test yes = "$hardcode_automatic_CXX"; then
# We can hardcode non-existent directories.
- if test "$hardcode_direct_CXX" != no &&
+ if test no != "$hardcode_direct_CXX" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+ test no != "$hardcode_minus_L_CXX"; then
# Linking always hardcodes the temporary library directory.
hardcode_action_CXX=relink
else
@@ -15161,12 +15791,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
$as_echo "$hardcode_action_CXX" >&6; }
-if test "$hardcode_action_CXX" = relink ||
- test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+ test yes = "$inherit_rpath_CXX"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -15189,7 +15819,7 @@ fi
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -15209,6 +15839,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
ac_config_commands="$ac_config_commands libtool"
@@ -15677,9 +16309,9 @@ fi
echo "*** Or see http://www.icu-project.org/"
else
ICU_VERSION=`$ICU_CONFIG --version`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU >= 3.6" >&5
-$as_echo_n "checking for ICU >= 3.6... " >&6; }
- VERSION_CHECK=`expr $ICU_VERSION \>\= 3.6`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU >= 4.2" >&5
+$as_echo_n "checking for ICU >= 4.2... " >&6; }
+ VERSION_CHECK=`expr $ICU_VERSION \>\= 4.2`
if test "$VERSION_CHECK" = "1" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -16403,7 +17035,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 libfolia $as_me 0.11, which was
+This file was extended by libfolia $as_me 1.3.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16463,13 +17095,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <timbl at uvt.nl>."
+Report bugs to <lamasoftware at science.ru.nl>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libfolia config.status 0.11
+libfolia config.status 1.3.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -16604,8 +17236,10 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $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"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $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"`'
@@ -16652,10 +17286,13 @@ 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_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $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"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $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"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $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"`'
@@ -16688,7 +17325,6 @@ 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_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $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"`'
@@ -16721,7 +17357,8 @@ 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"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $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"`'
@@ -16760,7 +17397,6 @@ 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_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_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"`'
@@ -16799,6 +17435,7 @@ _LTECHO_EOF'
# Quote evaled strings.
for var in SHELL \
ECHO \
+PATH_SEPARATOR \
SED \
GREP \
EGREP \
@@ -16826,9 +17463,12 @@ CFLAGS \
compiler \
lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
nm_file_list_spec \
+lt_cv_truncate_bin \
lt_prog_compiler_no_builtin_flag \
lt_prog_compiler_pic \
lt_prog_compiler_wl \
@@ -16849,7 +17489,6 @@ with_gnu_ld \
allow_undefined_flag \
no_undefined_flag \
hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
exclude_expsyms \
include_expsyms \
@@ -16883,7 +17522,6 @@ 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 \
exclude_expsyms_CXX \
include_expsyms_CXX \
@@ -16896,7 +17534,7 @@ postdeps_CXX \
compiler_lib_search_path_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16923,7 +17561,8 @@ postinstall_cmds \
postuninstall_cmds \
finish_cmds \
sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
reload_cmds_CXX \
old_archive_cmds_CXX \
old_archive_from_new_cmds_CXX \
@@ -16937,7 +17576,7 @@ prelink_cmds_CXX \
postlink_cmds_CXX; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -16946,19 +17585,16 @@ postlink_cmds_CXX; do
done
ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'
@@ -17674,55 +18310,53 @@ $as_echo X"$file" |
;;
"libtool":C)
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
# ### BEGIN LIBTOOL CONFIG
@@ -17742,12 +18376,18 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# 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
@@ -17856,18 +18496,27 @@ global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
# Transform the output of nm in a proper C declaration.
global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
# Transform the output of nm in a C name address pair.
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
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
# 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.
+# The root where to search for dependent libraries,and where our libraries should be installed.
lt_sysroot=$lt_sysroot
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
# The name of the directory that contains temporary libtool files.
objdir=$objdir
@@ -17958,8 +18607,11 @@ hardcode_into_libs=$hardcode_into_libs
# Compile-time system search path for libraries.
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
# Whether dlopen is supported.
dlopen_support=$enable_dlopen
@@ -18049,20 +18701,16 @@ 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
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute
@@ -18128,13 +18776,72 @@ compiler_lib_search_path=$lt_compiler_lib_search_path
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -18143,7 +18850,7 @@ _LT_EOF
esac
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
# We use sed instead of cat because bash on DJGPP gets confused if
@@ -18153,165 +18860,6 @@ ltmain="$ac_aux_dir/ltmain.sh"
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" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -18395,20 +18943,16 @@ 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
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary.
hardcode_direct=$hardcode_direct_CXX
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
# library is relocated.
hardcode_direct_absolute=$hardcode_direct_absolute_CXX
diff --git a/configure.ac b/configure.ac
index cd83805..e25b5cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,9 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-# $Id: configure.ac 9271 2011-04-04 12:08:35Z sloot $
-# $URL: https://ilk.uvt.nl/svn/sources/ucto/trunk/configure.ac $
AC_PREREQ(2.59)
-AC_INIT([libfolia], [0.11], [timbl at uvt.nl])
-AM_INIT_AUTOMAKE
+AC_INIT([libfolia], [1.3.1], [lamasoftware at science.ru.nl])
+AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER([config.h])
@@ -18,7 +16,7 @@ else
fi
# Checks for programs.
-AC_PROG_CXX( [g++] )
+AC_PROG_CXX( [g++ c++] )
if $cxx_flags_were_set; then
CXXFLAGS=$CXXFLAGS
@@ -63,7 +61,7 @@ AC_ARG_WITH(icu,
fi] )
if test "$useICU" = "1"; then
- AX_ICU_CHECK( [3.6],
+ AX_ICU_CHECK( [4.2],
[CXXFLAGS="$CXXFLAGS $ICU_CPPSEARCHPATH"
LIBS="$ICU_LIBPATH $ICU_LIBS $ICU_IOLIBS $LIBS"],
[AC_MSG_FAILURE( "No ICU development environment found. Please check if libicu-dev or the like is installed" )] )
diff --git a/depcomp b/depcomp
index 4ebd5b3..fc98710 100755
--- a/depcomp
+++ b/depcomp
@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# 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
diff --git a/include/Makefile.in b/include/Makefile.in
index 6aaff72..0b75d34 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
#AUTOMAKE_OPTIONS = foreign
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,7 +90,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = include
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -89,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -148,6 +158,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -225,6 +236,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -321,10 +333,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu include/Makefile
-.PRECIOUS: Makefile
+ $(AUTOMAKE) --foreign include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -619,6 +630,8 @@ uninstall-am:
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# 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.
diff --git a/include/libfolia/Makefile.am b/include/libfolia/Makefile.am
index 657da62..68d4ee6 100644
--- a/include/libfolia/Makefile.am
+++ b/include/libfolia/Makefile.am
@@ -1 +1,2 @@
-pkginclude_HEADERS = folia.h document.h foliautils.h
\ No newline at end of file
+pkginclude_HEADERS = folia.h folia_impl.h folia_document.h folia_types.h \
+ folia_utils.h folia_properties.h
diff --git a/include/libfolia/Makefile.in b/include/libfolia/Makefile.in
index 71e772e..c1bdb93 100644
--- a/include/libfolia/Makefile.in
+++ b/include/libfolia/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,8 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = include/libfolia
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(pkginclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -89,6 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(pkginclude_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -160,6 +170,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -212,6 +223,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -295,7 +307,9 @@ ticcutils_LIBS = @ticcutils_LIBS@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-pkginclude_HEADERS = folia.h document.h foliautils.h
+pkginclude_HEADERS = folia.h folia_impl.h folia_document.h folia_types.h \
+ folia_utils.h folia_properties.h
+
all: all-am
.SUFFIXES:
@@ -308,10 +322,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/libfolia/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/libfolia/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu include/libfolia/Makefile
-.PRECIOUS: Makefile
+ $(AUTOMAKE) --foreign include/libfolia/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -558,6 +571,8 @@ uninstall-am: uninstall-pkgincludeHEADERS
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-pkgincludeHEADERS
+.PRECIOUS: Makefile
+
# 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.
diff --git a/include/libfolia/folia.h b/include/libfolia/folia.h
index 8c1d7b9..59caba4 100644
--- a/include/libfolia/folia.h
+++ b/include/libfolia/folia.h
@@ -1,10 +1,7 @@
/*
- $Id: folia.h 17507 2014-08-13 15:20:36Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/include/libfolia/folia.h $
-
- Copyright (c) 1998 - 2014
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
ILK - Tilburg University
- CLiPS - University of Antwerp
This file is part of libfolia
@@ -22,1744 +19,16 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
+ https://github.com/LanguageMachines/ticcutils/issues
or send mail to:
- timbl at uvt.nl
+ lamasoftware (at ) science.ru.nl
*/
-
#ifndef FOLIA_H
#define FOLIA_H
-#include <list>
-#include "unicode/unistr.h"
-#include "libxml/tree.h"
-#include "libfolia/foliautils.h"
-
-namespace folia {
- class Document;
- class AbstractSpanAnnotation;
- class Alternative;
- class PosAnnotation;
- class LemmaAnnotation;
- class Sentence;
- class Word;
- class TextContent;
- class Correction;
- class Suggestion;
- class Division;
- class DependencyDependent;
- class Paragraph;
- class Morpheme;
-
- extern std::set<ElementType> default_ignore;
- extern std::set<ElementType> default_ignore_annotations;
- extern std::set<ElementType> default_ignore_structure;
-
-#define NOT_IMPLEMENTED { \
- throw NotImplementedError( xmltag() + "::" + std::string(__func__) ); \
- }
-
- class FoliaElement {
- friend std::ostream& operator<<( std::ostream&, const FoliaElement& );
- friend std::ostream& operator<<( std::ostream&, const FoliaElement* );
- friend bool operator==( const FoliaElement&, const FoliaElement& );
- public:
- virtual ~FoliaElement(){};
-
- virtual size_t size() const = 0;
- virtual void fixupDoc( Document* ) = 0;
- virtual FoliaElement *append( FoliaElement* ) = 0;
- virtual FoliaElement *postappend( ) = 0;
- virtual std::vector<FoliaElement*> findreplacables( FoliaElement * ) const = 0;
- virtual void remove( size_t, bool = true ) = 0;
- virtual void remove( FoliaElement *, bool = true ) = 0;
- virtual void replace( FoliaElement * ) = 0;
- virtual FoliaElement* replace( FoliaElement *, FoliaElement* ) = 0;
-
- virtual FoliaElement* index( size_t ) const = 0;
- virtual FoliaElement* rindex( size_t ) const = 0;
- FoliaElement* operator[]( size_t i ) const {
- return index(i);
- }
- virtual bool isinstance( ElementType et ) const = 0;
-
- virtual const Word* resolveword( const std::string& ) const = 0;
-
- virtual void setDateTime( const std::string& ) = 0;
- virtual std::string getDateTime() const = 0;
-
- virtual std::vector<AbstractSpanAnnotation*> selectSpan() const = 0;
-
- template <typename F>
- F *addAnnotation( const KWargs& args ) {
- F *res = 0;
- try {
- res = new F( doc(), args);
- }
- catch( std::exception& ){
- delete res;
- throw;
- }
- append( res );
- return res;
- }
-
- template <typename F>
- bool isinstance() const {
- F obj("");
- return element_id() == obj.element_id();
- }
-
- template <typename F>
- std::vector<F*> select( const std::string& st,
- const std::set<ElementType>& exclude,
- bool recurse = true ) const {
- F obj(0);
- std::vector<F*> res;
- std::vector<FoliaElement*> tmp = select( obj.element_id(),
- st,
- exclude,
- recurse );
- for ( size_t i = 0; i < tmp.size(); ++i ){
- res.push_back( dynamic_cast<F*>( tmp[i]) );
- }
- return res;
- }
-
- template <typename F>
- std::vector<F*> select( const std::string& st,
- bool recurse = true ) const {
- F obj(0);
- std::vector<F*> res;
- std::vector<FoliaElement*> tmp = select( obj.element_id(),
- st,
- recurse );
- for ( size_t i = 0; i < tmp.size(); ++i ){
- res.push_back( dynamic_cast<F*>( tmp[i]) );
- }
- return res;
- }
-
- template <typename F>
- std::vector<F*> select( const char* st,
- bool recurse = true ) const {
- F obj(0);
- std::vector<F*> res;
- std::vector<FoliaElement*> tmp = select( obj.element_id(),
- std::string(st),
- recurse );
- for ( size_t i = 0; i < tmp.size(); ++i ){
- res.push_back( dynamic_cast<F*>( tmp[i]) );
- }
- return res;
- }
-
- template <typename F>
- std::vector<F*> select( const std::set<ElementType>& exclude,
- bool recurse = true ) const {
- F obj(0);
- std::vector<F*> res;
- std::vector<FoliaElement*> tmp = select( obj.element_id(),
- exclude,
- recurse );
- for ( size_t i = 0; i < tmp.size(); ++i ){
- res.push_back( dynamic_cast<F*>( tmp[i]) );
- }
- return res;
- }
-
- template <typename F>
- std::vector<F*> select( bool recurse = true ) const {
- F obj(0);
- std::vector<F*> res;
- std::vector<FoliaElement*> tmp = select( obj.element_id(),
- recurse );
- for ( size_t i = 0; i < tmp.size(); ++i ){
- res.push_back( dynamic_cast<F*>( tmp[i]) );
- }
- return res;
- }
-
- template <typename F>
- std::vector<F*> annotations( const std::string& s = "" ) const {
- if ( allowannotations() ){
- std::vector<F*> v = select<F>( s, default_ignore_annotations );
- if ( v.size() >= 1 )
- return v;
- else {
- F obj(0);
- if ( s.empty() )
- throw NoSuchAnnotation( obj.classname() );
- else
- throw NoSuchAnnotation( obj.classname() + " for set='" + s + "'" );
- }
- }
- else NOT_IMPLEMENTED;
- }
-
- template <typename F>
- bool hasannotation( const std::string& st = "" ) const {
- try {
- std::vector<F*> v = annotations<F>( st );
- return true;
- }
- catch ( NoSuchAnnotation& e ){
- return false;
- }
- }
-
- template <typename F>
- F *annotation( const std::string& st = "" ) const {
- std::vector<F*>v = annotations<F>( st );
- return v[0]; // always exist, otherwise annotations would throw()
- }
-
- virtual std::vector<FoliaElement*> findspans( ElementType,
- const std::string& = "" ) const NOT_IMPLEMENTED;
-
- template <typename F>
- std::vector<FoliaElement*> findspans( const std::string& st = "" ) const {
- F obj("");
- return findspans( obj.element_id(), st );
- }
-
- std::vector<Sentence *> sentencePart() const;
- virtual std::vector<std::string> feats( const std::string& ) const = 0;
- virtual std::string feat( const std::string& ) const = 0;
- //XML (de)serialisation
- std::string xmlstring() const; // serialize to a string (XML fragment)
- virtual xmlNode *xml( bool, bool = false ) const = 0; //serialize to XML
- virtual FoliaElement* parseXml( const xmlNode * ) = 0;
- virtual std::string str() const = 0;
- UnicodeString unicode() const { return text(); };
- UnicodeString toktext( const std::string& cls = "current" ) const {
- return deeptext( cls, true );
- }
- virtual UnicodeString text( const std::string& = "current", bool = false ) const = 0;
- virtual TextContent *textcontent( const std::string& = "current" ) const = 0;
- UnicodeString stricttext( const std::string& = "current" ) const;
- virtual UnicodeString deeptext( const std::string& = "current", bool = false ) const = 0;
- bool hastext( const std::string& = "current" ) const;
- virtual bool printable() const = 0;
- virtual FoliaElement *head() const NOT_IMPLEMENTED;
- virtual FoliaElement *getNew() const NOT_IMPLEMENTED;
- virtual FoliaElement *getOriginal() const NOT_IMPLEMENTED;
- virtual FoliaElement *getCurrent() const NOT_IMPLEMENTED;
- virtual FoliaElement *split( FoliaElement *, FoliaElement *,
- const std::string& = "" ) NOT_IMPLEMENTED;
-
- virtual Correction *mergewords( FoliaElement *,
- const std::vector<FoliaElement *>&,
- const std::string& = "" ) NOT_IMPLEMENTED;
-
- virtual Correction *deleteword( FoliaElement *,
- const std::string& = "" ) NOT_IMPLEMENTED;
- virtual Correction *insertword( FoliaElement *, FoliaElement *,
- const std::string& = "" ) NOT_IMPLEMENTED;
- virtual std::vector<Suggestion*> suggestions() const NOT_IMPLEMENTED;
- virtual Suggestion *suggestions( size_t ) const NOT_IMPLEMENTED;
- virtual std::string subset() const NOT_IMPLEMENTED;
- virtual FoliaElement *previous() const NOT_IMPLEMENTED;
- virtual FoliaElement *next() const NOT_IMPLEMENTED;
- virtual std::vector<Word*> context( size_t,
- const std::string& ="" ) const NOT_IMPLEMENTED;
- virtual std::vector<Word*> leftcontext( size_t,
- const std::string& ="" ) const NOT_IMPLEMENTED;
- virtual std::vector<Word*> rightcontext( size_t,
- const std::string& ="" ) const NOT_IMPLEMENTED;
- virtual FoliaElement *findspan( const std::vector<FoliaElement*>& ) const NOT_IMPLEMENTED;
- virtual int offset() const NOT_IMPLEMENTED;
- virtual std::string getlang() const NOT_IMPLEMENTED;
- virtual std::string setlang( const std::string& ) NOT_IMPLEMENTED;
-
- virtual std::string pos( const std::string& = "" ) const = 0;
- virtual std::string lemma( const std::string& = "" ) const = 0;
- virtual std::string cls() const = 0;
- virtual std::string sett() const = 0;
- virtual std::string annotator( ) const = 0;
- virtual void annotator( const std::string& ) = 0;
- virtual AnnotatorType annotatortype() const = 0;
- virtual void annotatortype( AnnotatorType t ) = 0;
- virtual AnnotationType::AnnotationType annotation_type() const = 0;
- virtual std::string classname() const = 0;
- virtual std::string n() const = 0;
- virtual std::string id() const = 0;
- virtual ElementType element_id() const = 0;
- virtual std::string xmltag() const = 0;
- virtual Document *doc() const = 0;
- // virtual xmlNs *foliaNs() const = 0;
- virtual Sentence *sentence() const NOT_IMPLEMENTED;
- virtual Paragraph *paragraph() const NOT_IMPLEMENTED;
- virtual Division *division() const NOT_IMPLEMENTED;
- virtual Correction *incorrection() const NOT_IMPLEMENTED;
- virtual std::vector<Paragraph*> paragraphs() const NOT_IMPLEMENTED;
- virtual std::vector<Sentence*> sentences() const NOT_IMPLEMENTED;
- virtual std::vector<Word*> words() const NOT_IMPLEMENTED;
- virtual std::vector<FoliaElement*> wrefs() const NOT_IMPLEMENTED;
-
- virtual std::vector<Morpheme*> morphemes( const std::string& ="" ) const NOT_IMPLEMENTED;
- virtual Morpheme* morpheme( size_t, const std::string& ="" ) const NOT_IMPLEMENTED;
- virtual Sentence *sentences( size_t ) const NOT_IMPLEMENTED;
- virtual Sentence *rsentences( size_t ) const NOT_IMPLEMENTED;
- virtual Paragraph *paragraphs( size_t ) const NOT_IMPLEMENTED;
- virtual Paragraph *rparagraphs( size_t ) const NOT_IMPLEMENTED;
- virtual Word *words( size_t ) const NOT_IMPLEMENTED;
- virtual std::vector<Word *> wordParts() const NOT_IMPLEMENTED;
- virtual Word *rwords( size_t ) const NOT_IMPLEMENTED;
- virtual DependencyDependent *dependent() const NOT_IMPLEMENTED;
-
- std::string description() const;
- virtual Sentence *addSentence( const KWargs& ) = 0;
- Sentence *addSentence( const std::string& s ="" ){
- return addSentence( getArgs(s) );
- };
- virtual Word *addWord( const KWargs& ) = 0;
- Word *addWord( const std::string& s ){
- return addWord( getArgs(s) );
- }
- TextContent *settext( const std::string&, const std::string& = "current" );
- TextContent *settext( const std::string&, int , const std::string& = "current" );
- TextContent *setutext( const UnicodeString&, const std::string& = "current" );
- TextContent *setutext( const UnicodeString&, int , const std::string& = "current" );
-
- virtual PosAnnotation *addPosAnnotation( const KWargs& ) = 0;
- virtual LemmaAnnotation *addLemmaAnnotation( const KWargs& ) = 0;
- virtual std::vector<Alternative *> alternatives( ElementType,
- const std::string& = ""
- ) const NOT_IMPLEMENTED;
- std::vector<Alternative*> alternatives( const std::string& s = "" ) const {
- return alternatives( BASE, s );
- }
- virtual std::string content() const {
- throw NoSuchAnnotation( "content" );
- }
- virtual Correction *correct( const std::vector<FoliaElement*>&,
- const std::vector<FoliaElement*>&,
- const std::vector<FoliaElement*>&,
- const std::vector<FoliaElement*>&,
- const KWargs& ) NOT_IMPLEMENTED;
- virtual Correction* correct( FoliaElement*,
- FoliaElement*,
- const KWargs& ) NOT_IMPLEMENTED;
- virtual Correction* correct( FoliaElement*,
- FoliaElement*,
- const std::vector<FoliaElement*>&,
- const KWargs& ) NOT_IMPLEMENTED;
- virtual Correction *correct( const std::string& = "" ) NOT_IMPLEMENTED;
- virtual std::string src() const NOT_IMPLEMENTED;
- virtual UnicodeString caption() const NOT_IMPLEMENTED;
- virtual int refcount() const = 0;
- virtual void increfcount() = 0;
- virtual FoliaElement *parent() const = 0;
- virtual void setParent( FoliaElement *p ) = 0;
- virtual void setAuth( bool b ) = 0;
- virtual std::vector<FoliaElement *> resolve() const NOT_IMPLEMENTED;
- virtual const FoliaElement* resolveid() const NOT_IMPLEMENTED;
- bool isSubClass( ElementType ) const;
- bool isSubClass( const FoliaElement *c ) const {
- return isSubClass( c->element_id() );
- };
- virtual std::string getTextDelimiter( bool retaintok=false ) const = 0;
- virtual void setAttributes( const KWargs& ) = 0;
- virtual KWargs collectAttributes() const = 0;
- virtual std::string generateId( const std::string& ) NOT_IMPLEMENTED;
- virtual size_t occurrences() const = 0;
- virtual size_t occurrences_per_set() const = 0;
- virtual Attrib required_attributes() const = 0;
- virtual bool checkAtts() = 0;
-
- virtual void init()=0;
- virtual bool allowannotations() const { return false; };
-
- virtual std::vector<FoliaElement*> select( ElementType elementtype,
- bool = true ) const = 0;
- virtual std::vector<FoliaElement*> select( ElementType elementtype,
- const std::set<ElementType>& ,
- bool = true ) const = 0;
- virtual std::vector<FoliaElement*> select( ElementType elementtype,
- const std::string&,
- bool = true ) const = 0;
- virtual std::vector<FoliaElement*> select( ElementType elementtype,
- const std::string&,
- const std::set<ElementType>& ,
- bool = true ) const = 0;
- virtual bool acceptable( ElementType ) const = 0;
- virtual bool addable( const FoliaElement * ) const = 0;
- template <typename F>
- F *addAlternative();
- template <typename F>
- F *addAlternative( const KWargs& );
-
- };
-
- class FoliaImpl: public virtual FoliaElement {
- public:
- //Constructor
- FoliaImpl( Document* = 0 );
- virtual ~FoliaImpl();
- // static element Constructor
- static FoliaElement *createElement( Document *, const std::string& );
-
-
- std::vector<FoliaElement*> select( ElementType elementtype,
- bool = true ) const;
- std::vector<FoliaElement*> select( ElementType elementtype,
- const std::set<ElementType>& ,
- bool = true ) const;
- std::vector<FoliaElement*> select( ElementType elementtype,
- const std::string&,
- bool = true ) const;
- std::vector<FoliaElement*> select( ElementType elementtype,
- const std::string&,
- const std::set<ElementType>& ,
- bool = true ) const;
- bool checkAtts();
- bool addable( const FoliaElement * ) const;
- void classInit( const std::string& s="" ){
- init(); // virtual init
- if ( !s.empty() ){
- // this enables the init of empty classes, which hopefully get their
- // attributes in a later state
- setAttributes( getArgs( s ) );
- }
- }
-
- void classInit( const KWargs& a ){
- init(); // virtual init
- setAttributes( a ); // also virtual!
- }
-
- template <typename F>
- bool isinstance() const {
- F obj("");
- return element_id() == obj.element_id();
- }
-
- template <typename F>
- std::vector<F*> select( bool recurse = true ) const {
- return FoliaElement::select<F>(recurse);
- }
-
- template <typename F>
- std::vector<F*> select( const std::string& st,
- const std::set<ElementType>& exclude,
- bool recurse = true ) const {
- return FoliaElement::select<F>( st, exclude, recurse );
- }
-
- template <typename F>
- std::vector<F*> select( const std::string& st,
- bool recurse = true ) const {
- return FoliaElement::select<F>( st, recurse );
- }
-
- template <typename F>
- std::vector<F*> select( const char* st,
- bool recurse = true ) const {
- return FoliaElement::select<F>( st, recurse );
- }
-
- template <typename F>
- std::vector<F*> select( const std::set<ElementType>& exclude,
- bool recurse = true ) const {
- return FoliaElement::select<F>( exclude, recurse );
- }
-
- template <typename F>
- F *addAnnotation( const KWargs& args ) {
- return FoliaElement::addAnnotation<F>( args );
- }
-
- template <typename F>
- std::vector<F*> annotations( const std::string& s = "" ) const {
- return FoliaElement::annotations<F>( s );
- }
-
- template <typename F>
- bool hasannotation( const std::string& st = "" ) const {
- return FoliaElement::hasannotation<F>(st);
- }
-
- template <typename F>
- F *annotation( const std::string& st = "" ) const {
- return FoliaElement::annotation<F>(st);
- }
-
-
- bool acceptable( ElementType ) const;
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- xmlNode *xml( bool, bool = false ) const;
- FoliaElement* parseXml( const xmlNode * );
- std::vector<std::string> feats( const std::string& ) const;
- std::string feat( const std::string& ) const;
- std::string str() const;
- UnicodeString text( const std::string& = "current", bool = false ) const;
- //functions regarding contained data
- size_t size() const { return data.size(); };
-
-
- FoliaElement* index( size_t ) const;
- FoliaElement* rindex( size_t ) const;
- std::string pos( const std::string& = "" ) const ;
- std::string lemma( const std::string& = "" ) const;
- std::string cls() const { return _class; };
- std::string sett() const { return _set; };
- void setDateTime( const std::string& );
- std::string getDateTime() const;
- std::vector<FoliaElement*> findreplacables( FoliaElement * ) const;
- const Word* resolveword( const std::string& ) const { return 0; };
- bool isinstance( ElementType et ) const {
- return et == _element_id;
- }
-
- void fixupDoc( Document* );
- FoliaElement *append( FoliaElement* );
- FoliaElement *postappend( ) { return this; };
- void remove( size_t, bool = true );
- void remove( FoliaElement *, bool = true );
- void replace( FoliaElement * );
- FoliaElement* replace( FoliaElement *, FoliaElement* );
-
- UnicodeString deeptext( const std::string& = "current", bool = false ) const;
- UnicodeString toktext( const std::string& cls = "current" ) const {
- return deeptext( cls, true );
- }
- TextContent *textcontent( const std::string& = "current" ) const;
- std::string annotator( ) const { return _annotator; };
- void annotator( const std::string& a ) { _annotator = a; };
- AnnotatorType annotatortype() const { return _annotator_type; };
- void annotatortype( AnnotatorType t ) { _annotator_type = t; };
- double confidence() const { return _confidence; };
- void confidence( double d ) { _confidence = d; };
- AnnotationType::AnnotationType annotation_type() const { return _annotation_type; };
- std::string classname() const { return toString(_element_id); };
- std::string n() const { return _n; };
- std::string id() const { return _id; };
- ElementType element_id() const { return _element_id; };
- std::string xmltag() const { return _xmltag; };
- Document *doc() const { return mydoc; };
-
- int refcount() const { return _refcount; };
- void increfcount() { ++_refcount; };
- FoliaElement *parent() const { return _parent; };
- void setParent( FoliaElement *p ) { _parent = p ; };
- void setAuth( bool b ){ _auth = b; };
- bool printable() const { return PRINTABLE; };
- size_t occurrences() const { return _occurrences; };
- size_t occurrences_per_set() const { return _occurrences_per_set; };
- Attrib required_attributes() const { return _required_attributes; };
- PosAnnotation *addPosAnnotation( const KWargs& );
- LemmaAnnotation *addLemmaAnnotation( const KWargs& );
- std::vector<AbstractSpanAnnotation*> selectSpan() const;
- Sentence *addSentence( const KWargs& );
- Word *addWord( const KWargs& );
- std::string getTextDelimiter( bool retaintok=false ) const;
- private:
- void addFeatureNodes( const KWargs& args );
-
- protected:
- xmlNs *foliaNs() const;
- std::vector<FoliaElement*> data;
- FoliaElement *_parent;
- bool _auth;
- Document *mydoc;
- std::string _xmltag;
- ElementType _element_id;
- std::set<ElementType> _accepted_data;
- AnnotationType::AnnotationType _annotation_type;
-
- Attrib _required_attributes;
- Attrib _optional_attributes;
- size_t _occurrences;
- size_t _occurrences_per_set;
- std::string TEXTDELIMITER;
- bool PRINTABLE;
- bool AUTH;
- std::string _id;
- std::string _set;
- std::string _class;
- std::string _annotator;
- std::string _n;
- std::string _datetime;
- AnnotatorType _annotator_type;
- double _confidence;
- int _refcount;
- };
-
- bool isSubClass( const ElementType e1, const ElementType e2 );
-
- inline bool isSubClass( const FoliaElement *e1, const FoliaElement *e2 ){
- return isSubClass( e1->element_id(), e2->element_id() );
- }
-
- bool operator==( const FoliaElement&, const FoliaElement& );
- inline bool operator!=( const FoliaElement& e1, const FoliaElement& e2 ){
- return !( e1 == e2 );
- }
-
- inline size_t len( const FoliaElement *e ) {
- return e->size(); }
-
- template <typename T>
- inline size_t len( const std::vector<T>& v ) {
- return v.size(); }
-
- inline std::string str( const FoliaElement *e ) {
- return e->str(); }
-
- inline UnicodeString text( const FoliaElement *e ) {
- if ( e )
- return e->text();
- else
- throw ValueError( "text() for empty element" );
- }
-
- inline UnicodeString unicode( const FoliaElement *e ) {
- return e->unicode(); }
-
- inline bool isinstance( const FoliaElement *e, ElementType t ) {
- return e->isinstance( t ); }
-
- class AllowGenerateID: public virtual FoliaElement {
- public:
- void setMaxId( FoliaElement * );
- int getMaxId( const std::string& );
- std::string generateId( const std::string& tag ){
- return IDgen( tag, this );
- }
- private:
- std::string IDgen( const std::string&, const FoliaElement* );
- std::map<std::string, int> maxid;
- };
-
- class AllowCorrection: public virtual FoliaElement {
- public:
- Correction *correct( const std::vector<FoliaElement*>& v1,
- const std::vector<FoliaElement*>& v2,
- const std::vector<FoliaElement*>& v3,
- const std::vector<FoliaElement*>& v4,
- const KWargs& args );
- Correction *correct( FoliaElement* o,
- FoliaElement* n,
- const KWargs& args ) {
- const std::vector<FoliaElement*> v;
- return correct( o, n, v, args );
- }
- Correction* correct( FoliaElement*,
- FoliaElement*,
- const std::vector<FoliaElement*>&,
- const KWargs& );
- Correction *correct( const std::string& = "" );
- };
-
- class AllowAnnotation: public virtual FoliaElement {
- public:
- virtual bool allowannotations() const { return true; };
- };
-
- class AbstractStructureElement: public FoliaImpl,
- public AllowGenerateID,
- public AllowAnnotation,
- public AllowCorrection {
- public:
- AbstractStructureElement( Document *d=0 ): FoliaImpl( d ) { classInit(); };
-
- std::string str() const;
- std::vector<Alternative *> alternatives( ElementType = BASE,
- const std::string& = "" ) const;
-
- FoliaElement *append( FoliaElement* );
- std::vector<Paragraph*> paragraphs() const;
- std::vector<Sentence*> sentences() const;
- std::vector<Word*> words() const;
- Sentence *sentences( size_t ) const;
- Sentence *rsentences( size_t ) const;
- Paragraph *paragraphs( size_t ) const;
- Paragraph *rparagraphs( size_t ) const;
- Word *words( size_t ) const;
- Word *rwords( size_t ) const;
- const Word* resolveword( const std::string& ) const;
- private:
- void init();
- };
-
- class AbstractAnnotation: public FoliaImpl {
- public:
- AbstractAnnotation( Document *d=0 ): FoliaImpl( d ){};
- };
-
- class AbstractTokenAnnotation:
- public AbstractAnnotation,
- public AllowGenerateID {
- public:
- AbstractTokenAnnotation( Document *d=0 ): AbstractAnnotation( d ){ classInit(); };
- private:
- void init();
- };
-
- class Feature: public FoliaImpl {
- public:
- Feature( const std::string& s=""): FoliaImpl(){ classInit( s ); }
- Feature( const KWargs& a ): FoliaImpl(){ classInit( a ); }
- Feature( Document *d, const std::string& s=""): FoliaImpl(d){ classInit( s ); }
- Feature( Document *d, const KWargs& a ): FoliaImpl(d){ classInit( a ); }
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- std::string subset() const { return _subset; };
-
- protected:
- std::string _subset;
-
- private:
- void init();
- };
-
- class AbstractSpanAnnotation: public AbstractAnnotation,
- public AllowGenerateID,
- public AllowAnnotation,
- public AllowCorrection
- {
- public:
- AbstractSpanAnnotation( Document *d=0 ): AbstractAnnotation( d ){ classInit(); };
- xmlNode *xml( bool, bool=false ) const;
- FoliaElement *append( FoliaElement* );
-
- std::vector<FoliaElement*> wrefs() const;
-
- private:
- void init();
- };
-
- class AbstractTextMarkup: public AbstractAnnotation {
- public:
- AbstractTextMarkup( Document *d=0 ): AbstractAnnotation( d ){ classInit(); };
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- const FoliaElement* resolveid() const;
- UnicodeString text( const std::string& = "current", bool = false ) const;
- protected:
- std::string getTextDelimiter( bool ) const { return ""; };
- std::string idref;
- private:
- void init();
- };
-
- class TextMarkupGap: public AbstractTextMarkup {
- public:
- TextMarkupGap( Document *d=0 ): AbstractTextMarkup( d ){ classInit(); };
- private:
- void init();
- };
-
- class TextMarkupString: public AbstractTextMarkup {
- public:
- TextMarkupString( Document *d=0 ): AbstractTextMarkup( d ){ classInit(); };
- private:
- void init();
- };
-
- class TextMarkupCorrection: public AbstractTextMarkup {
- public:
- TextMarkupCorrection( Document *d=0 ): AbstractTextMarkup( d ){ classInit(); };
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- UnicodeString text( const std::string& = "current", bool = false ) const;
- private:
- void init();
- std::string _original;
- };
-
- class TextMarkupError: public AbstractTextMarkup {
- public:
- TextMarkupError( Document *d=0 ): AbstractTextMarkup( d ){ classInit(); };
- private:
- void init();
- };
-
- class TextMarkupStyle: public AbstractTextMarkup {
- public:
- TextMarkupStyle( Document *d=0 ): AbstractTextMarkup( d ){ classInit(); };
- private:
- void init();
- };
-
- class TextContent: public FoliaImpl {
- public:
- TextContent( const std::string& s="" ): FoliaImpl(){ classInit( s ); }
- TextContent( const KWargs& a ): FoliaImpl(){ classInit( a ); }
- TextContent( Document *d, const std::string& s="" ): FoliaImpl(d){ classInit( s ); }
- TextContent( Document *d, const KWargs& a ): FoliaImpl(d){ classInit( a ); }
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- std::string str() const;
- UnicodeString text( const std::string& = "current", bool = false ) const;
- int offset() const { return _offset; };
- TextContent *postappend();
- std::vector<FoliaElement*> findreplacables( FoliaElement * ) const;
- private:
- void init();
- int _offset;
- std::string _lang; // UNUSED!
- UnicodeString _text;
- };
-
- class FoLiA: public FoliaImpl {
- public:
- FoLiA( const std::string& s="" ): FoliaImpl() { classInit( s ); };
- FoLiA( const KWargs& a ): FoliaImpl() { classInit( a ); };
- FoLiA( Document *d, const std::string& s=""): FoliaImpl(d) { classInit( s ); };
- FoLiA( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- private:
- void init();
- };
-
- class DCOI: public FoliaImpl {
- public:
- DCOI( const std::string& s=""): FoliaImpl() { classInit( s ); };
- DCOI( const KWargs& a ): FoliaImpl() { classInit( a ); };
- DCOI( Document *d, const std::string& s=""): FoliaImpl(d) { classInit( s ); };
- DCOI( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- private:
- void init();
- };
-
- class Head: public AbstractStructureElement {
- public:
- Head( const std::string& s=""): AbstractStructureElement() { classInit( s ); };
- Head( const KWargs& a ): AbstractStructureElement() { classInit( a ); };
- Head( Document *d, const std::string& s=""): AbstractStructureElement( d ) { classInit( s ); };
- Head( Document *d, const KWargs& a ): AbstractStructureElement( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class TableHead: public AbstractStructureElement {
- public:
- TableHead( const std::string& s=""): AbstractStructureElement() { classInit( s ); };
- TableHead( const KWargs& a ): AbstractStructureElement() { classInit( a ); };
- TableHead( Document *d, const std::string& s=""): AbstractStructureElement( d ) { classInit( s ); };
- TableHead( Document *d, const KWargs& a ): AbstractStructureElement( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Table: public AbstractStructureElement {
- public:
- Table( const std::string& s=""): AbstractStructureElement() { classInit( s ); };
- Table( const KWargs& a ): AbstractStructureElement() { classInit( a ); };
- Table( Document *d, const std::string& s=""): AbstractStructureElement( d ) { classInit( s ); };
- Table( Document *d, const KWargs& a ): AbstractStructureElement( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Row: public AbstractStructureElement {
- public:
- Row( const std::string& s=""): AbstractStructureElement() { classInit( s ); };
- Row( const KWargs& a ): AbstractStructureElement() { classInit( a ); };
- Row( Document *d, const std::string& s=""): AbstractStructureElement( d ) { classInit( s ); };
- Row( Document *d, const KWargs& a ): AbstractStructureElement( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Cell: public AbstractStructureElement {
- public:
- Cell( const std::string& s=""): AbstractStructureElement() { classInit( s ); };
- Cell( const KWargs& a ): AbstractStructureElement() { classInit( a ); };
- Cell( Document *d, const std::string& s=""): AbstractStructureElement( d ) { classInit( s ); };
- Cell( Document *d, const KWargs& a ): AbstractStructureElement( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Gap: public FoliaImpl {
- public:
- Gap( const std::string& s=""): FoliaImpl() { classInit( s ); };
- Gap( const KWargs& a ): FoliaImpl() { classInit( a ); };
- Gap( Document *d, const std::string& s=""): FoliaImpl(d) { classInit( s ); };
- Gap( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- std::string content() const;
- private:
- void init();
- };
-
- class Content: public FoliaImpl {
- public:
- Content( const std::string& s=""): FoliaImpl() { classInit( s ); };
- Content( const KWargs& a ): FoliaImpl() { classInit( a ); };
- Content( Document *d, const std::string& s=""): FoliaImpl(d) { classInit( s ); };
- Content( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- FoliaElement* parseXml( const xmlNode * );
- xmlNode *xml( bool, bool = false ) const;
- std::string content() const { return value; };
- private:
- void init();
- std::string value;
- };
-
- class MetricAnnotation: public FoliaImpl {
- public:
- MetricAnnotation( const std::string& s=""): FoliaImpl() { classInit( s ); };
- MetricAnnotation( const KWargs& a ): FoliaImpl() { classInit( a ); };
- MetricAnnotation( Document *d, const std::string& s=""): FoliaImpl(d) { classInit( s ); };
- MetricAnnotation( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- private:
- void init();
- };
-
- class Division: public AbstractStructureElement {
- public:
- Division( const std::string& s=""): AbstractStructureElement() { classInit( s ); };
- Division( const KWargs& a ): AbstractStructureElement() { classInit( a ); };
- Division( Document *d, const std::string& s=""): AbstractStructureElement( d ) { classInit( s ); };
- Division( Document *d, const KWargs& a ): AbstractStructureElement( d ) { classInit( a ); };
- Head *head() const;
- private:
- void init();
- };
-
- class LineBreak: public AbstractStructureElement {
- public:
- LineBreak( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- LineBreak( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- LineBreak( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- LineBreak( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- UnicodeString text( const std::string& = "current", bool = false ) const {
- return "";
- }
- private:
- void init();
- };
-
- class WhiteSpace: public AbstractStructureElement {
- public:
- WhiteSpace( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- WhiteSpace( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- WhiteSpace( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- WhiteSpace( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Word: public AbstractStructureElement {
- public:
- Word( const std::string& s="" ): AbstractStructureElement(){ classInit( s ); };
- Word( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Word( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Word( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- FoliaElement *split( FoliaElement *, FoliaElement *,
- const std::string& = "" );
- Sentence *sentence() const;
- Paragraph *paragraph() const;
- Division *division() const;
- std::vector<Morpheme *> morphemes( const std::string& ="" ) const;
- Morpheme* morpheme( size_t, const std::string& ="" ) const;
- Correction *incorrection() const;
- Word *previous() const;
- Word *next() const;
- std::vector<Word*> context( size_t,
- const std::string& ="" ) const;
- std::vector<Word*> leftcontext( size_t,
- const std::string& = "" ) const;
- std::vector<Word*> rightcontext( size_t,
- const std::string& ="" ) const;
- std::vector<FoliaElement*> findspans( ElementType,
- const std::string& = "" ) const;
- FoliaElement *append( FoliaElement *);
- const Word* resolveword( const std::string& ) const;
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- std::string getTextDelimiter( bool=false) const;
- private:
- void init();
- bool space;
- };
-
- class String:
- public AbstractTokenAnnotation,
- public AllowAnnotation,
- public AllowCorrection {
- public:
- String( const std::string& s="" ): AbstractTokenAnnotation(){ classInit( s ); };
- String( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- String( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); };
- String( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class PlaceHolder: public Word {
- public:
- PlaceHolder( const std::string& s=""): Word(){ classInit( s ); };
- PlaceHolder( const KWargs& a ): Word(){ classInit( a ); };
- PlaceHolder( Document *d, const std::string& s=""): Word( d ){ classInit( s ); };
- PlaceHolder( Document *d, const KWargs& a ): Word( d ){ classInit( a ); };
- void setAttributes( const KWargs& );
- private:
- void init();
- };
-
- class Sentence: public AbstractStructureElement {
- public:
- Sentence( const std::string& s=""): AbstractStructureElement(){ classInit( s ); }
- Sentence( const KWargs& a ): AbstractStructureElement(){ classInit( a ); }
- Sentence( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); }
- Sentence( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); }
- Correction *splitWord( FoliaElement *, FoliaElement *,
- FoliaElement *, const KWargs& );
- Correction *mergewords( FoliaElement *,
- const std::vector<FoliaElement *>&,
- const std::string& = "" );
- Correction *deleteword( FoliaElement *, const std::string& args );
- Correction *insertword( FoliaElement *, FoliaElement *,
- const std::string& args );
- std::vector<Word*> wordParts() const;
- private:
- Correction *correctWords( const std::vector<FoliaElement *>&,
- const std::vector<FoliaElement *>&,
- const KWargs& );
- void init();
- };
-
- class Text: public AbstractStructureElement {
- public:
- Text( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Text( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Text( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Text( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Event: public AbstractStructureElement {
- public:
- Event( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Event( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Event( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Event( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Caption: public AbstractStructureElement {
- public:
- Caption( const std::string& s="" ): AbstractStructureElement(){ classInit( s ); };
- Caption( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Caption( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Caption( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Label: public AbstractStructureElement {
- public:
- Label( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Label( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Label( Document *d, const std::string& s="" ): AbstractStructureElement( d ){ classInit( s ); };
- Label( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Item: public AbstractStructureElement {
- public:
- Item( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Item( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Item( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Item( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class List: public AbstractStructureElement {
- public:
- List( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- List( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- List( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- List( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Figure: public AbstractStructureElement {
- public:
- Figure( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Figure( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Figure( Document *d, const std::string& s="" ): AbstractStructureElement( d ){ classInit( s ); };
- Figure( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- std::string src() const { return _src; };
- UnicodeString caption() const;
- private:
- void init();
- std::string _src;
- };
-
- class Paragraph: public AbstractStructureElement {
- public:
- Paragraph( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Paragraph( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Paragraph( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Paragraph( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Alternative: public AbstractStructureElement {
- public:
- Alternative( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Alternative( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Alternative( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Alternative( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- private:
- void init();
- };
-
-
- class AlternativeLayers: public FoliaImpl {
- public:
- AlternativeLayers( const std::string& s=""): FoliaImpl(){ classInit( s ); };
- AlternativeLayers( const KWargs& a ): FoliaImpl(){ classInit( a ); };
- AlternativeLayers( Document *d, const std::string& s=""): FoliaImpl(d){ classInit( s ); };
- AlternativeLayers( Document *d, const KWargs& a ): FoliaImpl(d){ classInit( a ); };
- private:
- void init();
- };
-
- template <typename F>
- F *FoliaElement::addAlternative( const KWargs& args ){
- KWargs kw;
- std::string id = generateId( "alt" );
- kw["id"] = id;
- F *res = 0;
- Alternative *alt = 0;
- try {
- alt = new Alternative( doc(), kw );
- res = alt->addAnnotation<F>( args );
- }
- catch( std::exception& ){
- delete alt;
- throw;
- }
- append( alt );
- return res;
- }
-
- template <typename F>
- F *FoliaElement::addAlternative(){
- KWargs numb;
- return addAlternative<F>( numb );
- }
-
- class PosAnnotation: public AbstractTokenAnnotation {
- public:
- PosAnnotation( const std::string& s=""): AbstractTokenAnnotation(){ classInit( s ); };
- PosAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- PosAnnotation( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); };
- PosAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class LemmaAnnotation: public AbstractTokenAnnotation {
- public:
- LemmaAnnotation( const std::string& s=""): AbstractTokenAnnotation(){ classInit( s ); };
- LemmaAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- LemmaAnnotation( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); };
- LemmaAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class LangAnnotation: public AbstractTokenAnnotation {
- public:
- LangAnnotation( const std::string& s=""): AbstractTokenAnnotation(){ classInit( s ); };
- LangAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- LangAnnotation( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); };
- LangAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class PhonAnnotation: public AbstractTokenAnnotation {
- public:
- PhonAnnotation( const std::string& s=""): AbstractTokenAnnotation(){ classInit( s ); };
- PhonAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- PhonAnnotation( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); };
- PhonAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class DomainAnnotation: public AbstractTokenAnnotation {
- public:
- DomainAnnotation( const std::string& s=""): AbstractTokenAnnotation(){ classInit( s ); };
- DomainAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- DomainAnnotation( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); };
- DomainAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class SenseAnnotation: public AbstractTokenAnnotation {
- public:
- SenseAnnotation( const std::string& s="" ): AbstractTokenAnnotation(){ classInit( s ); };
- SenseAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- SenseAnnotation( Document *d, const std::string& s="" ): AbstractTokenAnnotation( d ){ classInit( s ); };
- SenseAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class SubjectivityAnnotation: public AbstractTokenAnnotation {
- public:
- SubjectivityAnnotation( const std::string& s="" ): AbstractTokenAnnotation(){ classInit( s ); };
- SubjectivityAnnotation( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); };
- SubjectivityAnnotation( Document *d, const std::string& s="" ): AbstractTokenAnnotation( d ){ classInit( s ); };
- SubjectivityAnnotation( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); };
- private:
- void init();
- };
-
- class Quote: public AbstractStructureElement {
- public:
- Quote( const std::string& s="" ): AbstractStructureElement(){ classInit( s ); };
- Quote( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Quote( Document *d, const std::string& s="" ): AbstractStructureElement( d ){ classInit( s ); };
- Quote( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- FoliaElement *append( FoliaElement *);
- std::vector<Word*> wordParts() const;
- std::string getTextDelimiter( bool=false) const;
- private:
- void init();
- };
-
- class BeginDateTimeFeature: public Feature {
- public:
- BeginDateTimeFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- BeginDateTimeFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- BeginDateTimeFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- BeginDateTimeFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class EndDateTimeFeature: public Feature {
- public:
- EndDateTimeFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- EndDateTimeFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- EndDateTimeFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- EndDateTimeFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class SynsetFeature: public Feature {
- public:
- SynsetFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- SynsetFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- SynsetFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- SynsetFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class ActorFeature: public Feature {
- public:
- ActorFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- ActorFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- ActorFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- ActorFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class HeadFeature: public Feature {
- public:
- HeadFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- HeadFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- HeadFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- HeadFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class ValueFeature: public Feature {
- public:
- ValueFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- ValueFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- ValueFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- ValueFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class FunctionFeature: public Feature {
- public:
- FunctionFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- FunctionFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- FunctionFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- FunctionFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class TimeFeature: public Feature {
- public:
- TimeFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- TimeFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- TimeFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- TimeFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class LevelFeature: public Feature {
- public:
- LevelFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- LevelFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- LevelFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- LevelFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class ModalityFeature: public Feature {
- public:
- ModalityFeature( const std::string& s="" ): Feature( ){ classInit( s ); }
- ModalityFeature( const KWargs& a ): Feature( ){ classInit( a ); }
- ModalityFeature( Document *d, const std::string& s="" ): Feature( d ){ classInit( s ); }
- ModalityFeature( Document *d, const KWargs& a ): Feature( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class WordReference: public FoliaImpl {
- public:
- WordReference( const std::string& s="" ): FoliaImpl(){ classInit( s ); };
- WordReference( const KWargs& a ): FoliaImpl(){ classInit( a ); };
- WordReference( Document *d, const std::string& s="" ): FoliaImpl(d){ classInit( s ); };
- WordReference( Document *d, const KWargs& a ): FoliaImpl(d){ classInit( a ); };
- private:
- void init();
- FoliaElement* parseXml( const xmlNode *node );
- };
-
- class Alignment: public FoliaImpl {
- public:
- Alignment( const std::string& s="" ): FoliaImpl(){ classInit( s ); };
- Alignment( const KWargs& a ): FoliaImpl(){ classInit( a ); };
- Alignment( Document *d, const std::string& s="" ): FoliaImpl(d){ classInit( s ); };
- Alignment( Document *d, const KWargs& a ): FoliaImpl(d){ classInit( a ); };
- std::string href() const { return _href; };
- std::vector<FoliaElement *>resolve() const;
- KWargs collectAttributes() const;
- void setAttributes( const KWargs& );
- private:
- void init();
- std::string _href;
- std::string _type;
- };
-
- class AlignReference: public FoliaImpl {
- friend class Alignment;
- public:
- AlignReference( const std::string& s="" ): FoliaImpl(){ classInit( s ); };
- AlignReference( const KWargs& a ): FoliaImpl(){ classInit( a ); };
- AlignReference( Document *d, const std::string& s="" ): FoliaImpl(d){ classInit( s ); };
- AlignReference( Document *d, const KWargs& a ): FoliaImpl(d){ classInit( a ); };
- KWargs collectAttributes() const;
- void setAttributes( const KWargs& );
- private:
- void init();
- FoliaElement* parseXml( const xmlNode *node );
- FoliaElement *resolve( const Alignment *ref ) const;
- std::string refId;
- std::string _type;
- std::string _t;
- };
-
- class SyntacticUnit: public AbstractSpanAnnotation {
- public:
- SyntacticUnit( const std::string& s="" ): AbstractSpanAnnotation( ){ classInit( s ); }
- SyntacticUnit( const KWargs& a ): AbstractSpanAnnotation( ){ classInit( a ); }
- SyntacticUnit( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- SyntacticUnit( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class Chunk: public AbstractSpanAnnotation {
- public:
- Chunk( const std::string& s="" ): AbstractSpanAnnotation( ){ classInit( s ); }
- Chunk( const KWargs& a ): AbstractSpanAnnotation( ){ classInit( a ); }
- Chunk( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- Chunk( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class Entity: public AbstractSpanAnnotation {
- public:
- Entity( const std::string& s="" ): AbstractSpanAnnotation( ){ classInit( s ); }
- Entity( const KWargs& a ): AbstractSpanAnnotation( ){ classInit( a ); }
- Entity( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- Entity( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class Headwords: public AbstractSpanAnnotation {
- public:
- Headwords( const std::string& s="" ): AbstractSpanAnnotation( ){ classInit( s ); }
- Headwords( const KWargs& a ): AbstractSpanAnnotation( ){ classInit( a ); }
- Headwords( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- Headwords( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class DependencyDependent: public AbstractSpanAnnotation {
- public:
- DependencyDependent( const std::string& s="" ): AbstractSpanAnnotation( ){ classInit( s ); }
- DependencyDependent( const KWargs& a ): AbstractSpanAnnotation( ){ classInit( a ); }
- DependencyDependent( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- DependencyDependent( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class Dependency: public AbstractSpanAnnotation {
- public:
- Dependency( const std::string& s="" ): AbstractSpanAnnotation( ){ classInit( s ); }
- Dependency( const KWargs& a ): AbstractSpanAnnotation( ){ classInit( a ); }
- Dependency( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- Dependency( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- Headwords *head() const;
- DependencyDependent *dependent() const;
- private:
- void init();
- };
-
- class CoreferenceLink: public AbstractSpanAnnotation {
- public:
- CoreferenceLink( const std::string& s="" ): AbstractSpanAnnotation(){ classInit( s ); }
- CoreferenceLink( const KWargs& a ): AbstractSpanAnnotation(){ classInit( a ); }
- CoreferenceLink( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- CoreferenceLink( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class CoreferenceChain: public AbstractSpanAnnotation {
- public:
- CoreferenceChain( const std::string& s="" ): AbstractSpanAnnotation(){ classInit( s ); }
- CoreferenceChain( const KWargs& a ): AbstractSpanAnnotation(){ classInit( a ); }
- CoreferenceChain( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- CoreferenceChain( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class SemanticRole: public AbstractSpanAnnotation {
- public:
- SemanticRole( const std::string& s="" ): AbstractSpanAnnotation(){ classInit( s ); }
- SemanticRole( const KWargs& a ): AbstractSpanAnnotation(){ classInit( a ); }
- SemanticRole( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- SemanticRole( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class AbstractAnnotationLayer: public FoliaImpl,
- public AllowGenerateID,
- public AllowAnnotation,
- public AllowCorrection {
- public:
- AbstractAnnotationLayer( const std::string& s=""): FoliaImpl() { classInit( s ); };
- AbstractAnnotationLayer( const KWargs& a ): FoliaImpl() { classInit( a ); };
- AbstractAnnotationLayer( Document *d, const std::string& s=""): FoliaImpl(d) { classInit( s ); };
- AbstractAnnotationLayer( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- FoliaElement *findspan( const std::vector<FoliaElement*>& ) const;
- private:
- void init();
- };
-
- class AbstractCorrectionChild: public FoliaImpl {
- public:
- AbstractCorrectionChild( Document *d=0 ): FoliaImpl(d){ classInit(); };
- private:
- void init();
- };
-
- class NewElement: public AbstractCorrectionChild {
- public:
- NewElement( const std::string& s=""): AbstractCorrectionChild( ) { classInit( s ); };
- NewElement( const KWargs& a ): AbstractCorrectionChild( ) { classInit( a ); };
- NewElement( Document *d, const std::string& s=""): AbstractCorrectionChild( d ) { classInit( s ); };
- NewElement( Document *d, const KWargs& a ): AbstractCorrectionChild( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Current: public AbstractCorrectionChild {
- public:
- Current( const std::string& s=""): AbstractCorrectionChild( ) { classInit( s ); };
- Current( const KWargs& a ): AbstractCorrectionChild( ) { classInit( a ); };
- Current( Document *d, const std::string& s=""): AbstractCorrectionChild( d ) { classInit( s ); };
- Current( Document *d, const KWargs& a ): AbstractCorrectionChild( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Original: public AbstractCorrectionChild {
- public:
- Original( const std::string& s=""): AbstractCorrectionChild( ) { classInit( s ); };
- Original( const KWargs& a ): AbstractCorrectionChild( ) { classInit( a ); };
- Original( Document *d, const std::string& s=""): AbstractCorrectionChild( d ) { classInit( s ); };
- Original( Document *d, const KWargs& a ): AbstractCorrectionChild( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Suggestion: public AbstractCorrectionChild {
- public:
- Suggestion( const std::string& s=""): AbstractCorrectionChild( ) { classInit( s ); };
- Suggestion( const KWargs& a ): AbstractCorrectionChild( ) { classInit( a ); };
- Suggestion( Document *d, const std::string& s=""): AbstractCorrectionChild( d ) { classInit( s ); };
- Suggestion( Document *d, const KWargs& a ): AbstractCorrectionChild( d ) { classInit( a ); };
- private:
- void init();
- };
-
- class Description: public FoliaImpl {
- public:
- Description( const std::string& s=""): FoliaImpl() { classInit( s ); };
- Description( const KWargs& a ): FoliaImpl() { classInit( a ); };
- Description( Document *d, const std::string& s="" ): FoliaImpl(d) { classInit( s ); };
- Description( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- std::string description() const { return _value; };
- void setAttributes( const KWargs& kwargs );
- FoliaElement* parseXml( const xmlNode * );
- xmlNode *xml( bool, bool=false ) const;
- private:
- void init();
- std::string _value;
- };
-
- class XmlComment: public FoliaImpl {
- public:
- XmlComment( const std::string& s=""): FoliaImpl() { classInit( s ); };
- XmlComment( const KWargs& a ): FoliaImpl() { classInit( a ); };
- XmlComment( Document *d, const std::string& s="" ): FoliaImpl(d) { classInit( s ); };
- XmlComment( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- FoliaElement* parseXml( const xmlNode * );
- xmlNode *xml( bool, bool=false ) const;
- private:
- void init();
- std::string _value;
- };
-
- class XmlText: public FoliaImpl {
- public:
- XmlText( const std::string& s=""): FoliaImpl() { classInit( s ); };
- XmlText( const KWargs& a ): FoliaImpl() { classInit( a ); };
- XmlText( Document *d, const std::string& s="" ): FoliaImpl(d) { classInit( s ); };
- XmlText( Document *d, const KWargs& a ): FoliaImpl( d ) { classInit( a ); };
- FoliaElement* parseXml( const xmlNode * );
- xmlNode *xml( bool, bool=false ) const;
- bool setvalue( const std::string& s ) { _value = s; return true; };
- std::string getTextDelimiter( bool ) const { return ""; };
- UnicodeString text( const std::string&, bool ) const;
- private:
- void init();
- std::string _value; //UTF8 value
- };
-
- class External: public FoliaImpl {
- public:
- External( const std::string& s=""): FoliaImpl( ) { classInit( s ); };
- External( const KWargs& a ): FoliaImpl( ) { classInit( a ); };
- External( Document *d, const std::string& s="" ): FoliaImpl(d) { classInit( s ); };
- External( Document *d, const KWargs& a ): FoliaImpl(d) { classInit( a ); };
- FoliaElement* parseXml( const xmlNode * );
- void resolve();
- void setAttributes( const KWargs& );
- KWargs collectAttributes() const;
- private:
- void init();
- std::string _src;
- bool _include;
- };
-
-
- class Note: public AbstractStructureElement {
- public:
- Note( const std::string& s=""): AbstractStructureElement(){ classInit( s ); };
- Note( const KWargs& a ): AbstractStructureElement(){ classInit( a ); };
- Note( Document *d, const std::string& s=""): AbstractStructureElement( d ){ classInit( s ); };
- Note( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- KWargs collectAttributes() const;
- void setAttributes( const KWargs& );
- private:
- void init();
- std::string refId;
- };
-
- class Reference: public AbstractStructureElement {
- friend class Note;
- public:
- Reference( const std::string& s="" ): AbstractStructureElement( ){ classInit( s ); };
- Reference( const KWargs& a ): AbstractStructureElement( ){ classInit( a ); };
- Reference( Document *d, const std::string& s="" ): AbstractStructureElement( d ){ classInit( s ); };
- Reference( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); };
- KWargs collectAttributes() const;
- void setAttributes( const KWargs& );
- private:
- void init();
- std::string refId;
- std::string _type;
- };
-
-
- class Correction: public AbstractTokenAnnotation {
- public:
- Correction( const std::string& s=""): AbstractTokenAnnotation( ){ classInit( s ); }
- Correction( const KWargs& a ): AbstractTokenAnnotation( ){ classInit( a ); }
- Correction( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); }
- Correction( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); }
- bool hasNew() const;
- bool hasOriginal() const;
- bool hasCurrent() const;
- bool hasSuggestions() const;
- NewElement *getNew() const;
- Original *getOriginal() const;
- Current *getCurrent() const;
- std::vector<Suggestion*> suggestions() const;
- Suggestion *suggestions( size_t ) const;
- UnicodeString text( const std::string& = "current", bool = false ) const;
- TextContent *textcontent( const std::string& = "current" ) const;
- std::string getTextDelimiter( bool=false) const;
- private:
- void init();
- };
-
- class ErrorDetection: public AbstractTokenAnnotation {
- public:
- ErrorDetection( const std::string& s=""): AbstractTokenAnnotation(){ classInit( s ); }
- ErrorDetection( const KWargs& a ): AbstractTokenAnnotation(){ classInit( a ); }
- ErrorDetection( Document *d, const std::string& s=""): AbstractTokenAnnotation( d ){ classInit( s ); }
- ErrorDetection( Document *d, const KWargs& a ): AbstractTokenAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class TimeSegment: public AbstractSpanAnnotation {
- public:
- TimeSegment( const std::string& s="" ): AbstractSpanAnnotation(){ classInit( s ); }
- TimeSegment( const KWargs& a ): AbstractSpanAnnotation(){ classInit( a ); }
- TimeSegment( Document *d, const std::string& s="" ): AbstractSpanAnnotation( d ){ classInit( s ); }
- TimeSegment( Document *d, const KWargs& a ): AbstractSpanAnnotation( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class Morpheme: public AbstractStructureElement {
- public:
- Morpheme( const std::string& s="" ): AbstractStructureElement(){ classInit( s ); }
- Morpheme( const KWargs& a ): AbstractStructureElement(){ classInit( a ); }
- Morpheme( Document *d, const std::string& s="" ): AbstractStructureElement( d ){ classInit( s ); }
- Morpheme( Document *d, const KWargs& a ): AbstractStructureElement( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class SyntaxLayer: public AbstractAnnotationLayer {
- public:
- SyntaxLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- SyntaxLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- SyntaxLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- SyntaxLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class ChunkingLayer: public AbstractAnnotationLayer {
- public:
- ChunkingLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- ChunkingLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- ChunkingLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- ChunkingLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class EntitiesLayer: public AbstractAnnotationLayer {
- public:
- EntitiesLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- EntitiesLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- EntitiesLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- EntitiesLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class TimingLayer: public AbstractAnnotationLayer {
- public:
- TimingLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- TimingLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- TimingLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- TimingLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class MorphologyLayer: public AbstractAnnotationLayer {
- public:
- MorphologyLayer( const std::string& s="" ): AbstractAnnotationLayer(){ classInit( s ); }
- MorphologyLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- MorphologyLayer( Document *d, const std::string& s="" ): AbstractAnnotationLayer( d ){ classInit( s ); }
- MorphologyLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class DependenciesLayer: public AbstractAnnotationLayer {
- public:
- DependenciesLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- DependenciesLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- DependenciesLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- DependenciesLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class CoreferenceLayer: public AbstractAnnotationLayer {
- public:
- CoreferenceLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- CoreferenceLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- CoreferenceLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- CoreferenceLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- class SemanticRolesLayer: public AbstractAnnotationLayer {
- public:
- SemanticRolesLayer( const std::string& s=""): AbstractAnnotationLayer(){ classInit( s ); }
- SemanticRolesLayer( const KWargs& a ): AbstractAnnotationLayer(){ classInit( a ); }
- SemanticRolesLayer( Document *d, const std::string& s=""): AbstractAnnotationLayer( d ){ classInit( s ); }
- SemanticRolesLayer( Document *d, const KWargs& a ): AbstractAnnotationLayer( d ){ classInit( a ); }
- private:
- void init();
- };
-
- std::string VersionName();
- std::string Version();
-
-} // namespace folia
+#include "libfolia/folia_types.h"
+#include "libfolia/folia_utils.h"
+#include "libfolia/folia_impl.h"
+#include "libfolia/folia_document.h"
#endif
diff --git a/include/libfolia/document.h b/include/libfolia/folia_document.h
similarity index 85%
rename from include/libfolia/document.h
rename to include/libfolia/folia_document.h
index 58c8d50..f5e7388 100644
--- a/include/libfolia/document.h
+++ b/include/libfolia/folia_document.h
@@ -1,10 +1,7 @@
/*
- $Id: document.h 17512 2014-08-14 09:48:42Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/include/libfolia/document.h $
-
- Copyright (c) 1998 - 2014
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
ILK - Tilburg University
- CLiPS - University of Antwerp
This file is part of libfolia
@@ -22,36 +19,42 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
+ https://github.com/LanguageMachines/ticcutils/issues
or send mail to:
- timbl at uvt.nl
+ lamasoftware (at ) science.ru.nl
+
*/
#ifndef FOLIA_DOCUMENT_H
#define FOLIA_DOCUMENT_H
#include <list>
+#include <set>
+#include <map>
+#include <vector>
+#include <string>
+#include <iostream>
#include "unicode/unistr.h"
#include "unicode/regex.h"
#include "libxml/tree.h"
#include "libxml/xpath.h"
-#include <ctime>
#include "libfolia/folia.h"
-#include "libfolia/foliautils.h"
namespace folia {
void initMT();
extern const std::string NSFOLIA;
+ enum ElementType : unsigned int;
+
class Pattern {
friend std::ostream& operator<<( std::ostream&, const Pattern& );
public:
Pattern( const std::vector<std::string>&,
const ElementType = BASE,
const std::string& = "" );
- Pattern( const std::vector<std::string>&,
- const std::string& );
+ Pattern( const std::vector<std::string>&, const std::string& );
+
~Pattern();
bool match( const UnicodeString& , size_t&, int&, bool&, bool& ) const;
size_t size() const { return sequence.size(); };
@@ -99,6 +102,7 @@ namespace folia {
// almost backward compatible
return addText(t);
};
+ void set_foreign_metadata( xmlNode * );
void addStyle( const std::string&, const std::string& );
void replaceStyle( const std::string&, const std::string& );
std::vector<Paragraph*> paragraphs() const;
@@ -115,8 +119,12 @@ namespace folia {
Paragraph *rparagraphs( size_t ) const;
Sentence *sentences( size_t ) const;
Sentence *rsentences( size_t ) const;
- std::string toXml( const std::string& ="", bool = false ) const;
- MetaDataType metadatatype() const { return _metadatatype; };
+ std::string toXml( const std::string& ="",
+ bool = false ) const;
+ bool toXml( const std::string&,
+ const std::string& ="",
+ bool = false ) const;
+ std::string metadatatype() const { return _metadatatype; };
std::string metadatafile() const { return _metadatafile; };
void set_metadata( const std::string& type, const std::string& value );
const std::string get_metadata( const std::string& type ) const;
@@ -152,13 +160,13 @@ namespace folia {
void declare( AnnotationType::AnnotationType,
const std::string&, const std::string&,
const std::string&, const std::string& );
- xmlDoc *XmlDoc() const { return xmldoc; };
+ xmlDoc *XmlDoc() const { return _xmldoc; };
xmlNs *foliaNs() const { return _foliaNsOut; };
void keepForDeletion( FoliaElement *p ) { delSet.insert( p ); };
void addExternal( External *p ) { externals.push_back( p ); };
FoliaElement *resolveExternals( FoliaElement* );
int debug;
-
+ bool permissive() const { return mode == "permissive"; };
class at_t {
friend std::ostream& operator<<( std::ostream&, const at_t& );
public:
@@ -169,16 +177,17 @@ namespace folia {
};
private:
std::map<AnnotationType::AnnotationType,std::multimap<std::string,at_t> > annotationdefaults;
-
+ std::vector<std::pair<AnnotationType::AnnotationType,std::string>> anno_sort;
FoliaElement* parseFoliaDoc( xmlNode * );
void parsemeta( xmlNode * );
void setimdi( xmlNode * );
- void setAttributes( const KWargs& );
+ void setDocumentProps( KWargs& );
void parseannotations( xmlNode * );
void getstyles();
void setannotations( xmlNode *) const;
void setmetadata( xmlNode * ) const;
void setstyles( xmlDoc* ) const;
+ xmlDoc *to_xmlDoc( const std::string& ="", bool=false ) const;
std::map<std::string, FoliaElement* > sindex;
std::vector<FoliaElement* > iindex;
std::vector<FoliaElement*> data;
@@ -186,11 +195,13 @@ namespace folia {
std::string _id;
std::set<FoliaElement *> delSet;
FoliaElement *foliadoc;
- xmlDoc *xmldoc;
- xmlNs *_foliaNsIn;
+ xmlDoc *_xmldoc;
+ const xmlChar* _foliaNsIn_href;
+ const xmlChar* _foliaNsIn_prefix;
mutable xmlNs *_foliaNsOut;
- MetaDataType _metadatatype;
- xmlNode *metadata;
+ std::string _metadatatype;
+ xmlNode *_metadata;
+ ForeignData *_foreigndata;
std::string _metadatafile;
std::string _title;
std::string _date;
@@ -199,10 +210,12 @@ namespace folia {
std::string _license;
std::map<std::string,std::string> meta_atts;
std::multimap<std::string,std::string> styles;
- bool loadall;
+ std::string mode;
std::string filename;
std::string version;
bool external;
+ Document( const Document& ); // inhibit copies
+ Document& operator=( const Document& ); // inhibit copies
};
bool operator==( const Document&, const Document& );
diff --git a/include/libfolia/folia_impl.h b/include/libfolia/folia_impl.h
new file mode 100644
index 0000000..8c4ac59
--- /dev/null
+++ b/include/libfolia/folia_impl.h
@@ -0,0 +1,2290 @@
+/*
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
+ ILK - Tilburg University
+
+ This file is part of libfolia
+
+ libfolia 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 3 of the License, or
+ (at your option) any later version.
+
+ libfolia 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, see <http://www.gnu.org/licenses/>.
+
+ For questions and suggestions, see:
+ https://github.com/LanguageMachines/ticcutils/issues
+ or send mail to:
+ lamasoftware (at ) science.ru.nl
+*/
+
+#ifndef FOLIA_IMPL_H
+#define FOLIA_IMPL_H
+
+#include <set>
+#include <map>
+#include <vector>
+#include <string>
+#include <iostream>
+#include <exception>
+#include "unicode/unistr.h"
+#include "libxml/tree.h"
+
+namespace folia {
+ class Document;
+ class AbstractSpanAnnotation;
+ class Alternative;
+ class PosAnnotation;
+ class LemmaAnnotation;
+ class MorphologyLayer;
+ class Sentence;
+ class Word;
+ class TextContent;
+ class PhonContent;
+ class Correction;
+ class New;
+ class Original;
+ class Current;
+ class Suggestion;
+ class Division;
+ class DependencyDependent;
+ class Paragraph;
+ class Morpheme;
+
+ class properties;
+ extern const std::set<ElementType> default_ignore_annotations;
+
+#define NOT_IMPLEMENTED { \
+ throw NotImplementedError( xmltag() + "::" + std::string(__func__) ); \
+ }
+
+ class FoliaElement {
+ friend std::ostream& operator<<( std::ostream&, const FoliaElement& );
+ friend std::ostream& operator<<( std::ostream&, const FoliaElement* );
+ friend bool operator==( const FoliaElement&, const FoliaElement& );
+ public:
+ virtual ~FoliaElement(){};
+ virtual void init() {};
+ virtual size_t size() const = 0;
+ virtual FoliaElement* index( size_t ) const = 0;
+ virtual FoliaElement* rindex( size_t ) const = 0;
+ FoliaElement* operator[]( size_t i ) const {
+ return index(i);
+ }
+
+ virtual bool isinstance( ElementType et ) const = 0;
+ template <typename F>
+ bool isinstance() const {
+ F obj((Document*)0);
+ return element_id() == obj.element_id();
+ }
+ bool isSubClass( ElementType ) const;
+ bool isSubClass( const FoliaElement *c ) const {
+ return dynamic_cast<decltype(c)>(this) != 0;
+ };
+
+ virtual void assignDoc( Document* ) = 0;
+ virtual FoliaElement *parent() const = 0;
+ virtual void setParent( FoliaElement *p ) = 0;
+ virtual bool acceptable( ElementType ) const = 0;
+ virtual bool addable( const FoliaElement * ) const = 0;
+ virtual FoliaElement *append( FoliaElement* ) = 0;
+ virtual FoliaElement *postappend( ) = 0;
+ virtual void remove( size_t, bool = true ) = 0;
+ virtual void remove( FoliaElement *, bool = true ) = 0;
+ virtual std::vector<FoliaElement*> findreplacables( FoliaElement * ) const = 0;
+ virtual void replace( FoliaElement * ) = 0;
+ virtual FoliaElement* replace( FoliaElement *, FoliaElement* ) = 0;
+
+
+ virtual FoliaElement *head() const NOT_IMPLEMENTED;
+
+ // Sentences
+ virtual Sentence *addSentence( const KWargs& ) = 0;
+ Sentence *addSentence( const std::string& s ="" ){
+ return addSentence( getArgs(s) );
+ };
+
+ // Selections
+ template <typename F>
+ std::vector<F*> select( const std::string& st,
+ const std::set<ElementType>& exclude,
+ bool recurse = true ) const {
+ F obj((Document*)0);
+ std::vector<F*> res;
+ std::vector<FoliaElement*> tmp = select( obj.element_id(),
+ st,
+ exclude,
+ recurse );
+ for ( size_t i = 0; i < tmp.size(); ++i ){
+ res.push_back( dynamic_cast<F*>( tmp[i]) );
+ }
+ return res;
+ }
+
+ template <typename F>
+ std::vector<F*> select( const std::string& st,
+ bool recurse = true ) const {
+ F obj((Document*)0);
+ std::vector<F*> res;
+ std::vector<FoliaElement*> tmp = select( obj.element_id(),
+ st,
+ recurse );
+ for ( size_t i = 0; i < tmp.size(); ++i ){
+ res.push_back( dynamic_cast<F*>( tmp[i]) );
+ }
+ return res;
+ }
+
+ template <typename F>
+ std::vector<F*> select( const char* st,
+ bool recurse = true ) const {
+ F obj((Document*)0);
+ std::vector<F*> res;
+ std::vector<FoliaElement*> tmp = select( obj.element_id(),
+ std::string(st),
+ recurse );
+ for ( size_t i = 0; i < tmp.size(); ++i ){
+ res.push_back( dynamic_cast<F*>( tmp[i]) );
+ }
+ return res;
+ }
+
+ template <typename F>
+ std::vector<F*> select( const std::set<ElementType>& exclude,
+ bool recurse = true ) const {
+ F obj((Document*)0);
+ std::vector<F*> res;
+ std::vector<FoliaElement*> tmp = select( obj.element_id(),
+ exclude,
+ recurse );
+ for ( size_t i = 0; i < tmp.size(); ++i ){
+ res.push_back( dynamic_cast<F*>( tmp[i]) );
+ }
+ return res;
+ }
+
+ template <typename F>
+ std::vector<F*> select( bool recurse = true ) const {
+ F obj((Document*)0);
+ std::vector<F*> res;
+ std::vector<FoliaElement*> tmp = select( obj.element_id(),
+ recurse );
+ for ( size_t i = 0; i < tmp.size(); ++i ){
+ res.push_back( dynamic_cast<F*>( tmp[i]) );
+ }
+ return res;
+ }
+
+ // annotations
+
+ virtual bool allowannotations() const { return false; };
+ virtual const std::string annotator( ) const = 0;
+ virtual void annotator( const std::string& ) = 0;
+ virtual AnnotatorType annotatortype() const = 0;
+ virtual void annotatortype( AnnotatorType t ) = 0;
+ virtual AnnotationType::AnnotationType annotation_type() const = 0;
+ virtual PosAnnotation *addPosAnnotation( const KWargs& ) NOT_IMPLEMENTED;
+ virtual LemmaAnnotation *addLemmaAnnotation( const KWargs& ) NOT_IMPLEMENTED;
+ virtual MorphologyLayer *addMorphologyLayer( const KWargs& ) NOT_IMPLEMENTED;
+
+ virtual PosAnnotation *getPosAnnotations( const std::string&,
+ std::vector<PosAnnotation*>& ) const NOT_IMPLEMENTED;
+ virtual LemmaAnnotation *getLemmaAnnotations( const std::string&,
+ std::vector<LemmaAnnotation*>& ) const NOT_IMPLEMENTED;
+ virtual MorphologyLayer *getMorphologyLayers( const std::string&,
+ std::vector<MorphologyLayer*>& ) const NOT_IMPLEMENTED;
+
+ template <typename F>
+ std::vector<F*> annotations( const std::string& s = "" ) const {
+ if ( allowannotations() ){
+ std::vector<F*> v = select<F>( s, default_ignore_annotations );
+ if ( v.size() >= 1 )
+ return v;
+ else {
+ F obj((Document*)0);
+ if ( s.empty() )
+ throw NoSuchAnnotation( obj.classname() );
+ else
+ throw NoSuchAnnotation( obj.classname() + " for set='" + s + "'" );
+ }
+ }
+ else NOT_IMPLEMENTED;
+ }
+
+ template <typename F>
+ int hasannotation( const std::string& st = "" ) const {
+ try {
+ std::vector<F*> v = annotations<F>( st );
+ return v.size();
+ }
+ catch ( NoSuchAnnotation& e ){
+ }
+ return 0;
+ }
+
+ template <typename F>
+ F *annotation( const std::string& st = "" ) const {
+ std::vector<F*>v = annotations<F>( st );
+ return v[0]; // always exist, otherwise annotations would throw()
+ }
+
+ template <typename F>
+ F *addAnnotation( const KWargs& args ) {
+ F *res = 0;
+ try {
+ res = new F( args, doc() );
+ }
+ catch( std::exception& ){
+ delete res;
+ throw;
+ }
+ append( res );
+ return res;
+ }
+ // span annotation
+ virtual std::vector<AbstractSpanAnnotation*> selectSpan() const = 0;
+ virtual std::vector<AbstractSpanAnnotation*> findspans( ElementType,
+ const std::string& = "" ) const NOT_IMPLEMENTED;
+ template <typename F>
+ std::vector<AbstractSpanAnnotation*> findspans( const std::string& st = "" ) const {
+ F obj((Document*)0);
+ return findspans( obj.element_id(), st );
+ }
+ virtual AbstractSpanAnnotation *findspan( const std::vector<FoliaElement*>& ) const NOT_IMPLEMENTED;
+
+ // features
+ virtual std::vector<std::string> feats( const std::string& ) const = 0;
+ virtual const std::string feat( const std::string& ) const = 0;
+
+ //XML (de)serialisation
+ virtual FoliaElement* parseXml( const xmlNode * ) = 0;
+ const std::string xmlstring() const; // serialize to a string (XML fragment)
+ virtual xmlNode *xml( bool, bool = false ) const = 0; //serialize to XML
+
+ // text/string content
+ bool hastext( const std::string& = "current" ) const;
+
+ virtual const std::string str( const std::string& = "current" ) const = 0;
+ const UnicodeString unicode( const std::string& cls = "current" ) const { return text( cls ); };
+ virtual const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const = 0;
+ const UnicodeString stricttext( const std::string& = "current" ) const;
+ const UnicodeString toktext( const std::string& = "current" ) const;
+ virtual const UnicodeString phon( const std::string& = "current",
+ bool = false ) const = 0;
+ virtual bool printable() const = 0;
+ virtual bool speakable() const = 0;
+
+ // Word
+ virtual Word *previous() const NOT_IMPLEMENTED;
+ virtual Word *next() const NOT_IMPLEMENTED;
+ virtual const Word* resolveword( const std::string& ) const = 0;
+ virtual std::vector<Word*> context( size_t,
+ const std::string& ="" ) const NOT_IMPLEMENTED;
+ virtual std::vector<Word*> leftcontext( size_t,
+ const std::string& ="" ) const NOT_IMPLEMENTED;
+ virtual std::vector<Word*> rightcontext( size_t,
+ const std::string& ="" ) const NOT_IMPLEMENTED;
+ virtual Word *addWord( const KWargs& ) = 0;
+ Word *addWord( const std::string& s ){
+ return addWord( getArgs(s) );
+ }
+
+ // corrections
+ virtual New *getNew() const NOT_IMPLEMENTED;
+ virtual FoliaElement *getNew( size_t ) const NOT_IMPLEMENTED;
+ virtual Original *getOriginal() const NOT_IMPLEMENTED;
+ virtual FoliaElement *getOriginal( size_t ) const NOT_IMPLEMENTED;
+ virtual Current *getCurrent() const NOT_IMPLEMENTED;
+ virtual FoliaElement *getCurrent( size_t ) const NOT_IMPLEMENTED;
+ virtual Correction *incorrection() const NOT_IMPLEMENTED;
+ virtual Correction *split( FoliaElement *, FoliaElement *,
+ const std::string& = "" ) NOT_IMPLEMENTED;
+
+ virtual Correction *mergewords( FoliaElement *,
+ const std::vector<FoliaElement *>&,
+ const std::string& = "" ) NOT_IMPLEMENTED;
+
+ virtual Correction *deleteword( FoliaElement *,
+ const std::string& = "" ) NOT_IMPLEMENTED;
+ virtual Correction *insertword( FoliaElement *, FoliaElement *,
+ const std::string& = "" ) NOT_IMPLEMENTED;
+ virtual std::vector<Suggestion*> suggestions() const NOT_IMPLEMENTED;
+ virtual Suggestion *suggestions( size_t ) const NOT_IMPLEMENTED;
+
+ virtual Correction *correct( const std::vector<FoliaElement*>&,
+ const std::vector<FoliaElement*>&,
+ const std::vector<FoliaElement*>&,
+ const std::vector<FoliaElement*>&,
+ const KWargs& ) NOT_IMPLEMENTED;
+ virtual Correction* correct( FoliaElement*,
+ FoliaElement*,
+ const KWargs& ) NOT_IMPLEMENTED;
+ virtual Correction* correct( FoliaElement*,
+ FoliaElement*,
+ const std::vector<FoliaElement*>&,
+ const KWargs& ) NOT_IMPLEMENTED;
+ virtual Correction *correct( const std::string& = "" ) NOT_IMPLEMENTED;
+
+ // TextContent
+ virtual TextContent *textcontent( const std::string& = "current" ) const = 0;
+ TextContent *settext( const std::string&, const std::string& = "current" );
+ TextContent *settext( const std::string&, int , const std::string& = "current" );
+ TextContent *setutext( const UnicodeString&, const std::string& = "current" );
+ TextContent *setutext( const UnicodeString&, int , const std::string& = "current" );
+ virtual int offset() const NOT_IMPLEMENTED;
+
+ // PhonContent
+ virtual PhonContent *phoncontent( const std::string& = "current" ) const = 0;
+
+ // properties
+ virtual const std::string& getTextDelimiter( bool retaintok=false ) const = 0;
+ virtual void setDateTime( const std::string& ) = 0;
+ virtual const std::string getDateTime() const = 0;
+ virtual const std::string pos( const std::string& = "" ) const = 0;
+ virtual const std::string lemma( const std::string& = "" ) const = 0;
+ virtual const std::string cls() const = 0;
+ virtual const std::string sett() const = 0;
+ virtual const std::string n() const = 0;
+ virtual const std::string id() const = 0;
+ virtual const std::string begintime() const = 0;
+ virtual const std::string endtime() const = 0;
+ virtual const std::string speech_src() const = 0;
+ virtual const std::string speech_speaker() const = 0;
+ virtual double confidence() const = 0;
+ virtual void confidence( double ) = 0;
+ virtual ElementType element_id() const = 0;
+ virtual size_t occurrences() const = 0;
+ virtual size_t occurrences_per_set() const = 0;
+ virtual Attrib required_attributes() const = 0;
+ virtual Attrib optional_attributes() const = 0;
+ virtual const std::string& xmltag() const = 0;
+ const std::string& classname() const { return xmltag(); }; //synomym
+ virtual const std::string& default_subset() const = 0;
+ virtual const std::string subset() const NOT_IMPLEMENTED;
+ virtual bool setonly() const = 0;
+ virtual bool auto_generate_id() const = 0;
+ virtual Document *doc() const = 0;
+ virtual Sentence *sentence() const NOT_IMPLEMENTED;
+ virtual Paragraph *paragraph() const NOT_IMPLEMENTED;
+ virtual Division *division() const NOT_IMPLEMENTED;
+ virtual std::vector<Paragraph*> paragraphs() const NOT_IMPLEMENTED;
+ virtual std::vector<Sentence*> sentences() const NOT_IMPLEMENTED;
+ virtual std::vector<Word*> words() const NOT_IMPLEMENTED;
+ virtual std::vector<FoliaElement*> wrefs() const NOT_IMPLEMENTED;
+ virtual FoliaElement* wrefs( size_t ) const NOT_IMPLEMENTED;
+
+ virtual std::vector<Morpheme*> morphemes( const std::string& ="" ) const NOT_IMPLEMENTED;
+ virtual Morpheme* morpheme( size_t, const std::string& ="" ) const NOT_IMPLEMENTED;
+ virtual Sentence *sentences( size_t ) const NOT_IMPLEMENTED;
+ virtual Sentence *rsentences( size_t ) const NOT_IMPLEMENTED;
+ virtual Paragraph *paragraphs( size_t ) const NOT_IMPLEMENTED;
+ virtual Paragraph *rparagraphs( size_t ) const NOT_IMPLEMENTED;
+ virtual Word *words( size_t ) const NOT_IMPLEMENTED;
+ virtual std::vector<Word *> wordParts() const NOT_IMPLEMENTED;
+ virtual Word *rwords( size_t ) const NOT_IMPLEMENTED;
+
+ virtual DependencyDependent *dependent() const NOT_IMPLEMENTED;
+
+ virtual const std::string description() const;
+
+ // alternatives
+ template <typename F>
+ F *addAlternative();
+ template <typename F>
+ F *addAlternative( const KWargs& );
+ virtual std::vector<Alternative *> alternatives( ElementType,
+ const std::string& = ""
+ ) const NOT_IMPLEMENTED;
+ std::vector<Alternative*> alternatives( const std::string& s = "" ) const {
+ return alternatives( BASE, s );
+ }
+
+ virtual const std::string content() const NOT_IMPLEMENTED;
+ virtual const std::string src() const NOT_IMPLEMENTED;
+ virtual const UnicodeString caption() const NOT_IMPLEMENTED;
+ virtual std::vector<FoliaElement *> resolve() const NOT_IMPLEMENTED;
+ virtual const FoliaElement* resolveid() const NOT_IMPLEMENTED;
+ virtual bool checkAtts() = 0;
+
+
+ virtual std::vector<FoliaElement*> select( ElementType elementtype,
+ bool = true ) const = 0;
+ virtual std::vector<FoliaElement*> select( ElementType elementtype,
+ const std::set<ElementType>& ,
+ bool = true ) const = 0;
+ virtual std::vector<FoliaElement*> select( ElementType elementtype,
+ const std::string&,
+ bool = true ) const = 0;
+ virtual std::vector<FoliaElement*> select( ElementType elementtype,
+ const std::string&,
+ const std::set<ElementType>& ,
+ bool = true ) const = 0;
+ // some 'internal stuff
+ virtual int refcount() const = 0;
+ virtual void increfcount() = 0;
+ virtual void setAttributes( const KWargs& ) = 0;
+ virtual KWargs collectAttributes() const = 0;
+ virtual void setAuth( bool b ) = 0;
+ virtual const std::string generateId( const std::string& ) NOT_IMPLEMENTED;
+ };
+
+ class FoliaImpl: public virtual FoliaElement {
+ private:
+ FoliaImpl( const FoliaImpl& ); // inhibit copies
+ FoliaImpl& operator=( const FoliaImpl& ); // inhibit copies
+ public:
+ //Constructor
+ FoliaImpl( const properties& p, Document* = 0 );
+ // static element Constructor
+ static FoliaElement *createElement( ElementType, Document * =0 );
+ static FoliaElement *createElement( const std::string&, Document * =0 );
+ virtual ~FoliaImpl();
+
+ void classInit(){
+ // we could call 'init()' directly, but this is more esthetic
+ // keep in balance with the next function
+ init(); // virtual init
+ }
+
+ void classInit( const KWargs& a ){
+ // this funcion is needed because calling the virtual function
+ // setAttributes from the constuctor will NOT call the right version
+ // THIS IS BY DESIGN.
+ init(); // virtual init
+ setAttributes( a ); // also virtual!
+ }
+
+ //functions regarding contained data
+ size_t size() const { return data.size(); };
+ FoliaElement* index( size_t ) const;
+ FoliaElement* rindex( size_t ) const;
+
+ bool isinstance( ElementType et ) const {
+ return et == element_id();
+ }
+ template <typename F>
+ bool isinstance() const {
+ F obj((Document*)0);
+ return element_id() == obj.element_id();
+ }
+
+ void assignDoc( Document* );
+ FoliaElement *parent() const { return _parent; };
+ void setParent( FoliaElement *p ) { _parent = p ; };
+ bool acceptable( ElementType ) const;
+ bool addable( const FoliaElement * ) const;
+ FoliaElement *append( FoliaElement* );
+ FoliaElement *postappend( ) { return this; };
+ void remove( size_t, bool = true );
+ void remove( FoliaElement *, bool = true );
+ std::vector<FoliaElement*> findreplacables( FoliaElement * ) const;
+ void replace( FoliaElement * );
+ FoliaElement* replace( FoliaElement *, FoliaElement* );
+
+ // Sentences
+ Sentence *addSentence( const KWargs& );
+
+ // Selections
+ template <typename F>
+ std::vector<F*> select( bool recurse = true ) const {
+ return FoliaElement::select<F>(recurse);
+ }
+
+ template <typename F>
+ std::vector<F*> select( const std::string& st,
+ const std::set<ElementType>& exclude,
+ bool recurse = true ) const {
+ return FoliaElement::select<F>( st, exclude, recurse );
+ }
+
+ template <typename F>
+ std::vector<F*> select( const std::string& st,
+ bool recurse = true ) const {
+ return FoliaElement::select<F>( st, recurse );
+ }
+
+ template <typename F>
+ std::vector<F*> select( const char* st,
+ bool recurse = true ) const {
+ return FoliaElement::select<F>( st, recurse );
+ }
+
+ template <typename F>
+ std::vector<F*> select( const std::set<ElementType>& exclude,
+ bool recurse = true ) const {
+ return FoliaElement::select<F>( exclude, recurse );
+ }
+
+ const std::string annotator( ) const { return _annotator; };
+ void annotator( const std::string& a ) { _annotator = a; };
+ AnnotatorType annotatortype() const { return _annotator_type; };
+ void annotatortype( AnnotatorType t ) { _annotator_type = t; };
+
+ template <typename F>
+ F *addAnnotation( const KWargs& args ) {
+ return FoliaElement::addAnnotation<F>( args );
+ }
+
+ template <typename F>
+ std::vector<F*> annotations( const std::string& s = "" ) const {
+ return FoliaElement::annotations<F>( s );
+ }
+
+ template <typename F>
+ int hasannotation( const std::string& st = "" ) const {
+ return FoliaElement::hasannotation<F>(st);
+ }
+
+ template <typename F>
+ F *annotation( const std::string& st = "" ) const {
+ return FoliaElement::annotation<F>(st);
+ }
+
+ // Span annotations
+ std::vector<AbstractSpanAnnotation*> selectSpan() const;
+
+ // features
+ std::vector<std::string> feats( const std::string& ) const;
+ const std::string feat( const std::string& ) const;
+
+ //XML (de)serialisation
+ FoliaElement* parseXml( const xmlNode * );
+ xmlNode *xml( bool, bool = false ) const;
+
+ // text/string content
+
+ const std::string str( const std::string& = "current" ) const;
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const;
+
+ const UnicodeString phon( const std::string& = "current",
+ bool = false ) const;
+ const UnicodeString deeptext( const std::string& = "current",
+ bool = false ) const;
+ const UnicodeString deepphon( const std::string& = "current" ) const;
+
+ // Word
+ const Word* resolveword( const std::string& ) const { return 0; };
+ Word *addWord( const KWargs& );
+
+ // TextContent
+ TextContent *textcontent( const std::string& = "current" ) const;
+ // PhonContent
+ PhonContent *phoncontent( const std::string& = "current" ) const;
+
+ // properties
+ const std::string& getTextDelimiter( bool retaintok=false ) const;
+ void setDateTime( const std::string& );
+ const std::string getDateTime() const;
+ const std::string pos( const std::string& = "" ) const ;
+ const std::string lemma( const std::string& = "" ) const;
+ const std::string cls() const { return _class; };
+ const std::string sett() const { return _set; };
+ const std::string n() const { return _n; };
+ const std::string id() const { return _id; };
+ const std::string begintime() const { return _begintime; };
+ const std::string endtime() const { return _endtime; };
+ const std::string speech_src() const;
+ const std::string speech_speaker() const;
+
+ const std::string href() const;
+
+ double confidence() const { return _confidence; };
+ void confidence( double d ) { _confidence = d; };
+
+ // generic properties
+ ElementType element_id() const;
+ size_t occurrences() const;
+ size_t occurrences_per_set() const;
+ Attrib required_attributes() const;
+ Attrib optional_attributes() const;
+ const std::string& xmltag() const;
+ const std::string& default_subset() const;
+ AnnotationType::AnnotationType annotation_type() const;
+ const std::set<ElementType>& accepted_data() const;
+ const std::set<ElementType>& required_data() const;
+ bool printable() const;
+ bool speakable() const;
+ bool xlink() const;
+ bool auth() const;
+ bool setonly() const;
+ bool auto_generate_id() const;
+
+ Document *doc() const { return mydoc; };
+
+ bool checkAtts();
+
+ std::vector<FoliaElement*> select( ElementType elementtype,
+ bool = true ) const;
+ std::vector<FoliaElement*> select( ElementType elementtype,
+ const std::set<ElementType>& ,
+ bool = true ) const;
+ std::vector<FoliaElement*> select( ElementType elementtype,
+ const std::string&,
+ bool = true ) const;
+ std::vector<FoliaElement*> select( ElementType elementtype,
+ const std::string&,
+ const std::set<ElementType>& ,
+ bool = true ) const;
+ int refcount() const { return _refcount; };
+ void increfcount() { ++_refcount; };
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ void setAuth( bool b ){ _auth = b; };
+
+ protected:
+ xmlNs *foliaNs() const;
+ std::vector<FoliaElement*> data;
+ FoliaElement *_parent;
+ bool _auth;
+ Document *mydoc;
+ std::string _id;
+ std::string _class;
+ std::string _set;
+ std::map<std::string,std::string> _xlink;
+ std::string _src;
+ private:
+ static FoliaElement *private_createElement( ElementType );
+ void addFeatureNodes( const KWargs& args );
+ std::string _annotator;
+ std::string _n;
+ std::string _datetime;
+ std::string _begintime;
+ std::string _endtime;
+ std::string _speaker;
+ AnnotatorType _annotator_type;
+ double _confidence;
+ int _refcount;
+ const properties& _props;
+ };
+
+ bool isSubClass( const ElementType e1, const ElementType e2 );
+
+ bool isSubClass( const FoliaElement *e1, const FoliaElement *e2 );
+
+ template <typename T1, typename T2>
+ bool isSubClass(){
+ T1 t1((Document*)0);
+ return dynamic_cast<T2*>(&t1) != 0;
+ }
+
+ bool operator==( const FoliaElement&, const FoliaElement& );
+ inline bool operator!=( const FoliaElement& e1, const FoliaElement& e2 ){
+ return !( e1 == e2 );
+ }
+
+ inline size_t len( const FoliaElement *e ) {
+ return e->size(); }
+
+ template <typename T>
+ inline size_t len( const std::vector<T>& v ) {
+ return v.size(); }
+
+ inline const std::string str( const FoliaElement *e,
+ const std::string& cls = "current" ) {
+ return e->str( cls ); }
+
+ inline const UnicodeString text( const FoliaElement *e,
+ const std::string& cls = "current" ) {
+ if ( e )
+ return e->text( cls );
+ else
+ throw ValueError( "text() for empty element" );
+ }
+
+ inline const UnicodeString unicode( const FoliaElement *e ) {
+ return e->unicode(); }
+
+ inline bool isinstance( const FoliaElement *e, ElementType t ) {
+ return e->isinstance( t ); }
+
+ class AllowGenerateID: public virtual FoliaElement {
+ public:
+ void setMaxId( FoliaElement * );
+ int getMaxId( const std::string& );
+ const std::string generateId( const std::string& tag ){
+ return IDgen( tag, this );
+ }
+ private:
+ std::string IDgen( const std::string&, const FoliaElement* );
+ std::map<std::string, int> id_map;
+ };
+
+ class AllowCorrection: public virtual FoliaElement {
+ public:
+ Correction *correct( const std::vector<FoliaElement*>& v1,
+ const std::vector<FoliaElement*>& v2,
+ const std::vector<FoliaElement*>& v3,
+ const std::vector<FoliaElement*>& v4,
+ const KWargs& args );
+ Correction *correct( FoliaElement* o,
+ FoliaElement* n,
+ const KWargs& args ) {
+ const std::vector<FoliaElement*> v;
+ return correct( o, n, v, args );
+ }
+ Correction* correct( FoliaElement*,
+ FoliaElement*,
+ const std::vector<FoliaElement*>&,
+ const KWargs& );
+ Correction *correct( const std::string& = "" );
+ };
+
+ class AllowAnnotation: public virtual FoliaElement {
+ public:
+ bool allowannotations() const { return true; };
+ PosAnnotation *addPosAnnotation( const KWargs& );
+ PosAnnotation *getPosAnnotations( const std::string&,
+ std::vector<PosAnnotation*>& ) const;
+ LemmaAnnotation *addLemmaAnnotation( const KWargs& );
+ LemmaAnnotation *getLemmaAnnotations( const std::string&,
+ std::vector<LemmaAnnotation*>& ) const;
+ };
+
+ class AbstractStructureElement:
+ public FoliaImpl,
+ public AllowGenerateID,
+ public AllowAnnotation,
+ public AllowCorrection
+ {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractStructureElement as a real node!!
+ AbstractStructureElement( const properties& props, Document *d=0 ):
+ FoliaImpl( props, d ){ classInit(); };
+ AbstractStructureElement( Document *d=0 ):
+ FoliaImpl( PROPS, d ) { classInit(); };
+ public:
+ const std::string str( const std::string& = "current" ) const;
+ std::vector<Alternative *> alternatives( ElementType = BASE,
+ const std::string& = "" ) const;
+
+ FoliaElement *append( FoliaElement* );
+ std::vector<Paragraph*> paragraphs() const;
+ std::vector<Sentence*> sentences() const;
+ std::vector<Word*> words() const;
+ Sentence *sentences( size_t ) const;
+ Sentence *rsentences( size_t ) const;
+ Paragraph *paragraphs( size_t ) const;
+ Paragraph *rparagraphs( size_t ) const;
+ Word *words( size_t ) const;
+ Word *rwords( size_t ) const;
+ const Word* resolveword( const std::string& ) const;
+ private:
+ static properties PROPS;
+ };
+
+ class AbstractTokenAnnotation:
+ public FoliaImpl,
+ public AllowGenerateID
+ {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractTokenAnnotation as a real node!!
+ AbstractTokenAnnotation( const properties& props, Document *d=0 ):
+ FoliaImpl( props, d ){ classInit(); };
+ AbstractTokenAnnotation( Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(); };
+
+ private:
+ static properties PROPS;
+ };
+
+
+ class AbstractSpanAnnotation:
+ public FoliaImpl,
+ public AllowGenerateID,
+ public AllowAnnotation,
+ public AllowCorrection
+ {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractSpanAnnotation as a real node!!
+ AbstractSpanAnnotation( const properties& props, Document *d=0 ):
+ FoliaImpl( props, d ){ classInit(); };
+ AbstractSpanAnnotation( Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(); };
+ public:
+ xmlNode *xml( bool, bool=false ) const;
+ FoliaElement *append( FoliaElement* );
+
+ std::vector<FoliaElement*> wrefs() const;
+ FoliaElement *wrefs( size_t ) const;
+
+ private:
+ static properties PROPS;
+ };
+
+ class AbstractExtendedTokenAnnotation: public AbstractTokenAnnotation
+ {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractExtendedTokenAnnotation as a real node!!
+ AbstractExtendedTokenAnnotation( const properties& props, Document *d=0 ):
+ AbstractTokenAnnotation( props, d ){ classInit(); };
+ AbstractExtendedTokenAnnotation( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); };
+
+ private:
+ static properties PROPS;
+ };
+
+ class ComplexAlignment: public FoliaImpl {
+ friend void static_init();
+ public:
+ ComplexAlignment( Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ ComplexAlignment( const KWargs& a, Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class ForeignData: public FoliaImpl {
+ friend void static_init();
+ public:
+ ForeignData( const properties& props, Document *d=0 ):
+ FoliaImpl( props, d ){ classInit(); };
+ ForeignData( Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(); };
+ ~ForeignData();
+
+ FoliaElement* parseXml( const xmlNode * );
+ xmlNode *xml( bool, bool=false ) const;
+ void set_data( const xmlNode * );
+ xmlNode* get_data() const;
+ private:
+ void init();
+ static properties PROPS;
+ xmlNode *_foreign_data;
+ };
+
+ const std::string EMPTY_STRING = "";
+
+ class AbstractTextMarkup: public FoliaImpl {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractTextMarkup as a real node!!
+ AbstractTextMarkup( const properties& props, Document *d=0 ):
+ FoliaImpl( props, d ){ classInit(); };
+ AbstractTextMarkup( Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(); };
+ public:
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ const FoliaElement* resolveid() const;
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const;
+ protected:
+ const std::string& getTextDelimiter( bool ) const { return EMPTY_STRING; };
+ std::string idref;
+ private:
+ static properties PROPS;
+ };
+
+ class TextMarkupGap: public AbstractTextMarkup {
+ friend void static_init();
+ public:
+ TextMarkupGap( Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(); };
+ TextMarkupGap( const KWargs& a, Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(a); };
+ private:
+ static properties PROPS;
+ };
+
+ class TextMarkupString: public AbstractTextMarkup {
+ friend void static_init();
+ public:
+ TextMarkupString( Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(); };
+ TextMarkupString( const KWargs& a, Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(a); };
+ private:
+ static properties PROPS;
+ };
+
+ class TextMarkupCorrection: public AbstractTextMarkup {
+ friend void static_init();
+ public:
+ TextMarkupCorrection( Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ){ classInit(); };
+ TextMarkupCorrection( const KWargs& a, Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(a); };
+
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const;
+ private:
+ static properties PROPS;
+ std::string _original;
+ };
+
+ class TextMarkupError: public AbstractTextMarkup {
+ friend void static_init();
+ public:
+ TextMarkupError( Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ){ classInit(); };
+ TextMarkupError( const KWargs& a, Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(a); };
+
+ private:
+ static properties PROPS;
+ };
+
+ class TextMarkupStyle: public AbstractTextMarkup {
+ friend void static_init();
+ public:
+ TextMarkupStyle( Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ){ classInit(); };
+ TextMarkupStyle( const KWargs& a, Document *d=0 ):
+ AbstractTextMarkup( PROPS, d ) { classInit(a); };
+
+ private:
+ static properties PROPS;
+ };
+
+ class TextContent: public FoliaImpl {
+ friend void static_init();
+ public:
+ TextContent( Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ TextContent( const KWargs& a, Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(a); }
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ const std::string str( const std::string& = "current" ) const;
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const;
+ int offset() const { return _offset; };
+ TextContent *postappend();
+ std::vector<FoliaElement*> findreplacables( FoliaElement * ) const;
+ private:
+ void init();
+ static properties PROPS;
+ int _offset;
+ };
+
+ class PhonContent: public FoliaImpl {
+ friend void static_init();
+ public:
+ PhonContent( Document *d = 0 ):
+ FoliaImpl(PROPS,d){ classInit(); }
+ PhonContent( const KWargs& a, Document *d = 0 ):
+ FoliaImpl(PROPS,d){ classInit( a ); }
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ const UnicodeString phon( const std::string& = "current",
+ bool = false ) const;
+ int offset() const { return _offset; };
+ private:
+ void init();
+ static properties PROPS;
+ int _offset;
+ };
+
+ class FoLiA: public FoliaImpl {
+ friend void static_init();
+ public:
+ FoLiA( Document *d = 0 ):
+ FoliaImpl( PROPS,d) { classInit(); }
+ FoLiA( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class DCOI: public FoliaImpl {
+ friend void static_init();
+ public:
+ DCOI( Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( ); }
+ DCOI( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Head: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Head( Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit(); }
+ Head( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class TableHead: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ TableHead( Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( ); }
+ TableHead( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Table: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Table( Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit(); };
+ Table( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); };
+ private:
+ static properties PROPS;
+ };
+
+ class Row: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Row( Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit(); };
+ Row( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); };
+ private:
+ static properties PROPS;
+ };
+
+ class Cell: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Cell( Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit(); };
+ Cell( const KWargs& a, Document *d ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); };
+ private:
+ static properties PROPS;
+ };
+
+ class Gap: public FoliaImpl {
+ friend void static_init();
+ public:
+ Gap( Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit(); }
+ Gap( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ const std::string content() const;
+ private:
+ static properties PROPS;
+ };
+
+ class Content: public FoliaImpl {
+ friend void static_init();
+ public:
+ Content( Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit(); }
+ Content( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ FoliaElement* parseXml( const xmlNode * );
+ xmlNode *xml( bool, bool = false ) const;
+ const std::string content() const { return value; };
+
+ private:
+ static properties PROPS;
+ std::string value;
+ };
+
+ class Metric: public FoliaImpl {
+ friend void static_init();
+ public:
+ Metric( Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit(); }
+ Metric( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Division: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Division( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ) { classInit(); };
+ Division( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); };
+ Head *head() const;
+ private:
+ static properties PROPS;
+ };
+
+ class Linebreak: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Linebreak( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); };
+ Linebreak( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); };
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const {
+ return "\n";
+ }
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ private:
+ void init();
+ static properties PROPS;
+ std::string _pagenr;
+ std::string _linenr;
+ bool _newpage;
+ };
+
+ class Whitespace: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Whitespace( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Whitespace( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Word: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Word( Document *d = 0 ):
+ AbstractStructureElement(PROPS, d ) { classInit(); }
+ Word( const properties& p, Document *d=0 ):
+ AbstractStructureElement( p, d ) { classInit(); }
+ Word( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ) { classInit( a ); };
+
+ Correction *split( FoliaElement *, FoliaElement *,
+ const std::string& = "" );
+ Sentence *sentence() const;
+ Paragraph *paragraph() const;
+ Division *division() const;
+ std::vector<Morpheme *> morphemes( const std::string& ="" ) const;
+ Morpheme* morpheme( size_t, const std::string& ="" ) const;
+ Correction *incorrection() const;
+ Word *previous() const;
+ Word *next() const;
+ std::vector<Word*> context( size_t,
+ const std::string& ="" ) const;
+ std::vector<Word*> leftcontext( size_t,
+ const std::string& = "" ) const;
+ std::vector<Word*> rightcontext( size_t,
+ const std::string& ="" ) const;
+ std::vector<AbstractSpanAnnotation*> findspans( ElementType,
+ const std::string& = "" ) const;
+ FoliaElement *append( FoliaElement *);
+ const Word* resolveword( const std::string& ) const;
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ const std::string& getTextDelimiter( bool=false) const;
+ MorphologyLayer *addMorphologyLayer( const KWargs& );
+ MorphologyLayer *getMorphologyLayers( const std::string&,
+ std::vector<MorphologyLayer*>& ) const;
+ private:
+ void init();
+ static properties PROPS;
+ bool _space;
+ };
+
+ class Part: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Part( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Part( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class String:
+ public AbstractTokenAnnotation,
+ public AllowAnnotation,
+ public AllowCorrection {
+ friend void static_init();
+ public:
+ String( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ String( const KWargs& a, Document *d =0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class PlaceHolder: public Word {
+ friend void static_init();
+ public:
+ PlaceHolder( Document *d=0 ):
+ Word( PROPS, d ){ classInit(); }
+ PlaceHolder( const KWargs& a, Document *d = 0 ):
+ Word( PROPS, d ){ classInit( a ); }
+
+ void setAttributes( const KWargs& );
+ private:
+ static properties PROPS;
+ };
+
+ class Sentence: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Sentence( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Sentence( const KWargs& a, Document *d =0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ Correction *splitWord( FoliaElement *, FoliaElement *,
+ FoliaElement *, const KWargs& );
+ Correction *mergewords( FoliaElement *,
+ const std::vector<FoliaElement *>&,
+ const std::string& = "" );
+ Correction *deleteword( FoliaElement *, const std::string& args );
+ Correction *insertword( FoliaElement *, FoliaElement *,
+ const std::string& args );
+ std::vector<Word*> wordParts() const;
+ private:
+ static properties PROPS;
+ Correction *correctWords( const std::vector<FoliaElement *>&,
+ const std::vector<FoliaElement *>&,
+ const KWargs& );
+ };
+
+ class Speech: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Speech( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Speech( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Text: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Text( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Text( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Utterance: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Utterance( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Utterance( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Event: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Event( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Event( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Caption: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Caption( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Caption( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Label: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Label( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Label( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+ private:
+ static properties PROPS;
+ };
+
+ class ListItem: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ ListItem( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ ListItem( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class List: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ List( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ List( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Figure: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Figure( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Figure( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ const std::string src() const { return _src; };
+ const UnicodeString caption() const;
+ private:
+ static properties PROPS;
+ };
+
+ class Paragraph: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Paragraph( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Paragraph( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Alternative: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Alternative( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Alternative( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+
+ class AlternativeLayers: public FoliaImpl {
+ friend void static_init();
+ public:
+ AlternativeLayers( Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ AlternativeLayers( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ template <typename F>
+ F *FoliaElement::addAlternative( const KWargs& args ){
+ KWargs kw;
+ std::string id = generateId( "alt" );
+ kw["id"] = id;
+ F *res = 0;
+ Alternative *alt = 0;
+ try {
+ alt = new Alternative( kw, doc() );
+ res = alt->addAnnotation<F>( args );
+ }
+ catch( std::exception& ){
+ delete alt;
+ throw;
+ }
+ append( alt );
+ return res;
+ }
+
+ template <typename F>
+ F *FoliaElement::addAlternative(){
+ KWargs numb;
+ return addAlternative<F>( numb );
+ }
+
+ class PosAnnotation: public AbstractTokenAnnotation {
+ friend void static_init();
+ public:
+ PosAnnotation( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ PosAnnotation( const KWargs& a, Document *d = 0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class LemmaAnnotation: public AbstractTokenAnnotation {
+ friend void static_init();
+ public:
+ LemmaAnnotation( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ LemmaAnnotation( const KWargs& a, Document *d = 0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class LangAnnotation: public AbstractExtendedTokenAnnotation {
+ friend void static_init();
+ public:
+ LangAnnotation( Document *d=0 ):
+ AbstractExtendedTokenAnnotation( PROPS, d ){ classInit(); }
+ LangAnnotation( const KWargs& a, Document *d = 0 ):
+ AbstractExtendedTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Phoneme: public AbstractTokenAnnotation {
+ friend void static_init();
+ public:
+ Phoneme( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ Phoneme( const KWargs& a, Document *d = 0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class DomainAnnotation: public AbstractExtendedTokenAnnotation {
+ friend void static_init();
+ public:
+ DomainAnnotation( Document *d=0 ):
+ AbstractExtendedTokenAnnotation( PROPS, d ){ classInit(); }
+ DomainAnnotation( const KWargs& a, Document *d = 0 ):
+ AbstractExtendedTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class SenseAnnotation: public AbstractTokenAnnotation {
+ friend void static_init();
+ public:
+ SenseAnnotation( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ SenseAnnotation( const KWargs& a, Document *d = 0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class SubjectivityAnnotation: public AbstractTokenAnnotation {
+ friend void static_init();
+ public:
+ SubjectivityAnnotation( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ SubjectivityAnnotation( const KWargs& a, Document *d = 0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Quote: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Quote( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); };
+ Quote( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); };
+ FoliaElement *append( FoliaElement *);
+ std::vector<Word*> wordParts() const;
+ const std::string& getTextDelimiter( bool=false) const;
+ private:
+ static properties PROPS;
+ };
+
+ class Feature: public FoliaImpl {
+ friend void static_init();
+ public:
+ Feature( const properties&p, Document *d = 0 ):
+ FoliaImpl( p, d ){ classInit(); }
+ Feature( Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ Feature( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit( a ); }
+
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ const std::string subset() const { return _subset; };
+
+ protected:
+ std::string _subset;
+
+ private:
+ static properties PROPS;
+ };
+
+ class BegindatetimeFeature: public Feature {
+ friend void static_init();
+ public:
+ BegindatetimeFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ BegindatetimeFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class EnddatetimeFeature: public Feature {
+ friend void static_init();
+ public:
+ EnddatetimeFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ EnddatetimeFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class SynsetFeature: public Feature {
+ friend void static_init();
+ public:
+ SynsetFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ SynsetFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class ActorFeature: public Feature {
+ friend void static_init();
+ public:
+ ActorFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ ActorFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class HeadFeature: public Feature {
+ friend void static_init();
+ public:
+ HeadFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ HeadFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class ValueFeature: public Feature {
+ friend void static_init();
+ public:
+ ValueFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ ValueFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class FunctionFeature: public Feature {
+ friend void static_init();
+ public:
+ FunctionFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ FunctionFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class TimeFeature: public Feature {
+ friend void static_init();
+ public:
+ TimeFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ TimeFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class LevelFeature: public Feature {
+ friend void static_init();
+ public:
+ LevelFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ LevelFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class ModalityFeature: public Feature {
+ friend void static_init();
+ public:
+ ModalityFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ ModalityFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class StyleFeature: public Feature {
+ friend void static_init();
+ public:
+ StyleFeature( Document *d=0 ):
+ Feature( PROPS, d ){ classInit(); }
+ StyleFeature( const KWargs& a, Document *d = 0 ):
+ Feature( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class WordReference: public FoliaImpl {
+ friend void static_init();
+ public:
+ WordReference( Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ WordReference( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ FoliaElement* parseXml( const xmlNode *node );
+ };
+
+ class Alignment: public FoliaImpl {
+ friend void static_init();
+ public:
+ Alignment( Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ Alignment( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit( a ); }
+
+ std::vector<FoliaElement *>resolve() const;
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ private:
+ void init();
+ static properties PROPS;
+ std::string _format;
+ };
+
+ class AlignReference: public FoliaImpl {
+ friend void static_init();
+ friend class Alignment;
+ public:
+ AlignReference( Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit(); }
+ AlignReference( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ){ classInit( a ); }
+
+ KWargs collectAttributes() const;
+ void setAttributes( const KWargs& );
+
+ private:
+ static properties PROPS;
+ FoliaElement* parseXml( const xmlNode *node );
+ FoliaElement *resolve_element( const Alignment *ref ) const;
+ std::string refId;
+ std::string ref_type;
+ std::string _t;
+ };
+
+ class SyntacticUnit: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ SyntacticUnit( Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ SyntacticUnit( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Chunk: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ Chunk( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ Chunk( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Entity: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ Entity( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ Entity( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class AbstractSpanRole: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ AbstractSpanRole( const properties& props, Document *d=0 ):
+ AbstractSpanAnnotation( props, d ){ classInit(); }
+ AbstractSpanRole( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Headspan: public AbstractSpanRole {
+ friend void static_init();
+ public:
+ Headspan( Document *d=0 ):
+ AbstractSpanRole( PROPS, d ){ classInit(); }
+ Headspan( const KWargs& a, Document *d = 0 ):
+ AbstractSpanRole( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class DependencyDependent: public AbstractSpanRole {
+ friend void static_init();
+ public:
+ DependencyDependent( Document *d=0 ):
+ AbstractSpanRole( PROPS, d ){ classInit(); }
+ DependencyDependent( const KWargs& a, Document *d = 0 ):
+ AbstractSpanRole( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Dependency: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ Dependency( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ Dependency( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ Headspan *head() const;
+ DependencyDependent *dependent() const;
+ private:
+ static properties PROPS;
+ };
+
+ class CoreferenceLink: public AbstractSpanRole {
+ friend void static_init();
+ public:
+ CoreferenceLink( Document *d=0 ):
+ AbstractSpanRole( PROPS, d ){ classInit(); }
+ CoreferenceLink( const KWargs& a, Document *d = 0 ):
+ AbstractSpanRole( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class CoreferenceChain: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ CoreferenceChain( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ CoreferenceChain( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class SemanticRole: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ SemanticRole( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ SemanticRole( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class AbstractAnnotationLayer:
+ public FoliaImpl,
+ public AllowGenerateID,
+ public AllowAnnotation,
+ public AllowCorrection
+ {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractAnnotationLayer as a real node!!
+ AbstractAnnotationLayer( Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit(); };
+ AbstractAnnotationLayer( const properties& props, Document *d = 0 ):
+ FoliaImpl( props, d ) { classInit(); };
+ AbstractAnnotationLayer( const properties& props, const KWargs& a, Document *d = 0 ):
+ FoliaImpl( props, d ) { classInit( a ); };
+ public:
+ AbstractSpanAnnotation *findspan( const std::vector<FoliaElement*>& ) const;
+ FoliaElement *append( FoliaElement * );
+ KWargs collectAttributes() const;
+ private:
+ static properties PROPS;
+ void assignset( FoliaElement * );
+ };
+
+ class AbstractCorrectionChild: public FoliaImpl {
+ friend void static_init();
+ protected:
+ // DO NOT USE AbstractCorrectionChild as a real node!!
+ AbstractCorrectionChild( const properties& props, Document *d=0 ):
+ FoliaImpl( props, d ){ classInit(); };
+ AbstractCorrectionChild( Document *d=0 ):
+ FoliaImpl( PROPS, d ){ classInit(); };
+ private:
+ static properties PROPS;
+ };
+
+ class New: public AbstractCorrectionChild {
+ friend void static_init();
+ public:
+ New( Document *d=0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit(); }
+ New( const KWargs& a, Document *d = 0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Current: public AbstractCorrectionChild {
+ friend void static_init();
+ public:
+ Current( Document *d=0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit(); }
+ Current( const KWargs& a, Document *d = 0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Original: public AbstractCorrectionChild {
+ friend void static_init();
+ public:
+ Original( Document *d=0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit(); }
+ Original( const KWargs& a, Document *d = 0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Suggestion: public AbstractCorrectionChild {
+ friend void static_init();
+ public:
+ Suggestion( Document *d=0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit(); }
+ Suggestion( const KWargs& a, Document *d = 0 ):
+ AbstractCorrectionChild( PROPS, d ) { classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Description: public FoliaImpl {
+ friend void static_init();
+ public:
+ Description( Document *d=0 ):
+ FoliaImpl( PROPS, d ) { classInit(); }
+ Description( const KWargs& a, Document *d =0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ const std::string description() const { return _value; };
+ void setAttributes( const KWargs& kwargs );
+ FoliaElement* parseXml( const xmlNode * );
+ xmlNode *xml( bool, bool=false ) const;
+
+ private:
+ static properties PROPS;
+ std::string _value;
+ };
+
+ class XmlComment: public FoliaImpl {
+ friend void static_init();
+ public:
+ XmlComment( Document *d=0 ):
+ FoliaImpl( PROPS, d ) { classInit(); }
+ XmlComment( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit( a ); }
+
+ FoliaElement* parseXml( const xmlNode * );
+ xmlNode *xml( bool, bool=false ) const;
+ private:
+ static properties PROPS;
+ std::string _value;
+ };
+
+ class XmlText: public FoliaImpl {
+ friend void static_init();
+ public:
+ XmlText( Document *d = 0 ):
+ FoliaImpl( PROPS, d ) { classInit(); }
+ XmlText( const KWargs& a, Document *d = 0 ):
+ FoliaImpl(PROPS, d ) { classInit( a ); }
+
+ FoliaElement* parseXml( const xmlNode * );
+ xmlNode *xml( bool, bool=false ) const;
+ bool setvalue( const std::string& s ) { _value = s; return true; };
+ const std::string& getTextDelimiter( bool ) const { return EMPTY_STRING; };
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const;
+ private:
+ static properties PROPS;
+ std::string _value; //UTF8 value
+ };
+
+ class External: public FoliaImpl {
+ friend void static_init();
+ public:
+ External( Document *d = 0 ):
+ FoliaImpl( PROPS, d ), _include(false) { classInit(); }
+ External( const KWargs& a, Document *d = 0 ):
+ FoliaImpl( PROPS, d ), _include(false) { classInit( a ); }
+
+ FoliaElement* parseXml( const xmlNode * );
+ void resolve();
+ void setAttributes( const KWargs& );
+ KWargs collectAttributes() const;
+ private:
+ static properties PROPS;
+ bool _include;
+ };
+
+ class Note: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Note( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Note( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ void setAttributes( const KWargs& );
+ private:
+ static properties PROPS;
+ std::string refId;
+ };
+
+ class Definition: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Definition( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Definition( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Term: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Term( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Term( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Example: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Example( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Example( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Entry: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Entry( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Entry( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Reference: public AbstractStructureElement {
+ friend void static_init();
+ friend class Note;
+ public:
+ Reference( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Reference( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ KWargs collectAttributes() const;
+ void setAttributes( const KWargs& );
+ private:
+ void init();
+ static properties PROPS;
+ std::string refId;
+ std::string ref_type;
+ std::string _format;
+ };
+
+
+ class Correction: public AbstractTokenAnnotation {
+ friend void static_init();
+ public:
+ Correction( Document *d=0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit(); }
+ Correction( const KWargs& a, Document *d = 0 ):
+ AbstractTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ bool hasNew() const;
+ bool hasOriginal() const;
+ bool hasCurrent() const;
+ bool hasSuggestions() const;
+ New *getNew() const;
+ FoliaElement *getNew( size_t ) const;
+ Original *getOriginal() const;
+ FoliaElement *getOriginal( size_t ) const;
+ Current *getCurrent() const;
+ FoliaElement *getCurrent( size_t ) const;
+ std::vector<Suggestion*> suggestions() const;
+ Suggestion *suggestions( size_t ) const;
+ const UnicodeString text( const std::string& = "current",
+ bool = false, bool = false ) const;
+ TextContent *textcontent( const std::string& = "current" ) const;
+ PhonContent *phoncontent( const std::string& = "current" ) const;
+ const std::string& getTextDelimiter( bool=false) const;
+ private:
+ static properties PROPS;
+ };
+
+ class ErrorDetection: public AbstractExtendedTokenAnnotation {
+ friend void static_init();
+ public:
+ ErrorDetection( Document *d=0 ):
+ AbstractExtendedTokenAnnotation( PROPS, d ){ classInit(); }
+ ErrorDetection( const KWargs& a, Document *d = 0 ):
+ AbstractExtendedTokenAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class TimeSegment: public AbstractSpanAnnotation {
+ friend void static_init();
+ public:
+ TimeSegment( Document *d=0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit(); }
+ TimeSegment( const KWargs& a, Document *d = 0 ):
+ AbstractSpanAnnotation( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class Morpheme: public AbstractStructureElement {
+ friend void static_init();
+ public:
+ Morpheme( Document *d=0 ):
+ AbstractStructureElement( PROPS, d ){ classInit(); }
+ Morpheme( const KWargs& a, Document *d = 0 ):
+ AbstractStructureElement( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class SyntaxLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ SyntaxLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ SyntaxLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class ChunkingLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ ChunkingLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ ChunkingLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class EntitiesLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ EntitiesLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ EntitiesLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class TimingLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ TimingLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ TimingLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class MorphologyLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ MorphologyLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ MorphologyLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class PhonologyLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ PhonologyLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ PhonologyLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class DependenciesLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ DependenciesLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ DependenciesLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class CoreferenceLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ CoreferenceLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ CoreferenceLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+ class SemanticRolesLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ SemanticRolesLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ SemanticRolesLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+ private:
+ static properties PROPS;
+ };
+
+ class ComplexAlignmentLayer: public AbstractAnnotationLayer {
+ friend void static_init();
+ public:
+ ComplexAlignmentLayer( Document *d=0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit(); }
+ ComplexAlignmentLayer( const KWargs& a, Document *d = 0 ):
+ AbstractAnnotationLayer( PROPS, d ){ classInit( a ); }
+
+ private:
+ static properties PROPS;
+ };
+
+
+ std::string VersionName();
+ std::string Version();
+
+} // namespace folia
+
+#endif
diff --git a/include/libfolia/folia_properties.h b/include/libfolia/folia_properties.h
new file mode 100644
index 0000000..cd53cda
--- /dev/null
+++ b/include/libfolia/folia_properties.h
@@ -0,0 +1,61 @@
+#ifndef PROPERTIES_H
+#define PROPERTIES_H
+
+#include <set>
+#include <string>
+
+namespace folia {
+ enum ElementType : unsigned int;
+ enum Attrib : int;
+ enum AnnotatorType: int;
+
+ namespace AnnotationType {
+ enum AnnotationType : int;
+ }
+
+ class properties {
+ public:
+ properties();
+ ElementType ELEMENT_ID;
+ std::string XMLTAG;
+ std::set<ElementType> ACCEPTED_DATA;
+ std::set<ElementType> REQUIRED_DATA;
+ Attrib REQUIRED_ATTRIBS;
+ Attrib OPTIONAL_ATTRIBS;
+ AnnotationType::AnnotationType ANNOTATIONTYPE;
+ std::string SUBSET;
+ size_t OCCURRENCES;
+ size_t OCCURRENCES_PER_SET;
+ std::string TEXTDELIMITER;
+ bool PRINTABLE;
+ bool SPEAKABLE;
+ bool XLINK;
+ bool AUTH;
+ bool SETONLY;
+ bool AUTO_GENERATE_ID;
+ };
+
+ extern const std::set<std::string> AttributeFeatures;
+ extern const std::map<ElementType,std::string> et_s_map;
+ extern const std::map<std::string,ElementType> s_et_map;
+ extern const std::map<AnnotationType::AnnotationType,std::string> ant_s_map;
+ extern const std::map<std::string,AnnotationType::AnnotationType> s_ant_map;
+
+ extern const std::set<ElementType> default_ignore;
+ extern const std::set<ElementType> default_ignore_annotations;
+ extern const std::set<ElementType> default_ignore_structure;
+ extern const std::set<ElementType> AnnoExcludeSet;
+ extern const std::set<ElementType> SpanSet;
+
+ extern const int MAJOR_VERSION;
+ extern const int MINOR_VERSION;
+ extern const int SUB_VERSION;
+ extern const std::string NSFOLIA;
+ extern const std::string NSDCOI;
+ extern const std::string NSIMDI;
+
+ void static_init();
+ void print_type_hierarchy( std::ostream& );
+}
+
+#endif
diff --git a/include/libfolia/folia_types.h b/include/libfolia/folia_types.h
new file mode 100644
index 0000000..eff01f9
--- /dev/null
+++ b/include/libfolia/folia_types.h
@@ -0,0 +1,84 @@
+/*
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
+ ILK - Tilburg University
+
+ This file is part of libfolia
+
+ libfolia 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 3 of the License, or
+ (at your option) any later version.
+
+ libfolia 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, see <http://www.gnu.org/licenses/>.
+
+ For questions and suggestions, see:
+ https://github.com/LanguageMachines/ticcutils/issues
+ or send mail to:
+ lamasoftware (at ) science.ru.nl
+*/
+
+#ifndef TYPES_H
+#define TYPES_H
+
+namespace folia {
+
+ //foliaspec:elementtype
+ enum ElementType : unsigned int { BASE=0,AbstractAnnotationLayer_t, AbstractCorrectionChild_t, AbstractExtendedTokenAnnotation_t, AbstractSpanAnnotation_t, AbstractSpanRole_t, AbstractStructureElement_t, AbstractTextMarkup_t, AbstractTokenAnnotation_t, ActorFeature_t, AlignReference_t, Alignment_t, Alternative_t, AlternativeLayers_t, BegindatetimeFeature_t, Caption_t, Cell_t, Chunk_t, ChunkingLayer_t, ComplexAlignment_t, ComplexAlignmentLayer_t, Content_t, CoreferenceChain_t, Coreferen [...]
+
+ inline ElementType& operator++( ElementType &et ){
+ return et = ( LastElement == et )
+ ? BASE
+ : ElementType(et+1);
+ }
+
+
+ enum AnnotatorType: int { UNDEFINED = -1, AUTO = 0, MANUAL = 1 };
+
+ //foliaspec:attributes
+ //Defines all common FoLiA attributes (as part of the Attrib enumeration)
+ enum Attrib : int { NO_ATT=0, ID=1, CLASS=2, ANNOTATOR=4, CONFIDENCE=8, N=16, DATETIME=32, BEGINTIME=64, ENDTIME=128, SRC=256, SPEAKER=512, ALL=1024 };
+
+ inline Attrib& operator++( Attrib & a ){
+ return a = ( SPEAKER == a )
+ ? NO_ATT
+ : ( NO_ATT == a ? ID : Attrib(a<<1) );
+ }
+
+ inline Attrib operator|( Attrib a1, Attrib a2 ){
+ return (Attrib) ((int)a1|(int)a2) ;
+ }
+
+ inline Attrib& operator|=( Attrib& a1, Attrib& a2 ){
+ a1 = (a1 | a2);
+ return a1;
+ }
+
+#undef DOMAIN // ugly hack but GCC screws up
+
+ /*
+ * Annotation types tie FoLiA elements to a particular kind of annotation.
+ * Especially declarations make use of this.
+ * static const annotation_type = {AnnotationType}
+ */
+ namespace AnnotationType {
+
+ //foliaspec:annotationtype
+ //Defines all annotation types (as part of the AnnotationType enumeration)
+ enum AnnotationType : int { NO_ANN,TEXT, TOKEN, DIVISION, PARAGRAPH, LIST, FIGURE, WHITESPACE, LINEBREAK, SENTENCE, POS, LEMMA, DOMAIN, SENSE, SYNTAX, CHUNKING, ENTITY, CORRECTION, ERRORDETECTION, PHON, SUBJECTIVITY, MORPHOLOGICAL, EVENT, DEPENDENCY, TIMESEGMENT, GAP, NOTE, ALIGNMENT, COMPLEXALIGNMENT, COREFERENCE, SEMROLE, METRIC, LANG, STRING, TABLE, STYLE, PART, UTTERANCE, ENTRY, TERM, DEFINITION, EXAMPLE, PHONOLOGICAL, LAST_ANN };
+
+ inline AnnotationType& operator++( AnnotationType &at ){
+ return at = ( LAST_ANN == at )
+ ? NO_ANN
+ : AnnotationType(at+1);
+ }
+ }
+
+}
+#endif
diff --git a/include/libfolia/folia_utils.h b/include/libfolia/folia_utils.h
new file mode 100644
index 0000000..7f6501d
--- /dev/null
+++ b/include/libfolia/folia_utils.h
@@ -0,0 +1,163 @@
+/*
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
+ ILK - Tilburg University
+
+ This file is part of libfolia
+
+ libfolia 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 3 of the License, or
+ (at your option) any later version.
+
+ libfolia 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, see <http://www.gnu.org/licenses/>.
+
+ For questions and suggestions, see:
+ https://github.com/LanguageMachines/ticcutils/issues
+ or send mail to:
+ lamasoftware (at ) science.ru.nl
+*/
+
+#ifndef FOLIA_UTILS_H
+#define FOLIA_UTILS_H
+
+#include <map>
+#include <set>
+#include <string>
+#include <iostream>
+#include <exception>
+#include <ctime>
+#include "unicode/unistr.h"
+#include "unicode/unistr.h"
+#include <unicode/ustream.h>
+#include "libxml/tree.h"
+
+#include "ticcutils/StringOps.h"
+
+namespace folia {
+
+ namespace AnnotationType {
+ enum AnnotationType : int;
+ }
+ enum AnnotatorType : int;
+ enum ElementType : unsigned int;
+
+ class ArgsError: public std::runtime_error {
+ public:
+ ArgsError( const std::string& s ): std::runtime_error( "error in argument list: " + s ){};
+ };
+
+ class KeyError: public std::out_of_range {
+ public:
+ KeyError(): std::out_of_range( "key out of range" ){};
+ };
+
+ class NotImplementedError: public std::runtime_error {
+ public:
+ NotImplementedError( const std::string& s ):
+ std::runtime_error( "NOT IMPLEMENTED: " + s ){};
+ };
+
+ class ValueError: public std::runtime_error {
+ public:
+ ValueError( const std::string& s ): std::runtime_error( s ){};
+ };
+
+ class XmlError: public std::runtime_error {
+ public:
+ XmlError( const std::string& s ): std::runtime_error( "XML error: " + s ){};
+ };
+
+ class NoSuchAnnotation: public std::runtime_error {
+ public:
+ NoSuchAnnotation( const std::string& s ): std::runtime_error( "no such annotation: " + s ){};
+ };
+
+ class NoSuchText: public std::runtime_error {
+ public:
+ NoSuchText( const std::string& s ): std::runtime_error( "no such text: " + s ){};
+ };
+
+ class NoSuchPhon: public std::runtime_error {
+ public:
+ NoSuchPhon( const std::string& s ): std::runtime_error( "no such phoneme: " + s ){};
+ };
+
+ class DuplicateAnnotationError: public std::runtime_error {
+ public:
+ DuplicateAnnotationError( const std::string& s ): std::runtime_error( s ){};
+ };
+
+ class DuplicateIDError: public std::runtime_error {
+ public:
+ DuplicateIDError( const std::string& s ): std::runtime_error( "duplicate ID : " + s ){};
+ };
+
+ class NoDefaultError: public std::runtime_error {
+ public:
+ NoDefaultError( const std::string& s ): std::runtime_error( "No Default found: " + s ){};
+ };
+
+ UnicodeString UTF8ToUnicode( const std::string& );
+ std::string UnicodeToUTF8( const UnicodeString& );
+
+ std::string toString( const AnnotationType::AnnotationType& );
+ AnnotationType::AnnotationType stringToAT( const std::string& );
+
+ AnnotatorType stringToANT( const std::string& );
+
+ std::string toString( const ElementType& );
+ ElementType stringToET( const std::string& );
+
+ typedef std::map<std::string, std::string> KWargs;
+
+ KWargs getArgs( const std::string& );
+ std::string toString( const KWargs& );
+
+ inline std::ostream& operator<<( std::ostream& os,
+ const AnnotationType::AnnotationType& at ){
+ os << toString( at );
+ return os;
+ }
+
+ void addAttributes( xmlNode *, const KWargs& );
+ KWargs getAttributes( const xmlNode * );
+
+ std::string parseDate( const std::string& );
+ std::string parseTime( const std::string& );
+
+ bool AT_sanity_check();
+ bool Attrib_sanity_check();
+ bool ET_sanity_check();
+
+ bool isNCName( const std::string& );
+
+} // namespace folia
+
+namespace TiCC {
+ // add some specializations to the TiCC stringTo() family
+
+ template<>
+ inline folia::AnnotationType::AnnotationType stringTo( const std::string& str ) {
+ return folia::stringToAT( str );
+ }
+
+ template<>
+ inline folia::ElementType stringTo( const std::string& str ) {
+ return folia::stringToET( str );
+ }
+
+ template<>
+ inline folia::AnnotatorType stringTo( const std::string& str ) {
+ return folia::stringToANT( str );
+ }
+
+} // namespace TiCC
+
+#endif // FOLIA_UTILS
diff --git a/include/libfolia/foliautils.h b/include/libfolia/foliautils.h
deleted file mode 100644
index d07f9e9..0000000
--- a/include/libfolia/foliautils.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- $Id: foliautils.h 17477 2014-08-05 12:59:20Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/include/libfolia/foliautils.h $
-
- Copyright (c) 1998 - 2014
- ILK - Tilburg University
- CLiPS - University of Antwerp
-
- This file is part of libfolia
-
- libfolia 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 3 of the License, or
- (at your option) any later version.
-
- libfolia 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, see <http://www.gnu.org/licenses/>.
-
- For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
- or send mail to:
- timbl at uvt.nl
-*/
-
-#ifndef FOLIA_UTILS_H
-#define FOLIA_UTILS_H
-
-#include <sstream>
-#include <set>
-#include <list>
-#include <vector>
-#include <stdexcept>
-#include <ctime>
-#include "ticcutils/PrettyPrint.h"
-#include "ticcutils/StringOps.h"
-#include "ticcutils/XMLtools.h"
-#include "unicode/unistr.h"
-#include "unicode/unistr.h"
-#include <unicode/ustream.h>
-#include "libxml/tree.h"
-
-namespace folia {
- enum AnnotatorType{ UNDEFINED = -1, AUTO = 0, MANUAL = 1 };
-
- enum Attrib { NO_ATT=0, ID=1, CLASS=2, ANNOTATOR=4, CONFIDENCE=8,
- N=16, DATETIME=32, SETONLY=64, ALL=127 };
-
- inline Attrib& operator++( Attrib & a ){
- return a = ( SETONLY == a )
- ? NO_ATT
- : ( NO_ATT == a ? ID : Attrib(a<<1) );
- }
-
- inline Attrib operator|( Attrib a1, Attrib a2 ){
- return (Attrib) ((int)a1|(int)a2) ;
- }
-
- inline Attrib& operator|=( Attrib& a1, Attrib& a2 ){
- a1 = (a1 | a2);
- return a1;
- }
-
- enum ElementType {
- BASE=0, TextContent_t,
- Text_t, Word_t, Str_t,
- WordReference_t, Event_t,
- TimeSegment_t, TimingLayer_t,
- LineBreak_t, WhiteSpace_t,
- Sentence_t, Paragraph_t,
- Division_t, Head_t,
- Caption_t, Label_t,
- List_t, Item_t,
- Figure_t, Quote_t, //structure annotation elements
- Pos_t, Lemma_t,
- Phon_t, Domain_t,
- Sense_t, Subjectivity_t,
- Metric_t, Correction_t, //token annotation elements
- AnnotationLayer_t, SpanAnnotation_t,
- SyntacticUnit_t,
- Chunk_t, Chunking_t,
- Entity_t, Entities_t,
- Coreferences_t, CoreferenceLink_t,
- CoreferenceChain_t, SyntaxLayer_t,
- Semroles_t, Semrole_t,
- Morphology_t, Morpheme_t,
- ErrorDetection_t, New_t,
- Original_t, Current_t,
- Alternative_t, Alternatives_t, //alternatives
- Description_t, Gap_t,
- Suggestion_t, Content_t,
- Feature_t, SynsetFeature_t,
- ActorFeature_t, HeadFeature_t,
- ValueFeature_t, TimeFeature_t,
- ModalityFeature_t, LevelFeature_t,
- BeginDateTimeFeature_t, EndDateTimeFeature_t,
- FunctionFeature_t, //features
- PlaceHolder_t,
- Dependencies_t, Dependency_t,
- Headwords_t, DependencyDependent_t,
- Alignment_t, AlignReference_t,
- Table_t, TableHead_t, Row_t, Cell_t,
- Lang_t, XmlComment_t,
- TokenAnnotation_t, Structure_t,
- AbstractTextMarkup_t, TextMarkupString_t, TextMarkupGap_t,
- TextMarkupCorrection_t, TextMarkupError_t, TextMarkupStyle_t,
- XmlText_t, External_t, Note_t, Reference_t,
- LastElement
- };
-
- inline ElementType& operator++( ElementType &et ){
- return et = ( LastElement == et )
- ? BASE
- : ElementType(et+1);
- }
-
- /*
- * Annotation types tie FoLiA elements to a particular kind of annotation.
- * Especially declarations make use of this.
- * static const annotation_type = {AnnotationType}
- */
- namespace AnnotationType {
- enum AnnotationType { NO_ANN, TEXT, TOKEN, DIVISION, PARAGRAPH, STRING,
- LIST, FIGURE, WHITESPACE, LINEBREAK, SENTENCE,
- POS, LEMMA, DOMEIN, SENSE, SYNTAX, CHUNKING, ENTITY,
- // Attention DOMAIN seems to be a defined constant
- // where/how/why?
- CORRECTION, SUGGESTION, ERRORDETECTION, ALTERNATIVE,
- PHON, SUBJECTIVITY, MORPHOLOGICAL, SUBENTITY, EVENT,
- DEPENDENCY, TIMEDEVENT, GAP, ALIGNMENT,
- COMPLEXALIGNMENT, COREFERENCE, SEMROLE, METRIC,
- TABLE, LANG, STYLE, NOTE,
- LAST_ANN
- };
- inline AnnotationType& operator++( AnnotationType &at ){
- return at = ( LAST_ANN == at )
- ? NO_ANN
- : AnnotationType(at+1);
- }
- }
-
- enum MetaDataType { NATIVE, CMDI, IMDI };
-
- class ArgsError: public std::runtime_error {
- public:
- ArgsError( const std::string& s ): std::runtime_error( "error in argument list: " + s ){};
- };
-
- class KeyError: public std::out_of_range {
- public:
- KeyError(): std::out_of_range( "key out of range" ){};
- };
-
- class NotImplementedError: public std::runtime_error {
- public:
- NotImplementedError( const std::string& s ):
- std::runtime_error( "NOT IMPLEMENTED: " + s ){};
- };
-
- class ValueError: public std::runtime_error {
- public:
- ValueError( const std::string& s ): std::runtime_error( s ){};
- };
-
- class XmlError: public std::runtime_error {
- public:
- XmlError( const std::string& s ): std::runtime_error( "XML error: " + s ){};
- };
-
- class NoSuchAnnotation: public std::runtime_error {
- public:
- NoSuchAnnotation( ): std::runtime_error( "no such annotation" ){};
- NoSuchAnnotation( const std::string& s ): std::runtime_error( "no such annotation: " + s ){};
- };
-
- class NoSuchText: public std::runtime_error {
- public:
- NoSuchText( ): std::runtime_error( "no such text" ){};
- NoSuchText( const std::string& s ): std::runtime_error( "no such text: " + s ){};
- };
-
- class NoDescription: public std::runtime_error {
- public:
- NoDescription( ): std::runtime_error( "no description" ){};
- };
-
- class DuplicateAnnotationError: public std::runtime_error {
- public:
- DuplicateAnnotationError( const std::string& s ): std::runtime_error( s ){};
- };
-
- class DuplicateIDError: public std::runtime_error {
- public:
- DuplicateIDError( const std::string& s ): std::runtime_error( "duplicate ID : " + s ){};
- };
-
- class NoDefaultError: public std::runtime_error {
- public:
- NoDefaultError( const std::string& s ): std::runtime_error( "No Default found: " + s ){};
- };
-
- UnicodeString UTF8ToUnicode( const std::string& );
- std::string UnicodeToUTF8( const UnicodeString& );
-
- std::string toString( const AnnotationType::AnnotationType& );
- AnnotatorType stringToANT( const std::string& );
-
- AnnotationType::AnnotationType stringToAT( const std::string& );
-
- std::string toString( const ElementType& );
- ElementType stringToET( const std::string& );
-
- typedef std::map<std::string, std::string> KWargs;
-
- KWargs getArgs( const std::string& );
- std::string toString( const KWargs& );
-
- inline std::ostream& operator<<( std::ostream& os,
- const AnnotationType::AnnotationType& at ){
- os << toString( at );
- return os;
- }
-
-}
-
-namespace TiCC {
- template<>
- inline folia::AnnotationType::AnnotationType stringTo( const std::string& str ) {
- return folia::stringToAT( str );
- }
-
- template<>
- inline folia::ElementType stringTo( const std::string& str ) {
- return folia::stringToET( str );
- }
-
- template<>
- inline folia::AnnotatorType stringTo( const std::string& str ) {
- std::string at = uppercase( str );
- if ( at == "AUTO" )
- return folia::AUTO;
- else if ( at == "MANUAL" )
- return folia::MANUAL;
- else
- return folia::UNDEFINED;
- }
-
-}
-
-namespace folia {
- void addAttributes( xmlNode *, const KWargs& );
- KWargs getAttributes( const xmlNode * );
-
- std::string parseDate( const std::string& );
-
- bool AT_sanity_check();
- bool Attrib_sanity_check();
- bool ET_sanity_check();
-
- bool isNCName( const std::string& );
-
- inline std::string strip( const std::string& s ){ return TiCC::trim(s); }
-
-} // namespace folia
-
-#endif // FOLIA_UTILS
diff --git a/install-sh b/install-sh
index 377bb86..0b0fdcb 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
# This script is compatible with the BSD install script, but was written
# from scratch.
+tab=' '
nl='
'
-IFS=" "" $nl"
+IFS=" $tab$nl"
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
-# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
-
posix_mkdir=
# Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
dst_arg=
copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ case $mode in
+ *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift;;
+ shift;;
-s) stripcmd=$stripprog;;
- -t) dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
- shift;;
+ -t)
+ is_target_a_directory=always
+ dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
+ shift;;
- -T) no_target_directory=true;;
+ -T) is_target_a_directory=never;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
- break;;
+ --) shift
+ break;;
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
*) break;;
esac
shift
done
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+ if test -n "$dst_arg"; then
+ echo "$0: target directory not allowed when installing a directory." >&2
+ exit 1
+ fi
+fi
+
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
fi
if test -z "$dir_arg"; then
+ if test $# -gt 1 || test "$is_target_a_directory" = always; then
+ if test ! -d "$dst_arg"; then
+ echo "$0: $dst_arg: Is not a directory." >&2
+ exit 1
+ fi
+ fi
+fi
+
+if test -z "$dir_arg"; then
do_exit='(exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw='% 200'
+ u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw=,u+rw
+ u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -269,41 +274,15 @@ do
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
- if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
- exit 1
+ if test "$is_target_a_directory" = never; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstdir_status=0
else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
+ dstdir=`dirname "$dst"`
test -d "$dstdir"
dstdir_status=$?
fi
@@ -314,74 +293,74 @@ do
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
-
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
esac
if
$posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
@@ -391,53 +370,51 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- [-=\(\)!]*) prefix='./';;
- *) prefix='';;
+ /*) prefix='/';;
+ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
esac
- eval "$initialize_posix_glob"
-
oIFS=$IFS
IFS=/
- $posix_glob set -f
+ set -f
set fnord $dstdir
shift
- $posix_glob set +f
+ set +f
IFS=$oIFS
prefixes=
for d
do
- test X"$d" = X && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
+ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
done
if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
fi
fi
@@ -472,15 +449,12 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+ set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
+ set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
@@ -493,24 +467,24 @@ do
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
diff --git a/ltmain.sh b/ltmain.sh
index a356aca..0f0a2da 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 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-2015 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.
@@ -23,881 +26,2112 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# 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
-#
-# 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
-#
-# 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.
-# 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-1.7ubuntu1
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool at gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
-TIMESTAMP=""
-package_revision=1.3337
+VERSION=2.4.6
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 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.
+
+# 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 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES 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, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# 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.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+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"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-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
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# 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.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# 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 ()
-{
- # 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
+# 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
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
-# 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
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
-# 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,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
-# 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
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-# 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
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
- # 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
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
- # 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:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
case $progpath in
[\\/]*|[A-Za-z]:\\*) ;;
*[\\/]*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ _G_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
-# 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='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'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-# 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.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Standard options:
opt_dry_run=false
-opt_help=false
opt_quiet=false
opt_verbose=false
-opt_warning=:
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# 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
-}
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
-# 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
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
- # bash bug again:
- :
-}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ require_term_colors=:
}
-help="Try \`$progname --help' for more information." ## default
-# func_grep expression filename
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ [12].* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# 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"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
# Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep ()
{
+ $debug_cmd
+
$GREP "$1" "$2" >/dev/null 2>&1
}
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
+
+ _G_directory_path=$1
+ _G_dir_list=
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
esac
# While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
# If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
}
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
+
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
fi
- $ECHO "$my_tmpdir"
+ $ECHO "$_G_tmpdir"
}
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# 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.
+func_normal_abspath ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # 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.
;;
*)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ # 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 "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_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 "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_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_append 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
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ 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 -z "$func_relative_path_tlibdir"; 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 -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ fi
+
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
}
-# func_quote_for_expand arg
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
# Aesthetically quote ARG to be evaled later; same as above,
# but do not quote variable references.
func_quote_for_expand ()
{
+ $debug_cmd
+
case $1 in
*[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
*)
- my_arg="$1" ;;
+ _G_arg=$1 ;;
esac
- case $my_arg in
+ case $_G_arg in
# Double-quote args containing shell metacharacters to delay
# word splitting and command substitution for a subsequent eval.
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
+ _G_arg=\"$_G_arg\"
;;
esac
- func_quote_for_expand_result="$my_arg"
+ func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# 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).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ 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 ()
+{
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $debug_cmd
+
+ $opt_verbose && func_echo "$*"
+
+ :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
}
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 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.
+
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary at gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
}
-# 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 ()
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
{
- 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
+ $debug_cmd
+
+ func_parse_options_result=
+
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
+
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
+
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
+
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+ func_run_hooks func_validate_options ${1+"$@"}
+
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
}
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
}
-# 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'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- 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`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# 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 ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- 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_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# 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 ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- 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
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-exit_cmd=:
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+ exit $?
+}
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+
+ $warning_func ${1+"$@"}
+}
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --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
+ --no-warnings equivalent to '-Wnone'
+ --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 more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$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
+
+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.
+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)
+ version: $progname (GNU libtool) 2.4.6
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool at gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2149,19 @@ func_config ()
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,289 +2170,297 @@ func_features ()
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ 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 ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ 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
+ 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
+ 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
+ fi
- exit $EXIT_MISMATCH
- 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
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
+ nonopt=
+ preserve_args=
-# 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
+
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $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"
- 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
- 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)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append 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"
- 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+"$@"}
- 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
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
+ $debug_cmd
- # Validate options:
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ 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 $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
- # 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
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; 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."
+ }
+
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
+func_add_hook func_validate_options libtool_validate_options
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
@@ -1224,24 +2468,52 @@ func_enable_tag "$optarg"
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ 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=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2759,9 @@ EOF
# 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"
+ $debug_cmd
+
+ 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
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
# *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
+ 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"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ 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 -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"
+ 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
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# 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"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ 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.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# 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.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ 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"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ 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.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
# 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"
+ $debug_cmd
+
+ 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"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ 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"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ 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"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# 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.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
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}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3122,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ 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 ';.';
@@ -1849,7 +3143,7 @@ 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_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ 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"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
# 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"
+ $debug_cmd
+
+ 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_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"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ 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_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"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ 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
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
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_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"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3343,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3394,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# 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}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3496,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3544,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3566,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3597,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3607,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
-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
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -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
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
-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
+ -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)
-export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
-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.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3808,7 @@ if $opt_help; then
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3833,17 @@ fi
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
# 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"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4001,12 @@ func_mode_finish ()
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ 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 \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
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 "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 " - 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 " - 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"
+ $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'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4081,20 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4152,7 @@ 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
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4229,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
# 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"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ 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" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # Try 'ln -sf' first, because the 'ln' binary might depend on
# the symlink we replace! Solaris /bin/ln does not understand -f,
# so we also need to try rm && ln -s.
for linkname
@@ -3017,14 +4345,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4391,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4467,29 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4526,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4544,18 @@ func_mode_install ()
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#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
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4629,7 @@ extern \"C\" {
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$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'"
+ 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'"
done
@@ -3318,10 +4649,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ 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=""
+ 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
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@ typedef struct {
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# 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 ()
+{
+ $debug_cmd
+
+ 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 ()
+{
+ $debug_cmd
+
+ 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_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
# 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\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./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
+ # archive that possess that section. Heuristic: eliminate
+ # all those that 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
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
$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
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ 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
+ 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=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
# func_extract_an_archive dir oldlib
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
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; 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"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
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
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5152,23 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ for darwin_arch in $darwin_arches; do
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5205,7 @@ func_extract_archives ()
#
# 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
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
# 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
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
fi
else
# The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$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
exit 1
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#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__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
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);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6783,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7097,8 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ 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"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ 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"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,46 @@ func_mode_link ()
# -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
+ # -fstack-protector* stack protector 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
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -stdlib=* select c++ std lib with clang
-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)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7327,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7352,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7360,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7384,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7392,7 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7408,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7427,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7439,9 @@ func_mode_link ()
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7450,23 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
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 \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7489,7 @@ 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_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7497,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7529,7 @@ func_mode_link ()
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7537,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,32 +7549,29 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6151,26 +7592,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6180,13 +7621,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6194,31 +7635,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6226,19 +7658,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6247,15 +7679,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6268,18 +7710,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && 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"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6290,13 +7732,13 @@ func_mode_link ()
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6314,7 +7756,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6325,21 +7767,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
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 \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6347,18 +7794,13 @@ func_mode_link ()
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 "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6369,10 +7811,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6385,22 +7827,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6430,36 +7870,36 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ 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
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
+ func_fatal_error "'$lib' is not a convenience library"
fi
+ 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
continue
fi # $pass = conv
@@ -6467,26 +7907,26 @@ func_mode_link ()
# 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
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -6500,40 +7940,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6542,11 +7982,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6590,9 +8030,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6602,14 +8042,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6621,14 +8061,14 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6638,15 +8078,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6675,9 +8115,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6686,19 +8126,19 @@ func_mode_link ()
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6708,24 +8148,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6753,43 +8193,43 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6797,58 +8237,58 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ 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"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6857,10 +8297,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6868,7 +8308,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6878,15 +8318,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6895,33 +8335,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6930,10 +8370,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6941,43 +8381,43 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** Warning: This system cannot 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."
- if test "$module" = yes; then
+ if test yes = "$module"; 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."
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 "*** 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 "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6990,11 +8430,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7008,12 +8448,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7023,7 +8463,7 @@ func_mode_link ()
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7032,12 +8472,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7045,12 +8485,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7058,35 +8498,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ 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}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7098,23 +8538,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
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'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7124,12 +8564,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7187,62 +8627,93 @@ func_mode_link ()
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7251,10 +8722,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7268,8 +8739,8 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ if test pass_all != "$deplibs_check_method"; then
+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7278,21 +8749,21 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7301,20 +8772,20 @@ func_mode_link ()
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7322,45 +8793,42 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that 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)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7368,30 +8836,30 @@ func_mode_link ()
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7406,26 +8874,36 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7436,69 +8914,74 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7512,42 +8995,45 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7556,8 +9042,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7573,11 +9059,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7598,13 +9084,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7614,7 +9100,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7623,7 +9109,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7647,7 +9133,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7663,9 +9149,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7694,20 +9180,20 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7737,20 +9223,20 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7787,24 +9273,24 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ 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`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7822,25 +9308,25 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED '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"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7848,7 +9334,7 @@ EOF
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
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7871,30 +9357,30 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
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
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7902,7 +9388,7 @@ EOF
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
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7918,18 +9404,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7953,8 +9439,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7963,12 +9449,12 @@ EOF
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 "*** 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 "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7979,14 +9465,14 @@ EOF
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; 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."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8032,7 +9518,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8040,25 +9526,25 @@ EOF
dlname=
# 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.
+ if test yes = "$build_libtool_libs"; 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
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || 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"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8083,7 +9569,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8097,8 +9583,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8108,19 +9594,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8134,7 +9620,7 @@ EOF
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"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8143,31 +9629,31 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ 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
@@ -8181,7 +9667,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8192,7 +9678,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ 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"
@@ -8215,8 +9701,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8224,16 +9710,16 @@ EOF
fi
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"
+ 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"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8252,11 +9738,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8267,7 +9753,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8276,18 +9762,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8305,7 +9791,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8338,8 +9824,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8351,14 +9837,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8373,7 +9859,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8385,13 +9871,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8401,10 +9887,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8416,9 +9902,9 @@ EOF
# 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\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8426,9 +9912,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8437,16 +9923,16 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8454,7 +9940,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8463,7 +9949,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8471,18 +9957,18 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
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"
+ 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"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8491,7 +9977,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8505,7 +9991,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8527,7 +10013,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8535,11 +10021,12 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8547,7 +10034,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8556,10 +10043,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; 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
@@ -8579,39 +10066,39 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8619,7 +10106,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8632,17 +10119,19 @@ EOF
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
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'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8651,12 +10140,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || 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 "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8668,7 +10157,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8678,12 +10167,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8700,16 +10189,14 @@ EOF
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8723,11 +10210,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; 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"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8763,7 +10250,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8787,7 +10274,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8810,7 +10297,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8827,10 +10314,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8838,7 +10325,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8863,45 +10350,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; 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`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8914,12 +10399,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8949,9 +10434,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8968,27 +10453,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- 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'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9045,8 +10531,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -9067,7 +10553,7 @@ EOF
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9090,25 +10576,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9116,13 +10604,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9143,7 +10631,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9152,7 +10640,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9221,18 +10709,18 @@ EOF
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9249,7 +10737,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9264,31 +10752,31 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ 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' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9304,23 +10792,23 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9330,34 +10818,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9373,10 +10861,9 @@ EOF
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
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9385,7 +10872,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9399,7 +10886,7 @@ library_names='$library_names'
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9425,7 +10912,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9440,27 +10927,29 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9473,18 +10962,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9499,11 +10988,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9517,7 +11006,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9528,12 +11017,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9549,21 +11038,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append 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
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9590,12 +11077,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}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9604,7 +11091,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9614,16 +11101,17 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ 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 '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9634,7 +11122,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9657,5 +11145,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 56323e3..8b28aeb 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
# $Id: $
# $URL: $
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -81,7 +91,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -90,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -114,6 +124,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -166,6 +177,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -262,10 +274,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu m4/Makefile
-.PRECIOUS: Makefile
+ $(AUTOMAKE) --foreign m4/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -440,6 +451,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# 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.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 8ff3c76..a3bc337 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
# 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 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
#
-# GNU Libtool 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.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool 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 GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 57 LT_INIT
+# serial 58 LT_INIT
# LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@ esac
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
# _LT_CC_BASENAME(CC)
# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
])
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@@ -146,6 +155,8 @@ 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
@@ -175,15 +186,16 @@ 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
+m4_require([_LT_CMD_TRUNCATE])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -196,7 +208,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -207,14 +219,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -267,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -284,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
# label.
@@ -419,8 +431,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# 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"`'])
@@ -444,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -472,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -498,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -545,7 +557,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -558,7 +570,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -574,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# 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
+# '#!' 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).
@@ -596,7 +608,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -619,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@@ -637,11 +649,11 @@ 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) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -654,10 +666,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
esac
shift
done
@@ -683,7 +695,7 @@ chmod +x "$CONFIG_LT"
# 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 &&
+test yes = "$silent" &&
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
@@ -703,27 +715,31 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
_LT_COPYING
_LT_LIBTOOL_TAGS
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
_LT_LIBTOOL_TAG_VARS
@@ -731,13 +747,24 @@ _LT_LIBTOOL_TAG_VARS
_LT_EOF
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
case $host_os in
aix3*)
cat <<\_LT_EOF >> "$cfgfile"
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -754,8 +781,6 @@ _LT_EOF
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -773,7 +798,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -801,6 +825,7 @@ 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)],
@@ -822,6 +847,31 @@ 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],
@@ -852,6 +902,10 @@ 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)])])
@@ -942,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -954,7 +1008,13 @@ 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 test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ # 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 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1022,7 @@ 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
@@ -971,8 +1032,9 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ 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
@@ -990,7 +1052,9 @@ _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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1000,32 +1064,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _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" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1035,8 +1099,8 @@ _LT_EOF
])
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
# Checks for linker and compiler features on darwin
m4_defun([_LT_DARWIN_LINKER_FEATURES],
[
@@ -1045,27 +1109,29 @@ 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\"`'
+ if test yes = "$lt_cv_ld_force_load"; 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(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _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}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _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"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1085,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# 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
+if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1103,7 +1169,7 @@ else
_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"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1123,8 +1189,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# 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).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1152,10 +1218,10 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1181,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
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).],
+[AS_HELP_STRING([--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 #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1200,14 +1267,14 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
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.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1215,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1268,9 +1337,46 @@ ia64-*-hpux*)
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1280,9 +1386,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1301,7 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1319,25 +1438,39 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
+*-*solaris*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
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*) LD="${LD-ld} -m elf64_sparc" ;;
+ yes*)
+ case $host in
+ i?86-*-solaris*|x86_64-*-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
+ ;;
*)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64"
@@ -1351,7 +1484,7 @@ sparc*-*solaris*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1370,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[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
+ if test 0 -eq "$ac_status"; 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
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1382,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1413,14 +1546,14 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ bitrig* | openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
case $host_os in
@@ -1449,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -1476,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1498,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1517,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1541,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1581,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1600,6 +1733,11 @@ 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
@@ -1626,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# 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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1657,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1685,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1732,9 +1871,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -1760,7 +1899,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1781,7 +1920,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1791,44 +1930,52 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1837,21 +1984,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1861,7 +2008,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
@@ -1871,9 +2018,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -1965,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
@@ -1976,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ if test no = "$hard_links"; then
+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@@ -2004,8 +2151,8 @@ objdir=$lt_cv_objdir
_LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2017,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2039,12 +2186,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2068,7 +2215,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2086,6 +2233,47 @@ _LT_DECL([], [striplib], [1])
])# _LT_CMD_STRIPLIB
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x at S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
# _LT_SYS_DYNAMIC_LINKER([TAG])
# -----------------------------
# PORTME Fill in your ld.so characteristics
@@ -2096,17 +2284,18 @@ 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
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ 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" ;;
+ 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
@@ -2122,28 +2311,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
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 '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2157,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# 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'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2166,7 +2362,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2183,56 +2379,109 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
case $host_os in
aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2242,27 +2491,27 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
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=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $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
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
bsdi[[45]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2274,7 +2523,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2283,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# 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'\''`~
+ 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~
@@ -2300,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
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}'
+ 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"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ 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}'
+ 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'
@@ -2319,8 +2568,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2347,7 +2596,7 @@ m4_if([$1], [],[
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=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2360,8 +2609,8 @@ m4_if([$1], [],[
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'\''`~
+ 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'
@@ -2374,7 +2623,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2387,8 +2636,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2398,18 +2647,14 @@ m4_if([$1], [],[
;;
dgux*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -2417,25 +2662,26 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[23]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2454,26 +2700,15 @@ freebsd* | dragonfly*)
esac
;;
-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
- ;;
-
haiku*)
- version_type=linux
+ 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'
+ 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
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2491,14 +2726,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -2506,8 +2742,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -2516,8 +2752,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2527,11 +2763,11 @@ hpux9* | hpux10* | hpux11*)
;;
interix[[3-9]]*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2542,16 +2778,16 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
+ if test yes = "$lt_cv_prog_gnu_ld"; then
+ version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
fi ;;
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -2570,8 +2806,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -2580,13 +2816,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
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'
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2611,7 +2867,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -2626,29 +2887,17 @@ 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
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -2657,8 +2906,8 @@ netbsd*)
;;
newsos6)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
;;
@@ -2667,58 +2916,68 @@ newsos6)
version_type=qnx
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'
+ 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='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ 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~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2726,11 +2985,11 @@ rdos*)
;;
solaris*)
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
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'
+ 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=yes
hardcode_into_libs=yes
@@ -2740,20 +2999,20 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
;;
sysv4 | sysv4.3*)
- 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'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
case $host_vendor in
sni)
@@ -2774,24 +3033,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ if test -d /usr/nec; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2806,19 +3065,19 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
tpf*)
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
- version_type=linux
+ version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
uts4*)
- 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'
+ version_type=linux # correct to gnu/linux during the next big refactor
+ 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
;;
@@ -2827,20 +3086,30 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -2873,39 +3142,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -2928,11 +3199,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -2950,7 +3221,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2977,16 +3248,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3000,7 +3271,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3011,37 +3282,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3095,13 +3366,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3112,6 +3383,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+ [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
# _LT_CHECK_MAGIC_METHOD
# ----------------------
# how to check for library dependencies
@@ -3127,13 +3435,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[[4-9]]*)
@@ -3160,8 +3468,7 @@ 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
@@ -3197,10 +3504,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3238,12 +3541,12 @@ irix5* | irix6* | nonstopux*)
lt_cv_deplibs_check_method=pass_all
;;
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | 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
@@ -3261,8 +3564,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3315,6 +3618,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -3355,33 +3661,38 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3392,21 +3703,21 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; 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
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -3414,8 +3725,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3461,8 +3772,8 @@ lt_cv_sharedlib_from_linklib_cmd,
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
+ # two different shell functions defined in ltmain.sh;
+ # decide which one 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
@@ -3474,7 +3785,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3501,13 +3812,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
])# _LT_PATH_MANIFEST_TOOL
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+])# _LT_DLL_DEF_P
+
+
# LT_LIB_M
# --------
# check for math library
@@ -3519,11 +3845,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3542,7 +3868,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3594,7 +3920,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3627,14 +3953,44 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$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"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3652,20 +4008,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# 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};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3705,11 +4065,11 @@ _LT_EOF
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
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT@&t at _DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT@&t at _DLSYM_CONST
#else
@@ -3735,7 +4095,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -3755,9 +4115,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ 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
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3778,7 +4138,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3805,12 +4165,16 @@ _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],
[Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+ [Transform the output of nm into a list of symbols to manually relocate])
_LT_DECL([global_symbol_to_c_name_address],
[lt_cv_sys_global_symbol_to_c_name_address], [1],
[Transform the output of nm in a C name address pair])
_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_interface], [lt_cv_nm_interface], [1],
+ [The name lister interface])
_LT_DECL([], [nm_file_list_spec], [1],
[Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3826,17 +4190,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -3847,8 +4212,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -3864,6 +4229,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -3913,7 +4283,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -3954,14 +4324,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -3990,7 +4360,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -3998,7 +4368,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4054,7 +4424,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4143,17 +4513,18 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -4164,8 +4535,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -4182,6 +4553,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4242,7 +4618,9 @@ m4_if([$1], [CXX], [
case $cc_basename in
nvcc*) # Cuda Compiler Driver 2.2
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+ 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
@@ -4250,7 +4628,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4258,11 +4636,30 @@ m4_if([$1], [CXX], [
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ 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'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | 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'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4278,7 +4675,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4287,9 +4684,9 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4314,6 +4711,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C 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'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -4334,18 +4737,33 @@ m4_if([$1], [CXX], [
;;
*)
case `$CC -V 2>&1 | sed 5q` in
- *Sun\ F* | *Sun*Fortran*)
+ *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'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
esac
;;
esac
@@ -4396,7 +4814,7 @@ m4_if([$1], [CXX], [
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4425,7 +4843,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -4491,30 +4909,33 @@ m4_if([$1], [CXX], [
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".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
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") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*) ;;
+ 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 '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4533,7 +4954,6 @@ 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
@@ -4549,9 +4969,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4567,7 +4987,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4575,12 +4995,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4588,7 +5005,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# 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
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4610,24 +5027,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 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 ...
@@ -4640,7 +5057,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4659,7 +5076,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -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)=''
;;
m68k)
@@ -4675,7 +5092,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4685,7 +5102,7 @@ _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(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
@@ -4693,61 +5110,89 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
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'
- # 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _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'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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 $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _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)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
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; func_echo_all \"$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'
+ _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'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4758,43 +5203,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[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(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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; 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~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# 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)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ _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'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; 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'
+ 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'
fi
;;
esac
@@ -4803,13 +5252,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 $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'
fi
;;
@@ -4827,8 +5276,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 $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'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4840,7 +5289,7 @@ _LT_EOF
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -4855,9 +5304,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _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'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _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
@@ -4874,15 +5323,15 @@ _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 $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'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4898,7 +5347,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4906,34 +5355,57 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
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".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
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") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -4952,13 +5424,21 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -4977,62 +5457,80 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_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_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(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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _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
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; 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'
+ _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
_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'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 3 [...]
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5041,7 +5539,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -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)=''
;;
m68k)
@@ -5071,35 +5569,37 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ 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='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $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'
+ 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
@@ -5108,7 +5608,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ 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.
@@ -5130,10 +5630,6 @@ _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
@@ -5146,7 +5642,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
@@ -5162,34 +5658,33 @@ _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'
+ if test yes = "$GCC"; 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 "x$output_objdir/$soname" = "x$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'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
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 yes,no = "$GCC,$with_gnu_ld"; 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'
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'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5197,25 +5692,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _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 $pic_flag $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 $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5223,14 +5718,14 @@ _LT_EOF
# (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)='$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
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5241,7 +5736,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -5252,16 +5747,16 @@ _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'
+ if test yes = "$GCC"; 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'
# 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"
+ [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; }]],
@@ -5274,22 +5769,32 @@ _LT_EOF
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'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; 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
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" && 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'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ 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
@@ -5303,7 +5808,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5311,27 +5816,19 @@ _LT_EOF
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5342,33 +5839,53 @@ _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(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
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'
+ if test yes = "$GCC"; 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'
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" && func_echo_all "-set_version $verstring"` -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'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; 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(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" && func_echo_all "-set_version $verstring"` -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 "-set_version $verstring"` -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'
@@ -5379,24 +5896,24 @@ _LT_EOF
solaris*)
_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'
+ if test yes = "$GCC"; 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_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 $pic_flag $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"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $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 -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5406,11 +5923,11 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
fi
@@ -5420,10 +5937,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5472,43 +5989,43 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _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(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'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _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(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'
fi
;;
@@ -5523,17 +6040,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5550,7 +6067,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5627,18 +6144,15 @@ _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],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5679,10 +6193,10 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# 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'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5722,18 +6236,18 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5741,8 +6255,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -5750,13 +6268,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5764,14 +6282,14 @@ CC="$lt_save_CC"
# --------------------------
# 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'.
+# 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
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5787,7 +6305,6 @@ _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
@@ -5814,7 +6331,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5856,35 +6373,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_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
- _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'
+ if test yes = "$with_gnu_ld"; 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5920,18 +6437,30 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -5941,6 +6470,13 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5959,13 +6495,21 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5983,64 +6527,84 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _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
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; 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'
+ _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
_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'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# [...]
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6050,7 +6614,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6078,57 +6642,58 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ 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='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $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'
+ 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(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'
+ _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, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); 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
@@ -6139,6 +6704,34 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -6157,7 +6750,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
;;
- freebsd[[12]]*)
+ freebsd2.*)
# C++ shared libraries reported to be fairly broken before
# switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6173,18 +6766,15 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _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_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6196,7 +6786,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${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 -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6205,11 +6795,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; func_echo_all "$list"'
;;
*)
- 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'
+ if test yes = "$GXX"; 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 "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6219,15 +6809,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6253,13 +6843,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${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 -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -6270,20 +6860,20 @@ 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; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _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 $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 $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 $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6298,22 +6888,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _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'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _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'
;;
irix5* | irix6*)
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" && func_echo_all "-set_version $verstring"` -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
@@ -6322,22 +6912,22 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- 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'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; 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'
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 $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'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6345,8 +6935,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6355,10 +6945,10 @@ 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; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6372,59 +6962,59 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*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`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $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`~
- $RANLIB $oldlib'
+ 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`~
+ $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'
+ 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'
_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'
+ 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'
;;
*) # Version 6 and above 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'
+ _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'
;;
esac
- _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(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'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6438,18 +7028,18 @@ 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=`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'
;;
xl* | mpixl* | bgxl*)
# 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'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; 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~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6457,10 +7047,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _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(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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6518,22 +7108,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ _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
else
@@ -6549,9 +7134,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6569,17 +7154,17 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _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(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" && func_echo_all "-set_version $verstring"` -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~
- $RM $lib.exp'
+ 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~
+ $RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
esac
@@ -6594,21 +7179,21 @@ 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=`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"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; 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" && 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 $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 $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'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6654,9 +7239,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _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_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)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6664,7 +7249,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@@ -6681,30 +7266,30 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; 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 $pic_flag -nostdlib $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 $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $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 -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -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
@@ -6712,11 +7297,11 @@ if test "$_lt_caught_CXX_error" != yes; then
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6725,52 +7310,52 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
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(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(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
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(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(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -6801,10 +7386,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6831,7 +7416,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6853,13 +7438,14 @@ 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}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -6918,12 +7504,18 @@ 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
@@ -6937,13 +7529,13 @@ 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 $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -6959,16 +7551,16 @@ if AC_TRY_EVAL(ac_compile); then
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
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev 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.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -6976,9 +7568,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -6993,15 +7585,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7032,51 +7624,6 @@ interix[[3-9]]*)
_LT_TAGVAR(postdep_objects,$1)=
_LT_TAGVAR(postdeps,$1)=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
])
@@ -7085,7 +7632,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7105,10 +7652,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# 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'.
+# 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
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7120,7 +7667,6 @@ _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
@@ -7146,7 +7692,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7168,7 +7714,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7182,21 +7728,25 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7204,11 +7754,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7225,9 +7775,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7237,11 +7787,11 @@ AC_LANG_POP
# -------------------------
# 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'.
+# 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
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7253,7 +7803,6 @@ _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
@@ -7279,7 +7828,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7301,7 +7850,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7317,21 +7866,25 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7339,11 +7892,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7363,7 +7916,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7373,7 +7926,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@@ -7407,7 +7960,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7440,11 +7993,82 @@ CFLAGS=$lt_save_CFLAGS
])# _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
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE
@@ -7460,7 +8084,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7470,7 +8094,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7499,7 +8123,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7509,6 +8133,13 @@ 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],
@@ -7603,7 +8234,7 @@ lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7620,9 +8251,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ test 10 -lt "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7646,27 +8277,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
# Find out whether the shell is Bourne or XSI compatible,
# or has some other useful features.
m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# 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, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
lt_unset=false
@@ -7690,102 +8301,9 @@ _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_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##*/}"])
-
- _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}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_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"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _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"])
-
- # 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
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what 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],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 17cfd51..94b0829 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,19 +321,85 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+# 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],
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ [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=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -344,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a05..48bc934 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602..fa04b52 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 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.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..c6b26f8 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# 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.
#
@@ -25,7 +26,7 @@
# 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.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# 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
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index 9a71878..4688002 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,29 +1,60 @@
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-#
-# 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])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
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)))?$])
@@ -45,18 +76,19 @@ if test -n "$PKG_CONFIG"; then
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
-# --------------------------------------------------------------
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -66,8 +98,10 @@ m4_ifvaln([$3], [else
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -79,10 +113,11 @@ m4_define([_PKG_CONFIG],
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,19 +125,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
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
-#
-#
-# --------------------------------------------------------------
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl 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
@@ -156,4 +189,87 @@ else
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
diff --git a/missing b/missing
index db98974..f62bbae 100755
--- a/missing
+++ b/missing
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff --git a/src/Makefile.am b/src/Makefile.am
index 9033459..24a3729 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,19 @@
-# $Id: Makefile.am 17238 2014-05-22 14:26:29Z sloot $
-# $URL $
-
AM_CPPFLAGS = -I at top_srcdir@/include
+AM_CXXFLAGS = -std=c++0x -g -O3 # -Weffc++
+
LDADD = libfolia.la
lib_LTLIBRARIES = libfolia.la
-libfolia_la_LDFLAGS = -version-info 2:1:0
+libfolia_la_LDFLAGS = -version-info 4:0:0
-libfolia_la_SOURCES = folia.cxx document.cxx foliautils.cxx
+libfolia_la_SOURCES = folia_impl.cxx folia_document.cxx folia_utils.cxx \
+ folia_types.cxx folia_properties.cxx
bin_PROGRAMS = folialint
folialint_SOURCES = folialint.cxx
check_PROGRAMS = simpletest
TESTS = $(check_PROGRAMS)
-#TESTS_ENVIRONMENT = topsrcdir=$(top_srcdir)
simpletest_SOURCES = simpletest.cxx
CLEANFILES = simpletest.out
diff --git a/src/Makefile.in b/src/Makefile.in
index e3a7cff..ed98e32 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,12 +14,19 @@
@SET_MAKE@
-# $Id: Makefile.am 17238 2014-05-22 14:26:29Z sloot $
-# $URL $
-
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -85,8 +92,6 @@ host_triplet = @host@
bin_PROGRAMS = folialint$(EXEEXT)
check_PROGRAMS = simpletest$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp $(top_srcdir)/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -95,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_icu_check.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -129,7 +135,8 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libfolia_la_LIBADD =
-am_libfolia_la_OBJECTS = folia.lo document.lo foliautils.lo
+am_libfolia_la_OBJECTS = folia_impl.lo folia_document.lo \
+ folia_utils.lo folia_types.lo folia_properties.lo
libfolia_la_OBJECTS = $(am_libfolia_la_OBJECTS)
AM_V_lt = $(am__v_lt_ at AM_V@)
am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
@@ -386,6 +393,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+ $(top_srcdir)/test-driver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -438,6 +447,7 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -522,13 +532,15 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I at top_srcdir@/include
+AM_CXXFLAGS = -std=c++0x -g -O3 # -Weffc++
LDADD = libfolia.la
lib_LTLIBRARIES = libfolia.la
-libfolia_la_LDFLAGS = -version-info 2:1:0
-libfolia_la_SOURCES = folia.cxx document.cxx foliautils.cxx
+libfolia_la_LDFLAGS = -version-info 4:0:0
+libfolia_la_SOURCES = folia_impl.cxx folia_document.cxx folia_utils.cxx \
+ folia_types.cxx folia_properties.cxx
+
folialint_SOURCES = folialint.cxx
TESTS = $(check_PROGRAMS)
-#TESTS_ENVIRONMENT = topsrcdir=$(top_srcdir)
simpletest_SOURCES = simpletest.cxx
CLEANFILES = simpletest.out
all: all-am
@@ -544,10 +556,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
+ $(AUTOMAKE) --foreign src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -676,10 +687,12 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/document.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folia.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folia_document.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folia_impl.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folia_properties.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folia_types.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folia_utils.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/folialint.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/foliautils.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/simpletest.Po at am__quote@
.cxx.o:
@@ -791,7 +804,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1089,6 +1102,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES
uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-libLTLIBRARIES
+.PRECIOUS: Makefile
+
# 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.
diff --git a/src/folia.cxx b/src/folia.cxx
deleted file mode 100644
index d6dfd62..0000000
--- a/src/folia.cxx
+++ /dev/null
@@ -1,3823 +0,0 @@
-/*
- $Id: folia.cxx 17521 2014-08-14 14:44:01Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/src/folia.cxx $
-
- Copyright (c) 1998 - 2014
- ILK - Tilburg University
- CLiPS - University of Antwerp
-
- This file is part of libfolia
-
- libfolia 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 3 of the License, or
- (at your option) any later version.
-
- libfolia 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, see <http://www.gnu.org/licenses/>.
-
- For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
- or send mail to:
- timbl at uvt.nl
-*/
-
-#include <cassert>
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <set>
-#include <list>
-#include <vector>
-#include <map>
-#include <algorithm>
-#include <stdexcept>
-#include "ticcutils/PrettyPrint.h"
-#include "ticcutils/StringOps.h"
-#include "ticcutils/XMLtools.h"
-#include "libfolia/document.h"
-#include "config.h"
-
-using namespace std;
-using namespace TiCC;
-
-namespace folia {
-
- string VersionName() { return PACKAGE_STRING; }
- string Version() { return VERSION; }
-
- ostream& operator<<( ostream& os, const FoliaElement& ae ){
- os << " <" << ae.classname();
- KWargs ats = ae.collectAttributes();
- if ( !ae.id().empty() )
- ats["id"] = ae.id();
-
- KWargs::const_iterator it = ats.begin();
- while ( it != ats.end() ){
- os << " " << it->first << "='" << it->second << "'";
- ++it;
- }
- os << " > {";
- for( size_t i=0; i < ae.size(); ++i ){
- os << "<" << ae.index(i)->classname() << ">,";
- }
- os << "}";
- return os;
- }
-
- ostream& operator<<( ostream&os, const FoliaElement *ae ){
- if ( !ae )
- os << "nil";
- else
- os << *ae;
- return os;
- }
-
- FoliaImpl::FoliaImpl( Document *d ){
- mydoc = d;
- _confidence = -1;
- _element_id = BASE;
- _refcount = 0;
- _parent = 0;
- _auth = true;
- _required_attributes = NO_ATT;
- _optional_attributes = NO_ATT;
- _annotation_type = AnnotationType::NO_ANN;
- _annotator_type = UNDEFINED;
- _xmltag = "ThIsIsSoWrOnG";
- _occurrences = 0; //#Number of times this element may occur in its parent (0=unlimited, default=0)
- _occurrences_per_set = 1; // #Number of times this element may occur per set (0=unlimited, default=1)
- TEXTDELIMITER = "NONE" ;
- PRINTABLE = true;
- AUTH = true;
- }
-
- FoliaImpl::~FoliaImpl( ){
- // cerr << "delete element id=" << _id << " tag = " << _xmltag << " *= "
- // << (void*)this << " datasize= " << data.size() << endl;
- for ( size_t i=0; i < data.size(); ++i ){
- if ( data[i]->refcount() == 0 ) {
- // probably only for words
- delete data[i];
- }
- else if ( mydoc ){
- mydoc->keepForDeletion( data[i] );
- }
- }
- // cerr << "\t\tdelete element id=" << _id << " tag = " << _xmltag << " *= "
- // << (void*)this << " datasize= " << data.size() << endl;
- if ( mydoc ){
- mydoc->delDocIndex( this, _id );
- }
- }
-
- xmlNs *FoliaImpl::foliaNs() const {
- if ( mydoc )
- return mydoc->foliaNs();
- else
- return 0;
- }
-
- void FoliaImpl::setAttributes( const KWargs& kwargs ){
- Attrib supported = _required_attributes | _optional_attributes;
- // if ( _element_id == Feature_t ){
- // cerr << "set attributes: " << kwargs << " on " << toString(_element_id) << endl;
- // cerr << "required = " << _required_attributes << endl;
- // cerr << "optional = " << _optional_attributes << endl;
- // cerr << "supported = " << supported << endl;
- // cerr << "ID & supported = " << (ID & supported) << endl;
- // cerr << "ID & _required = " << (ID & _required_attributes ) << endl;
- // }
- if ( mydoc && mydoc->debug > 2 ){
- using TiCC::operator <<;
- cerr << "set attributes: " << kwargs << " on " << toString(_element_id) << endl;
- }
-
- KWargs::const_iterator it = kwargs.find( "generate_id" );
- if ( it != kwargs.end() ) {
- if ( !mydoc ){
- throw runtime_error( "can't generate an ID without a doc" );
- }
- FoliaElement *e = (*mydoc)[it->second];
- if ( e ){
- _id = e->generateId( _xmltag );
- }
- else
- throw ValueError("Unable to generate an id from ID= " + it->second );
- }
- else {
- it = kwargs.find( "_id" );
- KWargs::const_iterator it2 = kwargs.find( "id" );
- if ( it == kwargs.end() )
- it = it2;
- else if ( it2 != kwargs.end() ){
- throw ValueError("Both 'id' and 'xml:id found for " + classname() );
- }
- if ( it != kwargs.end() ) {
- if ( !ID & supported )
- throw ValueError("ID is not supported for " + classname() );
- else {
- isNCName( it->second );
- _id = it->second;
- }
- }
- else
- _id = "";
- }
-
- it = kwargs.find( "set" );
- string def;
- if ( it != kwargs.end() ) {
- if ( !( (CLASS|SETONLY) & supported ) ){
- throw ValueError("Set is not supported for " + classname());
- }
- else {
- _set = it->second;
- }
- if ( !mydoc ){
- throw ValueError( "Set=" + _set + " is used on a node without a document." );
- }
- if ( !mydoc->isDeclared( _annotation_type, _set ) )
- throw ValueError( "Set " + _set + " is used but has no declaration " +
- "for " + toString( _annotation_type ) + "-annotation" );
- }
- else if ( mydoc && ( def = mydoc->defaultset( _annotation_type )) != "" ){
- _set = def;
- }
- else
- _set = "";
-
- it = kwargs.find( "class" );
- if ( it == kwargs.end() )
- it = kwargs.find( "cls" );
- if ( it != kwargs.end() ) {
- if ( !( CLASS & supported ) )
- throw ValueError("Class is not supported for " + classname() );
- _class = it->second;
- if ( _element_id != TextContent_t ){
- if ( !mydoc ){
- throw ValueError( "Class=" + _class + " is used on a node without a document." );
- }
- else if ( _set == "" &&
- mydoc->defaultset( _annotation_type ) == "" &&
- mydoc->isDeclared( _annotation_type ) ){
- throw ValueError( "Class " + _class + " is used but has no default declaration " +
- "for " + toString( _annotation_type ) + "-annotation" );
- }
- }
- }
- else
- _class = "";
-
- if ( _element_id != TextContent_t ){
- if ( !_class.empty() && _set.empty() )
- throw ValueError("Set is required for " + classname() +
- " class=\"" + _class + "\" assigned without set." );
- }
- it = kwargs.find( "annotator" );
- if ( it != kwargs.end() ) {
- if ( !(ANNOTATOR & supported) )
- throw ValueError("Annotator is not supported for " + classname() );
- else {
- _annotator = it->second;
- }
- }
- else if ( mydoc &&
- (def = mydoc->defaultannotator( _annotation_type, _set )) != "" ){
- _annotator = def;
- }
- else
- _annotator = "";
-
- it = kwargs.find( "annotatortype" );
- if ( it != kwargs.end() ) {
- if ( ! (ANNOTATOR & supported) )
- throw ValueError("Annotatortype is not supported for " + classname() );
- else {
- _annotator_type = stringTo<AnnotatorType>( it->second );
- if ( _annotator_type == UNDEFINED )
- throw ValueError( "annotatortype must be 'auto' or 'manual', got '"
- + it->second + "'" );
- }
- }
- else if ( mydoc &&
- (def = mydoc->defaultannotatortype( _annotation_type, _set ) ) != "" ){
- _annotator_type = stringTo<AnnotatorType>( def );
- if ( _annotator_type == UNDEFINED )
- throw ValueError("annotatortype must be 'auto' or 'manual'");
- }
- else
- _annotator_type = UNDEFINED;
-
-
- it = kwargs.find( "confidence" );
- if ( it != kwargs.end() ) {
- if ( !(CONFIDENCE & supported) )
- throw ValueError("Confidence is not supported for " + classname() );
- else {
- try {
- _confidence = stringTo<double>(it->second);
- if ( _confidence < 0 || _confidence > 1.0 )
- throw ValueError("Confidence must be a floating point number between 0 and 1, got " + TiCC::toString(_confidence) );
- }
- catch (...){
- throw ValueError("invalid Confidence value, (not a number?)");
- }
- }
- }
- else
- _confidence = -1;
-
- it = kwargs.find( "n" );
- if ( it != kwargs.end() ) {
- if ( !(N & supported) )
- throw ValueError("N is not supported for " + classname() );
- else {
- _n = it->second;
- }
- }
- else
- _n = "";
-
- it = kwargs.find( "datetime" );
- if ( it != kwargs.end() ) {
- if ( !(DATETIME & supported) )
- throw ValueError("datetime is not supported for " + classname() );
- else {
- string time = parseDate( it->second );
- if ( time.empty() )
- throw ValueError( "invalid datetime string:" + it->second );
- _datetime = time;
- }
- }
- else if ( mydoc &&
- (def = mydoc->defaultdatetime( _annotation_type, _set )) != "" ){
- _datetime = def;
- }
- else
- _datetime.clear();
-
- it = kwargs.find( "auth" );
- if ( it != kwargs.end() ){
- _auth = stringTo<bool>( it->second );
- }
-
- if ( mydoc && !_id.empty() )
- mydoc->addDocIndex( this, _id );
-
- addFeatureNodes( kwargs );
- }
-
- void FoliaImpl::addFeatureNodes( const KWargs& kwargs ){
- KWargs::const_iterator it = kwargs.begin();
- while ( it != kwargs.end() ){
- string tag = it->first;
- if ( tag == "head" ){
- // "head" is special because the tag is "headfeature"
- // this to avoid conflicts withe the "head" tag!
- KWargs newa;
- newa["class"] = it->second;
- FoliaElement *tmp = new HeadFeature();
- tmp->setAttributes( newa );
- append( tmp );
- }
- else if ( tag == "actor" || tag == "value"|| tag == "function" ||
- tag == "level" || tag == "time" || tag == "modality" ||
- tag == "synset" || tag == "begindatetime" ||
- tag == "enddatetime" ){
- KWargs newa;
- newa["class"] = it->second;
- FoliaElement *tmp = createElement( mydoc, tag );
- tmp->setAttributes( newa );
- append( tmp );
- }
- ++it;
- }
- }
-
- KWargs FoliaImpl::collectAttributes() const {
- KWargs attribs;
- bool isDefaultSet = true;
- bool isDefaultAnn = true;
-
- if ( !_id.empty() ){
- attribs["_id"] = _id; // sort "id" as first!
- }
- if ( !_set.empty() &&
- _set != mydoc->defaultset( _annotation_type ) ){
- isDefaultSet = false;
- attribs["set"] = _set;
- }
- if ( !_class.empty() )
- attribs["class"] = _class;
-
- if ( !_annotator.empty() &&
- _annotator != mydoc->defaultannotator( _annotation_type, _set ) ){
- isDefaultAnn = false;
- attribs["annotator"] = _annotator;
- }
-
- if ( !_datetime.empty() &&
- _datetime != mydoc->defaultdatetime( _annotation_type, _set ) ){
- attribs["datetime"] = _datetime;
- }
- if ( _annotator_type != UNDEFINED ){
- AnnotatorType at = stringTo<AnnotatorType>( mydoc->defaultannotatortype( _annotation_type, _set ) );
- if ( (!isDefaultSet || !isDefaultAnn) && _annotator_type != at ){
- if ( _annotator_type == AUTO )
- attribs["annotatortype"] = "auto";
- else if ( _annotator_type == MANUAL )
- attribs["annotatortype"] = "manual";
- }
- }
-
- if ( _confidence >= 0 )
- attribs["confidence"] = TiCC::toString(_confidence);
-
- if ( !_n.empty() )
- attribs["n"] = _n;
-
- if ( !AUTH || !_auth )
- attribs["auth"] = "no";
-
- return attribs;
- }
-
- string FoliaElement::xmlstring() const{
- // serialize to a string (XML fragment)
- xmlNode *n = xml( true, false );
- xmlSetNs( n, xmlNewNs( n, (const xmlChar *)NSFOLIA.c_str(), 0 ) );
- xmlBuffer *buf = xmlBufferCreate();
- xmlNodeDump( buf, 0, n, 0, 0 );
- string result = (const char*)xmlBufferContent( buf );
- xmlBufferFree( buf );
- xmlFreeNode( n );
- return result;
- }
-
- string tagToAtt( const FoliaElement* c ){
- string att;
- if ( c->isSubClass( Feature_t ) ){
- att = c->xmltag();
- if ( att == "feat" ){
- // "feat" is a Feature_t too. exclude!
- att = "";
- }
- else if ( att == "headfeature" )
- // "head" is special
- att = "head";
- }
- return att;
- }
-
- xmlNode *FoliaImpl::xml( bool recursive, bool kanon ) const {
- xmlNode *e = XmlNewNode( foliaNs(), _xmltag );
- KWargs attribs = collectAttributes();
- set<FoliaElement *> attribute_elements;
- // nodes that can be represented as attributes are converted to atributes
- // and excluded of 'normal' output.
- vector<FoliaElement*>::const_iterator it=data.begin();
- while ( it != data.end() ){
- string at = tagToAtt( *it );
- if ( !at.empty() ){
- attribs[at] = (*it)->cls();
- attribute_elements.insert( *it );
- }
- ++it;
- }
- addAttributes( e, attribs );
- if ( recursive ){
- // append children:
- // we want make sure that text elements are in the right order,
- // in front and the 'current' class first
- list<FoliaElement *> textelements;
- list<FoliaElement *> otherelements;
- list<FoliaElement *> commentelements;
- multimap<ElementType, FoliaElement *> otherelementsMap;
- vector<FoliaElement*>::const_iterator it=data.begin();
- while ( it != data.end() ){
- if ( attribute_elements.find(*it) == attribute_elements.end() ){
- if ( (*it)->isinstance(TextContent_t) ){
- if ( (*it)->cls() == "current" )
- textelements.push_front( *it );
- else
- textelements.push_back( *it );
- }
- else {
- if ( kanon )
- otherelementsMap.insert( make_pair( (*it)->element_id(), *it ) );
- else {
- if ( (*it)->isinstance(XmlComment_t) && textelements.empty() ){
- commentelements.push_back( *it );
- }
- else
- otherelements.push_back( *it );
- }
- }
- }
- ++it;
- }
- list<FoliaElement*>::const_iterator lit=commentelements.begin();
- while ( lit != commentelements.end() ){
- xmlAddChild( e, (*lit)->xml( recursive, kanon ) );
- ++lit;
- }
- lit=textelements.begin();
- while ( lit != textelements.end() ){
- xmlAddChild( e, (*lit)->xml( recursive, kanon ) );
- ++lit;
- }
- if ( !kanon ){
- list<FoliaElement*>::const_iterator lit=otherelements.begin();
- while ( lit != otherelements.end() ){
- xmlAddChild( e, (*lit)->xml( recursive, kanon ) );
- ++lit;
- }
- }
- else {
- multimap<ElementType, FoliaElement*>::const_iterator lit
- = otherelementsMap.begin();
- while ( lit != otherelementsMap.end() ){
- xmlAddChild( e, (lit->second)->xml( recursive, kanon ) );
- ++lit;
- }
- }
- }
- return e;
- }
-
- string FoliaImpl::str() const {
- cerr << "Impl::str()" << endl;
- return _xmltag;
- }
-
- bool FoliaElement::hastext( const string& cls ) const {
- // does this element have a TextContent with class 'cls'
- // Default is class="current"
- try {
- this->textcontent(cls);
- return true;
- } catch (NoSuchText& e ) {
- return false;
- }
- }
-
- //#define DEBUG_TEXT
- //#define DEBUG_TEXT_DEL
-
- string FoliaImpl::getTextDelimiter( bool retaintok ) const {
-#ifdef DEBUG_TEXT_DEL
- cerr << "IN " << xmltag() << "::gettextdelimiter (" << retaintok << ")" << endl;
-#endif
- if ( TEXTDELIMITER == "NONE" ){
- if ( data.size() > 0 ){
- // attempt to get a delimiter form the last child
- string det = data[data.size()-1]->getTextDelimiter( retaintok );
-#ifdef DEBUG_TEXT_DEL
- cerr << "out" << xmltag() << "::gettextdelimiter ==> '" << det << "'" << endl;
-#endif
- return det;
- }
- else
-#ifdef DEBUG_TEXT_DEL
- cerr << "out" << xmltag() << "::gettextdelimiter ==> ''" << endl;
-#endif
- return "";
- }
- return TEXTDELIMITER;
- }
-
- UnicodeString FoliaImpl::text( const string& cls, bool retaintok ) const {
- // get the UnicodeString value of underlying elements
- // default cls="current"
-#ifdef DEBUG_TEXT
- cerr << "TEXT(" << cls << ") op node : " << xmltag() << " id ( " << id() << ")" << endl;
-#endif
- UnicodeString result;
- try {
- result = this->stricttext(cls);
- } catch (NoSuchText& e ) {
-#ifdef DEBUG_TEXT
- cerr << "No direct textcontent found: try children" << endl;
-#endif
- result = deeptext( cls, retaintok );
- }
- return result;
- }
-
- UnicodeString FoliaImpl::deeptext( const string& cls,
- bool retaintok ) const {
- // get the UnicodeString value of underlying elements
- // default cls="current"
-#ifdef DEBUG_TEXT
- cerr << "deepTEXT(" << cls << ") op node : " << _xmltag << " id(" << id() << ")" << endl;
-#endif
-#ifdef DEBUG_TEXT
- cerr << "deeptext: node has " << data.size() << " children." << endl;
-#endif
- vector<UnicodeString> parts;
- vector<UnicodeString> seps;
- for( size_t i=0; i < data.size(); ++i ){
- // try to get text dynamically from children
- // skip TextContent elements
- if ( data[i]->printable() && !data[i]->isinstance( TextContent_t ) ){
-#ifdef DEBUG_TEXT
- cerr << "deeptext:bekijk node[" << i << "] " << data[i]->xmltag() << endl;
-#endif
- try {
- UnicodeString tmp = data[i]->text( cls, retaintok );
-#ifdef DEBUG_TEXT
- cerr << "deeptext found '" << tmp << "'" << endl;
-#endif
- if ( !isSubClass(AbstractTextMarkup_t) )
- tmp.trim();
- parts.push_back(tmp);
- // get the delimiter
- string delim = data[i]->getTextDelimiter( retaintok );
-#ifdef DEBUG_TEXT
- cerr << "deeptext:delimiter van "<< data[i]->xmltag() << " ='" << delim << "'" << endl;
-#endif
- seps.push_back(UTF8ToUnicode(delim));
- } catch ( NoSuchText& e ){
-#ifdef DEBUG_TEXT
- cerr << "HELAAS" << endl;
-#endif
- }
- }
- }
-
- // now construct the result;
- UnicodeString result;
- for( size_t i=0; i < parts.size(); ++i ){
- result += parts[i];
- if ( i < parts.size()-1)
- result += seps[i];
- }
-#ifdef DEBUG_TEXT
- cerr << "deeptext() for " << _xmltag << " step 3 " << endl;
-#endif
- if ( !result.isEmpty() ){
-#ifdef DEBUG_TEXT
- cerr << "deeptext() for " << _xmltag << " result= '" << result << "'" << endl;
-#endif
- return result;
- }
- else
- throw NoSuchText( "(class=" + cls +"): empty!" );
- }
-
- UnicodeString FoliaElement::stricttext( const string& cls ) const {
- // get UnicodeString content of TextContent children only
- // default cls="current"
- return this->textcontent(cls)->text(cls);
- }
-
- TextContent *FoliaImpl::textcontent( const string& cls ) const {
- // Get the text explicitly associated with this element (of the specified class).
- // the default class is 'current'
- // Returns the TextContent instance rather than the actual text. Does not recurse into children
- // with sole exception of Correction
- // Raises NoSuchText exception if not found.
-
- if ( !PRINTABLE )
- throw NoSuchText( "non-printable tag: " + _xmltag );
-
- for( size_t i=0; i < data.size(); ++i ){
- if ( data[i]->isinstance(TextContent_t) && (data[i]->cls() == cls) ){
- return dynamic_cast<TextContent*>(data[i]);
- }
- else if ( data[i]->element_id() == Correction_t) {
- try {
- return data[i]->textcontent(cls);
- } catch ( NoSuchText& e ){
- // continue search for other Corrections or a TextContent
- }
- }
- }
- throw NoSuchText( _xmltag + "::textcontent()" );
- }
-
- vector<FoliaElement *>FoliaImpl::findreplacables( FoliaElement *par ) const {
- return par->select( element_id(), sett(), false );
- }
-
- void FoliaImpl::replace( FoliaElement *child ){
- // Appends a child element like append(), but replaces any existing child
- // element of the same type and set.
- // If no such child element exists, this will act the same as append()
-
- vector<FoliaElement*> replace = child->findreplacables( this );
- if ( replace.empty() ){
- // nothing to replace, simply call append
- append( child );
- }
- else if ( replace.size() > 1 ){
- throw runtime_error( "Unable to replace. Multiple candidates found, unable to choose." );
- }
- else {
- remove( replace[0], true );
- append( child );
- }
- }
-
- FoliaElement* FoliaImpl::replace( FoliaElement *old,
- FoliaElement* _new ){
- // replaced old by _new
- // returns old
- // when not found does nothing and returns 0;
- for( size_t i=0; i < data.size(); ++i ){
- if ( data[i] == old ){
- data[i] = _new;
- _new->setParent( this );
- return old;
- }
- }
- return 0;
- }
-
- TextContent *FoliaElement::settext( const string& txt,
- const string& cls ){
- // create a TextContent child of class 'cls'
- // Default cls="current"
- KWargs args;
- args["value"] = txt;
- args["class"] = cls;
- TextContent *node = new TextContent( doc() );
- node->setAttributes( args );
- replace( node );
- return node;
- }
-
- TextContent *FoliaElement::setutext( const UnicodeString& txt,
- const string& cls ){
- // create a TextContent child of class 'cls'
- // Default cls="current"
- string utf8 = UnicodeToUTF8(txt);
- return settext( utf8, cls );
- }
-
- TextContent *FoliaElement::settext( const string& txt,
- int offset,
- const string& cls ){
- // create a TextContent child of class 'cls'
- // Default cls="current"
- // sets the offset attribute.
- KWargs args;
- args["value"] = txt;
- args["class"] = cls;
- args["offset"] = TiCC::toString(offset);
- TextContent *node = new TextContent( doc() );
- node->setAttributes( args );
- replace( node );
- return node;
- }
-
- TextContent *FoliaElement::setutext( const UnicodeString& txt,
- int offset,
- const string& cls ){
- // create a TextContent child of class 'cls'
- // Default cls="current"
- string utf8 = UnicodeToUTF8(txt);
- return settext( utf8, offset, cls );
- }
-
- string FoliaElement::description() const {
- vector<FoliaElement *> v = select( Description_t, false );
- if ( v.size() == 0 )
- throw NoDescription();
- else
- return v[0]->description();
- }
-
- bool isSubClass( const ElementType e1, const ElementType e2 ){
- static map<ElementType,set<ElementType> > sm;
- static ElementType structureSet[] = { Head_t, Division_t,
- TableHead_t, Table_t,
- Row_t, Cell_t,
- LineBreak_t, WhiteSpace_t,
- Word_t, WordReference_t,
- Sentence_t, Paragraph_t,
- Quote_t, Morpheme_t,
- Text_t, Event_t, Reference_t,
- External_t,
- Caption_t, Label_t,
- Item_t, List_t,
- Figure_t, Alternative_t, Note_t };
- static ElementType featureSet[] = { SynsetFeature_t,
- ActorFeature_t, HeadFeature_t,
- ValueFeature_t, TimeFeature_t,
- ModalityFeature_t, LevelFeature_t,
- BeginDateTimeFeature_t,
- EndDateTimeFeature_t,
- FunctionFeature_t };
- static ElementType tokenAnnoSet[] = { Pos_t, Lemma_t, Morphology_t,
- Sense_t, Phon_t, Str_t, Lang_t,
- Correction_t, Subjectivity_t,
- ErrorDetection_t };
- static ElementType spanAnnoSet[] = { SyntacticUnit_t,
- Chunk_t, Entity_t,
- Headwords_t,
- DependencyDependent_t,Dependency_t,
- CoreferenceLink_t, CoreferenceChain_t,
- Semrole_t, TimeSegment_t };
- static ElementType annolaySet[] = { SyntaxLayer_t,
- Chunking_t, Entities_t,
- TimingLayer_t, Morphology_t,
- Dependencies_t,
- Coreferences_t, Semroles_t };
- static ElementType markupSet[] = { TextMarkupString_t, TextMarkupGap_t,
- TextMarkupCorrection_t,
- TextMarkupError_t, TextMarkupStyle_t };
- static bool filled = false;
- if ( !filled ){
- sm[Structure_t]
- = set<ElementType>( structureSet,
- structureSet + sizeof(structureSet)/sizeof(ElementType) );
- sm[Feature_t]
- = set<ElementType>(featureSet,
- featureSet + sizeof(featureSet)/sizeof(ElementType) );
- sm[TokenAnnotation_t]
- = set<ElementType>( tokenAnnoSet,
- tokenAnnoSet + sizeof(tokenAnnoSet)/sizeof(ElementType) );
- sm[SpanAnnotation_t]
- = set<ElementType>( spanAnnoSet,
- spanAnnoSet + sizeof(spanAnnoSet)/sizeof(ElementType) );
- sm[AnnotationLayer_t]
- = set<ElementType>( annolaySet,
- annolaySet + sizeof(annolaySet)/sizeof(ElementType) );
- sm[AbstractTextMarkup_t]
- = set<ElementType>( markupSet,
- markupSet + sizeof(markupSet)/sizeof(ElementType) );
- filled = true;
- }
- if ( e1 == e2 )
- return true;
- map<ElementType,set<ElementType> >::const_iterator it = sm.find( e2 );
- if ( it != sm.end() ){
- return it->second.find( e1 ) != it->second.end();
- }
- return false;
- }
-
- bool FoliaElement::isSubClass( ElementType t ) const {
- return folia::isSubClass( element_id(), t );
- }
-
- bool FoliaImpl::acceptable( ElementType t ) const {
- if ( t == XmlComment_t )
- return true;
- else {
- set<ElementType>::const_iterator it = _accepted_data.find( t );
- if ( it == _accepted_data.end() ){
- it = _accepted_data.begin();
- while ( it != _accepted_data.end() ){
- if ( folia::isSubClass( t, *it ) )
- return true;
- ++it;
- }
- return false;
- }
- return true;
- }
- }
-
- bool FoliaImpl::addable( const FoliaElement *c ) const {
- if ( !acceptable( c->element_id() ) ){
- throw ValueError( "Unable to append object of type " + c->classname()
- + " to a " + classname() );
- }
- if ( c->occurrences() > 0 ){
- vector<FoliaElement*> v = select( c->element_id(), false );
- size_t count = v.size();
- if ( count >= c->occurrences() ){
- throw DuplicateAnnotationError( "Unable to add another object of type " + c->classname() + " to " + classname() + ". There are already " + TiCC::toString(count) + " instances of this class, which is the maximum." );
- }
- }
- if ( c->occurrences_per_set() > 0 &&
- ( (CLASS|SETONLY) & c->required_attributes() ) ){
- vector<FoliaElement*> v = select( c->element_id(), c->sett(), false );
- size_t count = v.size();
- if ( count >= c->occurrences_per_set() ){
- throw DuplicateAnnotationError( "Unable to add another object of type " + c->classname() + " to " + classname() + ". There are already " + TiCC::toString(count) + " instances of this class, which is the maximum." );
- }
- }
- if ( c->parent() &&
- !(c->element_id() == Word_t || c->element_id() == Morpheme_t ) ){
- // Only for WordRef i hope
- throw XmlError( "attempt to reconnect node " + c->classname()
- + " to a " + classname() + " node, id=" + _id
- + ", it was already connected to a "
- + c->parent()->classname() + " id=" + c->parent()->id() );
- }
- if ( c->element_id() == TextContent_t && _element_id == Word_t ){
- string val = c->str();
- val = trim( val );
- if ( val.empty() ){
- throw ValueError( "attempt to add an empty <t> to word: " + _id );
- }
- }
- return true;
- }
-
- void FoliaImpl::fixupDoc( Document* doc ) {
- if ( !mydoc ){
- mydoc = doc;
- string myid = id();
- if ( !_set.empty()
- && (CLASS & _required_attributes )
- && !mydoc->isDeclared( _annotation_type, _set ) )
- throw ValueError( "Set " + _set + " is used in " + _xmltag
- + "element: " + myid + " but has no declaration " +
- "for " + toString( _annotation_type ) + "-annotation" );
- if ( !myid.empty() )
- doc->addDocIndex( this, myid );
- // assume that children also might be doc-less
- for( size_t i=0; i < data.size(); ++i )
- data[i]->fixupDoc( doc );
- }
- }
-
- bool FoliaImpl::checkAtts(){
- if ( _id.empty() && (ID & _required_attributes ) ){
- throw ValueError( "ID is required for " + classname() );
- }
- if ( _set.empty() && (CLASS & _required_attributes ) ){
- throw ValueError( "Set is required for " + classname() );
- }
- if ( _class.empty() && ( CLASS & _required_attributes ) ){
- throw ValueError( "Class is required for " + classname() );
- }
- if ( _annotator.empty() && ( ANNOTATOR & _required_attributes ) ){
- throw ValueError( "Annotator is required for " + classname() );
- }
- if ( _annotator_type == UNDEFINED && ( ANNOTATOR & _required_attributes ) ){
- throw ValueError( "Annotatortype is required for " + classname() );
- }
- if ( _confidence == -1 && ( CONFIDENCE & _required_attributes ) ){
- throw ValueError( "Confidence is required for " + classname() );
- }
- if ( _n.empty() && ( N & _required_attributes ) ){
- throw ValueError( "N is required for " + classname() );
- }
- if ( DATETIME & _required_attributes ){
- throw ValueError( "datetime is required for " + classname() );
- }
- return true;
- }
-
- FoliaElement *FoliaImpl::append( FoliaElement *child ){
- bool ok = false;
- try {
- ok = child->checkAtts();
- ok = addable( child );
- }
- catch ( XmlError& ){
- // don't delethe the offending child in case of illegal reconnection
- // it will be deleted by the true parent
- throw;
- }
- catch ( exception& ){
- delete child;
- throw;
- }
- if ( ok ){
- child->fixupDoc( mydoc );
- data.push_back(child);
- if ( !child->parent() ) // Only for WordRef and Morpheme
- child->setParent(this);
- else
- child->increfcount();
- return child->postappend();
- }
- return 0;
- }
-
-
- void FoliaImpl::remove( FoliaElement *child, bool del ){
- vector<FoliaElement*>::iterator it = std::remove( data.begin(), data.end(), child );
- data.erase( it, data.end() );
- if ( del )
- delete child;
- }
-
- void FoliaImpl::remove( size_t pos, bool del ){
- if ( pos < data.size() ){
- vector<FoliaElement*>::iterator it = data.begin();
- while ( pos > 0 ){
- ++it;
- --pos;
- }
- if ( del )
- delete *it;
- data.erase(it);
- }
- }
-
- FoliaElement* FoliaImpl::index( size_t i ) const {
- if ( i < data.size() )
- return data[i];
- else
- throw range_error( "[] index out of range" );
- }
-
- FoliaElement* FoliaImpl::rindex( size_t i ) const {
- if ( i < data.size() )
- return data[data.size()-1-i];
- else
- throw range_error( "[] rindex out of range" );
- }
-
- vector<FoliaElement*> FoliaImpl::select( ElementType et,
- const string& st,
- const set<ElementType>& exclude,
- bool recurse ) const {
- vector<FoliaElement*> res;
- for ( size_t i = 0; i < data.size(); ++i ){
- if ( data[i]->element_id() == et &&
- ( st.empty() || data[i]->sett() == st ) ){
- res.push_back( data[i] );
- }
- if ( recurse ){
- if ( exclude.find( data[i]->element_id() ) == exclude.end() ){
- vector<FoliaElement*> tmp = data[i]->select( et, st, exclude, recurse );
- res.insert( res.end(), tmp.begin(), tmp.end() );
- }
- }
- }
- return res;
- }
-
- static ElementType ignoreList[] = { Original_t,
- Suggestion_t,
- Alternative_t };
- set<ElementType> default_ignore( ignoreList,
- ignoreList + sizeof( ignoreList )/sizeof( ElementType ) );
-
- static ElementType ignoreAnnList[] = { Original_t,
- Suggestion_t,
- Alternative_t,
- Morphology_t };
- set<ElementType> default_ignore_annotations( ignoreAnnList,
- ignoreAnnList + sizeof( ignoreAnnList )/sizeof( ElementType ) );
-
- static ElementType ignoreStrList[] = { Original_t,
- Suggestion_t,
- Alternative_t,
- Chunk_t,
- SyntacticUnit_t,
- Coreferences_t,
- Semroles_t,
- Entity_t,
- Headwords_t,
- TimingLayer_t,
- DependencyDependent_t,
- TimeSegment_t };
- set<ElementType> default_ignore_structure( ignoreStrList,
- ignoreStrList + sizeof( ignoreStrList )/sizeof( ElementType ) );
-
-
- vector<FoliaElement*> FoliaImpl::select( ElementType et,
- const string& st,
- bool recurse ) const {
- return select( et, st, default_ignore, recurse );
- }
-
- vector<FoliaElement*> FoliaImpl::select( ElementType et,
- const set<ElementType>& exclude,
- bool recurse ) const {
- vector<FoliaElement*> res;
- for ( size_t i = 0; i < data.size(); ++i ){
- if ( data[i]->element_id() == et ){
- res.push_back( data[i] );
- }
- if ( recurse ){
- if ( exclude.find( data[i]->element_id() ) == exclude.end() ){
- vector<FoliaElement*> tmp = data[i]->select( et, exclude, recurse );
- res.insert( res.end(), tmp.begin(), tmp.end() );
- }
- }
- }
- return res;
- }
-
- vector<FoliaElement*> FoliaImpl::select( ElementType et,
- bool recurse ) const {
- return select( et, default_ignore, recurse );
- }
-
- FoliaElement* FoliaImpl::parseXml( const xmlNode *node ){
- KWargs att = getAttributes( node );
- setAttributes( att );
- xmlNode *p = node->children;
- while ( p ){
- if ( p->type == XML_ELEMENT_NODE ){
- string tag = Name( p );
- FoliaElement *t = createElement( doc(), tag );
- if ( t ){
- if ( doc() && doc()->debug > 2 )
- cerr << "created " << t << endl;
- t = t->parseXml( p );
- if ( t ){
- if ( doc() && doc()->debug > 2 )
- cerr << "extend " << this << " met " << t << endl;
- append( t );
- }
- }
- }
- else if ( p->type == XML_COMMENT_NODE ){
- string tag = "xml-comment";
- FoliaElement *t = createElement( doc(), tag );
- if ( t ){
- if ( doc() && doc()->debug > 2 )
- cerr << "created " << t << endl;
- t = t->parseXml( p );
- if ( t ){
- if ( doc() && doc()->debug > 2 )
- cerr << "extend " << this << " met " << t << endl;
- append( t );
- }
- }
- }
- else if ( p->type == XML_TEXT_NODE ){
- string tag = "xml-text";
- FoliaElement *t = createElement( doc(), tag );
- if ( t ){
- if ( doc() && doc()->debug > 2 )
- cerr << "created " << t << endl;
- t = t->parseXml( p );
- if ( t ){
- if ( doc() && doc()->debug > 2 )
- cerr << "extend " << this << " met " << t << endl;
- append( t );
- }
- }
- }
- p = p->next;
- }
- return this;
- }
-
- void FoliaImpl::setDateTime( const string& s ){
- Attrib supported = _required_attributes | _optional_attributes;
- if ( !(DATETIME & supported) )
- throw ValueError("datetime is not supported for " + classname() );
- else {
- string time = parseDate( s );
- if ( time.empty() )
- throw ValueError( "invalid datetime string:" + s );
- _datetime = time;
- }
- }
-
- string FoliaImpl::getDateTime() const {
- return _datetime;
- }
-
- string FoliaImpl::pos( const string& st ) const {
- return annotation<PosAnnotation>( st )->cls();
- }
-
- string FoliaImpl::lemma( const string& st ) const {
- return annotation<LemmaAnnotation>( st )->cls();
- }
-
- PosAnnotation *FoliaImpl::addPosAnnotation( const KWargs& args ){
- return addAnnotation<PosAnnotation>( args );
- }
-
- LemmaAnnotation *FoliaImpl::addLemmaAnnotation( const KWargs& args ){
- return addAnnotation<LemmaAnnotation>( args );
- }
-
- Sentence *FoliaImpl::addSentence( const KWargs& args ){
- Sentence *res = new Sentence( mydoc );
- KWargs kw = args;
- if ( kw["id"].empty() ){
- string id = generateId( "s" );
- kw["id"] = id;
- }
- try {
- res->setAttributes( kw );
- }
- catch( DuplicateIDError& e ){
- delete res;
- throw e;
- }
- append( res );
- return res;
- }
-
- Word *FoliaImpl::addWord( const KWargs& args ){
- Word *res = new Word( mydoc );
- KWargs kw = args;
- if ( kw["id"].empty() ){
- string id = generateId( "w" );
- kw["id"] = id;
- }
- try {
- res->setAttributes( kw );
- }
- catch( DuplicateIDError& e ){
- delete res;
- throw e;
- }
- append( res );
- return res;
- }
-
- std::string Quote::getTextDelimiter( bool retaintok ) const {
-#ifdef DEBUG_TEXT_DEL
- cerr << "IN " << xmltag() << "::gettextdelimiter (" << retaintok << ")" << endl;
-#endif
- std::vector<FoliaElement*>::const_reverse_iterator it = data.rbegin();
- while ( it != data.rend() ){
- if ( (*it)->isinstance( Sentence_t ) ){
- // if a quote ends in a sentence, we don't want any delimiter
-#ifdef DEBUG_TEXT_DEL
- cerr << "OUT " << xmltag() << "::gettextdelimiter ==>''" << endl;
-#endif
- return "";
- }
- else {
- string res = (*it)->getTextDelimiter( retaintok );
-#ifdef DEBUG_TEXT_DEL
- cerr << "OUT " << xmltag() << "::gettextdelimiter ==> '"
- << res << "'" << endl;
-#endif
- return res;
- }
- ++it;
- }
- return " ";
- }
-
- vector<Word*> Quote::wordParts() const {
- vector<Word*> result;
- for ( size_t i=0; i < data.size(); ++i ){
- FoliaElement *pnt = data[i];
- if ( pnt->isinstance( Word_t ) )
- result.push_back( dynamic_cast<Word*>(pnt) );
- else if ( pnt->isinstance( Sentence_t ) ){
- PlaceHolder *p = new PlaceHolder( mydoc, "text='" +
- pnt->id() + "'");
- mydoc->keepForDeletion( p );
- result.push_back( p );
- }
- else if ( pnt->isinstance( Quote_t ) ){
- vector<Word*> tmp = pnt->wordParts();
- result.insert( result.end(), tmp.begin(), tmp.end() );
- }
- else if ( pnt->isinstance( Description_t ) ){
- // ignore
- }
- else {
- throw XmlError( "Word or Sentence expected in Quote. got: "
- + pnt->classname() );
- }
- }
- return result;
- }
-
- vector<Word*> Sentence::wordParts() const {
- vector<Word*> result;
- for ( size_t i=0; i < data.size(); ++i ){
- FoliaElement *pnt = data[i];
- if ( pnt->isinstance( Word_t ) )
- result.push_back( dynamic_cast<Word*>(pnt) );
- else if ( pnt->isinstance( Quote_t ) ){
- vector<Word*> v = pnt->wordParts();
- result.insert( result.end(), v.begin(),v.end() );
- }
- else {
- // skip all other stuff. Is there any?
- }
- }
- return result;
- }
-
- Correction *Sentence::splitWord( FoliaElement *orig, FoliaElement *p1, FoliaElement *p2, const KWargs& args ){
- vector<FoliaElement*> ov;
- ov.push_back( orig );
- vector<FoliaElement*> nv;
- nv.push_back( p1 );
- nv.push_back( p2 );
- return correctWords( ov, nv, args );
- }
-
- Correction *Sentence::mergewords( FoliaElement *nw,
- const vector<FoliaElement *>& orig,
- const string& args ){
- vector<FoliaElement*> nv;
- nv.push_back( nw );
- return correctWords( orig, nv, getArgs(args) );
- }
-
- Correction *Sentence::deleteword( FoliaElement *w,
- const string& args ){
- vector<FoliaElement*> ov;
- ov.push_back( w );
- vector<FoliaElement*> nil1;
- return correctWords( ov, nil1, getArgs(args) );
- }
-
- Correction *Sentence::insertword( FoliaElement *w,
- FoliaElement *p,
- const string& args ){
- if ( !p || !p->isinstance( Word_t ) )
- throw runtime_error( "insertword(): previous is not a Word " );
- if ( !w || !w->isinstance( Word_t ) )
- throw runtime_error( "insertword(): new word is not a Word " );
- Word *tmp = new Word( "text='dummy', id='dummy'" );
- tmp->setParent( this ); // we create a dummy Word as member of the
- // Sentence. This makes correctWords() happy
- vector<FoliaElement *>::iterator it = data.begin();
- while ( it != data.end() ){
- if ( *it == p ){
- it = data.insert( ++it, tmp );
- break;
- }
- ++it;
- }
- if ( it == data.end() )
- throw runtime_error( "insertword(): previous not found" );
- vector<FoliaElement *> ov;
- ov.push_back( *it );
- vector<FoliaElement *> nv;
- nv.push_back( w );
- return correctWords( ov, nv, getArgs(args) );
- }
-
- Correction *Sentence::correctWords( const vector<FoliaElement *>& orig,
- const vector<FoliaElement *>& _new,
- const KWargs& args ){
- // Generic correction method for words. You most likely want to use the helper functions
- // splitword() , mergewords(), deleteword(), insertword() instead
-
- // sanity check:
- vector<FoliaElement *>::const_iterator it = orig.begin();
- while ( it != orig.end() ){
- if ( !(*it) || !(*it)->isinstance( Word_t) )
- throw runtime_error("Original word is not a Word instance" );
- else if ( (*it)->sentence() != this )
- throw runtime_error( "Original not found as member of sentence!");
- ++it;
- }
- it = _new.begin();
- while ( it != _new.end() ){
- if ( ! (*it)->isinstance( Word_t) )
- throw runtime_error("new word is not a Word instance" );
- ++it;
- }
- KWargs::const_iterator ait = args.find("suggest");
- if ( ait != args.end() && ait->second == "true" ){
- FoliaElement *sugg = new Suggestion();
- it = _new.begin();
- while ( it != _new.end() ){
- sugg->append( *it );
- ++it;
- }
- vector<FoliaElement *> nil1;
- vector<FoliaElement *> nil2;
- vector<FoliaElement *> sv;
- vector<FoliaElement *> tmp = orig;
- sv.push_back( sugg );
- return correct( nil1, tmp, nil2, sv, args );
- }
- else {
- vector<FoliaElement *> nil1;
- vector<FoliaElement *> nil2;
- vector<FoliaElement *> o_tmp = orig;
- vector<FoliaElement *> n_tmp = _new;
- return correct( o_tmp, nil1, n_tmp, nil2, args );
- }
- }
-
- void TextContent::setAttributes( const KWargs& args ){
- KWargs kwargs = args; // need to copy
- KWargs::const_iterator it = kwargs.find( "value" );
- if ( it != kwargs.end() ) {
- XmlText *t = new XmlText();
- string value = it->second;
- if ( value.empty() ){
- // can this ever happen?
- throw ValueError( "TextContent: 'value' attribute may not be empty." );
- }
- t->setvalue( value );
- append( t );
- kwargs.erase("value");
- }
- it = kwargs.find( "offset" );
- if ( it != kwargs.end() ) {
- _offset = stringTo<int>(it->second);
- kwargs.erase("offset");
- }
- else
- _offset = -1;
- it = kwargs.find( "ref" );
- if ( it != kwargs.end() ) {
- throw NotImplementedError( "ref attribute in TextContent" );
- }
- it = kwargs.find( "cls" );
- if ( it == kwargs.end() )
- it = kwargs.find( "class" );
- if ( it == kwargs.end() ) {
- kwargs["class"] = "current";
- }
- FoliaImpl::setAttributes(kwargs);
- }
-
- KWargs TextContent::collectAttributes() const {
- KWargs attribs = FoliaImpl::collectAttributes();
- if ( _class == "current" )
- attribs.erase( "class" );
- else if ( _class == "original" && parent() && parent()->isinstance( Original_t ) )
- attribs.erase( "class" );
-
- if ( _offset >= 0 ){
- attribs["offset"] = TiCC::toString( _offset );
- }
- return attribs;
- }
-
- TextContent *TextContent::postappend(){
- if ( _parent->isinstance( Original_t ) ){
- if ( _class == "current" )
- _class = "original";
- }
- return this;
- }
-
- vector<FoliaElement *>TextContent::findreplacables( FoliaElement *par ) const {
- vector<FoliaElement *> result;
- vector<TextContent*> v = par->FoliaElement::select<TextContent>( _set, false );
- // cerr << "TextContent::findreplacable found " << v << endl;
- vector<TextContent*>::iterator it = v.begin();
- while ( it != v.end() ){
- // cerr << "TextContent::findreplacable bekijkt " << *it << " ("
- if ( (*it)->cls() == _class )
- result.push_back( *it );
- ++it;
- }
- // cerr << "TextContent::findreplacable resultaat " << v << endl;
- return result;
- }
-
-
- string TextContent::str() const{
-#ifdef DEBUG_TEXT
- cerr << "textContent::str() this=" << this << endl;
-#endif
- return UnicodeToUTF8(text());
- }
-
- UnicodeString TextContent::text( const string& cls, bool retaintok ) const {
- // get the UnicodeString value of underlying elements
- // default cls="current"
-#ifdef DEBUG_TEXT
- cerr << "TextContent::TEXT(" << cls << ") " << endl;
-#endif
- UnicodeString result;
- for( size_t i=0; i < data.size(); ++i ){
- // try to get text dynamically from children
-#ifdef DEBUG_TEXT
- cerr << "TextContent: bekijk node[" << i+1 << "] " << data[i]->str() << endl;
-#endif
- try {
-#ifdef DEBUG_TEXT
- cerr << "roep text(" << cls << ") aan op " << data[i] << endl;
-#endif
- UnicodeString tmp = data[i]->text( cls, retaintok );
-#ifdef DEBUG_TEXT
- cerr << "TextContent found '" << tmp << "'" << endl;
-#endif
- result += tmp;
- } catch ( NoSuchText& e ){
-#ifdef DEBUG_TEXT
- cerr << "TextContent::HELAAS" << endl;
-#endif
- }
- }
- result.trim();
-#ifdef DEBUG_TEXT
- cerr << "TextContent return " << result << endl;
-#endif
- return result;
- }
-
- string AllowGenerateID::IDgen( const string& tag,
- const FoliaElement* parent ){
- string nodeId = parent->id();
- if ( nodeId.empty() ){
- // search nearest parent WITH an id
- const FoliaElement *p = parent;
- while ( p && p->id().empty() )
- p = p->parent();
- nodeId = p->id();
- }
- // cerr << "generateId," << tag << " nodeId = " << nodeId << endl;
- int max = getMaxId(tag);
- // cerr << "MAX = " << max << endl;
- string id = nodeId + '.' + tag + '.' + TiCC::toString( max + 1 );
- // cerr << "new id = " << id << endl;
- return id;
- }
-
- void AllowGenerateID::setMaxId( FoliaElement *child ) {
- if ( !child->id().empty() && !child->xmltag().empty() ){
- vector<string> parts;
- size_t num = TiCC::split_at( child->id(), parts, "." );
- if ( num > 0 ){
- string val = parts[num-1];
- int i;
- try {
- i = stringTo<int>( val );
- }
- catch ( exception ){
- // no number, so assume so user defined id
- return;
- }
- map<string,int>::iterator it = maxid.find( child->xmltag() );
- if ( it == maxid.end() ){
- maxid[child->xmltag()] = i;
- }
- else {
- if ( it->second < i ){
- it->second = i;
- }
- }
- }
- }
- }
-
- int AllowGenerateID::getMaxId( const string& xmltag ) {
- int res = 0;
- if ( !xmltag.empty() ){
- res = maxid[xmltag];
- ++maxid[xmltag];
- }
- return res;
- }
-
- Correction * AllowCorrection::correct( const vector<FoliaElement*>& _original,
- const vector<FoliaElement*>& current,
- const vector<FoliaElement*>& _newv,
- const vector<FoliaElement*>& _suggestions,
- const KWargs& args_in ){
- // cerr << "correct " << this << endl;
- // cerr << "original= " << original << endl;
- // cerr << "current = " << current << endl;
- // cerr << "new = " << _new << endl;
- // cerr << "suggestions = " << suggestions << endl;
- // cerr << "args in = " << args_in << endl;
- // Apply a correction
- Document *mydoc = doc();
- Correction *c = 0;
- bool suggestionsonly = false;
- bool hooked = false;
- FoliaElement * addnew = 0;
- KWargs args = args_in;
- vector<FoliaElement*> original = _original;
- vector<FoliaElement*> _new = _newv;
- vector<FoliaElement*> suggestions = _suggestions;
- KWargs::const_iterator it = args.find("new");
- if ( it != args.end() ){
- TextContent *t = new TextContent( mydoc, "value='" + it->second + "'" );
- _new.push_back( t );
- args.erase("new");
- }
- it = args.find("suggestion");
- if ( it != args.end() ){
- TextContent *t = new TextContent( mydoc, "value='" + it->second + "'" );
- suggestions.push_back( t );
- args.erase("suggestion");
- }
- it = args.find("reuse");
- if ( it != args.end() ){
- // reuse an existing correction instead of making a new one
- try {
- c = dynamic_cast<Correction*>(mydoc->index(it->second));
- }
- catch ( exception& e ){
- throw ValueError("reuse= must point to an existing correction id!");
- }
- if ( !c->isinstance( Correction_t ) ){
- throw ValueError("reuse= must point to an existing correction id!");
- }
- hooked = true;
- suggestionsonly = (!c->hasNew() && !c->hasOriginal() && c->hasSuggestions() );
- if ( !_new.empty() && c->hasCurrent() ){
- // can't add new if there's current, so first set original to current, and then delete current
-
- if ( !current.empty() )
- throw runtime_error( "Can't set both new= and current= !");
- if ( original.empty() ){
- FoliaElement *cur = c->getCurrent();
- original.push_back( cur );
- c->remove( cur, false );
- }
- }
- }
- else {
- KWargs args2 = args;
- args2.erase("suggestion" );
- args2.erase("suggestions" );
- string id = generateId( "correction" );
- args2["id"] = id;
- c = new Correction(mydoc );
- c->setAttributes( args2 );
- }
-
- if ( !current.empty() ){
- if ( !original.empty() || !_new.empty() )
- throw runtime_error("When setting current=, original= and new= can not be set!");
- vector<FoliaElement *>::const_iterator cit = current.begin();
- while ( cit != current.end() ){
- FoliaElement *add = new Current( mydoc );
- (*cit)->setParent(0);
- add->append( *cit );
- c->replace( add );
- if ( !hooked ) {
- for ( size_t i=0; i < size(); ++i ){
- if ( index(i) == *cit ){
- replace( index(i), c );
- hooked = true;
- }
- }
- }
- ++cit;
- }
- }
- if ( !_new.empty() ){
- // cerr << "there is new! " << endl;
- addnew = new NewElement( mydoc );
- c->append(addnew);
- vector<FoliaElement *>::iterator nit = _new.begin();
- while ( nit != _new.end() ){
- (*nit)->setParent(0);
- addnew->append( *nit );
- ++nit;
- }
- // cerr << "after adding " << c << endl;
- vector<Current*> v = c->FoliaElement::select<Current>();
- //delete current if present
- vector<Current*>::iterator cit = v.begin();
- while ( cit != v.end() ){
- c->remove( *cit, false );
- ++cit;
- }
- }
- if ( !original.empty() ){
- FoliaElement *add = new Original( mydoc );
- c->replace(add);
- vector<FoliaElement *>::iterator nit = original.begin();
- while ( nit != original.end() ){
- bool dummyNode = ( (*nit)->id() == "dummy" );
- if ( !dummyNode ){
- (*nit)->setParent(0);
- add->append( *nit );
- }
- for ( size_t i=0; i < size(); ++i ){
- if ( index(i) == *nit ){
- if ( !hooked ) {
- FoliaElement *tmp = replace( index(i), c );
- if ( dummyNode )
- delete tmp;
- hooked = true;
- }
- else
- remove( *nit, false );
- }
- }
- ++nit;
- }
- }
- else if ( addnew ){
- // original not specified, find automagically:
- vector<FoliaElement *> orig;
- // cerr << "start to look for original " << endl;
- for ( size_t i=0; i < len(addnew); ++ i ){
- FoliaElement *p = addnew->index(i);
- // cerr << "bekijk " << p << endl;
- vector<FoliaElement*> v = p->findreplacables( this );
- vector<FoliaElement*>::iterator vit=v.begin();
- while ( vit != v.end() ){
- orig.push_back( *vit );
- ++vit;
- }
- }
- if ( orig.empty() ){
- throw runtime_error( "No original= specified and unable to automatically infer");
- }
- else {
- // cerr << "we seem to have some originals! " << endl;
- FoliaElement *add = new Original( mydoc );
- c->replace(add);
- vector<FoliaElement *>::iterator oit = orig.begin();
- while ( oit != orig.end() ){
- // cerr << " an original is : " << *oit << endl;
- (*oit)->setParent( 0 );
- add->append( *oit );
- for ( size_t i=0; i < size(); ++i ){
- if ( index(i) == *oit ){
- if ( !hooked ) {
- replace( index(i), c );
- hooked = true;
- }
- else
- remove( *oit, false );
- }
- }
- ++oit;
- }
- vector<Current*> v = c->FoliaElement::select<Current>();
- vector<Current*>::iterator cit = v.begin();
- //delete current if present
- while ( cit != v.end() ){
- remove( *cit, false );
- ++cit;
- }
- }
- }
-
- if ( addnew ){
- vector<FoliaElement*>::iterator oit = original.begin();
- while ( oit != original.end() ){
- c->remove( *oit, false );
- ++oit;
- }
- }
-
- if ( !suggestions.empty() ){
- if ( !hooked )
- append(c);
- vector<FoliaElement *>::iterator nit = suggestions.begin();
- while ( nit != suggestions.end() ){
- if ( (*nit)->isinstance( Suggestion_t ) ){
- (*nit)->setParent(0);
- c->append( *nit );
- }
- else {
- FoliaElement *add = new Suggestion( mydoc );
- (*nit)->setParent(0);
- add->append( *nit );
- c->append( add );
- }
- ++nit;
- }
- }
-
- it = args.find("reuse");
- if ( it != args.end() ){
- if ( addnew && suggestionsonly ){
- vector<Suggestion*> sv = c->suggestions();
- for ( size_t i=0; i < sv.size(); ++i ){
- if ( !c->annotator().empty() && sv[i]->annotator().empty() )
- sv[i]->annotator( c->annotator() );
- if ( !(c->annotatortype() == UNDEFINED) &&
- (sv[i]->annotatortype() == UNDEFINED ) )
- sv[i]->annotatortype( c->annotatortype() );
- }
- }
- it = args.find("annotator");
- if ( it != args.end() )
- c->annotator( it->second );
- it = args.find("annotatortype");
- if ( it != args.end() )
- c->annotatortype( stringTo<AnnotatorType>(it->second) );
- it = args.find("confidence");
- if ( it != args.end() )
- c->confidence( stringTo<double>(it->second) );
-
- }
- return c;
- }
-
- Correction *AllowCorrection::correct( const string& s ){
- vector<FoliaElement*> nil1;
- vector<FoliaElement*> nil2;
- vector<FoliaElement*> nil3;
- vector<FoliaElement*> nil4;
- KWargs args = getArgs( s );
- // cerr << xmltag() << "::correct() <== " << this << endl;
- Correction *tmp = correct( nil1, nil2, nil3, nil4, args );
- // cerr << xmltag() << "::correct() ==> " << this << endl;
- return tmp;
- }
-
- Correction *AllowCorrection::correct( FoliaElement *_old,
- FoliaElement *_new,
- const vector<FoliaElement*>& sugg,
- const KWargs& args ){
- vector<FoliaElement *> nv;
- nv.push_back( _new );
- vector<FoliaElement *> ov;
- ov.push_back( _old );
- vector<FoliaElement *> nil;
- // cerr << xmltag() << "::correct() <== " << this << endl;
- Correction *tmp = correct( ov, nil, nv, sugg, args );
- // cerr << xmltag() << "::correct() ==> " << this << endl;
- return tmp;
- }
-
-
- string AbstractStructureElement::str() const{
- UnicodeString result = text();
- return UnicodeToUTF8(result);
- }
-
- FoliaElement *AbstractStructureElement::append( FoliaElement *child ){
- FoliaImpl::append( child );
- setMaxId( child );
- return child;
- }
-
- vector<Paragraph*> AbstractStructureElement::paragraphs() const{
- return FoliaElement::select<Paragraph>( default_ignore_structure );
- }
-
- vector<Sentence*> AbstractStructureElement::sentences() const{
- return FoliaElement::select<Sentence>( default_ignore_structure );
- }
-
- vector<Word*> AbstractStructureElement::words() const{
- return FoliaElement::select<Word>( default_ignore_structure );
- }
-
- Sentence *AbstractStructureElement::sentences( size_t index ) const {
- vector<Sentence*> v = sentences();
- if ( index < v.size() )
- return v[index];
- else
- throw range_error( "sentences(): index out of range" );
- }
-
- Sentence *AbstractStructureElement::rsentences( size_t index ) const {
- vector<Sentence*> v = sentences();
- if ( index < v.size() )
- return v[v.size()-1-index];
- else
- throw range_error( "rsentences(): index out of range" );
- }
-
- Paragraph *AbstractStructureElement::paragraphs( size_t index ) const {
- vector<Paragraph*> v = paragraphs();
- if ( index < v.size() )
- return v[index];
- else
- throw range_error( "paragraphs(): index out of range" );
- }
-
- Paragraph *AbstractStructureElement::rparagraphs( size_t index ) const {
- vector<Paragraph*> v = paragraphs();
- if ( index < v.size() )
- return v[v.size()-1-index];
- else
- throw range_error( "rparagraphs(): index out of range" );
- }
-
- Word *AbstractStructureElement::words( size_t index ) const {
- vector<Word*> v = words();
- if ( index < v.size() )
- return v[index];
- else
- throw range_error( "words(): index out of range" );
- }
-
- Word *AbstractStructureElement::rwords( size_t index ) const {
- vector<Word*> v = words();
- if ( index < v.size() )
- return v[v.size()-1-index];
- else
- throw range_error( "rwords(): index out of range" );
- }
-
- const Word* AbstractStructureElement::resolveword( const string& id ) const{
- const Word *result = 0;
- for ( size_t i=0; i < data.size(); ++i ){
- result = data[i]->resolveword( id );
- if ( result )
- return result;
- }
- return result;
- }
-
- vector<Alternative *> AbstractStructureElement::alternatives( ElementType elt,
- const string& st ) const {
- // Return a list of alternatives, either all or only of a specific type, restrained by set
- static set<ElementType> excludeSet;
- if ( excludeSet.empty() ){
- excludeSet.insert( Original_t );
- excludeSet.insert( Suggestion_t );
- }
- vector<Alternative *> alts = FoliaElement::select<Alternative>( excludeSet );
- if ( elt == BASE ){
- return alts;
- }
- else {
- vector<Alternative*> res;
- for ( size_t i=0; i < alts.size(); ++i ){
- if ( alts[i]->size() > 0 ) { // child elements?
- for ( size_t j =0; j < alts[i]->size(); ++j ){
- if ( alts[i]->index(j)->element_id() == elt &&
- ( alts[i]->sett().empty() || alts[i]->sett() == st ) ){
- res.push_back( alts[i] ); // not the child!
- break; // yield an alternative only once (in case there are multiple matches)
- }
- }
- }
- }
- return res;
- }
- }
-
- KWargs AlignReference::collectAttributes() const {
- KWargs atts;
- atts["id"] = refId;
- atts["type"] = _type;
- if ( !_t.empty() )
- atts["t"] = _t;
- return atts;
- }
-
- void AlignReference::setAttributes( const KWargs& args ){
- KWargs::const_iterator it = args.find( "id" );
- if ( it != args.end() ){
- refId = it->second;
- }
- it = args.find( "type" );
- if ( it != args.end() ){
- try {
- stringTo<ElementType>( it->second );
- }
- catch (...){
- throw XmlError( "attribute 'type' must be an Element Type" );
- }
- _type = it->second;
- }
- else {
- throw XmlError( "attribute 'type' required for AlignReference" );
- }
- it = args.find( "t" );
- if ( it != args.end() ){
- _t = it->second;
- }
- }
-
-
- KWargs Alignment::collectAttributes() const {
- KWargs atts = FoliaImpl::collectAttributes();
- if ( !_href.empty() ){
- atts["xlink:href"] = _href;
- if ( !_type.empty() )
- atts["xlink:type"] = _type;
- else
- atts["xlink:type"] = "simple";
- }
- return atts;
- }
-
- void Alignment::setAttributes( const KWargs& args ){
- KWargs::const_iterator it = args.find( "href" );
- if ( it != args.end() ){
- _href = it->second;
- }
- FoliaImpl::setAttributes( args );
- }
-
- void Word::setAttributes( const KWargs& args ){
- KWargs::const_iterator it = args.find( "space" );
- if ( it != args.end() ){
- if ( it->second == "no" ){
- space = false;
- }
- }
- it = args.find( "text" );
- if ( it != args.end() ) {
- settext( it->second );
- }
- FoliaImpl::setAttributes( args );
- }
-
- KWargs Word::collectAttributes() const {
- KWargs atts = FoliaImpl::collectAttributes();
- if ( !space ){
- atts["space"] = "no";
- }
- return atts;
- }
-
- string Word::getTextDelimiter( bool retaintok ) const {
- if ( space || retaintok )
- return TEXTDELIMITER;
- else {
- return "";
- }
- }
-
- FoliaElement *Word::split( FoliaElement *part1, FoliaElement *part2,
- const string& args ){
- return sentence()->splitWord( this, part1, part2, getArgs(args) );
- }
-
- FoliaElement *Word::append( FoliaElement *child ) {
- if ( child->isSubClass( TokenAnnotation_t ) ){
- // sanity check, there may be no other child within the same set
- vector<FoliaElement*> v = select( child->element_id(), child->sett() );
- if ( v.empty() ) {
- // OK!
- return FoliaImpl::append( child );
- }
- delete child;
- throw DuplicateAnnotationError( "Word::append" );
- }
- return FoliaImpl::append( child );
- }
-
- Sentence *Word::sentence( ) const {
- // return the sentence this word is a part of, otherwise return null
- FoliaElement *p = _parent;
- while( p ){
- if ( p->isinstance( Sentence_t ) )
- return dynamic_cast<Sentence*>(p);
- p = p->parent();
- }
- return 0;
- }
-
- Paragraph *Word::paragraph( ) const {
- // return the sentence this word is a part of, otherwise return null
- FoliaElement *p = _parent;
- while( p ){
- if ( p->isinstance( Paragraph_t ) )
- return dynamic_cast<Paragraph*>(p);
- p = p->parent();
- }
- return 0;
- }
-
- Division *Word::division() const {
- // return the <div> this word is a part of, otherwise return null
- FoliaElement *p = _parent;
- while( p ){
- if ( p->isinstance( Division_t ) )
- return dynamic_cast<Division*>(p);
- p = p->parent();
- }
- return 0;
- }
-
- vector<Morpheme *> Word::morphemes( const string& set ) const {
- vector<Morpheme *> result;
- vector<MorphologyLayer*> mv = FoliaElement::select<MorphologyLayer>();
- for( size_t i=0; i < mv.size(); ++i ){
- vector<Morpheme*> tmp = mv[i]->FoliaElement::select<Morpheme>( set );
- result.insert( result.end(), tmp.begin(), tmp.end() );
- }
- return result;
- }
-
- Morpheme * Word::morpheme( size_t pos, const string& set ) const {
- vector<Morpheme *> tmp = morphemes( set );
- if ( pos < tmp.size() )
- return tmp[pos];
- else
- throw range_error( "morpheme() index out of range" );
- }
-
- Correction *Word::incorrection( ) const {
- // Is the Word part of a correction? If it is, it returns the Correction element, otherwise it returns 0;
- FoliaElement *p = _parent;
- while( p ){
- if ( p->isinstance( Correction_t ) )
- return dynamic_cast<Correction*>(p);
- else if ( p->isinstance( Sentence_t ) )
- break;
- p = p->parent();
- }
- return 0;
- }
-
- Word *Word::previous() const{
- Sentence *s = sentence();
- vector<Word*> words = s->words();
- for( size_t i=0; i < words.size(); ++i ){
- if ( words[i] == this ){
- if ( i > 0 )
- return words[i-1];
- else
- return 0;
- break;
- }
- }
- return 0;
- }
-
- Word *Word::next() const{
- Sentence *s = sentence();
- vector<Word*> words = s->words();
- for( size_t i=0; i < words.size(); ++i ){
- if ( words[i] == this ){
- if ( i+1 < words.size() )
- return words[i+1];
- else
- return 0;
- break;
- }
- }
- return 0;
- }
-
- vector<Word*> Word::context( size_t size,
- const string& val ) const {
- vector<Word*> result;
- if ( size > 0 ){
- vector<Word*> words = mydoc->words();
- for( size_t i=0; i < words.size(); ++i ){
- if ( words[i] == this ){
- size_t miss = 0;
- if ( i < size ){
- miss = size - i;
- }
- for ( size_t index=0; index < miss; ++index ){
- if ( val.empty() )
- result.push_back( 0 );
- else {
- PlaceHolder *p = new PlaceHolder( "text='" + val + "'" );
- mydoc->keepForDeletion( p );
- result.push_back( p );
- }
- }
- for ( size_t index=i-size+miss; index < i + size + 1; ++index ){
- if ( index < words.size() ){
- result.push_back( words[index] );
- }
- else {
- if ( val.empty() )
- result.push_back( 0 );
- else {
- PlaceHolder *p = new PlaceHolder( "text='" + val + "'" );
- mydoc->keepForDeletion( p );
- result.push_back( p );
- }
- }
- }
- break;
- }
- }
- }
- return result;
- }
-
-
- vector<Word*> Word::leftcontext( size_t size,
- const string& val ) const {
- // cerr << "leftcontext : " << size << endl;
- vector<Word*> result;
- if ( size > 0 ){
- vector<Word*> words = mydoc->words();
- for( size_t i=0; i < words.size(); ++i ){
- if ( words[i] == this ){
- size_t miss = 0;
- if ( i < size ){
- miss = size - i;
- }
- for ( size_t index=0; index < miss; ++index ){
- if ( val.empty() )
- result.push_back( 0 );
- else {
- PlaceHolder *p = new PlaceHolder( "text='" + val + "'" );
- mydoc->keepForDeletion( p );
- result.push_back( p );
- }
- }
- for ( size_t index=i-size+miss; index < i; ++index ){
- result.push_back( words[index] );
- }
- break;
- }
- }
- }
- return result;
- }
-
- vector<Word*> Word::rightcontext( size_t size,
- const string& val ) const {
- vector<Word*> result;
- // cerr << "rightcontext : " << size << endl;
- if ( size > 0 ){
- vector<Word*> words = mydoc->words();
- size_t begin;
- size_t end;
- for( size_t i=0; i < words.size(); ++i ){
- if ( words[i] == this ){
- begin = i + 1;
- end = begin + size;
- for ( ; begin < end; ++begin ){
- if ( begin >= words.size() ){
- if ( val.empty() )
- result.push_back( 0 );
- else {
- PlaceHolder *p = new PlaceHolder( "text='" + val + "'" );
- mydoc->keepForDeletion( p );
- result.push_back( p );
- }
- }
- else
- result.push_back( words[begin] );
- }
- break;
- }
- }
- }
- return result;
- }
-
- const Word* Word::resolveword( const string& id ) const {
- if ( _id == id )
- return this;
- return 0;
- }
-
- vector<FoliaElement*> Word::findspans( ElementType et,
- const string& st ) const {
- vector<FoliaElement *> result;
- if ( !folia::isSubClass( et , AnnotationLayer_t ) ){
- throw NotImplementedError( "findspans(" + toString( et ) +
- ") is not supported. " +
- " (Not an AnnotationLayer type)" );
- }
- else {
- const FoliaElement *e = parent();
- if ( e ){
- vector<FoliaElement*> v = e->select( et, st, false );
- for ( size_t i=0; i < v.size(); ++i ){
- for ( size_t k=0; k < v[i]->size(); ++k ){
- FoliaElement *f = v[i]->index(k);
- AbstractSpanAnnotation *as = dynamic_cast<AbstractSpanAnnotation*>(f);
- if ( as ){
- vector<FoliaElement*> wv = f->wrefs();
- for ( size_t j=0; j < wv.size(); ++j ){
- if ( wv[j] == this ){
- result.push_back(f);
- }
- }
- }
- }
- }
- }
- }
- return result;
- }
-
- FoliaElement* WordReference::parseXml( const xmlNode *node ){
- KWargs att = getAttributes( node );
- string id = att["id"];
- if ( id.empty() )
- throw XmlError( "empty id in WordReference" );
- if ( mydoc->debug )
- cerr << "Found word reference" << id << endl;
- FoliaElement *res = (*mydoc)[id];
- if ( res ){
- // To DO: check type. Word_t and Morpheme_t
- res->increfcount();
- }
- else {
- if ( mydoc->debug )
- cerr << "...Unresolvable!" << endl;
- throw XmlError( "Unresolvable id " + id + "in WordReference" );
- }
- delete this;
- return res;
- }
-
- FoliaElement* AlignReference::parseXml( const xmlNode *node ){
- KWargs att = getAttributes( node );
- string val = att["id"];
- if ( val.empty() )
- throw XmlError( "ID required for AlignReference" );
- refId = val;
- if ( mydoc->debug )
- cerr << "Found AlignReference ID " << refId << endl;
- val = att["type"];
- if ( val.empty() )
- throw XmlError( "type required for AlignReference" );
- try {
- stringTo<ElementType>( val );
- }
- catch (...){
- throw XmlError( "AlignReference:type must be an Element Type ("
- + val + ")" );
- }
- _type = val;
- val = att["t"];
- if ( !val.empty() ){
- _t = val;
- }
- return this;
- }
-
- FoliaElement *AlignReference::resolve( const Alignment *ref ) const {
- if ( ref->href().empty() )
- return (*mydoc)[refId];
- else
- throw NotImplementedError( "AlignReference::resolve() for external doc" );
- }
-
- vector<FoliaElement *> Alignment::resolve() const {
- vector<AlignReference*> v = FoliaElement::select<AlignReference>();
- vector<FoliaElement*> result;
- for ( size_t i=0; i < v.size(); ++i ){
- result.push_back( v[i]->resolve( this ) );
- }
- return result;
- }
-
- void PlaceHolder::setAttributes( const KWargs& args ){
- KWargs::const_iterator it = args.find( "text" );
- if ( it == args.end() ){
- throw ValueError("text attribute is required for " + classname() );
- }
- else if ( args.size() != 1 ){
- throw ValueError("only the text attribute is supported for " + classname() );
- }
- Word::setAttributes( args );
- }
-
- KWargs Figure::collectAttributes() const {
- KWargs atts = FoliaImpl::collectAttributes();
- if ( !_src.empty() ){
- atts["src"] = _src;
- }
- return atts;
- }
-
- void Figure::setAttributes( const KWargs& kwargsin ){
- KWargs kwargs = kwargsin;
- KWargs::const_iterator it;
- it = kwargs.find( "src" );
- if ( it != kwargs.end() ) {
- _src = it->second;
- kwargs.erase( "src" );
- }
- FoliaImpl::setAttributes(kwargs);
- }
-
- UnicodeString Figure::caption() const {
- vector<FoliaElement *> v = select(Caption_t);
- if ( v.empty() )
- throw NoSuchText("caption");
- else
- return v[0]->text();
- }
-
- void Description::setAttributes( const KWargs& kwargs ){
- KWargs::const_iterator it;
- it = kwargs.find( "value" );
- if ( it == kwargs.end() ) {
- throw ValueError("value attribute is required for " + classname() );
- }
- _value = it->second;
- }
-
- xmlNode *Description::xml( bool, bool ) const {
- xmlNode *e = FoliaImpl::xml( false, false );
- xmlAddChild( e, xmlNewText( (const xmlChar*)_value.c_str()) );
- return e;
- }
-
- FoliaElement* Description::parseXml( const xmlNode *node ){
- KWargs att = getAttributes( node );
- KWargs::const_iterator it = att.find("value" );
- if ( it == att.end() ){
- att["value"] = XmlContent( node );
- }
- setAttributes( att );
- return this;
- }
-
- FoliaElement *AbstractSpanAnnotation::append( FoliaElement *child ){
- FoliaImpl::append( child );
- if ( child->isinstance(PlaceHolder_t) ){
- child->increfcount();
- }
- return child;
- }
-
- xmlNode *AbstractSpanAnnotation::xml( bool recursive, bool kanon ) const {
- xmlNode *e = FoliaImpl::xml( false, false );
- // append Word and Morpheme children as WREFS
- vector<FoliaElement*>::const_iterator it=data.begin();
- while ( it != data.end() ){
- if ( (*it)->element_id() == Word_t ||
- (*it)->element_id() == Morpheme_t ){
- xmlNode *t = XmlNewNode( foliaNs(), "wref" );
- KWargs attribs;
- attribs["id"] = (*it)->id();
- string txt = (*it)->str();
- if ( !txt.empty() )
- attribs["t"] = txt;
- addAttributes( t, attribs );
- xmlAddChild( e, t );
- }
- else {
- string at = tagToAtt( *it );
- if ( at.empty() ){
- // otherwise handled by FoliaElement::xml() above
- xmlAddChild( e, (*it)->xml( recursive, kanon ) );
- }
- }
- ++it;
- }
- return e;
- }
-
- FoliaElement *Quote::append( FoliaElement *child ){
- FoliaImpl::append( child );
- if ( child->isinstance(Sentence_t) )
- child->setAuth( false ); // Sentences under quotes are non-authoritative
- return child;
- }
-
-
- xmlNode *Content::xml( bool recurse, bool ) const {
- xmlNode *e = FoliaImpl::xml( recurse, false );
- xmlAddChild( e, xmlNewCDataBlock( 0,
- (const xmlChar*)value.c_str() ,
- value.length() ) );
- return e;
- }
-
- FoliaElement* Content::parseXml( const xmlNode *node ){
- KWargs att = getAttributes( node );
- setAttributes( att );
- xmlNode *p = node->children;
- bool isCdata = false;
- bool isText = false;
- while ( p ){
- if ( p->type == XML_CDATA_SECTION_NODE ){
- if ( isText )
- throw XmlError( "intermixing text and CDATA in Content node" );
- isCdata = true;
- value += (char*)p->content;
- }
- else if ( p->type == XML_TEXT_NODE ){
- if ( isCdata )
- throw XmlError( "intermixing text and CDATA in Content node" );
- isText = true;
- value += (char*)p->content;
- }
- else if ( p->type == XML_COMMENT_NODE ){
- string tag = "xml-comment";
- FoliaElement *t = createElement( mydoc, tag );
- if ( t ){
- t = t->parseXml( p );
- append( t );
- }
- }
- p = p->next;
- }
- if ( value.empty() )
- throw XmlError( "CDATA or Text expected in Content node" );
- return this;
- }
-
- UnicodeString Correction::text( const string& cls, bool retaintok ) const {
-#ifdef DEBUG_TEXT
- cerr << "TEXT(" << cls << ") op node : " << _xmltag << " id ( " << id() << ")" << endl;
-#endif
- if ( cls == "current" ){
- for( size_t i=0; i < data.size(); ++i ){
-#ifdef DEBUG_TEXT
- cerr << "data[" << i << "]=" << data[i] << endl;
-#endif
- if ( data[i]->isinstance( New_t ) || data[i]->isinstance( Current_t ) )
- return data[i]->text( cls, retaintok );
- }
- }
- else if ( cls == "original" ){
- for( size_t i=0; i < data.size(); ++i ){
-#ifdef DEBUG_TEXT
- cerr << "data[" << i << "]=" << data[i] << endl;
-#endif
- if ( data[i]->isinstance( Original_t ) )
- return data[i]->text( cls, retaintok );
- }
- }
- throw NoSuchText("wrong cls");
- }
-
- string Correction::getTextDelimiter( bool retaintok ) const {
- for( size_t i=0; i < data.size(); ++i ){
- // cerr << "data[" << i << "]=" << data[i] << endl;
- if ( data[i]->isinstance( New_t ) || data[i]->isinstance( Current_t ) )
- return data[i]->getTextDelimiter( retaintok );
- }
- return "";
- }
-
- TextContent *Correction::textcontent( const string& cls ) const {
- if ( cls == "current" ){
- for( size_t i=0; i < data.size(); ++i ){
- // cerr << "data[" << i << "]=" << data[i] << endl;
- if ( data[i]->isinstance( New_t ) || data[i]->isinstance( Current_t ) )
- return data[i]->textcontent( cls );
- }
- }
- else if ( cls == "original" ){
- for( size_t i=0; i < data.size(); ++i ){
- // cerr << "data[" << i << "]=" << data[i] << endl;
- if ( data[i]->isinstance( Original_t ) )
- return data[i]->textcontent( cls );;
- }
- }
- throw NoSuchText("wrong cls");
- }
-
- bool Correction::hasNew( ) const {
- vector<FoliaElement*> v = select( New_t, false );
- return !v.empty();
- }
-
- NewElement *Correction::getNew() const {
- vector<NewElement*> v = FoliaElement::select<NewElement>( false );
- if ( v.empty() )
- throw NoSuchAnnotation("new");
- else
- return v[0];
- }
-
- bool Correction::hasOriginal() const {
- vector<FoliaElement*> v = select( Original_t, false );
- return !v.empty();
- }
-
- Original *Correction::getOriginal() const {
- vector<Original*> v = FoliaElement::select<Original>( false );
- if ( v.empty() )
- throw NoSuchAnnotation("original");
- else
- return v[0];
- }
-
- bool Correction::hasCurrent( ) const {
- vector<FoliaElement*> v = select( Current_t, false );
- return !v.empty();
- }
-
- Current *Correction::getCurrent( ) const {
- vector<Current*> v = FoliaElement::select<Current>( false );
- if ( v.empty() )
- throw NoSuchAnnotation("current");
- else
- return v[0];
- }
-
- bool Correction::hasSuggestions( ) const {
- vector<Suggestion*> v = suggestions();
- return !v.empty();
- }
-
- vector<Suggestion*> Correction::suggestions( ) const {
- return FoliaElement::select<Suggestion>( false );
- }
-
- Suggestion *Correction::suggestions( size_t index ) const {
- vector<Suggestion*> v = suggestions();
- if ( v.empty() || index >= v.size() )
- throw NoSuchAnnotation("suggestion");
- return v[index];
- }
-
- Head *Division::head() const {
- if ( data.size() > 0 ||
- data[0]->element_id() == Head_t ){
- return dynamic_cast<Head*>(data[0]);
- }
- else
- throw runtime_error( "No head" );
- return 0;
- }
-
- string Gap::content() const {
- vector<FoliaElement*> cv = select( Content_t );
- if ( cv.size() < 1 )
- throw NoSuchAnnotation( "content" );
- else {
- return cv[0]->content();
- }
- }
-
- Headwords *Dependency::head() const {
- vector<Headwords*> v = FoliaElement::select<Headwords>();
- if ( v.size() < 1 )
- throw NoSuchAnnotation( "head" );
- else {
- return v[0];
- }
- }
-
- DependencyDependent *Dependency::dependent() const {
- vector<DependencyDependent *> v = FoliaElement::select<DependencyDependent>();
- if ( v.size() < 1 )
- throw NoSuchAnnotation( "dependent" );
- else {
- return v[0];
- }
- }
-
- void FoLiA::init(){
- _xmltag="FoLiA";
- _element_id = BASE;
- const ElementType accept[] = { Text_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void DCOI::init(){
- _xmltag="DCOI";
- _element_id = BASE;
- const ElementType accept[] = { Text_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void AbstractStructureElement::init(){
- _element_id = Structure_t;
- _xmltag = "structure";
- _required_attributes = ID;
- _optional_attributes = ALL;
- _occurrences_per_set=0;
- TEXTDELIMITER = "\n\n";
- }
-
- void AbstractTokenAnnotation::init(){
- _element_id = TokenAnnotation_t;
- _xmltag="tokenannotation";
- _required_attributes = CLASS;
- _optional_attributes = ALL;
- _occurrences_per_set=1;
- }
-
- void TextContent::init(){
- _element_id = TextContent_t;
- _xmltag="t";
- _optional_attributes = CLASS|ANNOTATOR|CONFIDENCE|DATETIME;
- const ElementType accept[] = { AbstractTextMarkup_t,
- XmlText_t, LineBreak_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TEXT;
- _occurrences = 0;
- _occurrences_per_set=0;
- _offset = -1;
- }
-
- void Head::init() {
- _element_id = Head_t;
- _xmltag="head";
- const ElementType accept[] = { Structure_t, Description_t, LineBreak_t,
- TextContent_t, Alignment_t, Metric_t,
- Alternatives_t, TokenAnnotation_t, Gap_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _occurrences=1;
- TEXTDELIMITER = " ";
- }
-
- void TableHead::init() {
- _element_id = TableHead_t;
- _xmltag="tablehead";
- _required_attributes = NO_ATT;
- const ElementType accept[] = { Row_t,
- Correction_t,
- Alternatives_t,
- AnnotationLayer_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TABLE;
- }
-
- void Table::init() {
- _element_id = Table_t;
- _xmltag="table";
- const ElementType accept[] = { TableHead_t,
- Row_t,
- Correction_t,
- Alternatives_t,
- AnnotationLayer_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TABLE;
- }
-
- void Cell::init() {
- _element_id = Cell_t;
- _xmltag="cell";
- _required_attributes = NO_ATT;
- const ElementType accept[] = { Structure_t,
- TokenAnnotation_t,
- Entities_t,
- Alignment_t,
- Metric_t,
- Alternatives_t,
- AnnotationLayer_t,
- Gap_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TABLE;
- TEXTDELIMITER = " | ";
- }
-
- void Row::init() {
- _element_id = Row_t;
- _xmltag="row";
- _required_attributes = NO_ATT;
- const ElementType accept[] = { Cell_t,
- Correction_t,
- Alternatives_t,
- AnnotationLayer_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TABLE;
- TEXTDELIMITER = "\n";
- }
-
- void LineBreak::init(){
- _xmltag = "br";
- _element_id = LineBreak_t;
- _required_attributes = NO_ATT;
- _annotation_type = AnnotationType::LINEBREAK;
- }
-
- void WhiteSpace::init(){
- _xmltag = "whitespace";
- _element_id = WhiteSpace_t;
- _required_attributes = NO_ATT;
- _annotation_type = AnnotationType::WHITESPACE;
- }
-
- void Word::init(){
- _xmltag="w";
- _element_id = Word_t;
- const ElementType accept[] = { TextContent_t, TokenAnnotation_t,
- Alternative_t, Reference_t,
- Description_t,
- Alignment_t, Metric_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TOKEN;
- TEXTDELIMITER = " ";
- space = true;
- }
-
- void String::init(){
- _xmltag="str";
- _element_id = Str_t;
- _required_attributes = NO_ATT;
- _optional_attributes = ID|CLASS;
- const ElementType accept[] = { TextContent_t, Correction_t, Lang_t,
- Description_t, Alignment_t, Metric_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::STRING;
- _occurrences = 0;
- _occurrences_per_set=0;
- }
-
- void PlaceHolder::init(){
- _xmltag="placeholder";
- _element_id = PlaceHolder_t;
- _required_attributes = NO_ATT;
- }
-
- void WordReference::init(){
- _required_attributes = ID;
- _xmltag = "wref";
- _element_id = WordReference_t;
- _auth = false;
- }
-
- void Alignment::init(){
- _optional_attributes = ALL;
- _xmltag = "alignment";
- _element_id = Alignment_t;
- const ElementType accept[] = { AlignReference_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _occurrences_per_set=0;
- _annotation_type = AnnotationType::ALIGNMENT;
- PRINTABLE = false;
- }
-
- void AlignReference::init(){
- _xmltag = "aref";
- _element_id = AlignReference_t;
- }
-
-
- void Gap::init(){
- _xmltag = "gap";
- _element_id = Gap_t;
- _annotation_type = AnnotationType::GAP;
- const ElementType accept[] = { Content_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _optional_attributes = CLASS|ID|ANNOTATOR|CONFIDENCE|N|DATETIME;
- }
-
- void MetricAnnotation::init(){
- _element_id = Metric_t;
- _xmltag = "metric";
- const ElementType accept[] = { ValueFeature_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _optional_attributes = CLASS|ANNOTATOR|CONFIDENCE;
- _annotation_type = AnnotationType::METRIC;
- }
-
- void Content::init(){
- _xmltag = "content";
- _element_id = Content_t;
- }
-
- void Sentence::init(){
- _xmltag="s";
- _element_id = Sentence_t;
- const ElementType accept[] = { Structure_t,
- TokenAnnotation_t,
- TextContent_t, AnnotationLayer_t,
- Correction_t,
- Description_t, Alignment_t, Metric_t,
- Gap_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::SENTENCE;
- TEXTDELIMITER = " ";
- }
-
- void Division::init(){
- _xmltag="div";
- _element_id = Division_t;
- _required_attributes = ID;
- _optional_attributes = CLASS|N;
- const ElementType accept[] = { Structure_t, Gap_t,
- TokenAnnotation_t,
- Description_t,
- TextContent_t,
- Metric_t, Coreferences_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::DIVISION;
- TEXTDELIMITER = "\n\n\n";
- }
-
- void Text::init(){
- _xmltag="text";
- _element_id = Text_t;
- const ElementType accept[] = { Gap_t, Division_t, Paragraph_t, Sentence_t,
- List_t, Figure_t, Description_t, Event_t,
- TokenAnnotation_t,
- TextContent_t, Metric_t, External_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _required_attributes = ID;
- TEXTDELIMITER = "\n\n";
- }
-
- void Event::init(){
- _xmltag="event";
- _element_id = Event_t;
- const ElementType accept[] = { Gap_t, Division_t, Structure_t,
- Description_t,
- Feature_t, TextContent_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::EVENT;
- _occurrences_per_set=0;
- }
-
- void TimeSegment::init(){
- _xmltag="timesegment";
- _element_id = TimeSegment_t;
- const ElementType accept[] = { Description_t, Feature_t, Word_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::TIMEDEVENT;
- _occurrences_per_set=0;
- }
-
- void Caption::init(){
- _xmltag="caption";
- _element_id = Caption_t;
- const ElementType accept[] = { Sentence_t, Reference_t, Description_t,
- TokenAnnotation_t, TextContent_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _occurrences = 1;
- }
-
- void Label::init(){
- _xmltag="label";
- _element_id = Label_t;
- const ElementType accept[] = { Word_t, Description_t, TextContent_t,
- TokenAnnotation_t, Alignment_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void Item::init(){
- _xmltag="item";
- _element_id = Item_t;
- const ElementType accept[] = { Structure_t, Description_t,
- TokenAnnotation_t,
- TextContent_t, Str_t, Alignment_t,
- Gap_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::LIST;
- }
-
- void List::init(){
- _xmltag="list";
- _element_id = List_t;
- const ElementType accept[] = { Item_t, Description_t,
- Caption_t, Event_t, Lang_t,
- Alignment_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
-
- _annotation_type = AnnotationType::LIST;
- TEXTDELIMITER="\n";
- }
-
- void Figure::init(){
- _xmltag="figure";
- _element_id = Figure_t;
- const ElementType accept[] = { Sentence_t, Description_t,
- Caption_t, Str_t, Lang_t,
- TextContent_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::FIGURE;
- }
-
- void Paragraph::init(){
- _xmltag="p";
- _element_id = Paragraph_t;
- const ElementType accept[] = { Structure_t, TextContent_t,
- TokenAnnotation_t,
- Description_t,
- Alignment_t, Metric_t,
- Gap_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::PARAGRAPH;
- }
-
- void SyntacticUnit::init(){
- _xmltag = "su";
- _element_id = SyntacticUnit_t;
- _required_attributes = NO_ATT;
- _annotation_type = AnnotationType::SYNTAX;
- const ElementType accept[] = { SyntacticUnit_t, Word_t, WordReference_t,
- Description_t, Feature_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void SemanticRole::init(){
- _xmltag = "semrole";
- _element_id = Semrole_t;
- _required_attributes = CLASS;
- _annotation_type = AnnotationType::SEMROLE;
- const ElementType accept[] = { Word_t, WordReference_t, Lang_t, Headwords_t,
- Alignment_t, Description_t, Metric_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void Chunk::init(){
- _required_attributes = NO_ATT;
- _xmltag = "chunk";
- _element_id = Chunk_t;
- _annotation_type = AnnotationType::CHUNKING;
- const ElementType accept[] = { Word_t, WordReference_t, Lang_t,
- Description_t, Feature_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void Entity::init(){
- _required_attributes = NO_ATT;
- _optional_attributes = ID|CLASS|ANNOTATOR|CONFIDENCE|DATETIME;
- _xmltag = "entity";
- _element_id = Entity_t;
- _annotation_type = AnnotationType::ENTITY;
- const ElementType accept[] = { Word_t, Lang_t, WordReference_t, Morpheme_t,
- Description_t, Feature_t, Metric_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );;
- }
-
- void AbstractAnnotationLayer::init(){
- _xmltag = "annotationlayer";
- _element_id = AnnotationLayer_t;
- _optional_attributes = SETONLY;
- PRINTABLE=false;
- }
-
- static ElementType ASlist[] = { SyntacticUnit_t, Chunk_t,
- Entity_t, Headwords_t,
- DependencyDependent_t,
- CoreferenceLink_t,
- CoreferenceChain_t, Semrole_t,
- Semroles_t, TimeSegment_t };
- static set<ElementType> asSet( ASlist,
- ASlist + sizeof( ASlist )/ sizeof( ElementType ) );
-
- vector<AbstractSpanAnnotation*> FoliaImpl::selectSpan() const {
- vector<AbstractSpanAnnotation*> res;
- set<ElementType>::const_iterator it = asSet.begin();
- while( it != asSet.end() ){
- vector<FoliaElement*> tmp = select( *it, true );
- for ( size_t i = 0; i < tmp.size(); ++i ){
- res.push_back( dynamic_cast<AbstractSpanAnnotation*>( tmp[i]) );
- }
- ++it;
- }
- return res;
- }
-
- vector<FoliaElement*> AbstractSpanAnnotation::wrefs() const {
- vector<FoliaElement*> res;
- for ( size_t i=0; i < size(); ++ i ){
- ElementType et = data[i]->element_id();
- if ( et == Word_t
- || et == WordReference_t
- // || et == Phoneme_t
- || et == Morphology_t ){
- res.push_back( data[i] );
- }
- else {
- AbstractSpanAnnotation *as = dynamic_cast<AbstractSpanAnnotation*>(data[i]);
- if ( as != 0 ){
- vector<FoliaElement*> sub = as->wrefs();
- for( size_t j=0; j < sub.size(); ++j ){
- res.push_back( sub[j] );
- }
- }
- }
- }
- return res;
- }
-
- FoliaElement *AbstractAnnotationLayer::findspan( const vector<FoliaElement*>& words ) const {
- vector<AbstractSpanAnnotation*> av = selectSpan();
- for ( size_t i=0; i < av.size(); ++i ){
- vector<FoliaElement*> v = av[i]->wrefs();
- if ( v.size() == words.size() ){
- bool ok = true;
- for ( size_t n = 0; n < v.size() && ok ; ++n ){
- if ( v[n] != words[n] )
- ok = false;
- }
- if ( ok )
- return av[i];
- }
- }
- return 0;
- }
-
- void Alternative::init(){
- _xmltag = "alt";
- _element_id = Alternative_t;
- _required_attributes = NO_ATT;
- _optional_attributes = ALL;
- const ElementType accept[] = { TokenAnnotation_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::ALTERNATIVE;
- PRINTABLE = false;
- AUTH = false;
- }
-
- void AlternativeLayers::init(){
- _xmltag = "altlayers";
- _element_id = Alternatives_t;
- _optional_attributes = ALL;
- const ElementType accept[] = { AnnotationLayer_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- PRINTABLE = false;
- AUTH = false;
- }
-
- void AbstractCorrectionChild::init(){
- _optional_attributes = NO_ATT;
- const ElementType accept[] = { TokenAnnotation_t, SpanAnnotation_t,
- Word_t, WordReference_t, Str_t,
- TextContent_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _occurrences = 1;
- PRINTABLE=true;
- }
-
- void NewElement::init(){
- _xmltag = "new";
- _element_id = New_t;
- }
-
- void Current::init(){
- _xmltag = "current";
- _element_id = Current_t;
- }
-
- void Original::init(){
- _xmltag = "original";
- _element_id = Original_t;
- AUTH = false;
- }
-
- void Suggestion::init(){
- _xmltag = "suggestion";
- _element_id = Suggestion_t;
- _optional_attributes = ANNOTATOR|CONFIDENCE|DATETIME|N;
- _annotation_type = AnnotationType::SUGGESTION;
- _occurrences=0;
- _occurrences_per_set=0;
- AUTH = false;
- }
-
- void Correction::init(){
- _xmltag = "correction";
- _element_id = Correction_t;
- _required_attributes = NO_ATT;
- _annotation_type = AnnotationType::CORRECTION;
- const ElementType accept[] = { New_t, Original_t, Suggestion_t, Current_t,
- Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _occurrences_per_set=0;
- }
-
- void Description::init(){
- _xmltag = "desc";
- _element_id = Description_t;
- _occurrences = 1;
- }
-
- UnicodeString XmlText::text( const string&, bool ) const {
- return UTF8ToUnicode(_value);
- }
-
- xmlNode *XmlText::xml( bool, bool ) const {
- return xmlNewText( (const xmlChar*)_value.c_str() );
- }
-
- FoliaElement* XmlText::parseXml( const xmlNode *node ){
- if ( node->content ){
- _value = (const char*)node->content;
- }
- if ( _value.empty() ){
- throw ValueError( "TextContent may not be empty" );
- }
- return this;
- }
-
- void XmlText::init(){
- _xmltag = "xml-text";
- _element_id = XmlText_t;
- TEXTDELIMITER = "*";
- }
-
- void External::init(){
- _xmltag = "external";
- _element_id = External_t;
- _include = false;
- }
-
- void External::resolve( ) {
- try {
- cerr << "try to resolve: " << _src << endl;
- Document doc( "file='"+_src +"'" );
- xmlDoc *xmldoc = doc.XmlDoc();
- xmlNode *root = xmlDocGetRootElement( xmldoc );
- xmlNode *p = root->children;
- while ( p ){
- if ( p->type == XML_ELEMENT_NODE ){
- string tag = Name( p );
- if ( tag == "text" ){
- FoliaElement *parent = _parent;
- KWargs args = parent->collectAttributes();
- args["_id"] = "Arglebargleglop-glyf";
- Text *tmp = new Text( mydoc, args );
- tmp->FoliaImpl::parseXml( p );
- FoliaElement *old = parent->replace( this, tmp->index(0) );
- mydoc->delDocIndex( tmp, "Arglebargleglop-glyf" );
- tmp->remove( (size_t)0, false );
- delete tmp;
- delete old;
- }
- p = p->next;
- }
- }
- }
- catch ( const exception& e ){
- throw XmlError( "resolving external " + _src + " failed: "
- + e.what() );
- }
- }
-
- FoliaElement* External::parseXml( const xmlNode *node ){
- KWargs att = getAttributes( node );
- KWargs::const_iterator it = att.find("src" );
- if ( it == att.end() ){
- throw ValueError( "External: 'src' may not be empty" );
- }
- setAttributes( att );
- if ( _include ){
- mydoc->addExternal( this );
- }
- return this;
- }
-
- KWargs External::collectAttributes() const {
- KWargs atts = FoliaImpl::collectAttributes();
- if ( !_src.empty() ){
- atts["src"] = _src;
- }
- if ( _include ){
- atts["include"] = "yes";
- }
- return atts;
- }
-
- void External::setAttributes( const KWargs& kwargsin ){
- KWargs kwargs = kwargsin;
- KWargs::const_iterator it;
- it = kwargs.find( "src" );
- if ( it != kwargs.end() ) {
- _src = it->second;
- kwargs.erase( "src" );
- }
- it = kwargs.find( "include" );
- if ( it != kwargs.end() ) {
- _include = stringTo<bool>( it->second );
- kwargs.erase( "include" );
- }
- FoliaImpl::setAttributes(kwargs);
- }
-
- void Note::init(){
- _required_attributes = ID;
- _xmltag = "note";
- _element_id = Note_t;
- const ElementType accept[] = { Structure_t, TextContent_t, Feature_t, Alignment_t, TokenAnnotation_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- KWargs Note::collectAttributes() const {
- KWargs attribs = FoliaImpl::collectAttributes();
- return attribs;
- }
-
- void Note::setAttributes( const KWargs& args ){
- KWargs::const_iterator it = args.find( "_id" );
- if ( it != args.end() ){
- refId = it->second;
- }
- FoliaImpl::setAttributes( args );
- }
-
- void Reference::init(){
- _xmltag = "ref";
- _element_id = Reference_t;
- _required_attributes = NO_ATT;
- }
-
- KWargs Reference::collectAttributes() const {
- KWargs atts;
- atts["id"] = refId;
- atts["type"] = _type;
- return atts;
- }
-
- void Reference::setAttributes( const KWargs& args ){
- KWargs::const_iterator it = args.find( "id" );
- if ( it != args.end() ){
- refId = it->second;
- }
- it = args.find( "type" );
- if ( it != args.end() ){
- try {
- stringTo<ElementType>( it->second );
- }
- catch (...){
- throw XmlError( "attribute 'type' must be an Element Type" );
- }
- _type = it->second;
- }
- }
-
- xmlNode *XmlComment::xml( bool, bool ) const {
- return xmlNewComment( (const xmlChar*)_value.c_str() );
- }
-
- FoliaElement* XmlComment::parseXml( const xmlNode *node ){
- if ( node->content )
- _value = (const char*)node->content;
- return this;
- }
-
- void XmlComment::init(){
- _xmltag = "xml-comment";
- _element_id = XmlComment_t;
- }
-
- void Feature::setAttributes( const KWargs& kwargs ){
- //
- // Feature is special. So DON'T call ::setAttributes
- //
- KWargs::const_iterator it = kwargs.find( "subset" );
- if ( it == kwargs.end() ){
- if ( _subset.empty() ) {
- throw ValueError("subset attribute is required for " + classname() );
- }
- }
- else {
- _subset = it->second;
- }
- it = kwargs.find( "cls" );
- if ( it == kwargs.end() )
- it = kwargs.find( "class" );
- if ( it == kwargs.end() ) {
- throw ValueError("class attribute is required for " + classname() );
- }
- _class = it->second;
- }
-
- KWargs Feature::collectAttributes() const {
- KWargs attribs = FoliaImpl::collectAttributes();
- attribs["subset"] = _subset;
- return attribs;
- }
-
- vector<string> FoliaImpl::feats( const std::string& s ) const {
- // return all classes of the given subset
- vector<string> result;
- for ( size_t i=0; i < data.size(); ++i ){
- if ( data[i]->isSubClass( Feature_t ) &&
- data[i]->subset() == s ) {
- result.push_back( data[i]->cls() );
- }
- }
- return result;
- }
-
- string FoliaImpl::feat( const std::string& s ) const {
- // return the fist class of the given subset
- for ( size_t i=0; i < data.size(); ++i ){
- if ( data[i]->isSubClass( Feature_t ) &&
- data[i]->subset() == s ) {
- return data[i]->cls();
- }
- }
- return "";
- }
-
- KWargs AbstractTextMarkup::collectAttributes() const {
- KWargs attribs = FoliaImpl::collectAttributes();
- if ( !idref.empty() )
- attribs["id"] = idref;
- return attribs;
- }
-
- void AbstractTextMarkup::setAttributes( const KWargs& atts ){
- KWargs args = atts;
- KWargs::iterator it = args.find( "id" );
- if ( it != args.end() ){
- KWargs::const_iterator it2 = args.find( "_id" );
- if ( it2 != args.end() ){
- throw ValueError("Both 'id' and 'xml:id found for " + classname() );
- }
- idref = it->second;
- args.erase( it );
- }
- FoliaImpl::setAttributes( args );
- }
-
- KWargs TextMarkupCorrection::collectAttributes() const {
- KWargs attribs = AbstractTextMarkup::collectAttributes();
- if ( !_original.empty() )
- attribs["original"] = _original;
- return attribs;
- }
-
- void TextMarkupCorrection::setAttributes( const KWargs& args ){
- KWargs argl = args;
- KWargs::const_iterator it = argl.find( "id" );
- if ( it != argl.end() ){
- idref = it->second;
- argl.erase( "id" );
- }
- it = argl.find( "original" );
- if ( it != argl.end() ){
- _original = it->second;
- argl.erase( "original" );
- }
- FoliaImpl::setAttributes( argl );
- }
-
- UnicodeString AbstractTextMarkup::text( const std::string& cls,
- bool ) const {
- // we assume al TextMarkup te be tokenized already
- return FoliaImpl::text( cls, true );
- }
-
- UnicodeString TextMarkupCorrection::text( const std::string& cls,
- bool ret ) const{
- if ( cls == "original" )
- return UTF8ToUnicode(_original);
- else
- return FoliaImpl::text( cls, ret );
- }
-
- const FoliaElement* AbstractTextMarkup::resolveid() const {
- if ( idref.empty() || !mydoc )
- return this;
- else
- return mydoc->index(idref);
- }
-
- void Morpheme::init(){
- _element_id = Morpheme_t;
- _xmltag = "morpheme";
- _required_attributes = NO_ATT;
- _optional_attributes = ALL;
- const ElementType accept[] = { Feature_t, FunctionFeature_t, TextContent_t,
- Metric_t, Alignment_t, TokenAnnotation_t,
- Description_t, Morpheme_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::MORPHOLOGICAL;
- }
-
- void SyntaxLayer::init(){
- _element_id = SyntaxLayer_t;
- _xmltag = "syntax";
- const ElementType accept[] = { SyntacticUnit_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::SYNTAX;
- }
-
- void ChunkingLayer::init(){
- _element_id = Chunking_t;
- _xmltag = "chunking";
- const ElementType accept[] = { Chunk_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::CHUNKING;
- }
-
- void EntitiesLayer::init(){
- _element_id = Entities_t;
- _xmltag = "entities";
- const ElementType accept[] = { Entity_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::ENTITY;
- }
-
- void TimingLayer::init(){
- _element_id = TimingLayer_t;
- _xmltag = "timing";
- const ElementType accept[] = { TimeSegment_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void MorphologyLayer::init(){
- _element_id = Morphology_t;
- _xmltag = "morphology";
- const ElementType accept[] = { Morpheme_t, Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _occurrences_per_set = 1; // Don't allow duplicates within the same set
- _annotation_type = AnnotationType::MORPHOLOGICAL;
- }
-
- void CoreferenceLayer::init(){
- _element_id = Coreferences_t;
- _xmltag = "coreferences";
- const ElementType accept[] = { CoreferenceChain_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::COREFERENCE;
- }
-
- void CoreferenceLink::init(){
- _element_id = CoreferenceLink_t;
- _xmltag = "coreferencelink";
- _required_attributes = NO_ATT;
- _optional_attributes = ANNOTATOR|N|DATETIME;
- const ElementType accept[] = { Word_t, WordReference_t, Headwords_t,
- Description_t, Lang_t,
- Alignment_t, TimeFeature_t, LevelFeature_t,
- ModalityFeature_t, Metric_t};
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::COREFERENCE;
- }
-
- void CoreferenceChain::init(){
- _element_id = CoreferenceChain_t;
- _xmltag = "coreferencechain";
- _required_attributes = NO_ATT;
- const ElementType accept[] = { CoreferenceLink_t, Description_t,
- Metric_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::COREFERENCE;
- }
-
- void SemanticRolesLayer::init(){
- _element_id = Semroles_t;
- _xmltag = "semroles";
- const ElementType accept[] = { Semrole_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::SEMROLE;
- }
-
- void DependenciesLayer::init(){
- _element_id = Dependencies_t;
- _xmltag = "dependencies";
- const ElementType accept[] = { Dependency_t,
- Description_t,
- Correction_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- _annotation_type = AnnotationType::DEPENDENCY;
- }
-
- void Dependency::init(){
- _element_id = Dependency_t;
- _xmltag = "dependency";
- _required_attributes = NO_ATT;
- _annotation_type = AnnotationType::DEPENDENCY;
- const ElementType accept[] = { DependencyDependent_t, Headwords_t,
- Feature_t, Description_t, Alignment_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void DependencyDependent::init(){
- _element_id = DependencyDependent_t;
- _xmltag = "dep";
- _required_attributes = NO_ATT;
- _optional_attributes = NO_ATT;
- _annotation_type = AnnotationType::DEPENDENCY;
- const ElementType accept[] = { Word_t, WordReference_t, PlaceHolder_t,
- Description_t, Feature_t, Alignment_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void Headwords::init(){
- _element_id = Headwords_t;
- _xmltag = "hd";
- _required_attributes = NO_ATT;
- _optional_attributes = NO_ATT;
- const ElementType accept[] = { Word_t, WordReference_t, PlaceHolder_t,
- Description_t, Feature_t, Metric_t,
- Alignment_t, Lang_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void PosAnnotation::init(){
- _xmltag="pos";
- _element_id = Pos_t;
- _annotation_type = AnnotationType::POS;
- const ElementType accept[] = { Feature_t,
- Metric_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void LemmaAnnotation::init(){
- _xmltag="lemma";
- _element_id = Lemma_t;
- _annotation_type = AnnotationType::LEMMA;
- const ElementType accept[] = { Feature_t, Metric_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void LangAnnotation::init(){
- _xmltag="lang";
- _element_id = Lang_t;
- _annotation_type = AnnotationType::LANG;
- const ElementType accept[] = { Feature_t, Metric_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void PhonAnnotation::init(){
- _xmltag="phon";
- _element_id = Phon_t;
- _annotation_type = AnnotationType::PHON;
- const ElementType accept[] = { Feature_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void DomainAnnotation::init(){
- _xmltag="domain";
- _element_id = Domain_t;
- _annotation_type = AnnotationType::DOMEIN;
- const ElementType accept[] = { Feature_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void SenseAnnotation::init(){
- _xmltag="sense";
- _element_id = Sense_t;
- _annotation_type = AnnotationType::SENSE;
- const ElementType accept[] = { Feature_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void SubjectivityAnnotation::init(){
- _xmltag="subjectivity";
- _element_id = Subjectivity_t;
- _annotation_type = AnnotationType::SUBJECTIVITY;
- const ElementType accept[] = { Feature_t, Description_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- }
-
- void Quote::init(){
- _xmltag="quote";
- _element_id = Quote_t;
- _required_attributes = NO_ATT;
- const ElementType accept[] = { Structure_t, Str_t, Lang_t,
- TextContent_t, Description_t, Alignment_t,
- Gap_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- TEXTDELIMITER = " ";
- }
-
- void Feature::init() {
- _xmltag = "feat";
- _element_id = Feature_t;
- _occurrences_per_set = 0; // Allow duplicates within the same set
- }
-
- void BeginDateTimeFeature::init(){
- _xmltag="begindatetime";
- _element_id = BeginDateTimeFeature_t;
- _subset = "begindatetime";
- }
-
- void EndDateTimeFeature::init(){
- _xmltag="enddatetime";
- _element_id = EndDateTimeFeature_t;
- _subset = "enddatetime";
- }
-
- void SynsetFeature::init(){
- _xmltag="synset";
- _element_id = SynsetFeature_t;
- _annotation_type = AnnotationType::SENSE;
- _subset = "synset";
- }
-
- void ActorFeature::init(){
- _xmltag = "actor";
- _element_id = ActorFeature_t;
- _subset = "actor";
- }
-
- void HeadFeature::init(){
- _xmltag = "headfeature";
- _element_id = HeadFeature_t;
- _subset = "head";
- }
-
- void ValueFeature::init(){
- _xmltag = "value";
- _element_id = ValueFeature_t;
- _subset = "value";
- }
-
- void FunctionFeature::init(){
- _xmltag = "function";
- _element_id = FunctionFeature_t;
- _subset = "function";
- }
-
- void LevelFeature::init(){
- _xmltag = "level";
- _element_id = LevelFeature_t;
- _subset = "level";
- }
-
- void ModalityFeature::init(){
- _xmltag = "modality";
- _element_id = ModalityFeature_t;
- _subset = "modality";
- }
-
- void TimeFeature::init(){
- _xmltag = "time";
- _element_id = TimeFeature_t;
- _subset = "time";
- }
-
- void AbstractSpanAnnotation::init() {
- _xmltag = "spanannotation";
- _element_id = SpanAnnotation_t;
- _required_attributes = NO_ATT;
- _optional_attributes = ALL;
- _occurrences_per_set = 0; // Allow duplicates within the same set
- }
-
- void ErrorDetection::init(){
- _xmltag = "errordetection";
- _element_id = ErrorDetection_t;
- _annotation_type = AnnotationType::ERRORDETECTION;
- _occurrences_per_set = 0; // Allow duplicates within the same set
- }
-
- void AbstractTextMarkup::init(){
- _xmltag = "textmarkup";
- _element_id = AbstractTextMarkup_t;
- _required_attributes = NO_ATT;
- _optional_attributes = ALL;
- _annotation_type = AnnotationType::NO_ANN;
- const ElementType accept[] = { AbstractTextMarkup_t, XmlText_t };
- _accepted_data =
- std::set<ElementType>( accept,
- accept + sizeof(accept)/sizeof(ElementType) );
- PRINTABLE = true;
- TEXTDELIMITER = "";
- _occurrences_per_set = 0; // Allow duplicates within the same set
- }
-
- void TextMarkupString::init(){
- _xmltag = "t-str";
- _element_id = TextMarkupString_t;
- _annotation_type = AnnotationType::STRING;
- }
-
- void TextMarkupGap::init(){
- _xmltag = "t-gap";
- _element_id = TextMarkupGap_t;
- _annotation_type = AnnotationType::GAP;
- }
-
- void TextMarkupCorrection::init(){
- _xmltag = "t-correction";
- _element_id = TextMarkupCorrection_t;
- _annotation_type = AnnotationType::CORRECTION;
- }
-
- void TextMarkupError::init(){
- _xmltag = "t-error";
- _element_id = TextMarkupError_t;
- _annotation_type = AnnotationType::ERRORDETECTION;
- }
-
- void TextMarkupStyle::init(){
- _xmltag = "t-style";
- _element_id = TextMarkupStyle_t;
- _annotation_type = AnnotationType::STYLE;
- }
-
-} // namespace folia
diff --git a/src/document.cxx b/src/folia_document.cxx
similarity index 71%
rename from src/document.cxx
rename to src/folia_document.cxx
index d38ef52..60aa9cb 100644
--- a/src/document.cxx
+++ b/src/folia_document.cxx
@@ -1,10 +1,7 @@
/*
- $Id: document.cxx 17507 2014-08-13 15:20:36Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/src/document.cxx $
-
- Copyright (c) 1998 - 2014
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
ILK - Tilburg University
- CLiPS - University of Antwerp
This file is part of libfolia
@@ -22,9 +19,9 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
+ https://github.com/LanguageMachines/ticcutils/issues
or send mail to:
- timbl at uvt.nl
+ lamasoftware (at ) science.ru.nl
*/
#include <cstdlib>
#include <iostream>
@@ -37,11 +34,14 @@
#include <map>
#include <algorithm>
#include <stdexcept>
+#include "config.h"
+#include "ticcutils/PrettyPrint.h"
#include "ticcutils/XMLtools.h"
#include "ticcutils/StringOps.h"
#include "ticcutils/zipper.h"
-#include "libfolia/document.h"
-#include "config.h"
+#include "libfolia/folia.h"
+#include "libfolia/folia_properties.h"
+#include "libxml/xmlstring.h"
using namespace std;
using namespace TiCC;
@@ -49,31 +49,36 @@ using namespace TiCC;
namespace folia {
void initMT(){
- try {
- Document doc( "string='<?xml version=\"1.0\" encoding=\"UTF-8\"?><FoLiA xmlns=\"http://ilk.uvt.nl/folia\" xml:id=\"ID\"><text xml:id=\"text\"><div xml:id=\"head\"><w xml:id=\"w1\"><t>test</t></w></div></text></FoLiA>'" );
- }
- catch( exception& e ){
- cerr << "serious initialization problem: " << e.what() << endl;
- exit(EXIT_FAILURE);
- };
+ // a NO_OP now
}
- const int MAJOR_VERSION = 0;
- const int MINOR_VERSION = 11;
- const int SUB_VERSION = 1;
- const string NSFOLIA = "http://ilk.uvt.nl/folia";
- const string NSDCOI = "http://lands.let.ru.nl/projects/d-coi/ns/1.0";
- const string NSIMDI = "http://www.mpi.nl/IMDI/Schema/IMDI";
+ map<string,string> getNS_definitions( const xmlNode *node ){
+ map<string,string> result;
+ xmlNs *p = node->nsDef;
+ while ( p ){
+ string pre;
+ string val;
+ if ( p->prefix ){
+ pre = (char *)p->prefix;
+ }
+ val = (char *)p->href;
+ result[pre] = val;
+ p = p->next;
+ }
+ return result;
+ }
Document::Document(){
init();
}
- Document::Document( const string& args ){
+ Document::Document( const string& args ) {
init();
- setAttributes( getArgs( args ) );
- if ( ! foliadoc )
- foliadoc = new FoLiA( this, args );
+ KWargs kwargs = getArgs( args );
+ setDocumentProps( kwargs );
+ if ( ! foliadoc ){
+ foliadoc = new FoLiA( kwargs, this );
+ }
}
string versionstring(){
@@ -83,23 +88,29 @@ namespace folia {
}
void Document::init(){
- _metadatatype = NATIVE;
- metadata = 0;
- xmldoc = 0;
+ _metadatatype = "native";
+ _metadata = 0;
+ _foreigndata = 0;
+ _xmldoc = 0;
foliadoc = 0;
- _foliaNsIn = 0;
+ _foliaNsIn_href = 0;
+ _foliaNsIn_prefix = 0;
_foliaNsOut = 0;
debug = 0;
version = versionstring();
+ external = false;
}
Document::~Document(){
- xmlFreeDoc( xmldoc );
+ xmlFreeDoc( _xmldoc );
+ xmlFree( (xmlChar*)_foliaNsIn_href );
+ xmlFree( (xmlChar*)_foliaNsIn_prefix );
+ sindex.clear();
+ iindex.clear();
delete foliadoc;
- set<FoliaElement*>::const_iterator it = delSet.begin();
- while ( it != delSet.end() ){
- delete *it;
- ++it;
+ delete _foreigndata;
+ for ( const auto& it : delSet ){
+ delete it;
}
}
@@ -135,24 +146,29 @@ namespace folia {
return true;
}
- void Document::setAttributes( const KWargs& kwargs ){
+ void Document::setDocumentProps( KWargs& kwargs ){
bool happy = false;
- KWargs::const_iterator it = kwargs.find( "debug" );
+ auto it = kwargs.find( "debug" );
if ( it != kwargs.end() )
debug = stringTo<int>( it->second );
- it = kwargs.find( "load" );
- if ( it != kwargs.end() )
- loadall = stringTo<bool>( it->second );
- else
- loadall = true;
+ it = kwargs.find( "mode" );
+ if ( it != kwargs.end() ){
+ mode = it->second;
+ if ( mode != "permissive" && mode != "strip" ){
+ throw runtime_error( "FoLiA::Document: unsupported mode value: "+mode );
+ }
+ }
it = kwargs.find( "external" );
- if ( it != kwargs.end() )
+ if ( it != kwargs.end() ){
external = stringTo<bool>( it->second );
+ kwargs.erase( it );
+ }
else
external = false;
it = kwargs.find( "version" );
if ( it != kwargs.end() ){
version = it->second;
+ kwargs.erase( it );
}
it = kwargs.find( "_id" );
if ( it == kwargs.end() ){
@@ -183,6 +199,7 @@ namespace folia {
}
if ( !happy )
throw runtime_error( "No ID, valid filename or string specified" );
+ kwargs.erase( "generator" ); // also delete unused att-val(s)
}
void Document::addDocIndex( FoliaElement* el, const string& s ){
@@ -202,15 +219,16 @@ namespace folia {
}
void Document::delDocIndex( const FoliaElement* el, const string& s ){
+ if ( sindex.empty() ){
+ // only when ~~Document is in progress
+ return;
+ }
if ( s.empty() ) {
return;
}
// cerr << _id << "-del docindex " << el << " (" << s << ")" << endl;
- // using TiCC::operator <<;
- // cerr << "VOOR: " << sindex << endl;
sindex.erase(s);
- // cerr << "NA : " << sindex << endl;
- vector<FoliaElement*>::iterator pos = iindex.begin();
+ auto pos = iindex.begin();
while( pos != iindex.end() ){
if ( *pos == el ){
iindex.erase( pos );
@@ -230,11 +248,11 @@ namespace folia {
}
bool Document::readFromFile( const string& s ){
- ifstream is( s.c_str() );
+ ifstream is( s );
if ( !is.good() ){
throw runtime_error( "file not found: " + s );
}
- if ( xmldoc ){
+ if ( foliadoc ){
throw runtime_error( "Document is already initialized" );
return false;
}
@@ -248,8 +266,8 @@ namespace folia {
}
int cnt = 0;
xmlSetStructuredErrorFunc( &cnt, (xmlStructuredErrorFunc)error_sink );
- xmldoc = xmlReadFile( s.c_str(), 0, XML_PARSE_NOBLANKS );
- if ( xmldoc ){
+ _xmldoc = xmlReadFile( s.c_str(), 0, XML_PARSE_NOBLANKS|XML_PARSE_HUGE );
+ if ( _xmldoc ){
if ( cnt > 0 ){
throw XmlError( "document is invalid" );
}
@@ -263,6 +281,8 @@ namespace folia {
else
cout << "failed to parse the doc" << endl;
}
+ xmlFreeDoc( _xmldoc );
+ _xmldoc = 0;
return foliadoc != 0;
}
if ( debug )
@@ -271,14 +291,15 @@ namespace folia {
}
bool Document::readFromString( const string& s ){
- if ( xmldoc ){
+ if ( foliadoc ){
throw runtime_error( "Document is already initialized" );
return false;
}
int cnt = 0;
xmlSetStructuredErrorFunc( &cnt, (xmlStructuredErrorFunc)error_sink );
- xmldoc = xmlReadMemory( s.c_str(), s.length(), 0, 0, XML_PARSE_NOBLANKS );
- if ( xmldoc ){
+ _xmldoc = xmlReadMemory( s.c_str(), s.length(), 0, 0,
+ XML_PARSE_NOBLANKS|XML_PARSE_HUGE );
+ if ( _xmldoc ){
if ( cnt > 0 ){
throw XmlError( "document is invalid" );
}
@@ -292,6 +313,8 @@ namespace folia {
else
cout << "failed to parse the doc" << endl;
}
+ xmlFreeDoc( _xmldoc );
+ _xmldoc = 0;
return foliadoc != 0;
}
if ( debug )
@@ -313,24 +336,41 @@ namespace folia {
bool Document::save( ostream& os, const string& nsLabel, bool kanon ) {
string s = toXml( nsLabel, kanon );
os << s << endl;
- return os;
+ return os.good();
}
bool Document::save( const string& fn, const string& nsLabel, bool kanon ) {
- if ( match_back( fn, ".bz2" ) ){
- string s = toXml( nsLabel, kanon );
- return bz2WriteFile( fn, s );
- }
- else if ( match_back( fn, ".gz" ) ){
- string s = toXml( nsLabel, kanon );
- return gzWriteFile( fn, s );
+ try {
+ if ( match_back( fn, ".bz2" ) ){
+ string tmpname = fn.substr( 0, fn.length() - 3 ) + "tmp";
+ if ( toXml( tmpname, nsLabel, kanon ) ){
+ bool stat = bz2Compress( tmpname, fn );
+ remove( tmpname.c_str() );
+ return stat;
+ }
+ else {
+ return false;
+ }
+ }
+ else if ( match_back( fn, ".gz" ) ){
+ string tmpname = fn.substr( 0, fn.length() - 2 ) + "tmp";
+ if ( toXml( tmpname, nsLabel, kanon ) ){
+ bool stat = gzCompress( tmpname, fn );
+ remove( tmpname.c_str() );
+ return stat;
+ }
+ else {
+ return false;
+ }
+ }
+ else {
+ return toXml( fn, nsLabel, kanon );
+ }
}
- ofstream os( fn.c_str() );
- if ( os.good() ) {
- return save( os, nsLabel, kanon );
+ catch ( ... ){
+ throw runtime_error( "saving to file " + fn + " failed" );
+ return false;
}
- throw runtime_error( "saving to file " + fn + " failed" );
- return false;
}
int Document::size() const {
@@ -341,7 +381,7 @@ namespace folia {
}
FoliaElement* Document::index( const string& s ) const {
- map<string,FoliaElement*>::const_iterator it = sindex.find( s );
+ const auto& it = sindex.find( s );
if ( it == sindex.end() )
return 0;
else
@@ -363,17 +403,15 @@ namespace folia {
return foliadoc->select<Paragraph>();
}
+ static const set<ElementType> quoteSet = { Quote_t };
+ static const set<ElementType> emptySet;
+
vector<Sentence*> Document::sentences() const {
- static set<ElementType> excludeSet;
- if ( excludeSet.empty() ){
- excludeSet.insert( Quote_t );
- }
- return foliadoc->select<Sentence>( excludeSet );
+ return foliadoc->select<Sentence>( quoteSet );
}
vector<Sentence*> Document::sentenceParts() const {
- static set<ElementType> excludeSet;
- vector<Sentence*> sents = foliadoc->select<Sentence>( excludeSet );
+ vector<Sentence*> sents = foliadoc->select<Sentence>( emptySet );
return sents;
}
@@ -474,9 +512,9 @@ namespace folia {
_publisher = val;
else if ( type == "licence" )
_license = val;
- else if ( _metadatatype != NATIVE ){
+ else if ( _metadatatype != "native" ){
throw runtime_error( "meta tag with id=" + type
- + " requires NATIVE metadataype." );
+ + " requires 'native' metadataype." );
}
else if ( meta_atts[type] != "" ){
throw runtime_error( "meta tag with id=" + type
@@ -498,9 +536,9 @@ namespace folia {
_publisher = value;
else if ( type == "licence" )
_license = value;
- else if ( _metadatatype != NATIVE ){
+ else if ( _metadatatype != "native" ){
throw runtime_error( "meta tag with id=" + type
- + " requires NATIVE metadataype." );
+ + " requires 'native' metadataype." );
}
else
meta_atts[type] = value;
@@ -518,7 +556,7 @@ namespace folia {
else if ( type == "licence" )
return _license;
else {
- map<string,string>::const_iterator it = meta_atts.find( type );
+ const auto& it = meta_atts.find( type );
if ( it != meta_atts.end() )
return it->second;
else
@@ -526,8 +564,26 @@ namespace folia {
}
}
+ void Document::set_foreign_metadata( xmlNode *node ){
+ if ( _foreigndata ){
+ throw XmlError( "multiple foreign-data nodes!" );
+ }
+ _foreigndata = new ForeignData();
+ if ( Name( node ) != "foreign-data" ){
+ // we need an extra layer then
+ xmlNode *n = XmlNewNode( "foreign-data" );
+ xmlAddChild( n, xmlCopyNode( node, 1 ) );
+ _foreigndata->set_data( n );
+ xmlFreeNode (n );
+ }
+ else {
+ _foreigndata->set_data( node );
+ }
+ }
+
void Document::parseannotations( xmlNode *node ){
xmlNode *n = node->children;
+ anno_sort.clear();
while ( n ){
string tag = Name( n );
if ( tag.length() > 11 && tag.substr( tag.length() - 11 ) == "-annotation" ){
@@ -538,7 +594,7 @@ namespace folia {
string a;
string t;
string d;
- KWargs::const_iterator it = att.find("set" );
+ auto it = att.find("set" );
if ( it != att.end() ){
s = it->second;
}
@@ -563,12 +619,13 @@ namespace folia {
}
bool checkNS( xmlNode *n, const string& ns ){
- if ( getNS(n) == ns )
+ string tns = getNS(n);
+ if ( tns == ns )
return true;
else
throw runtime_error( "namespace conflict for tag:" + Name(n)
+ ", wanted:" + ns
- + " got:" + getNS(n) );
+ + " got:" + tns );
return false;
}
@@ -594,8 +651,8 @@ namespace folia {
FoliaElement *Document::resolveExternals( FoliaElement* result ){
if ( !externals.empty() ){
- for ( size_t i= 0;i < externals.size(); ++i ){
- externals[i]->resolve();
+ for ( const auto& ext : externals ){
+ ext->resolve();
}
}
return result;
@@ -603,6 +660,7 @@ namespace folia {
FoliaElement* Document::parseFoliaDoc( xmlNode *root ){
KWargs att = getAttributes( root );
+ using TiCC::operator<<;
if ( att["_id"] == "" ){
throw XmlError("FoLiA Document has no ID!");
return 0;
@@ -613,8 +671,8 @@ namespace folia {
+ " (" + version + " is supported.)" );
return 0;
}
- setAttributes( att );
- FoliaElement *result = FoliaImpl::createElement( this, Name(root) );
+ setDocumentProps( att );
+ FoliaElement *result = FoliaImpl::createElement( Name(root), this );
if ( debug > 2 )
cerr << "created " << root << endl;
result->setAttributes( att );
@@ -628,27 +686,23 @@ namespace folia {
KWargs atts = getAttributes( p );
string val = lowercase(atts["type"]);
if ( !val.empty() ){
- if ( val == "native" ){
- _metadatatype = NATIVE;
- }
- else if ( val == "imdi" ){
- _metadatatype = IMDI;
- _metadatafile = atts["src"];
- }
- else if ( val == "cmdi" ){
- _metadatatype = CMDI;
+ _metadatatype = val;
+ if ( val == "imdi" || val == "cmdi" ){
_metadatafile = atts["src"];
}
}
xmlNode *m = p->children;
while ( m ){
if ( Name(m) == "METATRANSCRIPT" ){
- if ( !checkNS( m, NSIMDI ) || _metadatatype != IMDI )
+ if ( !checkNS( m, NSIMDI ) || _metadatatype != "imdi" )
throw runtime_error( "imdi != imdi " );
if ( debug > 1 )
cerr << "found IMDI" << endl;
- metadata = m;
- setimdi(m);
+ if ( _metadata ){
+ throw XmlError( "multiple imdi:METATRANSCRIPT nodes!" );
+ }
+ _metadata = xmlCopyNodeList(m);
+ setimdi( _metadata );
}
else if ( Name( m ) == "annotations" &&
checkNS( m, NSFOLIA ) ){
@@ -662,13 +716,23 @@ namespace folia {
cerr << "found meta node" << endl;
parsemeta( m );
}
+ else if ( Name(m) == "foreign-data" &&
+ checkNS( m, NSFOLIA ) ){
+ FoliaElement *t = FoliaImpl::createElement( "foreign-data", this );
+ if ( t ){
+ t = t->parseXml( m );
+ if ( t ){
+ _foreigndata = dynamic_cast<ForeignData *>(t);
+ }
+ }
+ }
m = m->next;
}
}
else {
if ( p && getNS(p) == NSFOLIA ){
string tag = Name( p );
- FoliaElement *t = FoliaImpl::createElement( this, tag );
+ FoliaElement *t = FoliaImpl::createElement( tag, this );
if ( t ){
if ( debug > 2 )
cerr << "created " << t << endl;
@@ -688,18 +752,18 @@ namespace folia {
return result;
}
- void Document::addStyle( const std::string& type, const std::string& href ){
+ void Document::addStyle( const string& type, const string& href ){
if ( type == "text/xsl" ){
- multimap<string,string>::iterator it = styles.find( type );
+ const auto& it = styles.find( type );
if ( it != styles.end() )
throw XmlError( "multiple 'text/xsl' style-sheets defined." );
}
styles.insert( make_pair( type, href ) );
}
- void Document::replaceStyle( const std::string& type,
- const std::string& href ){
- multimap<string,string>::iterator it = styles.find( type );
+ void Document::replaceStyle( const string& type,
+ const string& href ){
+ const auto& it = styles.find( type );
if ( it != styles.end() ){
it->second = href;
}
@@ -709,7 +773,7 @@ namespace folia {
}
void Document::getstyles(){
- xmlNode *pnt = xmldoc->children;
+ xmlNode *pnt = _xmldoc->children;
while ( pnt ){
if ( pnt->type == XML_PI_NODE && Name(pnt) == "xml-stylesheet" ){
string content = (const char*)pnt->content;
@@ -740,22 +804,51 @@ namespace folia {
}
}
+ void fixupNs( xmlNode *p, xmlNs *ns ){
+ while ( p ){
+ xmlSetNs( p, ns );
+ fixupNs( p->children, ns );
+ p = p->next;
+ }
+ }
+
FoliaElement* Document::parseXml( ){
getstyles();
- xmlNode *root = xmlDocGetRootElement( xmldoc );
- _foliaNsIn = root->ns;
+ xmlNode *root = xmlDocGetRootElement( _xmldoc );
+ if ( root->ns ){
+ if ( root->ns->prefix )
+ _foliaNsIn_prefix = xmlStrdup( root->ns->prefix );
+ _foliaNsIn_href = xmlStrdup( root->ns->href );
+ }
if ( debug > 2 ){
- using TiCC::operator <<;
+ using TiCC::operator<<;
string dum;
cerr << "root = " << Name( root ) << endl;
cerr << "in namespace " << getNS( root, dum ) << endl;
- cerr << "namespace list" << getNSvalues( root ) << endl;
+ cerr << "namespace list" << getNS_definitions( root ) << endl;
}
FoliaElement *result = 0;
if ( root ){
- try {
- if ( Name( root ) == "FoLiA" &&
- checkNS( root, NSFOLIA ) ){
+ if ( Name( root ) == "FoLiA" ){
+ string ns = getNS( root );
+ if ( ns.empty() ){
+ if ( mode == "permissive" ){
+ _foliaNsIn_href = xmlCharStrdup( NSFOLIA.c_str() );
+ _foliaNsIn_prefix = 0;
+ xmlNs *defNs = xmlNewNs( root,
+ _foliaNsIn_href, _foliaNsIn_prefix );
+ fixupNs( root, defNs );
+ }
+ else {
+ throw XmlError( "Folia Document should have namespace declaration "
+ + NSFOLIA + " but none found " );
+ }
+ }
+ else if ( ns != NSFOLIA ){
+ throw XmlError( "Folia Document should have namespace declaration "
+ + NSFOLIA + " but found: " + ns );
+ }
+ try {
result = parseFoliaDoc( root );
if ( result ){
if ( isNCName( result->id() ) )
@@ -765,16 +858,16 @@ namespace folia {
}
}
}
- else if ( Name( root ) == "DCOI" &&
- checkNS( root, NSDCOI ) ){
- throw runtime_error( "DCOI format not supported" );
- }
- else {
- throw runtime_error("root node must be FoLiA" );
+ catch ( exception& e ){
+ throw XmlError( e.what() );
}
}
- catch ( exception& e ){
- throw XmlError( e.what() );
+ else if ( Name( root ) == "DCOI" &&
+ checkNS( root, NSDCOI ) ){
+ throw XmlError( "DCOI format not supported" );
+ }
+ else {
+ throw XmlError( "root node must be FoLiA" );
}
}
return result;
@@ -818,6 +911,7 @@ namespace folia {
d = getNow();
}
annotationdefaults[type].insert( make_pair(s, at_t(a,t,d) ) );
+ anno_sort.push_back(make_pair(type,s));
// cerr << "inserted [" << type << "][" << st << "](" << a << "," << t << "," << d ")" << endl;
// cerr << "annotation defaults now: " << annotationdefaults << endl;
@@ -825,7 +919,7 @@ namespace folia {
}
Text* Document::addText( const KWargs& kwargs ){
- Text *res = new Text( this, kwargs );
+ Text *res = new Text( kwargs, this );
foliadoc->append( res );
return res;
}
@@ -845,12 +939,12 @@ namespace folia {
if ( type == AnnotationType::NO_ANN ){
return true;
}
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit1 = annotationdefaults.find(type);
- if ( mit1 != annotationdefaults.end() ){
+ const auto& it1 = annotationdefaults.find(type);
+ if ( it1 != annotationdefaults.end() ){
if ( s.empty() )
throw runtime_error("isDeclared with empty set.");
- multimap<string,at_t>::const_iterator mit2 = mit1->second.lower_bound(s);
- while ( mit2 != mit1->second.upper_bound(s) ){
+ auto mit2 = it1->second.lower_bound(s);
+ while ( mit2 != it1->second.upper_bound(s) ){
if ( mit2->second.a == a && mit2->second.t == t )
return true;
++mit2;
@@ -864,11 +958,11 @@ namespace folia {
if ( type == AnnotationType::NO_ANN ){
return true;
}
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit1 = annotationdefaults.find(type);
+ const auto& mit1 = annotationdefaults.find(type);
if ( mit1 != annotationdefaults.end() ){
if ( s.empty() )
return true;
- multimap<string,at_t>::const_iterator mit2 = mit1->second.find(s);
+ const auto& mit2 = mit1->second.find(s);
return mit2 != mit1->second.end();
}
return false;
@@ -879,8 +973,8 @@ namespace folia {
return "";
// search a set. it must be unique. Otherwise return ""
// cerr << "zoek '" << type << "' default set " << annotationdefaults << endl;
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit1 = annotationdefaults.find(type);
string result;
+ const auto& mit1 = annotationdefaults.find(type);
if ( mit1 != annotationdefaults.end() ){
// cerr << "vind tussen " << mit1->second << endl;
if ( mit1->second.size() == 1 )
@@ -890,15 +984,15 @@ namespace folia {
return result;
}
- std::string Document::defaultannotator( AnnotationType::AnnotationType type,
- const string& st ) const {
+ string Document::defaultannotator( AnnotationType::AnnotationType type,
+ const string& st ) const {
if ( type == AnnotationType::NO_ANN ){
return "";
}
// if ( !st.empty() ){
// cerr << "zoek '" << st << "' default annotator " << annotationdefaults << endl;
// }
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit1 = annotationdefaults.find(type);
+ const auto& mit1 = annotationdefaults.find(type);
string result;
if ( mit1 != annotationdefaults.end() ){
// cerr << "vind tussen " << mit1->second << endl;
@@ -910,7 +1004,7 @@ namespace folia {
}
else {
if ( mit1->second.count( st ) == 1 ){
- map<string,at_t>::const_iterator mit2 = mit1->second.find( st );
+ const auto& mit2 = mit1->second.find( st );
result = mit2->second.a;
}
}
@@ -919,12 +1013,12 @@ namespace folia {
return result;
}
- std::string Document::defaultannotatortype( AnnotationType::AnnotationType type,
- const string& st ) const {
+ string Document::defaultannotatortype( AnnotationType::AnnotationType type,
+ const string& st ) const {
if ( type == AnnotationType::NO_ANN ){
return "";
}
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit1 = annotationdefaults.find(type);
+ const auto& mit1 = annotationdefaults.find(type);
string result;
if ( mit1 != annotationdefaults.end() ){
if ( st.empty() ){
@@ -934,7 +1028,7 @@ namespace folia {
}
else {
if ( mit1->second.count( st ) == 1 ){
- map<string,at_t>::const_iterator mit2 = mit1->second.find( st );
+ const auto& mit2 = mit1->second.find( st );
result = mit2->second.t;
}
}
@@ -943,9 +1037,9 @@ namespace folia {
return result;
}
- std::string Document::defaultdatetime( AnnotationType::AnnotationType type,
- const string& st ) const {
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit1 = annotationdefaults.find(type);
+ string Document::defaultdatetime( AnnotationType::AnnotationType type,
+ const string& st ) const {
+ const auto& mit1 = annotationdefaults.find(type);
string result;
if ( mit1 != annotationdefaults.end() ){
if ( st.empty() ){
@@ -955,7 +1049,7 @@ namespace folia {
}
else {
if ( mit1->second.count( st ) == 1 ){
- map<string,at_t>::const_iterator mit2 = mit1->second.find( st );
+ const auto& mit2 = mit1->second.find( st );
result = mit2->second.d;
}
}
@@ -965,14 +1059,15 @@ namespace folia {
}
void Document::setannotations( xmlNode *node ) const {
- map<AnnotationType::AnnotationType,multimap<string,at_t> >::const_iterator mit = annotationdefaults.begin();
- while ( mit != annotationdefaults.end() ){
- map<string,at_t>::const_iterator it = mit->second.begin();
- while ( it != mit->second.end() ){
- // Find the 'label'
- string label = toString( mit->first );
- label += "-annotation";
- xmlNode *n = XmlNewNode( foliaNs(), label );
+ for ( const auto& pair : anno_sort ){
+ // Find the 'label'
+ AnnotationType::AnnotationType type = pair.first;
+ string label = toString( type );
+ label += "-annotation";
+ string sett = pair.second;
+ const auto& mm = annotationdefaults.find(type);
+ auto it = mm->second.lower_bound(sett);
+ while ( it != mm->second.upper_bound(sett) ){
KWargs args;
string s = it->second.a;
if ( !s.empty() )
@@ -980,25 +1075,30 @@ namespace folia {
s = it->second.t;
if ( !s.empty() )
args["annotatortype"] = s;
- s = it->second.d;
- if ( !s.empty() )
- args["datetime"] = s;
+ if ( mode != "strip" ){
+ s = it->second.d;
+ if ( !s.empty() )
+ args["datetime"] = s;
+ }
s = it->first;
if ( s != "undefined" ) // the default
args["set"] = s;
+ xmlNode *n = XmlNewNode( foliaNs(), label );
addAttributes( n, args );
xmlAddChild( node, n );
++it;
}
- ++mit;
}
}
void Document::setmetadata( xmlNode *node ) const{
- if ( _metadatatype == NATIVE ){
- KWargs atts;
- atts["type"] = "native";
- addAttributes( node, atts );
+ KWargs atts;
+ atts["type"] = _metadatatype;
+ if ( !_metadatafile.empty() ){
+ atts["src"] = _metadatafile;
+ }
+ addAttributes( node, atts );
+ if ( _metadatatype == "native" ){
if ( !_title.empty() ){
xmlNode *m = XmlNewNode( foliaNs(), "meta" );
xmlAddChild( m, xmlNewText( (const xmlChar*)_title.c_str()) );
@@ -1039,83 +1139,86 @@ namespace folia {
addAttributes( m, atts );
xmlAddChild( node, m );
}
- map<string,string>::const_iterator it = meta_atts.begin();
- while ( it != meta_atts.end() ){
+ for ( const auto& it : meta_atts ){
xmlNode *m = XmlNewNode( foliaNs(), "meta" );
- xmlAddChild( m, xmlNewText( (const xmlChar*)it->second.c_str()) );
+ xmlAddChild( m, xmlNewText( (const xmlChar*)it.second.c_str()) );
KWargs atts;
- atts["id"] = it->first;
+ atts["id"] = it.first;
addAttributes( m, atts );
xmlAddChild( node, m );
- ++it;
}
}
- else if ( _metadatatype == IMDI ||
- _metadatatype == CMDI ){
- KWargs atts;
- if ( _metadatatype == IMDI )
- atts["type"] = "imdi";
- else if ( _metadatatype == CMDI )
- atts["type"] = "cmdi";
- if ( !_metadatafile.empty() )
- atts["src"] = _metadatafile;
- addAttributes( node, atts );
- xmlAddChild( node, xmlCopyNodeList(metadata) );
+ else {
+ xmlAddChild( node, _metadata );
+ }
+ if ( _foreigndata ){
+ xmlNode *f = _foreigndata->xml( true, false );
+ xmlAddChild( node, f );
}
}
void Document::setstyles( xmlDoc* doc ) const {
- multimap<string,string>::const_iterator it = styles.begin();
- while ( it != styles.end() ){
- string content = "type=\"" + it->first
- + "\" href=\"" + it->second + "\"";
+ for ( const auto& it : styles ){
+ string content = "type=\"" + it.first + "\" href=\"" + it.second + "\"";
xmlAddChild( (xmlNode*)doc,
xmlNewDocPI( doc,
(const xmlChar*)"xml-stylesheet",
(const xmlChar*)content.c_str() ) );
- ++it;
}
}
- string Document::toXml( const string& nsLabel, bool kanon ) const {
- string result;
- if ( foliadoc ){
- xmlDoc *outDoc = xmlNewDoc( (const xmlChar*)"1.0" );
- setstyles( outDoc );
- xmlNode *root = xmlNewDocNode( outDoc, 0, (const xmlChar*)"FoLiA", 0 );
- xmlDocSetRootElement( outDoc, root );
- xmlNs *xl = xmlNewNs( root, (const xmlChar *)"http://www.w3.org/1999/xlink",
- (const xmlChar *)"xlink" );
- xmlSetNs( root, xl );
- if ( !_foliaNsIn ){
- if ( nsLabel.empty() )
- _foliaNsOut = xmlNewNs( root, (const xmlChar *)NSFOLIA.c_str(), 0 );
- else
- _foliaNsOut = xmlNewNs( root,
- (const xmlChar *)NSFOLIA.c_str(),
- (const xmlChar*)nsLabel.c_str() );
- }
- else {
- _foliaNsOut = xmlNewNs( root, _foliaNsIn->href, _foliaNsIn->prefix );
- }
- xmlSetNs( root, _foliaNsOut );
- KWargs attribs;
- attribs["_id"] = foliadoc->id(); // sort "id" in front!
+ xmlDoc *Document::to_xmlDoc( const string& nsLabel, bool kanon ) const {
+ xmlDoc *outDoc = xmlNewDoc( (const xmlChar*)"1.0" );
+ setstyles( outDoc );
+ xmlNode *root = xmlNewDocNode( outDoc, 0, (const xmlChar*)"FoLiA", 0 );
+ xmlDocSetRootElement( outDoc, root );
+ xmlNs *xl = xmlNewNs( root, (const xmlChar *)"http://www.w3.org/1999/xlink",
+ (const xmlChar *)"xlink" );
+ xmlSetNs( root, xl );
+ if ( _foliaNsIn_href == 0 ){
+ if ( nsLabel.empty() )
+ _foliaNsOut = xmlNewNs( root, (const xmlChar *)NSFOLIA.c_str(), 0 );
+ else
+ _foliaNsOut = xmlNewNs( root,
+ (const xmlChar *)NSFOLIA.c_str(),
+ (const xmlChar*)nsLabel.c_str() );
+ }
+ else {
+ _foliaNsOut = xmlNewNs( root,
+ _foliaNsIn_href,
+ _foliaNsIn_prefix );
+ }
+ xmlSetNs( root, _foliaNsOut );
+ KWargs attribs;
+ attribs["_id"] = foliadoc->id(); // sort "id" in front!
+ if ( mode == "strip" ){
+ attribs["generator"] = "";
+ attribs["version"] = "";
+ }
+ else {
attribs["generator"] = string("libfolia-v") + VERSION;
if ( !version.empty() )
attribs["version"] = version;
- if ( external )
- attribs["external"] = "yes";
- addAttributes( root, attribs );
-
- xmlNode *md = xmlAddChild( root, XmlNewNode( foliaNs(), "metadata" ) );
- xmlNode *an = xmlAddChild( md, XmlNewNode( foliaNs(), "annotations" ) );
- setannotations( an );
- setmetadata( md );
- for ( size_t i=0; i < foliadoc->size(); ++i ){
- FoliaElement* el = foliadoc->index(i);
- xmlAddChild( root, el->xml( true, kanon ) );
- }
+ }
+ if ( external )
+ attribs["external"] = "yes";
+ addAttributes( root, attribs );
+
+ xmlNode *md = xmlAddChild( root, XmlNewNode( foliaNs(), "metadata" ) );
+ xmlNode *an = xmlAddChild( md, XmlNewNode( foliaNs(), "annotations" ) );
+ setannotations( an );
+ setmetadata( md );
+ for ( size_t i=0; i < foliadoc->size(); ++i ){
+ FoliaElement* el = foliadoc->index(i);
+ xmlAddChild( root, el->xml( true, kanon ) );
+ }
+ return outDoc;
+ }
+
+ string Document::toXml( const string& nsLabel, bool kanon ) const {
+ string result;
+ if ( foliadoc ){
+ xmlDoc *outDoc = to_xmlDoc( nsLabel, kanon );
xmlChar *buf; int size;
xmlDocDumpFormatMemoryEnc( outDoc, &buf, &size, "UTF-8", 1 );
result = string( (const char *)buf, size );
@@ -1128,6 +1231,22 @@ namespace folia {
return result;
}
+ bool Document::toXml( const string& filename,
+ const string& nsLabel, bool kanon ) const {
+ if ( foliadoc ){
+ xmlDoc *outDoc = to_xmlDoc( nsLabel, kanon );
+ long int res = xmlSaveFormatFileEnc( filename.c_str(), outDoc, "UTF-8", 1 );
+ xmlFreeDoc( outDoc );
+ _foliaNsOut = 0;
+ if ( res == -1 )
+ return false;
+ }
+ else {
+ return false;
+ }
+ return true;
+ }
+
vector<vector<Word*> > Document::findwords( const Pattern& pat,
const string& args ) const {
size_t leftcontext = 0;
@@ -1218,58 +1337,52 @@ namespace folia {
bool start = true;
bool unsetwildcards = false;
set<int> variablewildcards;
- list<Pattern>::const_iterator it = pats.begin();
int index = 0;
- while ( it != pats.end() ){
+ for ( const auto& it : pats ){
// cerr << "bekijk patroon : " << *it << endl;
if ( start ){
- prevsize = it->size();
+ prevsize = it.size();
start = false;
}
- else if ( it->size() != prevsize ){
+ else if ( it.size() != prevsize ){
throw runtime_error( "findnodes(): If multiple patterns are provided, they must all have the same length!" );
}
- if ( it->variablesize() ){
+ if ( it.variablesize() ){
if ( index > 0 && variablewildcards.empty() )
unsetwildcards = true;
else {
if ( !variablewildcards.empty() &&
- variablewildcards != it->variablewildcards() ){
+ variablewildcards != it.variablewildcards() ){
throw runtime_error("If multiple patterns are provided with variable wildcards, then these wildcards must all be in the same positions!");
}
- variablewildcards = it->variablewildcards();
+ variablewildcards = it.variablewildcards();
}
}
else if ( !variablewildcards.empty() )
unsetwildcards = true;
++index;
- ++it;
}
if ( unsetwildcards ){
- list<Pattern>::iterator it1 = pats.begin();
- while ( it1 != pats.end() ){
- it1->unsetwild();
- ++it1;
+ for ( auto& it : pats ){
+ it.unsetwild();
}
}
vector<vector<Word*> > result;
- it = pats.begin();
- while ( it != pats.end() ){
- vector<vector<Word*> > res = findwords( *it, args );
+ for ( const auto& it : pats ){
+ vector<vector<Word*> > res = findwords( it, args );
if ( result.empty() )
result = res;
else if ( res != result ){
result.clear();
break;
}
- ++it;
}
return result;
}
- Pattern::Pattern( const std::vector<std::string>&v,
+ Pattern::Pattern( const vector<string>& pat_vec,
const ElementType at,
- const string& args ):matchannotation(at) {
+ const string& args ): matchannotation(at) {
regexp = false;
case_sensitive = false;
KWargs kw = getArgs( args );
@@ -1282,35 +1395,31 @@ namespace folia {
maxgapsize = 10;
if ( kw["casesensitive"] != "" )
case_sensitive = stringTo<bool>( kw["casesensitive"] );
- for ( size_t i=0; i < v.size(); ++i ){
- if ( v[i].find( "regexp('" ) == 0 &&
- v[i].rfind( "')" ) == v[i].length()-2 ){
- string tmp = v[i].substr( 8, v[i].length() - 10 );
+ for ( const auto& pat : pat_vec ){
+ if ( pat.find( "regexp('" ) == 0 &&
+ pat.rfind( "')" ) == pat.length()-2 ){
+ string tmp = pat.substr( 8, pat.length() - 10 );
UnicodeString us = UTF8ToUnicode( tmp );
UErrorCode u_stat = U_ZERO_ERROR;
- RegexMatcher *mat = new RegexMatcher(us, 0, u_stat);
+ RegexMatcher *matcher = new RegexMatcher(us, 0, u_stat);
if ( U_FAILURE(u_stat) ){
throw runtime_error( "failed to create a regexp matcher with '" + tmp + "'" );
}
- matchers.push_back( mat );
+ matchers.push_back( matcher );
sequence.push_back( "" );
}
else {
- sequence.push_back( UTF8ToUnicode(v[i]) );
+ sequence.push_back( UTF8ToUnicode(pat) );
matchers.push_back( 0 );
if ( !case_sensitive ){
- sequence[i].toLower();
+ sequence.back().toLower();
}
}
}
}
- Pattern::Pattern( const std::vector<std::string>&v,
- const string& args ):matchannotation(BASE) {
-
- // code duplication
- // BAD BAD BAD
- //
+ Pattern::Pattern( const std::vector<std::string>& pat_vec,
+ const std::string& args ) : matchannotation(BASE) {
regexp = false;
case_sensitive = false;
KWargs kw = getArgs( args );
@@ -1323,36 +1432,36 @@ namespace folia {
maxgapsize = 10;
if ( kw["casesensitive"] != "" )
case_sensitive = stringTo<bool>( kw["casesensitive"] );
- for ( size_t i=0; i < v.size(); ++i ){
- if ( v[i].find( "regexp('" ) == 0 &&
- v[i].rfind( "')" ) == v[i].length()-2 ){
- string tmp = v[i].substr( 8, v[i].length() - 10 );
+ for ( const auto& pat : pat_vec ){
+ if ( pat.find( "regexp('" ) == 0 &&
+ pat.rfind( "')" ) == pat.length()-2 ){
+ string tmp = pat.substr( 8, pat.length() - 10 );
UnicodeString us = UTF8ToUnicode( tmp );
UErrorCode u_stat = U_ZERO_ERROR;
- RegexMatcher *mat = new RegexMatcher(us, 0, u_stat);
+ RegexMatcher *matcher = new RegexMatcher(us, 0, u_stat);
if ( U_FAILURE(u_stat) ){
throw runtime_error( "failed to create a regexp matcher with '" + tmp + "'" );
}
- matchers.push_back( mat );
+ matchers.push_back( matcher );
sequence.push_back( "" );
}
else {
- sequence.push_back( UTF8ToUnicode(v[i]) );
+ sequence.push_back( UTF8ToUnicode(pat) );
matchers.push_back( 0 );
if ( !case_sensitive ){
- sequence[i].toLower();
+ sequence.back().toLower();
}
}
}
}
Pattern::~Pattern(){
- for ( size_t i=0; i < matchers.size(); ++i ){
- delete matchers[i];
+ for ( const auto& m : matchers ){
+ delete m;
}
}
- inline std::ostream& operator<<( std::ostream& os, const Pattern& p ){
+ inline ostream& operator<<( ostream& os, const Pattern& p ){
using TiCC::operator <<;
os << "pattern: " << p.sequence;
return os;
@@ -1410,8 +1519,8 @@ namespace folia {
}
bool Pattern::variablesize() const {
- for ( size_t i=0; i < sequence.size(); ++i ){
- if ( sequence[i] == "*" ){
+ for ( const auto& s : sequence ){
+ if ( s == "*" ){
return true;
}
}
@@ -1419,9 +1528,9 @@ namespace folia {
}
void Pattern::unsetwild() {
- for ( size_t i=0; i < sequence.size(); ++i ){
- if ( sequence[i] == "*" )
- sequence[i] = "*:1";
+ for ( auto& s : sequence ){
+ if ( s == "*" )
+ s = "*:1";
}
}
@@ -1431,7 +1540,6 @@ namespace folia {
if ( sequence[i] == "*" )
result.insert( i );
}
- // cerr << "variablewildcards() ==> " << result << endl;
return result;
}
diff --git a/src/folia_impl.cxx b/src/folia_impl.cxx
new file mode 100644
index 0000000..bffcbcf
--- /dev/null
+++ b/src/folia_impl.cxx
@@ -0,0 +1,3757 @@
+/*
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
+ ILK - Tilburg University
+
+ This file is part of libfolia
+
+ libfolia 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 3 of the License, or
+ (at your option) any later version.
+
+ libfolia 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, see <http://www.gnu.org/licenses/>.
+
+ For questions and suggestions, see:
+ https://github.com/LanguageMachines/ticcutils/issues
+ or send mail to:
+ lamasoftware (at ) science.ru.nl
+*/
+
+#include <cassert>
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <set>
+#include <list>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <type_traits>
+#include <stdexcept>
+#include "ticcutils/PrettyPrint.h"
+#include "ticcutils/StringOps.h"
+#include "ticcutils/XMLtools.h"
+#include "libfolia/folia.h"
+#include "libfolia/folia_properties.h"
+#include "config.h"
+
+using namespace std;
+using namespace TiCC;
+
+namespace folia {
+ using TiCC::operator <<;
+
+ string VersionName() { return PACKAGE_STRING; }
+ string Version() { return VERSION; }
+
+ ElementType FoliaImpl::element_id() const {
+ return _props.ELEMENT_ID;
+ }
+
+ size_t FoliaImpl::occurrences() const {
+ return _props.OCCURRENCES;
+ }
+
+ size_t FoliaImpl::occurrences_per_set() const {
+ return _props.OCCURRENCES_PER_SET;
+ }
+
+ Attrib FoliaImpl::required_attributes() const {
+ return _props.REQUIRED_ATTRIBS;
+ }
+
+ Attrib FoliaImpl::optional_attributes() const {
+ return _props.OPTIONAL_ATTRIBS;
+ }
+
+ const string& FoliaImpl::xmltag() const {
+ return _props.XMLTAG;
+ }
+
+ const string& FoliaImpl::default_subset() const {
+ return _props.SUBSET;
+ }
+
+ AnnotationType::AnnotationType FoliaImpl::annotation_type() const {
+ return _props.ANNOTATIONTYPE;
+ }
+
+ const set<ElementType>& FoliaImpl::accepted_data() const {
+ return _props.ACCEPTED_DATA;
+ }
+
+ const set<ElementType>& FoliaImpl::required_data() const {
+ return _props.REQUIRED_DATA;
+ }
+
+ bool FoliaImpl::printable() const {
+ return _props.PRINTABLE;
+ }
+
+ bool FoliaImpl::speakable() const {
+ return _props.SPEAKABLE;
+ }
+
+ bool FoliaImpl::xlink() const {
+ return _props.XLINK;
+ }
+
+ bool FoliaImpl::auth() const {
+ return _props.AUTH;
+ }
+
+ bool FoliaImpl::setonly() const {
+ return _props.SETONLY;
+ }
+
+ bool FoliaImpl::auto_generate_id() const {
+ return _props.AUTO_GENERATE_ID;
+ }
+
+ const string FoliaImpl::href() const {
+ auto it = _xlink.find("href");
+ if ( it != _xlink.end() ){
+ return it->second;
+ }
+ return "";
+ }
+
+ ostream& operator<<( ostream& os, const FoliaElement& ae ) {
+ os << " <" << ae.classname();
+ KWargs ats = ae.collectAttributes();
+ if ( !ae.id().empty() ) {
+ ats["id"] = ae.id();
+ }
+ for ( const auto& it: ats ) {
+ os << " " << it.first << "='" << it.second << "'";
+ }
+ os << " > {";
+ for ( size_t i=0; i < ae.size(); ++i ) {
+ os << "<" << ae.index(i)->classname() << ">,";
+ }
+ os << "}";
+ return os;
+ }
+
+ ostream& operator<<( ostream&os, const FoliaElement *ae ) {
+ if ( !ae ) {
+ os << "nil";
+ }
+ else
+ os << *ae;
+ return os;
+ }
+
+ FoliaImpl::FoliaImpl( const properties& p, Document *d ) :
+ _parent(0),
+ _auth( p.AUTH ),
+ mydoc(d),
+ _annotator_type(UNDEFINED),
+ _confidence(-1),
+ _refcount(0),
+ _props(p)
+ {
+ }
+
+ FoliaImpl::~FoliaImpl( ) {
+ // cerr << "delete element id=" << _id << " tag = " << xmltag() << " *= "
+ // << (void*)this << " datasize= " << data.size() << endl;
+ for ( const auto& el : data ) {
+ if ( el->refcount() == 0 ) {
+ // probably only != 0 for words
+ delete el;
+ }
+ else if ( mydoc ) {
+ mydoc->keepForDeletion( el );
+ }
+ }
+ // cerr << "\t\tdelete element id=" << _id << " tag = " << xmltag() << " *= "
+ // << (void*)this << " datasize= " << data.size() << endl;
+ if ( mydoc ) {
+ mydoc->delDocIndex( this, _id );
+ }
+ }
+
+ xmlNs *FoliaImpl::foliaNs() const {
+ if ( mydoc ) {
+ return mydoc->foliaNs();
+ }
+ return 0;
+ }
+
+ void FoliaImpl::setAttributes( const KWargs& kwargs_in ) {
+ KWargs kwargs = kwargs_in;
+ Attrib supported = required_attributes() | optional_attributes();
+ //if ( element_id() == Original_t ) {
+ //cerr << "set attributes: " << kwargs << " on " << classname() << endl;
+ // cerr << "required = " << required_attributes() << endl;
+ // cerr << "optional = " << optional_attributes() << endl;
+ // cerr << "supported = " << supported << endl;
+ // cerr << "ID & supported = " << (ID & supported) << endl;
+ // cerr << "ID & _required = " << (ID & required_attributes() ) << endl;
+ //
+ // cerr << "AUTH : " << _auth << ", default=" << default_auth() << endl;
+ // }
+ if ( mydoc && mydoc->debug > 2 ) {
+ cerr << "set attributes: " << kwargs << " on " << classname() << endl;
+ }
+
+ auto it = kwargs.find( "generate_id" );
+ if ( it != kwargs.end() ) {
+ if ( !mydoc ) {
+ throw runtime_error( "can't generate an ID without a doc" );
+ }
+ FoliaElement *e = (*mydoc)[it->second];
+ if ( e ) {
+ _id = e->generateId( xmltag() );
+ }
+ else
+ throw ValueError("Unable to generate an id from ID= " + it->second );
+ kwargs.erase( it );
+ }
+ else {
+ it = kwargs.find( "_id" );
+ auto it2 = kwargs.find( "id" );
+ if ( it == kwargs.end() ) {
+ it = it2;
+ }
+ else if ( it2 != kwargs.end() ) {
+ throw ValueError("Both 'id' and 'xml:id found for " + classname() );
+ }
+ if ( it != kwargs.end() ) {
+ if ( (!ID) & supported ) {
+ throw ValueError("ID is not supported for " + classname() );
+ }
+ else {
+ try {
+ isNCName( it->second );
+ }
+ catch ( const XmlError& xe ){
+ throw XmlError( "while processing a " + classname() + " node:\n"
+ + xe.what() );
+ }
+ _id = it->second;
+ kwargs.erase( it );
+ }
+ }
+ else
+ _id = "";
+ }
+
+ it = kwargs.find( "set" );
+ string def;
+ if ( it != kwargs.end() ) {
+ if ( !( (CLASS & supported) || setonly() ) ) {
+ throw ValueError("Set is not supported for " + classname());
+ }
+ else {
+ _set = it->second;
+ }
+ if ( !mydoc ) {
+ throw ValueError( "Set=" + _set + " is used on a node without a document." );
+ }
+ if ( !mydoc->isDeclared( annotation_type(), _set ) ) {
+ throw ValueError( "Set " + _set + " is used but has no declaration " +
+ "for " + toString( annotation_type() ) + "-annotation" );
+ }
+ kwargs.erase( it );
+ }
+ else if ( mydoc && ( def = mydoc->defaultset( annotation_type() )) != "" ) {
+ _set = def;
+ }
+ else {
+ _set = "";
+ }
+ it = kwargs.find( "class" );
+ if ( it != kwargs.end() ) {
+ if ( !( CLASS & supported ) ) {
+ throw ValueError("Class is not supported for " + classname() );
+ }
+ _class = it->second;
+ if ( element_id() != TextContent_t ) {
+ if ( !mydoc ) {
+ throw ValueError( "Class=" + _class + " is used on a node without a document." );
+ }
+ else if ( _set == "" &&
+ mydoc->defaultset( annotation_type() ) == "" &&
+ mydoc->isDeclared( annotation_type() ) ) {
+ throw ValueError( "Class " + _class + " is used but has no default declaration " +
+ "for " + toString( annotation_type() ) + "-annotation" );
+ }
+ }
+ kwargs.erase( it );
+ }
+ else
+ _class = "";
+
+ if ( element_id() != TextContent_t && element_id() != PhonContent_t ) {
+ if ( !_class.empty() && _set.empty() ) {
+ throw ValueError("Set is required for <" + classname() +
+ " class=\"" + _class + "\"> assigned without set." );
+ }
+ }
+ it = kwargs.find( "annotator" );
+ if ( it != kwargs.end() ) {
+ if ( !(ANNOTATOR & supported) ) {
+ throw ValueError("Annotator is not supported for " + classname() );
+ }
+ else {
+ _annotator = it->second;
+ }
+ kwargs.erase( it );
+ }
+ else if ( mydoc &&
+ (def = mydoc->defaultannotator( annotation_type(), _set )) != "" ) {
+ _annotator = def;
+ }
+ else {
+ _annotator = "";
+ }
+
+ it = kwargs.find( "annotatortype" );
+ if ( it != kwargs.end() ) {
+ if ( ! (ANNOTATOR & supported) ) {
+ throw ValueError("Annotatortype is not supported for " + classname() );
+ }
+ else {
+ _annotator_type = stringTo<AnnotatorType>( it->second );
+ if ( _annotator_type == UNDEFINED ) {
+ throw ValueError( "annotatortype must be 'auto' or 'manual', got '"
+ + it->second + "'" );
+ }
+ }
+ kwargs.erase( it );
+ }
+ else if ( mydoc &&
+ (def = mydoc->defaultannotatortype( annotation_type(), _set ) ) != "" ) {
+ _annotator_type = stringTo<AnnotatorType>( def );
+ if ( _annotator_type == UNDEFINED ) {
+ throw ValueError("annotatortype must be 'auto' or 'manual'");
+ }
+ }
+ else {
+ _annotator_type = UNDEFINED;
+ }
+
+ it = kwargs.find( "confidence" );
+ if ( it != kwargs.end() ) {
+ if ( !(CONFIDENCE & supported) ) {
+ throw ValueError("Confidence is not supported for " + classname() );
+ }
+ else {
+ try {
+ _confidence = stringTo<double>(it->second);
+ if ( _confidence < 0 || _confidence > 1.0 )
+ throw ValueError("Confidence must be a floating point number between 0 and 1, got " + TiCC::toString(_confidence) );
+ }
+ catch (...) {
+ throw ValueError("invalid Confidence value, (not a number?)");
+ }
+ }
+ kwargs.erase( it );
+ }
+ else {
+ _confidence = -1;
+ }
+ it = kwargs.find( "n" );
+ if ( it != kwargs.end() ) {
+ if ( !(N & supported) ) {
+ throw ValueError("N is not supported for " + classname() );
+ }
+ else {
+ _n = it->second;
+ }
+ kwargs.erase( it );
+ }
+ else
+ _n = "";
+
+ if ( xlink() ) {
+ string type = "simple";
+ it = kwargs.find( "type" );
+ if ( it != kwargs.end() ) {
+ type = it->second;
+ kwargs.erase( it );
+ }
+ if ( type != "simple" && type != "locator" ) {
+ throw XmlError( "only xlink:types: 'simple' and 'locator' are supported!" );
+ }
+ _xlink["type"] = type;
+ it = kwargs.find( "href" );
+ if ( it != kwargs.end() ) {
+ _xlink["href"] = it->second;
+ kwargs.erase( it );
+ }
+ else if ( type == "locator" ){
+ throw XmlError( "xlink:type='locator' requires an 'xlink:href' attribute" );
+ }
+ it = kwargs.find( "role" );
+ if ( it != kwargs.end() ) {
+ _xlink["role"] = it->second;
+ kwargs.erase( it );
+ }
+ it = kwargs.find( "title" );
+ if ( it != kwargs.end() ) {
+ _xlink["title"] = it->second;
+ kwargs.erase( it );
+ }
+ it = kwargs.find( "label" );
+ if ( it != kwargs.end() ) {
+ if ( type == "simple" ){
+ throw XmlError( "xlink:type='simple' may not have an 'xlink:label' attribute" );
+ }
+ _xlink["label"] = it->second;
+ kwargs.erase( it );
+ }
+ it = kwargs.find( "arcrole" );
+ if ( it != kwargs.end() ) {
+ if ( type == "locator" ){
+ throw XmlError( "xlink:type='locator' may not have an 'xlink:arcrole' attribute" );
+ }
+ _xlink["arcrole"] = it->second;
+ kwargs.erase( it );
+ }
+ it = kwargs.find( "show" );
+ if ( it != kwargs.end() ) {
+ if ( type == "locator" ){
+ throw XmlError( "xlink:type='locator' may not have an 'xlink:show' attribute" );
+ }
+ _xlink["show"] = it->second;
+ kwargs.erase( it );
+ }
+ it = kwargs.find( "actuate" );
+ if ( it != kwargs.end() ) {
+ if ( type == "locator" ){
+ throw XmlError( "xlink:type='locator' may not have an 'xlink:actuate' attribute" );
+ }
+ _xlink["actuate"] = it->second;
+ kwargs.erase( it );
+ }
+ }
+
+ it = kwargs.find( "datetime" );
+ if ( it != kwargs.end() ) {
+ if ( !(DATETIME & supported) ) {
+ throw ValueError("datetime is not supported for " + classname() );
+ }
+ else {
+ string time = parseDate( it->second );
+ if ( time.empty() )
+ throw ValueError( "invalid datetime, must be in YYYY-MM-DDThh:mm:ss format: " + it->second );
+ _datetime = time;
+ }
+ kwargs.erase( it );
+ }
+ else if ( mydoc &&
+ (def = mydoc->defaultdatetime( annotation_type(), _set )) != "" ) {
+ _datetime = def;
+ }
+ else {
+ _datetime.clear();
+ }
+ it = kwargs.find( "begintime" );
+ if ( it != kwargs.end() ) {
+ if ( !(BEGINTIME & supported) ) {
+ throw ValueError( "begintime is not supported for " + classname() );
+ }
+ else {
+ string time = parseTime( it->second );
+ if ( time.empty() ) {
+ throw ValueError( "invalid begintime, must be in HH:MM:SS:mmmm format: " + it->second );
+ }
+ _begintime = time;
+ }
+ kwargs.erase( it );
+ }
+ else {
+ _begintime.clear();
+ }
+ it = kwargs.find( "endtime" );
+ if ( it != kwargs.end() ) {
+ if ( !(ENDTIME & supported) ) {
+ throw ValueError( "endtime is not supported for " + classname() );
+ }
+ else {
+ string time = parseTime( it->second );
+ if ( time.empty() ) {
+ throw ValueError( "invalid endtime, must be in HH:MM:SS:mmmm format: " + it->second );
+ }
+ _endtime = time;
+ }
+ kwargs.erase( it );
+ }
+ else {
+ _endtime.clear();
+ }
+
+ it = kwargs.find( "src" );
+ if ( it != kwargs.end() ) {
+ if ( !(SRC & supported) ) {
+ throw ValueError( "src is not supported for " + classname() );
+ }
+ else {
+ _src = it->second;
+ }
+ kwargs.erase( it );
+ }
+ else
+ _src.clear();
+
+ it = kwargs.find( "speaker" );
+ if ( it != kwargs.end() ) {
+ if ( !(SPEAKER & supported) ) {
+ throw ValueError( "speaker is not supported for " + classname() );
+ }
+ else {
+ _speaker = it->second;
+ }
+ kwargs.erase( it );
+ }
+ else {
+ _speaker.clear();
+ }
+ it = kwargs.find( "auth" );
+ if ( it != kwargs.end() ) {
+ _auth = stringTo<bool>( it->second );
+ kwargs.erase( it );
+ }
+ if ( mydoc && !_id.empty() ) {
+ mydoc->addDocIndex( this, _id );
+ }
+ addFeatureNodes( kwargs );
+ }
+
+ void FoliaImpl::addFeatureNodes( const KWargs& kwargs ) {
+ for ( const auto& it: kwargs ) {
+ string tag = it.first;
+ if ( tag == "head" ) {
+ // "head" is special because the tag is "headfeature"
+ // this to avoid conflicts withe the "head" tag!
+ tag = "headfeature";
+ }
+ if ( AttributeFeatures.find( tag ) == AttributeFeatures.end() ) {
+ string message = "unsupported attribute: " + tag + "='" + it.second
+ + "' for node with tag '" + classname() + "'";
+ if ( mydoc && mydoc->permissive() ) {
+ cerr << message << endl;
+ }
+ else {
+ throw XmlError( message );
+ }
+ }
+ KWargs newa;
+ newa["class"] = it.second;
+ FoliaElement *new_node = createElement( tag, mydoc );
+ new_node->setAttributes( newa );
+ append( new_node );
+ }
+ }
+
+ KWargs FoliaImpl::collectAttributes() const {
+ KWargs attribs;
+ bool isDefaultSet = true;
+ bool isDefaultAnn = true;
+
+ if ( !_id.empty() ) {
+ attribs["_id"] = _id; // sort "id" as first!
+ }
+ if ( !_set.empty() &&
+ _set != mydoc->defaultset( annotation_type() ) ) {
+ isDefaultSet = false;
+ attribs["set"] = _set;
+ }
+ if ( !_class.empty() ) {
+ attribs["class"] = _class;
+ }
+ if ( !_annotator.empty() &&
+ _annotator != mydoc->defaultannotator( annotation_type(), _set ) ) {
+ isDefaultAnn = false;
+ attribs["annotator"] = _annotator;
+ }
+ if ( xlink() ) {
+ auto it = _xlink.find("type");
+ if ( it != _xlink.end() ){
+ string type = it->second;
+ if ( type == "simple" || type == "locator" ){
+ auto it = _xlink.find("href");
+ if ( it != _xlink.end() ){
+ attribs["xlink:href"] = it->second;
+ attribs["xlink:type"] = type;
+ }
+ it = _xlink.find("role");
+ if ( it != _xlink.end() ){
+ attribs["xlink:role"] = it->second;
+ }
+ it = _xlink.find("arcrole");
+ if ( it != _xlink.end() ){
+ attribs["xlink:arcrole"] = it->second;
+ }
+ it = _xlink.find("show");
+ if ( it != _xlink.end() ){
+ attribs["xlink:show"] = it->second;
+ }
+ it = _xlink.find("actuate");
+ if ( it != _xlink.end() ){
+ attribs["xlink:actuate"] = it->second;
+ }
+ it = _xlink.find("title");
+ if ( it != _xlink.end() ){
+ attribs["xlink:title"] = it->second;
+ }
+ it = _xlink.find("label");
+ if ( it != _xlink.end() ){
+ attribs["xlink:label"] = it->second;
+ }
+ }
+ }
+ }
+ if ( !_datetime.empty() &&
+ _datetime != mydoc->defaultdatetime( annotation_type(), _set ) ) {
+ attribs["datetime"] = _datetime;
+ }
+ if ( !_begintime.empty() ) {
+ attribs["begintime"] = _begintime;
+ }
+ if ( !_endtime.empty() ) {
+ attribs["endtime"] = _endtime;
+ }
+ if ( !_src.empty() ) {
+ attribs["src"] = _src;
+ }
+ if ( !_speaker.empty() ) {
+ attribs["speaker"] = _speaker;
+ }
+ if ( _annotator_type != UNDEFINED ) {
+ AnnotatorType at = stringTo<AnnotatorType>( mydoc->defaultannotatortype( annotation_type(), _set ) );
+ if ( (!isDefaultSet || !isDefaultAnn) && _annotator_type != at ) {
+ if ( _annotator_type == AUTO ) {
+ attribs["annotatortype"] = "auto";
+ }
+ else if ( _annotator_type == MANUAL ) {
+ attribs["annotatortype"] = "manual";
+ }
+ }
+ }
+
+ if ( _confidence >= 0 ) {
+ attribs["confidence"] = TiCC::toString(_confidence);
+ }
+ if ( !_n.empty() ) {
+ attribs["n"] = _n;
+ }
+ if ( !_auth ) {
+ attribs["auth"] = "no";
+ }
+ return attribs;
+ }
+
+ const string FoliaElement::xmlstring() const{
+ // serialize to a string (XML fragment)
+ xmlNode *n = xml( true, false );
+ xmlSetNs( n, xmlNewNs( n, (const xmlChar *)NSFOLIA.c_str(), 0 ) );
+ xmlBuffer *buf = xmlBufferCreate();
+ xmlNodeDump( buf, 0, n, 0, 0 );
+ string result = (const char*)xmlBufferContent( buf );
+ xmlBufferFree( buf );
+ xmlFreeNode( n );
+ return result;
+ }
+
+ string tagToAtt( const FoliaElement* c ) {
+ string att;
+ if ( c->isSubClass( Feature_t ) ) {
+ att = c->xmltag();
+ if ( att == "feat" ) {
+ // "feat" is a Feature_t too. exclude!
+ att = "";
+ }
+ else if ( att == "headfeature" ) {
+ // "head" is special
+ att = "head";
+ }
+ }
+ return att;
+ }
+
+ xmlNode *FoliaImpl::xml( bool recursive, bool kanon ) const {
+ xmlNode *e = XmlNewNode( foliaNs(), xmltag() );
+ KWargs attribs = collectAttributes();
+ set<FoliaElement *> attribute_elements;
+ // nodes that can be represented as attributes are converted to atributes
+ // and excluded of 'normal' output.
+
+ map<string,int> af_map;
+ // first we search al features that can be serialized to an attribute
+ // and count them!
+ for ( const auto& el : data ) {
+ string at = tagToAtt( el );
+ if ( !at.empty() ) {
+ ++af_map[at];
+ }
+ }
+ // ok, now we create attributes for those that only occur once
+ for ( const auto& el : data ) {
+ string at = tagToAtt( el );
+ if ( !at.empty() && af_map[at] == 1 ) {
+ attribs[at] = el->cls();
+ attribute_elements.insert( el );
+ }
+ }
+ addAttributes( e, attribs );
+ if ( recursive ) {
+ // append children:
+ // we want make sure that text elements are in the right order,
+ // in front and the 'current' class first
+ list<FoliaElement *> currenttextelements;
+ list<FoliaElement *> textelements;
+ list<FoliaElement *> otherelements;
+ list<FoliaElement *> commentelements;
+ multimap<ElementType, FoliaElement *, std::greater<ElementType>> otherelementsMap;
+ for ( const auto& el : data ) {
+ if ( attribute_elements.find(el) == attribute_elements.end() ) {
+ if ( el->isinstance(TextContent_t) ) {
+ if ( el->cls() == "current" ) {
+ currenttextelements.push_back( el );
+ }
+ else {
+ textelements.push_back( el );
+ }
+ }
+ else {
+ if ( kanon ) {
+ otherelementsMap.insert( make_pair( el->element_id(), el ) );
+ }
+ else {
+ if ( el->isinstance(XmlComment_t)
+ && currenttextelements.empty()
+ && textelements.empty() ) {
+ commentelements.push_back( el );
+ }
+ else {
+ otherelements.push_back( el );
+ }
+ }
+ }
+ }
+ }
+ for ( const auto& cel : commentelements ) {
+ xmlAddChild( e, cel->xml( recursive, kanon ) );
+ }
+ for ( const auto& tel : currenttextelements ) {
+ xmlAddChild( e, tel->xml( recursive, kanon ) );
+ }
+ for ( const auto& tel : textelements ) {
+ xmlAddChild( e, tel->xml( recursive, kanon ) );
+ }
+ if ( !kanon ) {
+ for ( const auto& oel : otherelements ) {
+ xmlAddChild( e, oel->xml( recursive, kanon ) );
+ }
+ }
+ else {
+ for ( const auto& oem : otherelementsMap ) {
+ xmlAddChild( e, oem.second->xml( recursive, kanon ) );
+ }
+ }
+ }
+ return e;
+ }
+
+ const string FoliaImpl::str( const string& ) const {
+ cerr << "Impl::str()" << endl;
+ return xmltag();
+ }
+
+ const string FoliaImpl::speech_src() const {
+ if ( !_src.empty() ) {
+ return _src;
+ }
+ if ( _parent ) {
+ return _parent->speech_src();
+ }
+ return "";
+ }
+
+ const string FoliaImpl::speech_speaker() const {
+ if ( !_speaker.empty() ) {
+ return _speaker;
+ }
+ if ( _parent ) {
+ return _parent->speech_speaker();
+ }
+ return "";
+ }
+
+ bool FoliaElement::hastext( const string& cls ) const {
+ // does this element have a TextContent with class 'cls'
+ // Default is class="current"
+ try {
+ this->textcontent(cls);
+ return true;
+ } catch (NoSuchText& e ) {
+ return false;
+ }
+ }
+
+ //#define DEBUG_TEXT
+ //#define DEBUG_TEXT_DEL
+
+ const string& FoliaImpl::getTextDelimiter( bool retaintok ) const {
+#ifdef DEBUG_TEXT_DEL
+ cerr << "IN " << xmltag() << "::gettextdelimiter (" << retaintok << ")" << endl;
+#endif
+ if ( _props.TEXTDELIMITER == "NONE" ) {
+ if ( data.size() > 0 ) {
+ // attempt to get a delimiter from the last child
+ const string& det = data[data.size()-1]->getTextDelimiter( retaintok );
+#ifdef DEBUG_TEXT_DEL
+ cerr << "out" << xmltag() << "::gettextdelimiter ==> '" << det << "'" << endl;
+#endif
+ return det;
+ }
+ else
+#ifdef DEBUG_TEXT_DEL
+ cerr << "out" << xmltag() << "::gettextdelimiter ==> ''" << endl;
+#endif
+ return EMPTY_STRING;
+ }
+ return _props.TEXTDELIMITER;
+ }
+
+ const UnicodeString FoliaImpl::text( const string& cls,
+ bool retaintok,
+ bool strict ) const {
+ // get the UnicodeString value of underlying elements
+ // default cls="current"
+#ifdef DEBUG_TEXT
+ cerr << "TEXT(" << cls << ") op node : " << xmltag() << " id ( " << id() << ")" << endl;
+#endif
+ if ( strict ) {
+ return textcontent(cls)->text();
+ }
+ else if ( !printable() ) {
+ throw NoSuchText( "NON printable element: " + xmltag() );
+ }
+ else {
+ UnicodeString result = deeptext( cls, retaintok );
+ if ( result.isEmpty() ) {
+ result = stricttext( cls );
+ }
+ if ( result.isEmpty() ) {
+ throw NoSuchText( "on tag " + xmltag() + " nor it's children" );
+ }
+ return result;
+ }
+ }
+
+ const UnicodeString FoliaImpl::deeptext( const string& cls,
+ bool retaintok ) const {
+ // get the UnicodeString value of underlying elements
+ // default cls="current"
+#ifdef DEBUG_TEXT
+ cerr << "deepTEXT(" << cls << ") op node : " << xmltag() << " id(" << id() << ")" << endl;
+#endif
+#ifdef DEBUG_TEXT
+ cerr << "deeptext: node has " << data.size() << " children." << endl;
+#endif
+ vector<UnicodeString> parts;
+ vector<UnicodeString> seps;
+ for ( const auto& child : data ) {
+ // try to get text dynamically from children
+ // skip TextContent elements
+#ifdef DEBUG_TEXT
+ if ( !child->printable() ) {
+ cerr << "deeptext: node[" << child->xmltag() << "] NOT PRINTABLE! " << endl;
+ }
+#endif
+ if ( child->printable() && !child->isinstance( TextContent_t ) ) {
+#ifdef DEBUG_TEXT
+ cerr << "deeptext:bekijk node[" << child->xmltag() << "]"<< endl;
+#endif
+ try {
+ UnicodeString tmp = child->text( cls, retaintok, false );
+#ifdef DEBUG_TEXT
+ cerr << "deeptext found '" << tmp << "'" << endl;
+#endif
+ if ( !isSubClass(AbstractTextMarkup_t) ) {
+ tmp.trim();
+ }
+ parts.push_back(tmp);
+ // get the delimiter
+ const string& delim = child->getTextDelimiter( retaintok );
+#ifdef DEBUG_TEXT
+ cerr << "deeptext:delimiter van "<< child->xmltag() << " ='" << delim << "'" << endl;
+#endif
+ seps.push_back(UTF8ToUnicode(delim));
+ } catch ( NoSuchText& e ) {
+#ifdef DEBUG_TEXT
+ cerr << "HELAAS" << endl;
+#endif
+ }
+ }
+ }
+
+ // now construct the result;
+ UnicodeString result;
+ for ( size_t i=0; i < parts.size(); ++i ) {
+ result += parts[i];
+ if ( i < parts.size()-1 ) {
+ result += seps[i];
+ }
+ }
+#ifdef DEBUG_TEXT
+ cerr << "deeptext() for " << xmltag() << " step 3 " << endl;
+#endif
+ if ( result.isEmpty() ) {
+ result = textcontent(cls)->text();
+ }
+#ifdef DEBUG_TEXT
+ cerr << "deeptext() for " << xmltag() << " result= '" << result << "'" << endl;
+#endif
+ if ( result.isEmpty() ) {
+ throw NoSuchText( xmltag() + ":(class=" + cls +"): empty!" );
+ }
+ return result;
+ }
+
+ const UnicodeString FoliaElement::stricttext( const string& cls ) const {
+ // get UnicodeString content of TextContent children only
+ // default cls="current"
+ return this->text(cls, false, true );
+ }
+
+ const UnicodeString FoliaElement::toktext( const string& cls ) const {
+ // get UnicodeString content of TextContent children only
+ // default cls="current"
+ return this->text(cls, true, false );
+ }
+
+ TextContent *FoliaImpl::textcontent( const string& cls ) const {
+ // Get the text explicitly associated with this element
+ // (of the specified class) the default class is 'current'
+ // Returns the TextContent instance rather than the actual text.
+ // Does not recurse into children
+ // with sole exception of Correction
+ // Raises NoSuchText exception if not found.
+
+ if ( !printable() ) {
+ throw NoSuchText( "non-printable element: " + xmltag() );
+ }
+ for ( const auto& el : data ) {
+ if ( el->isinstance(TextContent_t) && (el->cls() == cls) ) {
+ return dynamic_cast<TextContent*>(el);
+ }
+ else if ( el->element_id() == Correction_t) {
+ try {
+ return el->textcontent(cls);
+ } catch ( NoSuchText& e ) {
+ // continue search for other Corrections or a TextContent
+ }
+ }
+ }
+ throw NoSuchText( xmltag() + "::textcontent()" );
+ }
+
+ PhonContent *FoliaImpl::phoncontent( const string& cls ) const {
+ // Get the phon explicitly associated with this element
+ // (of the specified class) the default class is 'current'
+ // Returns the PhonContent instance rather than the actual phoneme.
+ // Does not recurse into children
+ // with sole exception of Correction
+ // Raises NoSuchPhon exception if not found.
+
+ if ( !speakable() ) {
+ throw NoSuchPhon( "non-speakable element: " + xmltag() );
+ }
+
+ for ( const auto& el : data ) {
+ if ( el->isinstance(PhonContent_t) && ( el->cls() == cls) ) {
+ return dynamic_cast<PhonContent*>(el);
+ }
+ else if ( el->element_id() == Correction_t) {
+ try {
+ return el->phoncontent(cls);
+ } catch ( NoSuchPhon& e ) {
+ // continue search for other Corrections or a TextContent
+ }
+ }
+ }
+ throw NoSuchPhon( xmltag() + "::phoncontent()" );
+ }
+
+ //#define DEBUG_PHON
+
+ const UnicodeString FoliaImpl::phon( const string& cls,
+ bool strict ) const {
+ // get the UnicodeString value of underlying elements
+ // default cls="current"
+#ifdef DEBUG_PHON
+ cerr << "PHON(" << cls << ") op node : " << xmltag() << " id ( " << id() << ")" << endl;
+#endif
+ if ( strict ) {
+ return phoncontent(cls)->phon();
+ }
+ else if ( !speakable() ) {
+ throw NoSuchText( "NON speakable element: " + xmltag() );
+ }
+ else {
+ UnicodeString result = deepphon( cls );
+ if ( result.isEmpty() ) {
+ result = phoncontent(cls)->phon();
+ }
+ if ( result.isEmpty() ) {
+ throw NoSuchPhon( "on tag " + xmltag() + " nor it's children" );
+ }
+ return result;
+ }
+ }
+
+ const UnicodeString FoliaImpl::deepphon( const string& cls ) const {
+ // get the UnicodeString value of underlying elements
+ // default cls="current"
+#ifdef DEBUG_PHON
+ cerr << "deepPHON(" << cls << ") op node : " << xmltag() << " id(" << id() << ")" << endl;
+#endif
+#ifdef DEBUG_PHON
+ cerr << "deepphon: node has " << data.size() << " children." << endl;
+#endif
+ vector<UnicodeString> parts;
+ vector<UnicodeString> seps;
+ for ( const auto& child : data ) {
+ // try to get text dynamically from children
+ // skip TextContent elements
+#ifdef DEBUG_PHON
+ if ( !child->speakable() ) {
+ cerr << "deepphon: node[" << child->xmltag() << "] NOT SPEAKABLE! " << endl;
+ }
+#endif
+ if ( child->speakable() && !child->isinstance( PhonContent_t ) ) {
+#ifdef DEBUG_PHON
+ cerr << "deepphon:bekijk node[" << child->xmltag() << "]" << endl;
+#endif
+ try {
+ UnicodeString tmp = child->phon( cls, false );
+#ifdef DEBUG_PHON
+ cerr << "deepphon found '" << tmp << "'" << endl;
+#endif
+ parts.push_back(tmp);
+ // get the delimiter
+ const string& delim = child->getTextDelimiter();
+#ifdef DEBUG_PHON
+ cerr << "deepphon:delimiter van "<< child->xmltag() << " ='" << delim << "'" << endl;
+#endif
+ seps.push_back(UTF8ToUnicode(delim));
+ } catch ( NoSuchPhon& e ) {
+#ifdef DEBUG_PHON
+ cerr << "HELAAS" << endl;
+#endif
+ }
+ }
+ }
+
+ // now construct the result;
+ UnicodeString result;
+ for ( size_t i=0; i < parts.size(); ++i ) {
+ result += parts[i];
+ if ( i < parts.size()-1 ) {
+ result += seps[i];
+ }
+ }
+#ifdef DEBUG_TEXT
+ cerr << "deepphon() for " << xmltag() << " step 3 " << endl;
+#endif
+ if ( result.isEmpty() ) {
+ result = phoncontent(cls)->phon();
+ }
+#ifdef DEBUG_TEXT
+ cerr << "deepphontext() for " << xmltag() << " result= '" << result << "'" << endl;
+#endif
+ if ( result.isEmpty() ) {
+ throw NoSuchPhon( xmltag() + ":(class=" + cls +"): empty!" );
+ }
+ return result;
+ }
+
+
+ vector<FoliaElement *>FoliaImpl::findreplacables( FoliaElement *par ) const {
+ return par->select( element_id(), sett(), false );
+ }
+
+ void FoliaImpl::replace( FoliaElement *child ) {
+ // Appends a child element like append(), but replaces any existing child
+ // element of the same type and set.
+ // If no such child element exists, this will act the same as append()
+
+ vector<FoliaElement*> replace = child->findreplacables( this );
+ if ( replace.empty() ) {
+ // nothing to replace, simply call append
+ append( child );
+ }
+ else if ( replace.size() > 1 ) {
+ throw runtime_error( "Unable to replace. Multiple candidates found, unable to choose." );
+ }
+ else {
+ remove( replace[0], true );
+ append( child );
+ }
+ }
+
+ FoliaElement* FoliaImpl::replace( FoliaElement *old,
+ FoliaElement* _new ) {
+ // replaced old by _new
+ // returns old
+ // when not found does nothing and returns 0;
+ for ( auto& el: data ) {
+ if ( el == old ) {
+ el = _new;
+ _new->setParent( this );
+ return old;
+ }
+ }
+ return 0;
+ }
+
+ TextContent *FoliaElement::settext( const string& txt,
+ const string& cls ) {
+ // create a TextContent child of class 'cls'
+ // Default cls="current"
+ KWargs args;
+ args["value"] = txt;
+ args["class"] = cls;
+ TextContent *node = new TextContent( doc() );
+ node->setAttributes( args );
+ replace( node );
+ return node;
+ }
+
+ TextContent *FoliaElement::setutext( const UnicodeString& txt,
+ const string& cls ) {
+ // create a TextContent child of class 'cls'
+ // Default cls="current"
+ string utf8 = UnicodeToUTF8(txt);
+ return settext( utf8, cls );
+ }
+
+ TextContent *FoliaElement::settext( const string& txt,
+ int offset,
+ const string& cls ) {
+ // create a TextContent child of class 'cls'
+ // Default cls="current"
+ // sets the offset attribute.
+ KWargs args;
+ args["value"] = txt;
+ args["class"] = cls;
+ args["offset"] = TiCC::toString(offset);
+ TextContent *node = new TextContent( doc() );
+ node->setAttributes( args );
+ replace( node );
+ return node;
+ }
+
+ TextContent *FoliaElement::setutext( const UnicodeString& txt,
+ int offset,
+ const string& cls ) {
+ // create a TextContent child of class 'cls'
+ // Default cls="current"
+ string utf8 = UnicodeToUTF8(txt);
+ return settext( utf8, offset, cls );
+ }
+
+ const string FoliaElement::description() const {
+ vector<FoliaElement *> v = select( Description_t, false );
+ if ( v.size() == 0 ) {
+ return "";
+ }
+ return v[0]->description();
+ }
+
+ bool FoliaImpl::acceptable( ElementType t ) const {
+ auto it = accepted_data().find( t );
+ if ( it == accepted_data().end() ) {
+ for ( const auto& et : accepted_data() ) {
+ if ( folia::isSubClass( t, et ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+ return true;
+ }
+
+ bool FoliaImpl::addable( const FoliaElement *c ) const {
+ if ( !acceptable( c->element_id() ) ) {
+ throw ValueError( "Unable to append object of type " + c->classname()
+ + " to a " + classname() );
+ }
+ if ( c->occurrences() > 0 ) {
+ vector<FoliaElement*> v = select( c->element_id(), false );
+ size_t count = v.size();
+ if ( count >= c->occurrences() ) {
+ throw DuplicateAnnotationError( "Unable to add another object of type " + c->classname() + " to " + classname() + ". There are already " + TiCC::toString(count) + " instances of this class, which is the maximum." );
+ }
+ }
+ if ( c->occurrences_per_set() > 0 &&
+ (CLASS & c->required_attributes() || c->setonly() ) ){
+ vector<FoliaElement*> v = select( c->element_id(), c->sett(), false );
+ size_t count = v.size();
+ if ( count >= c->occurrences_per_set() ) {
+ throw DuplicateAnnotationError( "Unable to add another object of type " + c->classname() + " to " + classname() + ". There are already " + TiCC::toString(count) + " instances of this class, which is the maximum." );
+ }
+ }
+ if ( c->parent() &&
+ !( c->element_id() == Word_t
+ || c->element_id() == Morpheme_t
+ || c->element_id() == Phoneme_t ) ) {
+ throw XmlError( "attempt to reconnect node " + c->classname()
+ + " to a " + classname() + " node, id=" + _id
+ + ", it was already connected to a "
+ + c->parent()->classname() + " id=" + c->parent()->id() );
+ }
+ if ( c->element_id() == TextContent_t && element_id() == Word_t ) {
+ string val = c->str();
+ val = trim( val );
+ if ( val.empty() ) {
+ throw ValueError( "attempt to add an empty <t> to word: " + _id );
+ }
+ }
+ if ( c->element_id() == TextContent_t ){
+ string st = c->sett();
+ vector<TextContent*> tmp = select<TextContent>( st, false );
+ if ( !tmp.empty() ) {
+ string cls = c->cls();
+ for( const auto& t : tmp ){
+ if ( t->cls() == cls ){
+ throw DuplicateAnnotationError( "attempt to add <t> with class="
+ + cls + " to element: " + _id
+ + " which already has a <t> with that class" );
+ }
+ }
+ }
+ }
+ return true;
+ }
+
+ void FoliaImpl::assignDoc( Document* doc ) {
+ // attach a document-less FoliaElement (tree) to its doc
+ // needs checking for correct annotation_type
+ // also register the ID
+ // then recurse into the children
+ if ( !mydoc ) {
+ mydoc = doc;
+ string myid = id();
+ if ( !_set.empty()
+ && (CLASS & required_attributes() )
+ && !mydoc->isDeclared( annotation_type(), _set ) ) {
+ throw ValueError( "Set " + _set + " is used in " + xmltag()
+ + "element: " + myid + " but has no declaration " +
+ "for " + toString( annotation_type() ) + "-annotation" );
+ }
+ if ( !myid.empty() ) {
+ doc->addDocIndex( this, myid );
+ }
+ // assume that children also might be doc-less
+ for ( const auto& el : data ) {
+ el->assignDoc( doc );
+ }
+ }
+ }
+
+ bool FoliaImpl::checkAtts() {
+ if ( _id.empty()
+ && (ID & required_attributes() ) ) {
+ throw ValueError( "attribute 'ID' is required for " + classname() );
+ }
+ if ( _set.empty()
+ && (CLASS & required_attributes() ) ) {
+ throw ValueError( "attribute 'set' is required for " + classname() );
+ }
+ if ( _class.empty()
+ && ( CLASS & required_attributes() ) ) {
+ throw ValueError( "attribute 'class' is required for " + classname() );
+ }
+ if ( _annotator.empty()
+ && ( ANNOTATOR & required_attributes() ) ) {
+ throw ValueError( "attribute 'annotator' is required for " + classname() );
+ }
+ if ( _annotator_type == UNDEFINED
+ && ( ANNOTATOR & required_attributes() ) ) {
+ throw ValueError( "attribute 'Annotatortype' is required for " + classname() );
+ }
+ if ( _confidence == -1 &&
+ ( CONFIDENCE & required_attributes() ) ) {
+ throw ValueError( "attribute 'confidence' is required for " + classname() );
+ }
+ if ( _n.empty()
+ && ( N & required_attributes() ) ) {
+ throw ValueError( "attribute 'n' is required for " + classname() );
+ }
+ if ( _datetime.empty()
+ && ( DATETIME & required_attributes() ) ) {
+ throw ValueError( "attribute 'datetime' is required for " + classname() );
+ }
+ if ( _begintime.empty()
+ && ( BEGINTIME & required_attributes() ) ) {
+ throw ValueError( "attribute 'begintime' is required for " + classname() );
+ }
+ if ( _endtime.empty()
+ && ( ENDTIME & required_attributes() ) ) {
+ throw ValueError( "attribute 'endtime' is required for " + classname() );
+ }
+ if ( _src.empty()
+ && ( SRC & required_attributes() ) ) {
+ throw ValueError( "attribute 'src' is required for " + classname() );
+ }
+ if ( _speaker.empty()
+ && ( SPEAKER & required_attributes() ) ) {
+ throw ValueError( "attribute 'speaker' is required for " + classname() );
+ }
+ return true;
+ }
+
+ FoliaElement *FoliaImpl::append( FoliaElement *child ) {
+ bool ok = false;
+ try {
+ ok = child->checkAtts();
+ ok = addable( child );
+ }
+ catch ( XmlError& ) {
+ // don't delete the offending child in case of illegal reconnection
+ // it will be deleted by the true parent
+ throw;
+ }
+ catch ( exception& ) {
+ delete child;
+ throw;
+ }
+ if ( ok ) {
+ child->assignDoc( mydoc );
+ data.push_back(child);
+ if ( !child->parent() ) {
+ // Only for WordRef and Morpheme
+ child->setParent(this);
+ }
+ else {
+ child->increfcount();
+ }
+ return child->postappend();
+ }
+ return 0;
+ }
+
+
+ void FoliaImpl::remove( FoliaElement *child, bool del ) {
+ auto it = std::remove( data.begin(), data.end(), child );
+ data.erase( it, data.end() );
+ if ( del ) {
+ delete child;
+ }
+ }
+
+ void FoliaImpl::remove( size_t pos, bool del ) {
+ if ( pos < data.size() ) {
+ auto it = data.begin();
+ while ( pos > 0 ) {
+ ++it;
+ --pos;
+ }
+ if ( del ) {
+ delete *it;
+ }
+ data.erase(it);
+ }
+ }
+
+ FoliaElement* FoliaImpl::index( size_t i ) const {
+ if ( i < data.size() ) {
+ return data[i];
+ }
+ throw range_error( "[] index out of range" );
+ }
+
+ FoliaElement* FoliaImpl::rindex( size_t i ) const {
+ if ( i < data.size() ) {
+ return data[data.size()-1-i];
+ }
+ throw range_error( "[] rindex out of range" );
+ }
+
+ vector<FoliaElement*> FoliaImpl::select( ElementType et,
+ const string& st,
+ const set<ElementType>& exclude,
+ bool recurse ) const {
+ vector<FoliaElement*> res;
+ for ( const auto& el : data ) {
+ if ( el->element_id() == et &&
+ ( st.empty() || el->sett() == st ) ) {
+ res.push_back( el );
+ }
+ if ( recurse ) {
+ if ( exclude.find( el->element_id() ) == exclude.end() ) {
+ vector<FoliaElement*> tmp = el->select( et, st, exclude, recurse );
+ res.insert( res.end(), tmp.begin(), tmp.end() );
+ }
+ }
+ }
+ return res;
+ }
+
+ vector<FoliaElement*> FoliaImpl::select( ElementType et,
+ const string& st,
+ bool recurse ) const {
+ return select( et, st, default_ignore, recurse );
+ }
+
+ vector<FoliaElement*> FoliaImpl::select( ElementType et,
+ const set<ElementType>& exclude,
+ bool recurse ) const {
+ return select( et, "", exclude, recurse );
+ }
+
+ vector<FoliaElement*> FoliaImpl::select( ElementType et,
+ bool recurse ) const {
+ return select( et, "", default_ignore, recurse );
+ }
+
+ FoliaElement* FoliaImpl::parseXml( const xmlNode *node ) {
+ KWargs att = getAttributes( node );
+ setAttributes( att );
+ xmlNode *p = node->children;
+ while ( p ) {
+ string pref;
+ string ns = getNS( p, pref );
+ if ( !ns.empty() && ns != NSFOLIA ){
+ // skip alien nodes
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "skiping non-FoLiA node: " << pref << ":" << Name(p) << endl;
+ }
+ p = p->next;
+ continue;
+ }
+ if ( p->type == XML_ELEMENT_NODE ) {
+ string tag = Name( p );
+ FoliaElement *t = createElement( tag, doc() );
+ if ( t ) {
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "created " << t << endl;
+ }
+ t = t->parseXml( p );
+ if ( t ) {
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "extend " << this << " met " << t << endl;
+ }
+ append( t );
+ }
+ }
+ else if ( mydoc || !mydoc->permissive() ){
+ throw XmlError( "FoLiA parser terminated" );
+ }
+ }
+ else if ( p->type == XML_COMMENT_NODE ) {
+ string tag = "_XmlComment";
+ FoliaElement *t = createElement( tag, doc() );
+ if ( t ) {
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "created " << t << endl;
+ }
+ t = t->parseXml( p );
+ if ( t ) {
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "extend " << this << " met " << t << endl;
+ }
+ append( t );
+ }
+ }
+ }
+ else if ( p->type == XML_TEXT_NODE ) {
+ string tag = "_XmlText";
+ FoliaElement *t = createElement( tag, doc() );
+ if ( t ) {
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "created " << t << endl;
+ }
+ try {
+ t = t->parseXml( p );
+ }
+ catch ( ValueError& ){
+ // ignore empty content
+ delete t;
+ t = 0;
+ }
+ if ( t ) {
+ if ( doc() && doc()->debug > 2 ) {
+ cerr << "extend " << this << " met " << t << endl;
+ }
+ append( t );
+ }
+ }
+ }
+ p = p->next;
+ }
+ return this;
+ }
+
+ void FoliaImpl::setDateTime( const string& s ) {
+ Attrib supported = required_attributes() | optional_attributes();
+ if ( !(DATETIME & supported) ) {
+ throw ValueError("datetime is not supported for " + classname() );
+ }
+ else {
+ string time = parseDate( s );
+ if ( time.empty() ) {
+ throw ValueError( "invalid datetime, must be in YYYY-MM-DDThh:mm:ss format: " + s );
+ }
+ _datetime = time;
+ }
+ }
+
+ const string FoliaImpl::getDateTime() const {
+ return _datetime;
+ }
+
+ const string FoliaImpl::pos( const string& st ) const {
+ return annotation<PosAnnotation>( st )->cls();
+ }
+
+ const string FoliaImpl::lemma( const string& st ) const {
+ return annotation<LemmaAnnotation>( st )->cls();
+ }
+
+ PosAnnotation *AllowAnnotation::addPosAnnotation( const KWargs& inargs ) {
+ KWargs args = inargs;
+ string st;
+ auto it = args.find("set" );
+ if ( it != args.end() ) {
+ st = it->second;
+ }
+ string newId = "alt-pos";
+ it = args.find("generate_id" );
+ if ( it != args.end() ) {
+ newId = it->second;
+ args.erase("generate_id");
+ }
+ if ( hasannotation<PosAnnotation>( st ) > 0 ) {
+ // ok, there is already one, so create an Alternative
+ KWargs kw;
+ kw["id"] = generateId( newId );
+ Alternative *alt = new Alternative( kw, doc() );
+ append( alt );
+ return alt->addAnnotation<PosAnnotation>( args );
+ }
+ else {
+ return addAnnotation<PosAnnotation>( args );
+ }
+ }
+
+ PosAnnotation* AllowAnnotation::getPosAnnotations( const string& st,
+ vector<PosAnnotation*>& vec ) const {
+ PosAnnotation *res = 0;
+ vec.clear();
+ try {
+ res = annotation<PosAnnotation>( st );
+ }
+ catch( NoSuchAnnotation& e ) {
+ res = 0;
+ }
+ // now search for alternatives
+ vector<Alternative *> alts = select<Alternative>( AnnoExcludeSet );
+ for ( const auto& alt : alts ){
+ if ( alt->size() > 0 ) { // child elements?
+ for ( size_t j=0; j < alt->size(); ++j ) {
+ if ( alt->index(j)->element_id() == PosAnnotation_t &&
+ ( st.empty() || alt->index(j)->sett() == st ) ) {
+ vec.push_back( dynamic_cast<PosAnnotation*>(alt->index(j)) );
+ }
+ }
+ }
+ }
+ return res;
+ }
+
+ LemmaAnnotation *AllowAnnotation::addLemmaAnnotation( const KWargs& inargs ) {
+ KWargs args = inargs;
+ string st;
+ auto it = args.find("set" );
+ if ( it != args.end() ) {
+ st = it->second;
+ }
+ string newId = "alt-lem";
+ it = args.find("generate_id" );
+ if ( it != args.end() ) {
+ newId = it->second;
+ args.erase("generate_id");
+ }
+ if ( hasannotation<LemmaAnnotation>( st ) > 0 ) {
+ // ok, there is already one, so create an Alternative
+ KWargs kw;
+ kw["id"] = generateId( newId );
+ Alternative *alt = new Alternative( kw, doc() );
+ append( alt );
+ return alt->addAnnotation<LemmaAnnotation>( args );
+ }
+ else {
+ return addAnnotation<LemmaAnnotation>( args );
+ }
+ }
+
+ LemmaAnnotation* AllowAnnotation::getLemmaAnnotations( const string& st,
+ vector<LemmaAnnotation*>& vec ) const {
+ LemmaAnnotation *res = 0;
+ vec.clear();
+ try {
+ res = annotation<LemmaAnnotation>( st );
+ }
+ catch( NoSuchAnnotation& e ) {
+ // ok
+ res = 0;
+ }
+ vector<Alternative *> alts = select<Alternative>( AnnoExcludeSet );
+ for ( const auto& alt : alts ){
+ if ( alt->size() > 0 ) { // child elements?
+ for ( size_t j =0; j < alt->size(); ++j ) {
+ if ( alt->index(j)->element_id() == LemmaAnnotation_t &&
+ ( st.empty() || alt->index(j)->sett() == st ) ) {
+ vec.push_back( dynamic_cast<LemmaAnnotation*>(alt->index(j)) );
+ }
+ }
+ }
+ }
+ return res;
+ }
+
+ MorphologyLayer *Word::addMorphologyLayer( const KWargs& inargs ) {
+ KWargs args = inargs;
+ string st;
+ auto it = args.find("set" );
+ if ( it != args.end() ) {
+ st = it->second;
+ }
+ string newId = "alt-mor";
+ it = args.find("generate_id" );
+ if ( it != args.end() ) {
+ newId = it->second;
+ args.erase("generate_id");
+ }
+ if ( hasannotation<MorphologyLayer>( st ) > 0 ) {
+ // ok, there is already one, so create an Alternative
+ KWargs kw;
+ kw["id"] = generateId( newId );
+ Alternative *alt = new Alternative( kw, doc() );
+ append( alt );
+ return alt->addAnnotation<MorphologyLayer>( args );
+ }
+ else {
+ return addAnnotation<MorphologyLayer>( args );
+ }
+ }
+
+ MorphologyLayer *Word::getMorphologyLayers( const string& st,
+ vector<MorphologyLayer*>& vec ) const {
+ MorphologyLayer *res = 0;
+ vec.clear();
+ try {
+ res = annotation<MorphologyLayer>( st );
+ }
+ catch( NoSuchAnnotation& e ) {
+ // ok
+ res = 0;
+ }
+ // now search for alternatives
+ vector<Alternative *> alts = select<Alternative>( AnnoExcludeSet );
+ for ( const auto& alt : alts ){
+ if ( alt->size() > 0 ) { // child elements?
+ for ( size_t j =0; j < alt->size(); ++j ) {
+ if ( alt->index(j)->element_id() == MorphologyLayer_t &&
+ ( st.empty() || alt->index(j)->sett() == st ) ) {
+ vec.push_back( dynamic_cast<MorphologyLayer*>(alt->index(j)) );
+ }
+ }
+ }
+ }
+ return res;
+ }
+
+ Sentence *FoliaImpl::addSentence( const KWargs& args ) {
+ Sentence *res = new Sentence( mydoc );
+ KWargs kw = args;
+ if ( kw["id"].empty() ) {
+ string id = generateId( "s" );
+ kw["id"] = id;
+ }
+ try {
+ res->setAttributes( kw );
+ }
+ catch( DuplicateIDError& e ) {
+ delete res;
+ throw e;
+ }
+ append( res );
+ return res;
+ }
+
+ Word *FoliaImpl::addWord( const KWargs& args ) {
+ Word *res = new Word( mydoc );
+ KWargs kw = args;
+ if ( kw["id"].empty() ) {
+ string id = generateId( "w" );
+ kw["id"] = id;
+ }
+ try {
+ res->setAttributes( kw );
+ }
+ catch( DuplicateIDError& e ) {
+ delete res;
+ throw e;
+ }
+ append( res );
+ return res;
+ }
+
+ const string& Quote::getTextDelimiter( bool retaintok ) const {
+#ifdef DEBUG_TEXT_DEL
+ cerr << "IN " << xmltag() << "::gettextdelimiter (" << retaintok << ")" << endl;
+#endif
+ auto it = data.rbegin();
+ while ( it != data.rend() ) {
+ if ( (*it)->isinstance( Sentence_t ) ) {
+ // if a quote ends in a sentence, we don't want any delimiter
+#ifdef DEBUG_TEXT_DEL
+ cerr << "OUT " << xmltag() << "::gettextdelimiter ==>''" << endl;
+#endif
+ return EMPTY_STRING;
+ }
+ else {
+ const string& res = (*it)->getTextDelimiter( retaintok );
+#ifdef DEBUG_TEXT_DEL
+ cerr << "OUT " << xmltag() << "::gettextdelimiter ==> '"
+ << res << "'" << endl;
+#endif
+ return res;
+ }
+ ++it;
+ }
+ static const string SPACE = " ";
+ return SPACE;
+ }
+
+ vector<Word*> Quote::wordParts() const {
+ vector<Word*> result;
+ for ( const auto& pnt : data ) {
+ if ( pnt->isinstance( Word_t ) ) {
+ result.push_back( dynamic_cast<Word*>(pnt) );
+ }
+ else if ( pnt->isinstance( Sentence_t ) ) {
+ KWargs args;
+ args["text"] = pnt->id();
+ PlaceHolder *p = new PlaceHolder( args, mydoc );
+ mydoc->keepForDeletion( p );
+ result.push_back( p );
+ }
+ else if ( pnt->isinstance( Quote_t ) ) {
+ vector<Word*> tmp = pnt->wordParts();
+ result.insert( result.end(), tmp.begin(), tmp.end() );
+ }
+ else if ( pnt->isinstance( Description_t ) ) {
+ // ignore
+ }
+ else {
+ throw XmlError( "Word or Sentence expected in Quote. got: "
+ + pnt->classname() );
+ }
+ }
+ return result;
+ }
+
+ vector<Word*> Sentence::wordParts() const {
+ vector<Word*> result;
+ for ( const auto& pnt : data ) {
+ if ( pnt->isinstance( Word_t ) ) {
+ result.push_back( dynamic_cast<Word*>(pnt) );
+ }
+ else if ( pnt->isinstance( Quote_t ) ) {
+ vector<Word*> v = pnt->wordParts();
+ result.insert( result.end(), v.begin(),v.end() );
+ }
+ else {
+ // skip all other stuff. Is there any?
+ }
+ }
+ return result;
+ }
+
+ Correction *Sentence::splitWord( FoliaElement *orig, FoliaElement *p1, FoliaElement *p2, const KWargs& args ) {
+ vector<FoliaElement*> ov;
+ ov.push_back( orig );
+ vector<FoliaElement*> nv;
+ nv.push_back( p1 );
+ nv.push_back( p2 );
+ return correctWords( ov, nv, args );
+ }
+
+ Correction *Sentence::mergewords( FoliaElement *nw,
+ const vector<FoliaElement *>& orig,
+ const string& args ) {
+ vector<FoliaElement*> nv;
+ nv.push_back( nw );
+ return correctWords( orig, nv, getArgs(args) );
+ }
+
+ Correction *Sentence::deleteword( FoliaElement *w,
+ const string& args ) {
+ vector<FoliaElement*> ov;
+ ov.push_back( w );
+ vector<FoliaElement*> nil1;
+ return correctWords( ov, nil1, getArgs(args) );
+ }
+
+ Correction *Sentence::insertword( FoliaElement *w,
+ FoliaElement *p,
+ const string& args ) {
+ if ( !p || !p->isinstance( Word_t ) ) {
+ throw runtime_error( "insertword(): previous is not a Word " );
+ }
+ if ( !w || !w->isinstance( Word_t ) ) {
+ throw runtime_error( "insertword(): new word is not a Word " );
+ }
+ KWargs kwargs;
+ kwargs["text"] = "dummy";
+ kwargs["id"] = "dummy";
+ Word *tmp = new Word( kwargs );
+ tmp->setParent( this ); // we create a dummy Word as member of the
+ // Sentence. This makes correctWords() happy
+ auto it = data.begin();
+ while ( it != data.end() ) {
+ if ( *it == p ) {
+ it = data.insert( ++it, tmp );
+ break;
+ }
+ ++it;
+ }
+ if ( it == data.end() ) {
+ throw runtime_error( "insertword(): previous not found" );
+ }
+ vector<FoliaElement *> ov;
+ ov.push_back( *it );
+ vector<FoliaElement *> nv;
+ nv.push_back( w );
+ return correctWords( ov, nv, getArgs(args) );
+ }
+
+ Correction *Sentence::correctWords( const vector<FoliaElement *>& orig,
+ const vector<FoliaElement *>& _new,
+ const KWargs& argsin ) {
+ // Generic correction method for words. You most likely want to use the helper functions
+ // splitword() , mergewords(), deleteword(), insertword() instead
+
+ // sanity check:
+ for ( const auto& org : orig ) {
+ if ( !org || !org->isinstance( Word_t) ) {
+ throw runtime_error("Original word is not a Word instance" );
+ }
+ else if ( org->sentence() != this ) {
+ throw runtime_error( "Original not found as member of sentence!");
+ }
+ }
+ for ( const auto& nw : _new ) {
+ if ( ! nw->isinstance( Word_t) ) {
+ throw runtime_error("new word is not a Word instance" );
+ }
+ }
+ auto ait = argsin.find("suggest");
+ if ( ait != argsin.end() && ait->second == "true" ) {
+ FoliaElement *sugg = new Suggestion();
+ for ( const auto& nw : _new ) {
+ sugg->append( nw );
+ }
+ vector<FoliaElement *> nil1;
+ vector<FoliaElement *> nil2;
+ vector<FoliaElement *> sv;
+ vector<FoliaElement *> tmp = orig;
+ sv.push_back( sugg );
+ KWargs args = argsin;
+ args.erase("suggest");
+ return correct( nil1, tmp, nil2, sv, args );
+ }
+ else {
+ vector<FoliaElement *> nil1;
+ vector<FoliaElement *> nil2;
+ vector<FoliaElement *> o_tmp = orig;
+ vector<FoliaElement *> n_tmp = _new;
+ return correct( o_tmp, nil1, n_tmp, nil2, argsin );
+ }
+ }
+
+ void TextContent::setAttributes( const KWargs& args ) {
+ KWargs kwargs = args; // need to copy
+ auto it = kwargs.find( "value" );
+ if ( it != kwargs.end() ) {
+ XmlText *t = new XmlText();
+ string value = it->second;
+ if ( value.empty() ) {
+ // can this ever happen?
+ throw ValueError( "TextContent: 'value' attribute may not be empty." );
+ }
+ t->setvalue( value );
+ append( t );
+ kwargs.erase(it);
+ }
+ it = kwargs.find( "offset" );
+ if ( it != kwargs.end() ) {
+ _offset = stringTo<int>(it->second);
+ kwargs.erase(it);
+ }
+ else
+ _offset = -1;
+ it = kwargs.find( "ref" );
+ if ( it != kwargs.end() ) {
+ throw NotImplementedError( "ref attribute in TextContent" );
+ }
+ it = kwargs.find( "class" );
+ if ( it == kwargs.end() ) {
+ kwargs["class"] = "current";
+ }
+ FoliaImpl::setAttributes(kwargs);
+ }
+
+ void PhonContent::setAttributes( const KWargs& args ) {
+ KWargs kwargs = args; // need to copy
+ auto it = kwargs.find( "offset" );
+ if ( it != kwargs.end() ) {
+ _offset = stringTo<int>(it->second);
+ kwargs.erase(it);
+ }
+ else
+ _offset = -1;
+ it = kwargs.find( "ref" );
+ if ( it != kwargs.end() ) {
+ throw NotImplementedError( "ref attribute in PhonContent" );
+ }
+ it = kwargs.find( "class" );
+ if ( it == kwargs.end() ) {
+ kwargs["class"] = "current";
+ }
+ FoliaImpl::setAttributes(kwargs);
+ }
+
+ KWargs TextContent::collectAttributes() const {
+ KWargs attribs = FoliaImpl::collectAttributes();
+ if ( _class == "current" ) {
+ attribs.erase( "class" );
+ }
+ else if ( _class == "original" && parent() && parent()->isinstance( Original_t ) ) {
+ attribs.erase( "class" );
+ }
+
+ if ( _offset >= 0 ) {
+ attribs["offset"] = TiCC::toString( _offset );
+ }
+ return attribs;
+ }
+
+ KWargs PhonContent::collectAttributes() const {
+ KWargs attribs = FoliaImpl::collectAttributes();
+ if ( _class == "current" ) {
+ attribs.erase( "class" );
+ }
+ if ( _offset >= 0 ) {
+ attribs["offset"] = TiCC::toString( _offset );
+ }
+ return attribs;
+ }
+
+ void Linebreak::setAttributes( const KWargs& args_in ){
+ KWargs args = args_in;
+ auto it = args.find( "pagenr" );
+ if ( it != args.end() ) {
+ _pagenr = it->second;
+ args.erase( it );
+ }
+ it = args.find( "linenr" );
+ if ( it != args.end() ) {
+ _linenr = it->second;
+ args.erase( it );
+ }
+ it = args.find( "newpage" );
+ if ( it != args.end() ) {
+ _newpage = ( it->second == "yes" );
+ args.erase( it );
+ }
+ FoliaImpl::setAttributes( args );
+ }
+
+ KWargs Linebreak::collectAttributes() const {
+ KWargs atts;
+ if ( ! _linenr.empty() ){
+ atts["linenr"] = _linenr;
+ }
+ if ( ! _pagenr.empty() ){
+ atts["pagenr"] = _pagenr;
+ }
+ if ( _newpage ){
+ atts["newpage"] = "yes";
+ }
+ return atts;
+ }
+
+ TextContent *TextContent::postappend() {
+ if ( _parent->isinstance( Original_t ) ) {
+ if ( _class == "current" ) {
+ _class = "original";
+ }
+ }
+ return this;
+ }
+
+ vector<FoliaElement *>TextContent::findreplacables( FoliaElement *par ) const {
+ vector<FoliaElement *> result;
+ vector<TextContent*> v = par->FoliaElement::select<TextContent>( _set, false );
+ // cerr << "TextContent::findreplacable found " << v << endl;
+ for ( const auto& el:v ) {
+ // cerr << "TextContent::findreplacable bekijkt " << el << " ("
+ if ( el->cls() == _class ) {
+ result.push_back( el );
+ }
+ }
+ // cerr << "TextContent::findreplacable resultaat " << v << endl;
+ return result;
+ }
+
+
+ const string TextContent::str( const string& cls ) const{
+#ifdef DEBUG_TEXT
+ cerr << "textContent::str(" << cls << ") this=" << this << endl;
+#endif
+ return UnicodeToUTF8(text(cls));
+ }
+
+ const UnicodeString TextContent::text( const string& cls,
+ bool retaintok,
+ bool ) const {
+ // get the UnicodeString value of underlying elements
+ // default cls="current"
+#ifdef DEBUG_TEXT
+ cerr << "TextContent::TEXT(" << cls << ") " << endl;
+#endif
+ UnicodeString result;
+ for ( const auto& el : data ) {
+ // try to get text dynamically from children
+#ifdef DEBUG_TEXT
+ cerr << "TextContent: bekijk node[" << el->xmltag() << "]" << endl;
+#endif
+ try {
+#ifdef DEBUG_TEXT
+ cerr << "roep text(" << cls << ") aan op " << el << endl;
+#endif
+ UnicodeString tmp = el->text( cls, retaintok );
+#ifdef DEBUG_TEXT
+ cerr << "TextContent found '" << tmp << "'" << endl;
+#endif
+ result += tmp;
+ } catch ( NoSuchText& e ) {
+#ifdef DEBUG_TEXT
+ cerr << "TextContent::HELAAS" << endl;
+#endif
+ }
+ }
+#ifdef DEBUG_TEXT
+ cerr << "TextContent return " << result << endl;
+#endif
+ return result;
+ }
+
+ const UnicodeString PhonContent::phon( const string& cls,
+ bool ) const {
+ // get the UnicodeString value of underlying elements
+ // default cls="current"
+#ifdef DEBUG_PHON
+ cerr << "PhonContent::PHON(" << cls << ") " << endl;
+#endif
+ UnicodeString result;
+ for ( const auto& el : data ) {
+ // try to get text dynamically from children
+#ifdef DEBUG_PHON
+ cerr << "PhonContent: bekijk node[" << el->str(cls) << endl;
+#endif
+ try {
+#ifdef DEBUG_PHON
+ cerr << "roep text(" << cls << ") aan op " << el << endl;
+#endif
+ UnicodeString tmp = el->text( cls );
+#ifdef DEBUG_PHON
+ cerr << "PhonContent found '" << tmp << "'" << endl;
+#endif
+ result += tmp;
+ } catch ( NoSuchPhon& e ) {
+#ifdef DEBUG_TEXT
+ cerr << "PhonContent::HELAAS" << endl;
+#endif
+ }
+ }
+ result.trim();
+#ifdef DEBUG_PHON
+ cerr << "PhonContent return " << result << endl;
+#endif
+ return result;
+ }
+
+ string AllowGenerateID::IDgen( const string& tag,
+ const FoliaElement* parent ) {
+ string nodeId = parent->id();
+ if ( nodeId.empty() ) {
+ // search nearest parent WITH an id
+ const FoliaElement *p = parent;
+ while ( p && p->id().empty() )
+ p = p->parent();
+ nodeId = p->id();
+ }
+ // cerr << "generateId," << tag << " nodeId = " << nodeId << endl;
+ int max = getMaxId(tag);
+ // cerr << "MAX = " << max << endl;
+ string id = nodeId + '.' + tag + '.' + TiCC::toString( max + 1 );
+ // cerr << "new id = " << id << endl;
+ return id;
+ }
+
+ void AllowGenerateID::setMaxId( FoliaElement *child ) {
+ if ( !child->id().empty() && !child->xmltag().empty() ) {
+ vector<string> parts;
+ size_t num = TiCC::split_at( child->id(), parts, "." );
+ if ( num > 0 ) {
+ string val = parts[num-1];
+ int i;
+ try {
+ i = stringTo<int>( val );
+ }
+ catch ( exception ) {
+ // no number, so assume so user defined id
+ return;
+ }
+ const auto& it = id_map.find( child->xmltag() );
+ if ( it == id_map.end() ) {
+ id_map[child->xmltag()] = i;
+ }
+ else {
+ if ( it->second < i ) {
+ it->second = i;
+ }
+ }
+ }
+ }
+ }
+
+ int AllowGenerateID::getMaxId( const string& xmltag ) {
+ int res = 0;
+ if ( !xmltag.empty() ) {
+ res = id_map[xmltag];
+ ++id_map[xmltag];
+ }
+ return res;
+ }
+
+ Correction * AllowCorrection::correct( const vector<FoliaElement*>& _original,
+ const vector<FoliaElement*>& current,
+ const vector<FoliaElement*>& _newv,
+ const vector<FoliaElement*>& _suggestions,
+ const KWargs& args_in ) {
+ // cerr << "correct " << this << endl;
+ // cerr << "original= " << original << endl;
+ // cerr << "current = " << current << endl;
+ // cerr << "new = " << _new << endl;
+ // cerr << "suggestions = " << suggestions << endl;
+ // cerr << "args in = " << args_in << endl;
+ // Apply a correction
+ Document *mydoc = doc();
+ Correction *c = 0;
+ bool suggestionsonly = false;
+ bool hooked = false;
+ FoliaElement * addnew = 0;
+ KWargs args = args_in;
+ vector<FoliaElement*> original = _original;
+ vector<FoliaElement*> _new = _newv;
+ vector<FoliaElement*> suggestions = _suggestions;
+ auto it = args.find("new");
+ if ( it != args.end() ) {
+ KWargs my_args;
+ my_args["value"] = it->second;
+ TextContent *t = new TextContent( my_args, mydoc );
+ _new.push_back( t );
+ args.erase( it );
+ }
+ it = args.find("suggestion");
+ if ( it != args.end() ) {
+ KWargs my_args;
+ my_args["value"] = it->second;
+ TextContent *t = new TextContent( my_args, mydoc );
+ suggestions.push_back( t );
+ args.erase( it );
+ }
+ it = args.find("reuse");
+ if ( it != args.end() ) {
+ // reuse an existing correction instead of making a new one
+ try {
+ c = dynamic_cast<Correction*>(mydoc->index(it->second));
+ }
+ catch ( exception& e ) {
+ throw ValueError("reuse= must point to an existing correction id!");
+ }
+ if ( !c->isinstance( Correction_t ) ) {
+ throw ValueError("reuse= must point to an existing correction id!");
+ }
+ hooked = true;
+ suggestionsonly = (!c->hasNew() && !c->hasOriginal() && c->hasSuggestions() );
+ if ( !_new.empty() && c->hasCurrent() ) {
+ // can't add new if there's current, so first set original to current, and then delete current
+
+ if ( !current.empty() ) {
+ throw runtime_error( "Can't set both new= and current= !");
+ }
+ if ( original.empty() ) {
+ FoliaElement *cur = c->getCurrent();
+ original.push_back( cur );
+ c->remove( cur, false );
+ }
+ }
+ }
+ else {
+ KWargs args2 = args;
+ args2.erase("suggestion" );
+ args2.erase("suggestions" );
+ string id = generateId( "correction" );
+ args2["id"] = id;
+ c = new Correction(mydoc );
+ c->setAttributes( args2 );
+ }
+
+ if ( !current.empty() ) {
+ if ( !original.empty() || !_new.empty() ) {
+ throw runtime_error("When setting current=, original= and new= can not be set!");
+ }
+ for ( const auto& cur : current ) {
+ FoliaElement *add = new Current( mydoc );
+ cur->setParent(0);
+ add->append( cur );
+ c->replace( add );
+ if ( !hooked ) {
+ for ( size_t i=0; i < size(); ++i ) {
+ if ( index(i) == cur ) {
+ replace( index(i), c );
+ hooked = true;
+ }
+ }
+ }
+ }
+ }
+ if ( !_new.empty() ) {
+ // cerr << "there is new! " << endl;
+ addnew = new New( mydoc );
+ c->append(addnew);
+ for ( const auto& nw : _new ) {
+ nw->setParent(0);
+ addnew->append( nw );
+ }
+ // cerr << "after adding " << c << endl;
+ vector<Current*> v = c->FoliaElement::select<Current>();
+ //delete current if present
+ for ( const auto& cur:v ) {
+ c->remove( cur, false );
+ }
+ }
+ if ( !original.empty() ) {
+ FoliaElement *add = new Original( mydoc );
+ c->replace(add);
+ for ( const auto& org: original ) {
+ bool dummyNode = ( org->id() == "dummy" );
+ if ( !dummyNode ) {
+ org->setParent(0);
+ add->append( org );
+ }
+ for ( size_t i=0; i < size(); ++i ) {
+ if ( index(i) == org ) {
+ if ( !hooked ) {
+ FoliaElement *tmp = replace( index(i), c );
+ if ( dummyNode ) {
+ delete tmp;
+ }
+ hooked = true;
+ }
+ else {
+ remove( org, false );
+ }
+ }
+ }
+ }
+ }
+ else if ( addnew ) {
+ // original not specified, find automagically:
+ vector<FoliaElement *> orig;
+ // cerr << "start to look for original " << endl;
+ for ( size_t i=0; i < len(addnew); ++ i ) {
+ FoliaElement *p = addnew->index(i);
+ // cerr << "bekijk " << p << endl;
+ vector<FoliaElement*> v = p->findreplacables( this );
+ for ( const auto& el: v ) {
+ orig.push_back( el );
+ }
+ }
+ if ( orig.empty() ) {
+ throw runtime_error( "No original= specified and unable to automatically infer");
+ }
+ else {
+ // cerr << "we seem to have some originals! " << endl;
+ FoliaElement *add = new Original( mydoc );
+ c->replace(add);
+ for ( const auto& org: orig ) {
+ // cerr << " an original is : " << *oit << endl;
+ org->setParent( 0 );
+ add->append( org );
+ for ( size_t i=0; i < size(); ++i ) {
+ if ( index(i) == org ) {
+ if ( !hooked ) {
+ replace( index(i), c );
+ hooked = true;
+ }
+ else
+ remove( org, false );
+ }
+ }
+ }
+ vector<Current*> v = c->FoliaElement::select<Current>();
+ //delete current if present
+ for ( const auto& cur: v ) {
+ remove( cur, false );
+ }
+ }
+ }
+
+ if ( addnew ) {
+ for ( const auto& org : original ) {
+ c->remove( org, false );
+ }
+ }
+
+ if ( !suggestions.empty() ) {
+ if ( !hooked ) {
+ append(c);
+ }
+ for ( const auto& sug : suggestions ) {
+ if ( sug->isinstance( Suggestion_t ) ) {
+ sug->setParent(0);
+ c->append( sug );
+ }
+ else {
+ FoliaElement *add = new Suggestion( mydoc );
+ sug->setParent(0);
+ add->append( sug );
+ c->append( add );
+ }
+ }
+ }
+
+ it = args.find("reuse");
+ if ( it != args.end() ) {
+ if ( addnew && suggestionsonly ) {
+ vector<Suggestion*> sv = c->suggestions();
+ for ( const auto& sug : sv ){
+ if ( !c->annotator().empty() && sug->annotator().empty() ) {
+ sug->annotator( c->annotator() );
+ }
+ if ( !(c->annotatortype() == UNDEFINED) &&
+ (sug->annotatortype() == UNDEFINED ) ) {
+ sug->annotatortype( c->annotatortype() );
+ }
+ }
+ }
+ it = args.find("annotator");
+ if ( it != args.end() ) {
+ c->annotator( it->second );
+ }
+ it = args.find("annotatortype");
+ if ( it != args.end() )
+ c->annotatortype( stringTo<AnnotatorType>(it->second) );
+ it = args.find("confidence");
+ if ( it != args.end() ) {
+ c->confidence( stringTo<double>(it->second) );
+ }
+ }
+ return c;
+ }
+
+ Correction *AllowCorrection::correct( const string& s ) {
+ vector<FoliaElement*> nil1;
+ vector<FoliaElement*> nil2;
+ vector<FoliaElement*> nil3;
+ vector<FoliaElement*> nil4;
+ KWargs args = getArgs( s );
+ // cerr << xmltag() << "::correct() <== " << this << endl;
+ Correction *tmp = correct( nil1, nil2, nil3, nil4, args );
+ // cerr << xmltag() << "::correct() ==> " << this << endl;
+ return tmp;
+ }
+
+ Correction *AllowCorrection::correct( FoliaElement *_old,
+ FoliaElement *_new,
+ const vector<FoliaElement*>& sugg,
+ const KWargs& args ) {
+ vector<FoliaElement *> nv;
+ nv.push_back( _new );
+ vector<FoliaElement *> ov;
+ ov.push_back( _old );
+ vector<FoliaElement *> nil;
+ // cerr << xmltag() << "::correct() <== " << this << endl;
+ Correction *tmp = correct( ov, nil, nv, sugg, args );
+ // cerr << xmltag() << "::correct() ==> " << this << endl;
+ return tmp;
+ }
+
+ const string AbstractStructureElement::str( const string& cls ) const{
+ UnicodeString result = text( cls );
+ return UnicodeToUTF8(result);
+ }
+
+ FoliaElement *AbstractStructureElement::append( FoliaElement *child ) {
+ FoliaImpl::append( child );
+ setMaxId( child );
+ return child;
+ }
+
+ vector<Paragraph*> AbstractStructureElement::paragraphs() const{
+ return FoliaElement::select<Paragraph>( default_ignore_structure );
+ }
+
+ vector<Sentence*> AbstractStructureElement::sentences() const{
+ return FoliaElement::select<Sentence>( default_ignore_structure );
+ }
+
+ vector<Word*> AbstractStructureElement::words() const{
+ return FoliaElement::select<Word>( default_ignore_structure );
+ }
+
+ Sentence *AbstractStructureElement::sentences( size_t index ) const {
+ vector<Sentence*> v = sentences();
+ if ( index < v.size() ) {
+ return v[index];
+ }
+ throw range_error( "sentences(): index out of range" );
+ }
+
+ Sentence *AbstractStructureElement::rsentences( size_t index ) const {
+ vector<Sentence*> v = sentences();
+ if ( index < v.size() ) {
+ return v[v.size()-1-index];
+ }
+ throw range_error( "rsentences(): index out of range" );
+ }
+
+ Paragraph *AbstractStructureElement::paragraphs( size_t index ) const {
+ vector<Paragraph*> v = paragraphs();
+ if ( index < v.size() ) {
+ return v[index];
+ }
+ throw range_error( "paragraphs(): index out of range" );
+ }
+
+ Paragraph *AbstractStructureElement::rparagraphs( size_t index ) const {
+ vector<Paragraph*> v = paragraphs();
+ if ( index < v.size() ) {
+ return v[v.size()-1-index];
+ }
+ throw range_error( "rparagraphs(): index out of range" );
+ }
+
+ Word *AbstractStructureElement::words( size_t index ) const {
+ vector<Word*> v = words();
+ if ( index < v.size() ) {
+ return v[index];
+ }
+ throw range_error( "words(): index out of range" );
+ }
+
+ Word *AbstractStructureElement::rwords( size_t index ) const {
+ vector<Word*> v = words();
+ if ( index < v.size() ) {
+ return v[v.size()-1-index];
+ }
+ throw range_error( "rwords(): index out of range" );
+ }
+
+ const Word* AbstractStructureElement::resolveword( const string& id ) const{
+ const Word *result = 0;
+ for ( const auto& el : data ) {
+ result = el->resolveword( id );
+ if ( result ) {
+ break;
+ }
+ }
+ return result;
+ }
+
+ vector<Alternative *> AbstractStructureElement::alternatives( ElementType elt,
+ const string& st ) const {
+ // Return a list of alternatives, either all or only of a specific type, restrained by set
+ vector<Alternative *> alts = FoliaElement::select<Alternative>( AnnoExcludeSet );
+ if ( elt == BASE ) {
+ return alts;
+ }
+ else {
+ vector<Alternative*> res;
+ for ( const auto& alt : alts ){
+ if ( alt->size() > 0 ) { // child elements?
+ for ( size_t j =0; j < alt->size(); ++j ) {
+ if ( alt->index(j)->element_id() == elt &&
+ ( alt->sett().empty() || alt->sett() == st ) ) {
+ res.push_back( alt ); // not the child!
+ }
+ }
+ }
+ }
+ return res;
+ }
+ }
+
+ KWargs AlignReference::collectAttributes() const {
+ KWargs atts;
+ atts["id"] = refId;
+ atts["type"] = ref_type;
+ if ( !_t.empty() ) {
+ atts["t"] = _t;
+ }
+ return atts;
+ }
+
+ void AlignReference::setAttributes( const KWargs& argsin ) {
+ KWargs args = argsin;
+ auto it = args.find( "id" );
+ if ( it != args.end() ) {
+ refId = it->second;
+ args.erase(it);
+ }
+ it = args.find( "type" );
+ if ( it != args.end() ) {
+ ref_type = it->second;
+ args.erase(it);
+ }
+ it = args.find( "t" );
+ if ( it != args.end() ) {
+ _t = it->second;
+ args.erase(it);
+ }
+ FoliaImpl::setAttributes(args);
+ }
+
+ void Word::setAttributes( const KWargs& args_in ) {
+ KWargs args = args_in;
+ auto it = args.find( "space" );
+ if ( it != args.end() ) {
+ if ( it->second == "no" ) {
+ _space = false;
+ }
+ args.erase( it );
+ }
+ it = args.find( "text" );
+ if ( it != args.end() ) {
+ settext( it->second );
+ args.erase( it );
+ }
+ FoliaImpl::setAttributes( args );
+ }
+
+ KWargs Word::collectAttributes() const {
+ KWargs atts = FoliaImpl::collectAttributes();
+ if ( !_space ) {
+ atts["space"] = "no";
+ }
+ return atts;
+ }
+
+ const string& Word::getTextDelimiter( bool retaintok ) const {
+ if ( _space || retaintok ) {
+ return PROPS.TEXTDELIMITER;
+ }
+ return EMPTY_STRING;
+ }
+
+ Correction *Word::split( FoliaElement *part1, FoliaElement *part2,
+ const string& args ) {
+ return sentence()->splitWord( this, part1, part2, getArgs(args) );
+ }
+
+ FoliaElement *Word::append( FoliaElement *child ) {
+ if ( child->isSubClass( AbstractAnnotationLayer_t ) ) {
+ // sanity check, there may be no other child within the same set
+ vector<FoliaElement*> v = select( child->element_id(), child->sett() );
+ if ( v.empty() ) {
+ // OK!
+ return FoliaImpl::append( child );
+ }
+ delete child;
+ throw DuplicateAnnotationError( "Word::append" );
+ }
+ return FoliaImpl::append( child );
+ }
+
+ Sentence *Word::sentence( ) const {
+ // return the sentence this word is a part of, otherwise return null
+ FoliaElement *p = _parent;
+ while( p ) {
+ if ( p->isinstance( Sentence_t ) ) {
+ return dynamic_cast<Sentence*>(p);
+ }
+ p = p->parent();
+ }
+ return 0;
+ }
+
+ Paragraph *Word::paragraph( ) const {
+ // return the sentence this word is a part of, otherwise return null
+ FoliaElement *p = _parent;
+ while( p ) {
+ if ( p->isinstance( Paragraph_t ) ) {
+ return dynamic_cast<Paragraph*>(p);
+ }
+ p = p->parent();
+ }
+ return 0;
+ }
+
+ Division *Word::division() const {
+ // return the <div> this word is a part of, otherwise return null
+ FoliaElement *p = _parent;
+ while( p ) {
+ if ( p->isinstance( Division_t ) ) {
+ return dynamic_cast<Division*>(p);
+ }
+ p = p->parent();
+ }
+ return 0;
+ }
+
+ vector<Morpheme *> Word::morphemes( const string& set ) const {
+ vector<Morpheme *> result;
+ vector<MorphologyLayer*> mv = FoliaElement::select<MorphologyLayer>();
+ for ( const auto& mor : mv ){
+ vector<Morpheme*> tmp = mor->FoliaElement::select<Morpheme>( set );
+ result.insert( result.end(), tmp.begin(), tmp.end() );
+ }
+ return result;
+ }
+
+ Morpheme * Word::morpheme( size_t pos, const string& set ) const {
+ vector<Morpheme *> tmp = morphemes( set );
+ if ( pos < tmp.size() ) {
+ return tmp[pos];
+ }
+ throw range_error( "morpheme() index out of range" );
+ }
+
+ Correction *Word::incorrection( ) const {
+ // Is the Word part of a correction? If it is, it returns the Correction element, otherwise it returns 0;
+ FoliaElement *p = _parent;
+ while ( p ) {
+ if ( p->isinstance( Correction_t ) ) {
+ return dynamic_cast<Correction*>(p);
+ }
+ else if ( p->isinstance( Sentence_t ) )
+ break;
+ p = p->parent();
+ }
+ return 0;
+ }
+
+ Word *Word::previous() const{
+ Sentence *s = sentence();
+ vector<Word*> words = s->words();
+ for ( size_t i=0; i < words.size(); ++i ) {
+ if ( words[i] == this ) {
+ if ( i > 0 ) {
+ return words[i-1];
+ }
+ else {
+ return 0;
+ }
+ break;
+ }
+ }
+ return 0;
+ }
+
+ Word *Word::next() const{
+ Sentence *s = sentence();
+ vector<Word*> words = s->words();
+ for ( size_t i=0; i < words.size(); ++i ) {
+ if ( words[i] == this ) {
+ if ( i+1 < words.size() ) {
+ return words[i+1];
+ }
+ else {
+ return 0;
+ }
+ break;
+ }
+ }
+ return 0;
+ }
+
+ vector<Word*> Word::context( size_t size,
+ const string& val ) const {
+ vector<Word*> result;
+ if ( size > 0 ) {
+ vector<Word*> words = mydoc->words();
+ for ( size_t i=0; i < words.size(); ++i ) {
+ if ( words[i] == this ) {
+ size_t miss = 0;
+ if ( i < size ) {
+ miss = size - i;
+ }
+ for ( size_t index=0; index < miss; ++index ) {
+ if ( val.empty() ) {
+ result.push_back( 0 );
+ }
+ else {
+ KWargs args;
+ args["text"] = val;
+ PlaceHolder *p = new PlaceHolder( args );
+ mydoc->keepForDeletion( p );
+ result.push_back( p );
+ }
+ }
+ for ( size_t index=i-size+miss; index < i + size + 1; ++index ) {
+ if ( index < words.size() ) {
+ result.push_back( words[index] );
+ }
+ else {
+ if ( val.empty() ) {
+ result.push_back( 0 );
+ }
+ else {
+ KWargs args;
+ args["text"] = val;
+ PlaceHolder *p = new PlaceHolder( args );
+ mydoc->keepForDeletion( p );
+ result.push_back( p );
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
+
+ vector<Word*> Word::leftcontext( size_t size,
+ const string& val ) const {
+ // cerr << "leftcontext : " << size << endl;
+ vector<Word*> result;
+ if ( size > 0 ) {
+ vector<Word*> words = mydoc->words();
+ for ( size_t i=0; i < words.size(); ++i ) {
+ if ( words[i] == this ) {
+ size_t miss = 0;
+ if ( i < size ) {
+ miss = size - i;
+ }
+ for ( size_t index=0; index < miss; ++index ) {
+ if ( val.empty() ) {
+ result.push_back( 0 );
+ }
+ else {
+ KWargs args;
+ args["text"] = val;
+ PlaceHolder *p = new PlaceHolder( args );
+ mydoc->keepForDeletion( p );
+ result.push_back( p );
+ }
+ }
+ for ( size_t index=i-size+miss; index < i; ++index ) {
+ result.push_back( words[index] );
+ }
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
+ vector<Word*> Word::rightcontext( size_t size,
+ const string& val ) const {
+ vector<Word*> result;
+ // cerr << "rightcontext : " << size << endl;
+ if ( size > 0 ) {
+ vector<Word*> words = mydoc->words();
+ size_t begin;
+ size_t end;
+ for ( size_t i=0; i < words.size(); ++i ) {
+ if ( words[i] == this ) {
+ begin = i + 1;
+ end = begin + size;
+ for ( ; begin < end; ++begin ) {
+ if ( begin >= words.size() ) {
+ if ( val.empty() ) {
+ result.push_back( 0 );
+ }
+ else {
+ KWargs args;
+ args["text"] = val;
+ PlaceHolder *p = new PlaceHolder( args );
+ mydoc->keepForDeletion( p );
+ result.push_back( p );
+ }
+ }
+ else
+ result.push_back( words[begin] );
+ }
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
+ const Word* Word::resolveword( const string& id ) const {
+ if ( _id == id ) {
+ return this;
+ }
+ return 0;
+ }
+
+ ElementType layertypeof( ElementType et ) {
+ switch( et ) {
+ case Entity_t:
+ case EntitiesLayer_t:
+ return EntitiesLayer_t;
+ case Chunk_t:
+ case ChunkingLayer_t:
+ return ChunkingLayer_t;
+ case SyntacticUnit_t:
+ case SyntaxLayer_t:
+ return SyntaxLayer_t;
+ case TimeSegment_t:
+ case TimingLayer_t:
+ return TimingLayer_t;
+ case Morpheme_t:
+ case MorphologyLayer_t:
+ return MorphologyLayer_t;
+ case Phoneme_t:
+ case PhonologyLayer_t:
+ return PhonologyLayer_t;
+ case CoreferenceChain_t:
+ case CoreferenceLayer_t:
+ return CoreferenceLayer_t;
+ case SemanticRolesLayer_t:
+ case SemanticRole_t:
+ return SemanticRolesLayer_t;
+ case DependenciesLayer_t:
+ case Dependency_t:
+ return DependenciesLayer_t;
+ default:
+ return BASE;
+ }
+ }
+
+ vector<AbstractSpanAnnotation*> Word::findspans( ElementType et,
+ const string& st ) const {
+ ElementType layertype = layertypeof( et );
+ vector<AbstractSpanAnnotation *> result;
+ if ( layertype != BASE ) {
+ const FoliaElement *e = parent();
+ if ( e ) {
+ vector<FoliaElement*> v = e->select( layertype, st, false );
+ for ( const auto& el : v ){
+ for ( size_t k=0; k < el->size(); ++k ) {
+ FoliaElement *f = el->index(k);
+ AbstractSpanAnnotation *as = dynamic_cast<AbstractSpanAnnotation*>(f);
+ if ( as ) {
+ vector<FoliaElement*> wrefv = f->wrefs();
+ for ( const auto& wr : wrefv ){
+ if ( wr == this ) {
+ result.push_back(as);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ FoliaElement* WordReference::parseXml( const xmlNode *node ) {
+ KWargs att = getAttributes( node );
+ string id = att["id"];
+ if ( id.empty() ) {
+ throw XmlError( "empty id in WordReference" );
+ }
+ if ( mydoc->debug ) {
+ cerr << "Found word reference" << id << endl;
+ }
+ FoliaElement *res = (*mydoc)[id];
+ if ( res ) {
+ // To DO: check type. Word_t, Phoneme_t or Morpheme_t??
+ res->increfcount();
+ }
+ else {
+ if ( mydoc->debug ) {
+ cerr << "...Unresolvable id: " << id << endl;
+ }
+ throw XmlError( "Unresolvable id " + id + "in WordReference" );
+ }
+ delete this;
+ return res;
+ }
+
+ FoliaElement* AlignReference::parseXml( const xmlNode *node ) {
+ KWargs att = getAttributes( node );
+ string val = att["id"];
+ if ( val.empty() ) {
+ throw XmlError( "ID required for AlignReference" );
+ }
+ refId = val;
+ if ( mydoc->debug ) {
+ cerr << "Found AlignReference ID " << refId << endl;
+ }
+ ref_type = att["type"];
+ val = att["t"];
+ if ( !val.empty() ) {
+ _t = val;
+ }
+ return this;
+ }
+
+ FoliaElement *AlignReference::resolve_element( const Alignment *ref ) const {
+ if ( ref->href().empty() ) {
+ return (*mydoc)[refId];
+ }
+ throw NotImplementedError( "AlignReference::resolve() for external doc" );
+ }
+
+ void Alignment::setAttributes( const KWargs& kwargsin ) {
+ KWargs kwargs = kwargsin;
+ auto it = kwargs.find( "format" );
+ if ( it != kwargs.end() ) {
+ _format = it->second;
+ kwargs.erase( it );
+ }
+ FoliaImpl::setAttributes(kwargs);
+ }
+
+ KWargs Alignment::collectAttributes() const {
+ KWargs atts = FoliaImpl::collectAttributes();
+ if ( !_format.empty() && _format != "text/folia+xml" ) {
+ atts["format"] = _format;
+ }
+ return atts;
+ }
+
+ vector<FoliaElement *> Alignment::resolve() const {
+ vector<FoliaElement*> result;
+ vector<AlignReference*> v = FoliaElement::select<AlignReference>();
+ for ( const auto& ar : v ){
+ result.push_back( ar->resolve_element( this ) );
+ }
+ return result;
+ }
+
+ void PlaceHolder::setAttributes( const KWargs& args ) {
+ auto it = args.find( "text" );
+ if ( it == args.end() ) {
+ throw ValueError("text attribute is required for " + classname() );
+ }
+ else if ( args.size() != 1 ) {
+ throw ValueError("only the text attribute is supported for " + classname() );
+ }
+ Word::setAttributes( args );
+ }
+
+ const UnicodeString Figure::caption() const {
+ vector<FoliaElement *> v = select(Caption_t);
+ if ( v.empty() ) {
+ throw NoSuchText("caption");
+ }
+ else {
+ return v[0]->text();
+ }
+ }
+
+ void Description::setAttributes( const KWargs& kwargs ) {
+ auto it = kwargs.find( "value" );
+ if ( it == kwargs.end() ) {
+ throw ValueError("value attribute is required for " + classname() );
+ }
+ _value = it->second;
+ }
+
+ xmlNode *Description::xml( bool, bool ) const {
+ xmlNode *e = FoliaImpl::xml( false, false );
+ xmlAddChild( e, xmlNewText( (const xmlChar*)_value.c_str()) );
+ return e;
+ }
+
+ FoliaElement* Description::parseXml( const xmlNode *node ) {
+ KWargs att = getAttributes( node );
+ auto it = att.find("value" );
+ if ( it == att.end() ) {
+ att["value"] = XmlContent( node );
+ }
+ setAttributes( att );
+ return this;
+ }
+
+ FoliaElement *AbstractSpanAnnotation::append( FoliaElement *child ) {
+ FoliaImpl::append( child );
+ if ( child->isinstance(PlaceHolder_t) ) {
+ child->increfcount();
+ }
+ return child;
+ }
+
+ void AbstractAnnotationLayer::assignset( FoliaElement *child ) {
+ // If there is no set (yet), try to get the set form the child
+ // but not if it is the default set.
+ // for a Correction child, we look deeper.
+ if ( _set.empty() ) {
+ if ( child->isSubClass( AbstractSpanAnnotation_t ) ) {
+ string st = child->sett();
+ if ( !st.empty()
+ && mydoc->defaultset( child->annotation_type() ) != st ) {
+ _set = st;
+ }
+ }
+ else if ( child->isinstance(Correction_t) ) {
+ Original *org = child->getOriginal();
+ if ( org ) {
+ for ( size_t i=0; i < org->size(); ++i ) {
+ FoliaElement *el = org->index(i);
+ if ( el->isSubClass( AbstractSpanAnnotation_t ) ) {
+ string st = el->sett();
+ if ( !st.empty()
+ && mydoc->defaultset( el->annotation_type() ) != st ) {
+ _set = st;
+ return;
+ }
+ }
+ }
+ }
+ New *nw = child->getNew();
+ if ( nw ) {
+ for ( size_t i=0; i < nw->size(); ++i ) {
+ FoliaElement *el = nw->index(i);
+ if ( el->isSubClass( AbstractSpanAnnotation_t ) ) {
+ string st = el->sett();
+ if ( !st.empty()
+ && mydoc->defaultset( el->annotation_type() ) != st ) {
+ _set = st;
+ return;
+ }
+ }
+ }
+ }
+ auto v = child->suggestions();
+ for ( const auto& el : v ) {
+ if ( el->isSubClass( AbstractSpanAnnotation_t ) ) {
+ string st = el->sett();
+ if ( !st.empty()
+ && mydoc->defaultset( el->annotation_type() ) != st ) {
+ _set = st;
+ return;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ FoliaElement *AbstractAnnotationLayer::append( FoliaElement *child ) {
+ FoliaImpl::append( child );
+ assignset( child );
+ return child;
+ }
+
+ KWargs AbstractAnnotationLayer::collectAttributes() const {
+ KWargs attribs = FoliaImpl::collectAttributes();
+ auto it = attribs.find("set");
+ if ( it != attribs.end() ) {
+ attribs.erase(it);
+ }
+ return attribs;
+ }
+
+ xmlNode *AbstractSpanAnnotation::xml( bool recursive, bool kanon ) const {
+ xmlNode *e = FoliaImpl::xml( false, false );
+ // append Word, Phon and Morpheme children as WREFS
+ for ( const auto& el : data ) {
+ if ( el->element_id() == Word_t ||
+ el->element_id() == Phoneme_t ||
+ el->element_id() == Morpheme_t ) {
+ xmlNode *t = XmlNewNode( foliaNs(), "wref" );
+ KWargs attribs;
+ attribs["id"] = el->id();
+ string txt = el->str();
+ if ( !txt.empty() ) {
+ attribs["t"] = txt;
+ }
+ addAttributes( t, attribs );
+ xmlAddChild( e, t );
+ }
+ else {
+ string at = tagToAtt( el );
+ if ( at.empty() ) {
+ // otherwise handled by FoliaElement::xml() above
+ xmlAddChild( e, el->xml( recursive, kanon ) );
+ }
+ }
+ }
+ return e;
+ }
+
+ FoliaElement *Quote::append( FoliaElement *child ) {
+ FoliaImpl::append( child );
+ if ( child->isinstance(Sentence_t) ) {
+ child->setAuth( false ); // Sentences under quotes are non-authoritative
+ }
+ return child;
+ }
+
+ xmlNode *Content::xml( bool recurse, bool ) const {
+ xmlNode *e = FoliaImpl::xml( recurse, false );
+ xmlAddChild( e, xmlNewCDataBlock( 0,
+ (const xmlChar*)value.c_str() ,
+ value.length() ) );
+ return e;
+ }
+
+ FoliaElement* Content::parseXml( const xmlNode *node ) {
+ KWargs att = getAttributes( node );
+ setAttributes( att );
+ xmlNode *p = node->children;
+ bool isCdata = false;
+ bool isText = false;
+ while ( p ) {
+ if ( p->type == XML_CDATA_SECTION_NODE ) {
+ if ( isText ) {
+ throw XmlError( "intermixing text and CDATA in Content node" );
+ }
+ isCdata = true;
+ value += (char*)p->content;
+ }
+ else if ( p->type == XML_TEXT_NODE ) {
+ if ( isCdata ) {
+ throw XmlError( "intermixing text and CDATA in Content node" );
+ }
+ isText = true;
+ value += (char*)p->content;
+ }
+ else if ( p->type == XML_COMMENT_NODE ) {
+ string tag = "_XmlComment";
+ FoliaElement *t = createElement( tag, mydoc );
+ if ( t ) {
+ t = t->parseXml( p );
+ append( t );
+ }
+ }
+ p = p->next;
+ }
+ if ( value.empty() ) {
+ throw XmlError( "CDATA or Text expected in Content node" );
+ }
+ return this;
+ }
+
+ const UnicodeString Correction::text( const string& cls,
+ bool retaintok,
+ bool ) const {
+#ifdef DEBUG_TEXT
+ cerr << "TEXT(" << cls << ") op node : " << xmltag() << " id ( " << id() << ")" << endl;
+#endif
+ if ( cls == "current" ) {
+ for ( const auto& el : data ) {
+#ifdef DEBUG_TEXT
+ cerr << "data=" << el << endl;
+#endif
+ if ( el->isinstance( New_t ) || el->isinstance( Current_t ) ) {
+ return el->text( cls, retaintok );
+ }
+ }
+ }
+ else if ( cls == "original" ) {
+ for ( const auto& el : data ) {
+#ifdef DEBUG_TEXT
+ cerr << "data=" << el << endl;
+#endif
+ if ( el->isinstance( Original_t ) ) {
+ return el->text( cls, retaintok );
+ }
+ }
+ }
+ throw NoSuchText("wrong cls");
+ }
+
+ const string& Correction::getTextDelimiter( bool retaintok ) const {
+ for ( const auto& el : data ) {
+ if ( el->isinstance( New_t ) || el->isinstance( Current_t ) ) {
+ return el->getTextDelimiter( retaintok );
+ }
+ }
+ return EMPTY_STRING;
+ }
+
+ TextContent *Correction::textcontent( const string& cls ) const {
+ if ( cls == "current" ) {
+ for ( const auto& el : data ) {
+ if ( el->isinstance( New_t ) || el->isinstance( Current_t ) ) {
+ return el->textcontent( cls );
+ }
+ }
+ }
+ else if ( cls == "original" ) {
+ for ( const auto& el : data ) {
+ if ( el->isinstance( Original_t ) ) {
+ return el->textcontent( cls );
+ }
+ }
+ }
+ throw NoSuchText("wrong cls");
+ }
+
+ PhonContent *Correction::phoncontent( const string& cls ) const {
+ if ( cls == "current" ) {
+ for ( const auto& el: data ) {
+ if ( el->isinstance( New_t ) || el->isinstance( Current_t ) ) {
+ return el->phoncontent( cls );
+ }
+ }
+ }
+ else if ( cls == "original" ) {
+ for ( const auto& el: data ) {
+ if ( el->isinstance( Original_t ) ) {
+ return el->phoncontent( cls );
+ }
+ }
+ }
+ throw NoSuchPhon("wrong cls");
+ }
+
+ bool Correction::hasNew( ) const {
+ vector<FoliaElement*> v = select( New_t, false );
+ return !v.empty();
+ }
+
+ New *Correction::getNew() const {
+ vector<New*> v = FoliaElement::select<New>( false );
+ if ( v.empty() ) {
+ throw NoSuchAnnotation( "new" );
+ }
+ return v[0];
+ }
+
+ FoliaElement *Correction::getNew( size_t index ) const {
+ New *n = getNew();
+ return n->index(index);
+ }
+
+ bool Correction::hasOriginal() const {
+ vector<FoliaElement*> v = select( Original_t, false );
+ return !v.empty();
+ }
+
+ Original *Correction::getOriginal() const {
+ vector<Original*> v = FoliaElement::select<Original>( false );
+ if ( v.empty() ) {
+ throw NoSuchAnnotation( "original" );
+ }
+ return v[0];
+ }
+
+ FoliaElement *Correction::getOriginal( size_t index ) const {
+ Original *n = getOriginal();
+ return n->index(index);
+ }
+
+ bool Correction::hasCurrent( ) const {
+ vector<FoliaElement*> v = select( Current_t, false );
+ return !v.empty();
+ }
+
+ Current *Correction::getCurrent( ) const {
+ vector<Current*> v = FoliaElement::select<Current>( false );
+ if ( v.empty() ) {
+ throw NoSuchAnnotation( "current" );
+ }
+ return v[0];
+ }
+
+ FoliaElement *Correction::getCurrent( size_t index ) const {
+ Current *n = getCurrent();
+ return n->index(index);
+ }
+
+ bool Correction::hasSuggestions( ) const {
+ vector<Suggestion*> v = suggestions();
+ return !v.empty();
+ }
+
+ vector<Suggestion*> Correction::suggestions( ) const {
+ return FoliaElement::select<Suggestion>( false );
+ }
+
+ Suggestion *Correction::suggestions( size_t index ) const {
+ vector<Suggestion*> v = suggestions();
+ if ( v.empty() || index >= v.size() ) {
+ throw NoSuchAnnotation( "suggestion" );
+ }
+ return v[index];
+ }
+
+ Head *Division::head() const {
+ if ( data.size() > 0 ||
+ data[0]->element_id() == Head_t ) {
+ return dynamic_cast<Head*>(data[0]);
+ }
+ throw runtime_error( "No head" );
+ }
+
+ const string Gap::content() const {
+ vector<FoliaElement*> cv = select( Content_t );
+ if ( cv.empty() ) {
+ throw NoSuchAnnotation( "content" );
+ }
+ return cv[0]->content();
+ }
+
+ Headspan *Dependency::head() const {
+ vector<Headspan*> v = FoliaElement::select<Headspan>();
+ if ( v.size() < 1 ) {
+ throw NoSuchAnnotation( "head" );
+ }
+ return v[0];
+ }
+
+ DependencyDependent *Dependency::dependent() const {
+ vector<DependencyDependent *> v = FoliaElement::select<DependencyDependent>();
+ if ( v.empty() ) {
+ throw NoSuchAnnotation( "dependent" );
+ }
+ return v[0];
+ }
+
+ vector<AbstractSpanAnnotation*> FoliaImpl::selectSpan() const {
+ vector<AbstractSpanAnnotation*> res;
+ for ( const auto& el : SpanSet ) {
+ vector<FoliaElement*> tmp = select( el, true );
+ for ( auto& sp : tmp ) {
+ res.push_back( dynamic_cast<AbstractSpanAnnotation*>( sp ) );
+ }
+ }
+ return res;
+ }
+
+ vector<FoliaElement*> AbstractSpanAnnotation::wrefs() const {
+ vector<FoliaElement*> res;
+ for ( const auto& el : data ) {
+ ElementType et = el->element_id();
+ if ( et == Word_t
+ || et == WordReference_t
+ || et == Phoneme_t
+ || et == MorphologyLayer_t ) {
+ res.push_back( el );
+ }
+ else {
+ AbstractSpanAnnotation *as = dynamic_cast<AbstractSpanAnnotation*>(el);
+ if ( as != 0 ) {
+ vector<FoliaElement*> sub = as->wrefs();
+ for ( auto& wr : sub ) {
+ res.push_back( wr );
+ }
+ }
+ }
+ }
+ return res;
+ }
+
+ FoliaElement *AbstractSpanAnnotation::wrefs( size_t pos ) const {
+ vector<FoliaElement*> v = wrefs();
+ if ( pos < v.size() ) {
+ return v[pos];
+ }
+ return 0;
+ }
+
+ AbstractSpanAnnotation *AbstractAnnotationLayer::findspan( const vector<FoliaElement*>& words ) const {
+ vector<AbstractSpanAnnotation*> av = selectSpan();
+ for ( const auto& span : av ){
+ vector<FoliaElement*> v = span->wrefs();
+ if ( v.size() == words.size() ) {
+ bool ok = true;
+ for ( size_t n = 0; n < v.size(); ++n ) {
+ if ( v[n] != words[n] ) {
+ ok = false;
+ break;
+ }
+ }
+ if ( ok ) {
+ return span;
+ }
+ }
+ }
+ return 0;
+ }
+
+ const UnicodeString XmlText::text( const string&, bool, bool ) const {
+ return UTF8ToUnicode(_value);
+ }
+
+ xmlNode *XmlText::xml( bool, bool ) const {
+ return xmlNewText( (const xmlChar*)_value.c_str() );
+ }
+
+ FoliaElement* XmlText::parseXml( const xmlNode *node ) {
+ string tmp;
+ if ( node->content ) {
+ _value = (const char*)node->content;
+ tmp = trim( _value );
+ }
+ if ( tmp.empty() ) {
+ throw ValueError( "TextContent may not be empty" );
+ }
+ return this;
+ }
+
+ static int error_sink(void *mydata, xmlError *error ) {
+ int *cnt = (int*)mydata;
+ if ( *cnt == 0 ) {
+ cerr << "\nXML-error: " << error->message << endl;
+ }
+ (*cnt)++;
+ return 1;
+ }
+
+ void External::resolve( ) {
+ try {
+ cerr << "try to resolve: " << _src << endl;
+ int cnt = 0;
+ xmlSetStructuredErrorFunc( &cnt, (xmlStructuredErrorFunc)error_sink );
+ xmlDoc *extdoc = xmlReadFile( _src.c_str(), 0, XML_PARSE_NOBLANKS|XML_PARSE_HUGE );
+ if ( extdoc ) {
+ xmlNode *root = xmlDocGetRootElement( extdoc );
+ xmlNode *p = root->children;
+ while ( p ) {
+ if ( p->type == XML_ELEMENT_NODE ) {
+ string tag = Name( p );
+ if ( tag == "text" ) {
+ FoliaElement *parent = _parent;
+ KWargs args = parent->collectAttributes();
+ args["_id"] = "Arglebargleglop-glyf";
+ Text *tmp = new Text( args, mydoc );
+ tmp->FoliaImpl::parseXml( p );
+ FoliaElement *old = parent->replace( this, tmp->index(0) );
+ mydoc->delDocIndex( tmp, "Arglebargleglop-glyf" );
+ tmp->remove( (size_t)0, false );
+ delete tmp;
+ delete old;
+ }
+ p = p->next;
+ }
+ }
+ xmlFreeDoc( extdoc );
+ }
+ else {
+ throw XmlError( "resolving external " + _src + " failed" );
+ }
+ }
+ catch ( const exception& e ) {
+ throw XmlError( "resolving external " + _src + " failed: "
+ + e.what() );
+ }
+ }
+
+ FoliaElement* External::parseXml( const xmlNode *node ) {
+ KWargs att = getAttributes( node );
+ setAttributes( att );
+ if ( _include ) {
+ mydoc->addExternal( this );
+ }
+ return this;
+ }
+
+ KWargs External::collectAttributes() const {
+ KWargs atts = FoliaImpl::collectAttributes();
+ if ( _include ) {
+ atts["include"] = "yes";
+ }
+ return atts;
+ }
+
+ void External::setAttributes( const KWargs& kwargsin ) {
+ KWargs kwargs = kwargsin;
+ auto it = kwargs.find( "include" );
+ if ( it != kwargs.end() ) {
+ _include = TiCC::stringTo<bool>( it->second );
+ kwargs.erase( it );
+ }
+ FoliaImpl::setAttributes(kwargs);
+ }
+
+ void Note::setAttributes( const KWargs& args ) {
+ auto it = args.find( "_id" );
+ if ( it != args.end() ) {
+ refId = it->second;
+ }
+ FoliaImpl::setAttributes( args );
+ }
+
+ KWargs Reference::collectAttributes() const {
+ KWargs atts;
+ atts["id"] = refId;
+ atts["type"] = ref_type;
+ if ( !_format.empty() && _format != "text/folia+xml" ) {
+ atts["format"] = _format;
+ }
+ return atts;
+ }
+
+ void Reference::setAttributes( const KWargs& argsin ) {
+ KWargs args = argsin;
+ auto it = args.find( "id" );
+ if ( it != args.end() ) {
+ refId = it->second;
+ args.erase( it );
+ }
+ it = args.find( "type" );
+ if ( it != args.end() ) {
+ ref_type = it->second;
+ args.erase( it );
+ }
+ it = args.find( "format" );
+ if ( it != args.end() ) {
+ _format = it->second;
+ args.erase( it );
+ }
+ FoliaImpl::setAttributes(args);
+ }
+
+ xmlNode *XmlComment::xml( bool, bool ) const {
+ return xmlNewComment( (const xmlChar*)_value.c_str() );
+ }
+
+ FoliaElement* XmlComment::parseXml( const xmlNode *node ) {
+ if ( node->content ) {
+ _value = (const char*)node->content;
+ }
+ return this;
+ }
+
+ void Feature::setAttributes( const KWargs& kwargs ) {
+ //
+ // Feature is special. So DON'T call ::setAttributes
+ //
+ auto it = kwargs.find( "subset" );
+ if ( it == kwargs.end() ) {
+ _subset = default_subset();
+ if ( _subset.empty() ){
+ throw ValueError("subset attribute is required for " + classname() );
+ }
+
+ }
+ else {
+ _subset = it->second;
+ }
+ it = kwargs.find( "class" );
+ if ( it == kwargs.end() ) {
+ throw ValueError("class attribute is required for " + classname() );
+ }
+ _class = it->second;
+ }
+
+ KWargs Feature::collectAttributes() const {
+ KWargs attribs = FoliaImpl::collectAttributes();
+ attribs["subset"] = _subset;
+ return attribs;
+ }
+
+ vector<string> FoliaImpl::feats( const string& s ) const {
+ // return all classes of the given subset
+ vector<string> result;
+ for ( const auto& el : data ) {
+ if ( el->isSubClass( Feature_t ) &&
+ el->subset() == s ) {
+ result.push_back( el->cls() );
+ }
+ }
+ return result;
+ }
+
+ const string FoliaImpl::feat( const string& s ) const {
+ // return the fist class of the given subset
+ for ( const auto& el : data ) {
+ if ( el->isSubClass( Feature_t ) &&
+ el->subset() == s ) {
+ return el->cls();
+ }
+ }
+ return "";
+ }
+
+ ForeignData::~ForeignData(){
+ xmlFreeNode( _foreign_data );
+ }
+
+ FoliaElement* ForeignData::parseXml( const xmlNode *node ){
+ set_data( node );
+ return this;
+ }
+
+ xmlNode *ForeignData::xml( bool, bool ) const {
+ return get_data();
+ }
+
+ void ForeignData::set_data( const xmlNode *node ){
+ xmlNode *p = (xmlNode *)node->children;
+ while ( p ){
+ string pref;
+ string ns = getNS( p, pref );
+ if ( ns == NSFOLIA ){
+ throw XmlError( "ForeignData MAY NOT be in the FoLiA namespace" );
+ }
+ p = p->next;
+ }
+ _foreign_data = xmlCopyNode( (xmlNode*)node, 1 );
+ }
+
+ void clean_ns( xmlNode *node, const string& ns ){
+ xmlNs *p = node->nsDef;
+ xmlNs *prev = 0;
+ while ( p ){
+ string val = (char *)p->href;
+ if ( val == ns ){
+ if ( prev ){
+ prev->next = p->next;
+ }
+ else {
+ node->nsDef = p->next;
+ }
+ return;
+ }
+ prev = p;
+ p = p->next;
+ }
+ }
+
+ xmlNode* ForeignData::get_data() const {
+ xmlNode * result = xmlCopyNode(_foreign_data, 1 );
+ clean_ns( result, NSFOLIA ); // HACK: remove FoLiA namespace def
+ return result;
+ }
+
+ KWargs AbstractTextMarkup::collectAttributes() const {
+ KWargs attribs = FoliaImpl::collectAttributes();
+ if ( !idref.empty() ) {
+ attribs["id"] = idref;
+ }
+ return attribs;
+ }
+
+ void AbstractTextMarkup::setAttributes( const KWargs& atts ) {
+ KWargs args = atts;
+ auto it = args.find( "id" );
+ if ( it != args.end() ) {
+ auto it2 = args.find( "_id" );
+ if ( it2 != args.end() ) {
+ throw ValueError("Both 'id' and 'xml:id found for " + classname() );
+ }
+ idref = it->second;
+ args.erase( it );
+ }
+ it = args.find( "text" );
+ if ( it != args.end() ) {
+ XmlText *txt = new XmlText();
+ txt->setvalue( it->second );
+ append(txt);
+ args.erase( it );
+ }
+ FoliaImpl::setAttributes( args );
+ }
+
+ KWargs TextMarkupCorrection::collectAttributes() const {
+ KWargs attribs = AbstractTextMarkup::collectAttributes();
+ if ( !_original.empty() ) {
+ attribs["original"] = _original;
+ }
+ return attribs;
+ }
+
+ void TextMarkupCorrection::setAttributes( const KWargs& args ) {
+ KWargs argl = args;
+ auto it = argl.find( "id" );
+ if ( it != argl.end() ) {
+ idref = it->second;
+ argl.erase( it );
+ }
+ it = argl.find( "original" );
+ if ( it != argl.end() ) {
+ _original = it->second;
+ argl.erase( it );
+ }
+ FoliaImpl::setAttributes( argl );
+ }
+
+ const UnicodeString AbstractTextMarkup::text( const string& cls,
+ bool, bool ) const {
+ // we assume al TextMarkup to be tokenized already
+ return FoliaImpl::text( cls, true );
+ }
+
+ const UnicodeString TextMarkupCorrection::text( const string& cls,
+ bool ret,
+ bool strict ) const{
+ if ( cls == "original" ) {
+ return UTF8ToUnicode(_original);
+ }
+ return FoliaImpl::text( cls, ret, strict );
+ }
+
+ const FoliaElement* AbstractTextMarkup::resolveid() const {
+ if ( idref.empty() || !mydoc ) {
+ return this;
+ }
+ else {
+ return mydoc->index(idref);
+ }
+ }
+
+ void TextContent::init() {
+ _offset = -1;
+ }
+
+ void PhonContent::init() {
+ _offset = -1;
+ }
+
+ void Word::init() {
+ _space = true;
+ }
+
+ void Linebreak::init() {
+ _newpage = false;
+ }
+
+ void Alignment::init() {
+ _format = "text/folia+xml";
+ }
+
+ void Reference::init() {
+ _format = "text/folia+xml";
+ }
+
+ void ForeignData::init() {
+ _foreign_data = 0;
+ }
+
+} // namespace folia
diff --git a/src/folia_properties.cxx b/src/folia_properties.cxx
new file mode 100644
index 0000000..40a1226
--- /dev/null
+++ b/src/folia_properties.cxx
@@ -0,0 +1,1433 @@
+#include <set>
+#include <string>
+#include <iostream>
+
+#include "libfolia/folia.h"
+#include "libfolia/folia_properties.h"
+
+//foliaspec:header
+//This file was last updated according to the FoLiA specification for version 1.2.0 on 2016-05-18 13:42:12, using foliaspec.py
+//Code blocks after a foliaspec comment (until the next newline) are automatically generated. **DO NOT EDIT THOSE** and **DO NOT REMOVE ANY FOLIASPEC COMMENTS** !!!
+
+namespace folia {
+
+ using namespace std;
+
+ //foliaspec:version_major:MAJOR_VERSION
+ //The FoLiA version (major)
+ const int MAJOR_VERSION = 1;
+
+ //foliaspec:version_minor:MINOR_VERSION
+ //The FoLiA version (minor)
+ const int MINOR_VERSION = 2;
+
+ //foliaspec:version_sub:SUB_VERSION
+ //The FoLiA version (sub/rev)
+ const int SUB_VERSION = 0;
+
+ //foliaspec:namespace:NSFOLIA
+ //The FoLiA XML namespace
+ const string NSFOLIA = "http://ilk.uvt.nl/folia";
+
+ const string NSDCOI = "http://lands.let.ru.nl/projects/d-coi/ns/1.0";
+ const string NSIMDI = "http://www.mpi.nl/IMDI/Schema/IMDI";
+
+ //foliaspec:attributefeatures
+ const set<string> AttributeFeatures = { "actor", "begindatetime", "enddatetime", "function", "headfeature", "level", "modality", "style", "synset", "time", "value" };
+
+ //foliaspec:annotationtype_string_map
+ //A mapping from annotation types to strings
+ const map<AnnotationType::AnnotationType,string> ant_s_map = {
+ { AnnotationType::NO_ANN, "NONE" },
+ { AnnotationType::ALIGNMENT, "alignment" },
+ { AnnotationType::CHUNKING, "chunking" },
+ { AnnotationType::COMPLEXALIGNMENT, "complexalignment" },
+ { AnnotationType::COREFERENCE, "coreference" },
+ { AnnotationType::CORRECTION, "correction" },
+ { AnnotationType::DEFINITION, "definition" },
+ { AnnotationType::DEPENDENCY, "dependency" },
+ { AnnotationType::DIVISION, "division" },
+ { AnnotationType::DOMAIN, "domain" },
+ { AnnotationType::ENTITY, "entity" },
+ { AnnotationType::ENTRY, "entry" },
+ { AnnotationType::ERRORDETECTION, "errordetection" },
+ { AnnotationType::EVENT, "event" },
+ { AnnotationType::EXAMPLE, "example" },
+ { AnnotationType::FIGURE, "figure" },
+ { AnnotationType::GAP, "gap" },
+ { AnnotationType::LANG, "lang" },
+ { AnnotationType::LEMMA, "lemma" },
+ { AnnotationType::LINEBREAK, "linebreak" },
+ { AnnotationType::LIST, "list" },
+ { AnnotationType::METRIC, "metric" },
+ { AnnotationType::MORPHOLOGICAL, "morphological" },
+ { AnnotationType::NOTE, "note" },
+ { AnnotationType::PARAGRAPH, "paragraph" },
+ { AnnotationType::PART, "part" },
+ { AnnotationType::PHON, "phon" },
+ { AnnotationType::PHONOLOGICAL, "phonological" },
+ { AnnotationType::POS, "pos" },
+ { AnnotationType::SEMROLE, "semrole" },
+ { AnnotationType::SENSE, "sense" },
+ { AnnotationType::SENTENCE, "sentence" },
+ { AnnotationType::STRING, "string" },
+ { AnnotationType::SUBJECTIVITY, "subjectivity" },
+ { AnnotationType::SYNTAX, "syntax" },
+ { AnnotationType::TABLE, "table" },
+ { AnnotationType::TERM, "term" },
+ { AnnotationType::TEXT, "text" },
+ { AnnotationType::STYLE, "style" },
+ { AnnotationType::TIMESEGMENT, "timesegment" },
+ { AnnotationType::UTTERANCE, "utterance" },
+ { AnnotationType::WHITESPACE, "whitespace" },
+ { AnnotationType::TOKEN, "token" },
+ };
+
+ //foliaspec:string_annotationtype_map
+ //A mapping from strings to annotation types
+ const map<string,AnnotationType::AnnotationType> s_ant_map = {
+ { "NONE", AnnotationType::NO_ANN },
+ { "alignment", AnnotationType::ALIGNMENT },
+ { "chunking", AnnotationType::CHUNKING },
+ { "complexalignment", AnnotationType::COMPLEXALIGNMENT },
+ { "coreference", AnnotationType::COREFERENCE },
+ { "correction", AnnotationType::CORRECTION },
+ { "definition", AnnotationType::DEFINITION },
+ { "dependency", AnnotationType::DEPENDENCY },
+ { "division", AnnotationType::DIVISION },
+ { "domain", AnnotationType::DOMAIN },
+ { "entity", AnnotationType::ENTITY },
+ { "entry", AnnotationType::ENTRY },
+ { "errordetection", AnnotationType::ERRORDETECTION },
+ { "event", AnnotationType::EVENT },
+ { "example", AnnotationType::EXAMPLE },
+ { "figure", AnnotationType::FIGURE },
+ { "gap", AnnotationType::GAP },
+ { "lang", AnnotationType::LANG },
+ { "lemma", AnnotationType::LEMMA },
+ { "linebreak", AnnotationType::LINEBREAK },
+ { "list", AnnotationType::LIST },
+ { "metric", AnnotationType::METRIC },
+ { "morphological", AnnotationType::MORPHOLOGICAL },
+ { "note", AnnotationType::NOTE },
+ { "paragraph", AnnotationType::PARAGRAPH },
+ { "part", AnnotationType::PART },
+ { "phon", AnnotationType::PHON },
+ { "phonological", AnnotationType::PHONOLOGICAL },
+ { "pos", AnnotationType::POS },
+ { "semrole", AnnotationType::SEMROLE },
+ { "sense", AnnotationType::SENSE },
+ { "sentence", AnnotationType::SENTENCE },
+ { "string", AnnotationType::STRING },
+ { "subjectivity", AnnotationType::SUBJECTIVITY },
+ { "syntax", AnnotationType::SYNTAX },
+ { "table", AnnotationType::TABLE },
+ { "term", AnnotationType::TERM },
+ { "text", AnnotationType::TEXT },
+ { "style", AnnotationType::STYLE },
+ { "timesegment", AnnotationType::TIMESEGMENT },
+ { "utterance", AnnotationType::UTTERANCE },
+ { "whitespace", AnnotationType::WHITESPACE },
+ { "token", AnnotationType::TOKEN },
+ };
+
+ //foliaspec:elementtype_string_map
+ const map<ElementType,string> et_s_map = {
+ { BASE, "FoLiA" },
+ { AbstractAnnotationLayer_t, "_AbstractAnnotationLayer" },
+ { AbstractCorrectionChild_t, "_AbstractCorrectionChild" },
+ { AbstractExtendedTokenAnnotation_t, "_AbstractExtendedTokenAnnotation" },
+ { AbstractSpanAnnotation_t, "_AbstractSpanAnnotation" },
+ { AbstractSpanRole_t, "_AbstractSpanRole" },
+ { AbstractStructureElement_t, "_AbstractStructureElement" },
+ { AbstractTextMarkup_t, "_AbstractTextMarkup" },
+ { AbstractTokenAnnotation_t, "_AbstractTokenAnnotation" },
+ { ActorFeature_t, "actor" },
+ { AlignReference_t, "aref" },
+ { Alignment_t, "alignment" },
+ { Alternative_t, "alt" },
+ { AlternativeLayers_t, "altlayers" },
+ { BegindatetimeFeature_t, "begindatetime" },
+ { Caption_t, "caption" },
+ { Cell_t, "cell" },
+ { Chunk_t, "chunk" },
+ { ChunkingLayer_t, "chunking" },
+ { ComplexAlignment_t, "complexalignment" },
+ { ComplexAlignmentLayer_t, "complexalignments" },
+ { Content_t, "content" },
+ { CoreferenceChain_t, "coreferencechain" },
+ { CoreferenceLayer_t, "coreferences" },
+ { CoreferenceLink_t, "coreferencelink" },
+ { Correction_t, "correction" },
+ { Current_t, "current" },
+ { Definition_t, "def" },
+ { DependenciesLayer_t, "dependencies" },
+ { Dependency_t, "dependency" },
+ { DependencyDependent_t, "dep" },
+ { Description_t, "desc" },
+ { Division_t, "div" },
+ { DomainAnnotation_t, "domain" },
+ { EnddatetimeFeature_t, "enddatetime" },
+ { EntitiesLayer_t, "entities" },
+ { Entity_t, "entity" },
+ { Entry_t, "entry" },
+ { ErrorDetection_t, "errordetection" },
+ { Event_t, "event" },
+ { Example_t, "ex" },
+ { External_t, "external" },
+ { Feature_t, "feat" },
+ { Figure_t, "figure" },
+ { ForeignData_t, "foreign-data" },
+ { FunctionFeature_t, "function" },
+ { Gap_t, "gap" },
+ { Head_t, "head" },
+ { HeadFeature_t, "headfeature" },
+ { Headspan_t, "hd" },
+ { Label_t, "label" },
+ { LangAnnotation_t, "lang" },
+ { LemmaAnnotation_t, "lemma" },
+ { LevelFeature_t, "level" },
+ { Linebreak_t, "br" },
+ { List_t, "list" },
+ { ListItem_t, "item" },
+ { Metric_t, "metric" },
+ { ModalityFeature_t, "modality" },
+ { Morpheme_t, "morpheme" },
+ { MorphologyLayer_t, "morphology" },
+ { New_t, "new" },
+ { Note_t, "note" },
+ { Original_t, "original" },
+ { Paragraph_t, "p" },
+ { Part_t, "part" },
+ { PhonContent_t, "ph" },
+ { Phoneme_t, "phoneme" },
+ { PhonologyLayer_t, "phonology" },
+ { PosAnnotation_t, "pos" },
+ { Quote_t, "quote" },
+ { Reference_t, "ref" },
+ { Row_t, "row" },
+ { SemanticRole_t, "semrole" },
+ { SemanticRolesLayer_t, "semroles" },
+ { SenseAnnotation_t, "sense" },
+ { Sentence_t, "s" },
+ { Speech_t, "speech" },
+ { String_t, "str" },
+ { StyleFeature_t, "style" },
+ { SubjectivityAnnotation_t, "subjectivity" },
+ { Suggestion_t, "suggestion" },
+ { SynsetFeature_t, "synset" },
+ { SyntacticUnit_t, "su" },
+ { SyntaxLayer_t, "syntax" },
+ { Table_t, "table" },
+ { TableHead_t, "tablehead" },
+ { Term_t, "term" },
+ { Text_t, "text" },
+ { TextContent_t, "t" },
+ { TextMarkupCorrection_t, "t-correction" },
+ { TextMarkupError_t, "t-error" },
+ { TextMarkupGap_t, "t-gap" },
+ { TextMarkupString_t, "t-str" },
+ { TextMarkupStyle_t, "t-style" },
+ { TimeFeature_t, "time" },
+ { TimeSegment_t, "timesegment" },
+ { TimingLayer_t, "timing" },
+ { Utterance_t, "utt" },
+ { ValueFeature_t, "value" },
+ { Whitespace_t, "whitespace" },
+ { Word_t, "w" },
+ { WordReference_t, "wref" },
+ { PlaceHolder_t, "_PlaceHolder" },
+ { XmlComment_t, "_XmlComment" },
+ { XmlText_t, "_XmlText" }
+ };
+
+ //foliaspec:string_elementtype_map
+ const map<string,ElementType> s_et_map = {
+ { "FoLiA", BASE },
+ { "_AbstractAnnotationLayer", AbstractAnnotationLayer_t },
+ { "_AbstractCorrectionChild", AbstractCorrectionChild_t },
+ { "_AbstractExtendedTokenAnnotation", AbstractExtendedTokenAnnotation_t },
+ { "_AbstractSpanAnnotation", AbstractSpanAnnotation_t },
+ { "_AbstractSpanRole", AbstractSpanRole_t },
+ { "_AbstractStructureElement", AbstractStructureElement_t },
+ { "_AbstractTextMarkup", AbstractTextMarkup_t },
+ { "_AbstractTokenAnnotation", AbstractTokenAnnotation_t },
+ { "actor", ActorFeature_t },
+ { "aref", AlignReference_t },
+ { "alignment", Alignment_t },
+ { "alt", Alternative_t },
+ { "altlayers", AlternativeLayers_t },
+ { "begindatetime", BegindatetimeFeature_t },
+ { "caption", Caption_t },
+ { "cell", Cell_t },
+ { "chunk", Chunk_t },
+ { "chunking", ChunkingLayer_t },
+ { "complexalignment", ComplexAlignment_t },
+ { "complexalignments", ComplexAlignmentLayer_t },
+ { "content", Content_t },
+ { "coreferencechain", CoreferenceChain_t },
+ { "coreferences", CoreferenceLayer_t },
+ { "coreferencelink", CoreferenceLink_t },
+ { "correction", Correction_t },
+ { "current", Current_t },
+ { "def", Definition_t },
+ { "dependencies", DependenciesLayer_t },
+ { "dependency", Dependency_t },
+ { "dep", DependencyDependent_t },
+ { "desc", Description_t },
+ { "div", Division_t },
+ { "domain", DomainAnnotation_t },
+ { "enddatetime", EnddatetimeFeature_t },
+ { "entities", EntitiesLayer_t },
+ { "entity", Entity_t },
+ { "entry", Entry_t },
+ { "errordetection", ErrorDetection_t },
+ { "event", Event_t },
+ { "ex", Example_t },
+ { "external", External_t },
+ { "feat", Feature_t },
+ { "figure", Figure_t },
+ { "foreign-data", ForeignData_t },
+ { "function", FunctionFeature_t },
+ { "gap", Gap_t },
+ { "head", Head_t },
+ { "headfeature", HeadFeature_t },
+ { "hd", Headspan_t },
+ { "label", Label_t },
+ { "lang", LangAnnotation_t },
+ { "lemma", LemmaAnnotation_t },
+ { "level", LevelFeature_t },
+ { "br", Linebreak_t },
+ { "list", List_t },
+ { "item", ListItem_t },
+ { "metric", Metric_t },
+ { "modality", ModalityFeature_t },
+ { "morpheme", Morpheme_t },
+ { "morphology", MorphologyLayer_t },
+ { "new", New_t },
+ { "note", Note_t },
+ { "original", Original_t },
+ { "p", Paragraph_t },
+ { "part", Part_t },
+ { "ph", PhonContent_t },
+ { "phoneme", Phoneme_t },
+ { "phonology", PhonologyLayer_t },
+ { "pos", PosAnnotation_t },
+ { "quote", Quote_t },
+ { "ref", Reference_t },
+ { "row", Row_t },
+ { "semrole", SemanticRole_t },
+ { "semroles", SemanticRolesLayer_t },
+ { "sense", SenseAnnotation_t },
+ { "s", Sentence_t },
+ { "speech", Speech_t },
+ { "str", String_t },
+ { "style", StyleFeature_t },
+ { "subjectivity", SubjectivityAnnotation_t },
+ { "suggestion", Suggestion_t },
+ { "synset", SynsetFeature_t },
+ { "su", SyntacticUnit_t },
+ { "syntax", SyntaxLayer_t },
+ { "table", Table_t },
+ { "tablehead", TableHead_t },
+ { "term", Term_t },
+ { "text", Text_t },
+ { "t", TextContent_t },
+ { "t-correction", TextMarkupCorrection_t },
+ { "t-error", TextMarkupError_t },
+ { "t-gap", TextMarkupGap_t },
+ { "t-str", TextMarkupString_t },
+ { "t-style", TextMarkupStyle_t },
+ { "time", TimeFeature_t },
+ { "timesegment", TimeSegment_t },
+ { "timing", TimingLayer_t },
+ { "utt", Utterance_t },
+ { "value", ValueFeature_t },
+ { "whitespace", Whitespace_t },
+ { "w", Word_t },
+ { "wref", WordReference_t },
+ { "_PlaceHolder", PlaceHolder_t },
+ { "_XmlComment", XmlComment_t },
+ { "_XmlText", XmlText_t }
+ };
+
+ //foliaspec:default_ignore
+ //Default ignore list for the select() method, do not descend into these
+ const set<ElementType> default_ignore = { Alternative_t, AlternativeLayers_t, ForeignData_t, Original_t, Suggestion_t };
+
+ //foliaspec:default_ignore_annotations
+ //Default ignore list for token annotation
+ const set<ElementType> default_ignore_annotations = { Alternative_t, AlternativeLayers_t, MorphologyLayer_t, Original_t, PhonologyLayer_t, Suggestion_t };
+
+ //foliaspec:default_ignore_structure
+ //Default ignore list for structure annotation
+ const set<ElementType> default_ignore_structure = { Alternative_t, AlternativeLayers_t, ChunkingLayer_t, ComplexAlignmentLayer_t, CoreferenceLayer_t, DependenciesLayer_t, EntitiesLayer_t, MorphologyLayer_t, Original_t, PhonologyLayer_t, SemanticRolesLayer_t, Suggestion_t, SyntaxLayer_t, TimingLayer_t };
+
+ const set<ElementType> AnnoExcludeSet = { Original_t, Suggestion_t };
+
+ const set<ElementType> SpanSet = { SyntacticUnit_t,
+ Chunk_t,
+ Entity_t,
+ Headspan_t,
+ DependencyDependent_t,
+ CoreferenceLink_t,
+ CoreferenceChain_t,
+ SemanticRole_t,
+ SemanticRolesLayer_t,
+ TimeSegment_t };
+
+ properties DEFAULT_PROPERTIES;
+
+ //these are not in the external specification yet:
+ properties FoLiA::PROPS = DEFAULT_PROPERTIES;
+ properties DCOI::PROPS = DEFAULT_PROPERTIES;
+ properties XmlComment::PROPS = DEFAULT_PROPERTIES;
+ properties PlaceHolder::PROPS = DEFAULT_PROPERTIES;
+ properties XmlText::PROPS = DEFAULT_PROPERTIES;
+
+ //foliaspec:instantiateelementproperties
+ //Instantiates all element properties for the first time, setting them to the default properties
+ properties AbstractAnnotationLayer::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractCorrectionChild::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractExtendedTokenAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractSpanAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractSpanRole::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractStructureElement::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractTextMarkup::PROPS = DEFAULT_PROPERTIES;
+ properties AbstractTokenAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties ActorFeature::PROPS = DEFAULT_PROPERTIES;
+ properties AlignReference::PROPS = DEFAULT_PROPERTIES;
+ properties Alignment::PROPS = DEFAULT_PROPERTIES;
+ properties Alternative::PROPS = DEFAULT_PROPERTIES;
+ properties AlternativeLayers::PROPS = DEFAULT_PROPERTIES;
+ properties BegindatetimeFeature::PROPS = DEFAULT_PROPERTIES;
+ properties Caption::PROPS = DEFAULT_PROPERTIES;
+ properties Cell::PROPS = DEFAULT_PROPERTIES;
+ properties Chunk::PROPS = DEFAULT_PROPERTIES;
+ properties ChunkingLayer::PROPS = DEFAULT_PROPERTIES;
+ properties ComplexAlignment::PROPS = DEFAULT_PROPERTIES;
+ properties ComplexAlignmentLayer::PROPS = DEFAULT_PROPERTIES;
+ properties Content::PROPS = DEFAULT_PROPERTIES;
+ properties CoreferenceChain::PROPS = DEFAULT_PROPERTIES;
+ properties CoreferenceLayer::PROPS = DEFAULT_PROPERTIES;
+ properties CoreferenceLink::PROPS = DEFAULT_PROPERTIES;
+ properties Correction::PROPS = DEFAULT_PROPERTIES;
+ properties Current::PROPS = DEFAULT_PROPERTIES;
+ properties Definition::PROPS = DEFAULT_PROPERTIES;
+ properties DependenciesLayer::PROPS = DEFAULT_PROPERTIES;
+ properties Dependency::PROPS = DEFAULT_PROPERTIES;
+ properties DependencyDependent::PROPS = DEFAULT_PROPERTIES;
+ properties Description::PROPS = DEFAULT_PROPERTIES;
+ properties Division::PROPS = DEFAULT_PROPERTIES;
+ properties DomainAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties EnddatetimeFeature::PROPS = DEFAULT_PROPERTIES;
+ properties EntitiesLayer::PROPS = DEFAULT_PROPERTIES;
+ properties Entity::PROPS = DEFAULT_PROPERTIES;
+ properties Entry::PROPS = DEFAULT_PROPERTIES;
+ properties ErrorDetection::PROPS = DEFAULT_PROPERTIES;
+ properties Event::PROPS = DEFAULT_PROPERTIES;
+ properties Example::PROPS = DEFAULT_PROPERTIES;
+ properties External::PROPS = DEFAULT_PROPERTIES;
+ properties Feature::PROPS = DEFAULT_PROPERTIES;
+ properties Figure::PROPS = DEFAULT_PROPERTIES;
+ properties ForeignData::PROPS = DEFAULT_PROPERTIES;
+ properties FunctionFeature::PROPS = DEFAULT_PROPERTIES;
+ properties Gap::PROPS = DEFAULT_PROPERTIES;
+ properties Head::PROPS = DEFAULT_PROPERTIES;
+ properties HeadFeature::PROPS = DEFAULT_PROPERTIES;
+ properties Headspan::PROPS = DEFAULT_PROPERTIES;
+ properties Label::PROPS = DEFAULT_PROPERTIES;
+ properties LangAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties LemmaAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties LevelFeature::PROPS = DEFAULT_PROPERTIES;
+ properties Linebreak::PROPS = DEFAULT_PROPERTIES;
+ properties List::PROPS = DEFAULT_PROPERTIES;
+ properties ListItem::PROPS = DEFAULT_PROPERTIES;
+ properties Metric::PROPS = DEFAULT_PROPERTIES;
+ properties ModalityFeature::PROPS = DEFAULT_PROPERTIES;
+ properties Morpheme::PROPS = DEFAULT_PROPERTIES;
+ properties MorphologyLayer::PROPS = DEFAULT_PROPERTIES;
+ properties New::PROPS = DEFAULT_PROPERTIES;
+ properties Note::PROPS = DEFAULT_PROPERTIES;
+ properties Original::PROPS = DEFAULT_PROPERTIES;
+ properties Paragraph::PROPS = DEFAULT_PROPERTIES;
+ properties Part::PROPS = DEFAULT_PROPERTIES;
+ properties PhonContent::PROPS = DEFAULT_PROPERTIES;
+ properties Phoneme::PROPS = DEFAULT_PROPERTIES;
+ properties PhonologyLayer::PROPS = DEFAULT_PROPERTIES;
+ properties PosAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties Quote::PROPS = DEFAULT_PROPERTIES;
+ properties Reference::PROPS = DEFAULT_PROPERTIES;
+ properties Row::PROPS = DEFAULT_PROPERTIES;
+ properties SemanticRole::PROPS = DEFAULT_PROPERTIES;
+ properties SemanticRolesLayer::PROPS = DEFAULT_PROPERTIES;
+ properties SenseAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties Sentence::PROPS = DEFAULT_PROPERTIES;
+ properties Speech::PROPS = DEFAULT_PROPERTIES;
+ properties String::PROPS = DEFAULT_PROPERTIES;
+ properties StyleFeature::PROPS = DEFAULT_PROPERTIES;
+ properties SubjectivityAnnotation::PROPS = DEFAULT_PROPERTIES;
+ properties Suggestion::PROPS = DEFAULT_PROPERTIES;
+ properties SynsetFeature::PROPS = DEFAULT_PROPERTIES;
+ properties SyntacticUnit::PROPS = DEFAULT_PROPERTIES;
+ properties SyntaxLayer::PROPS = DEFAULT_PROPERTIES;
+ properties Table::PROPS = DEFAULT_PROPERTIES;
+ properties TableHead::PROPS = DEFAULT_PROPERTIES;
+ properties Term::PROPS = DEFAULT_PROPERTIES;
+ properties Text::PROPS = DEFAULT_PROPERTIES;
+ properties TextContent::PROPS = DEFAULT_PROPERTIES;
+ properties TextMarkupCorrection::PROPS = DEFAULT_PROPERTIES;
+ properties TextMarkupError::PROPS = DEFAULT_PROPERTIES;
+ properties TextMarkupGap::PROPS = DEFAULT_PROPERTIES;
+ properties TextMarkupString::PROPS = DEFAULT_PROPERTIES;
+ properties TextMarkupStyle::PROPS = DEFAULT_PROPERTIES;
+ properties TimeFeature::PROPS = DEFAULT_PROPERTIES;
+ properties TimeSegment::PROPS = DEFAULT_PROPERTIES;
+ properties TimingLayer::PROPS = DEFAULT_PROPERTIES;
+ properties Utterance::PROPS = DEFAULT_PROPERTIES;
+ properties ValueFeature::PROPS = DEFAULT_PROPERTIES;
+ properties Whitespace::PROPS = DEFAULT_PROPERTIES;
+ properties Word::PROPS = DEFAULT_PROPERTIES;
+ properties WordReference::PROPS = DEFAULT_PROPERTIES;
+
+ set<ElementType>& operator+=( set<ElementType>& a ,
+ const set<ElementType>& b ){
+ a.insert(b.begin(), b.end());
+ return a;
+ }
+
+ void static_init(){
+ FoLiA::PROPS.XMLTAG = "FoLiA";
+ FoLiA::PROPS.ACCEPTED_DATA += { Text_t, Speech_t };
+
+ DCOI::PROPS.XMLTAG = "DCOI";
+ DCOI::PROPS.ACCEPTED_DATA += { Text_t, Speech_t };
+
+
+ //foliaspec:begin:setelementproperties
+ //Sets all element properties for all elements
+//------ AbstractAnnotationLayer -------
+ AbstractAnnotationLayer::PROPS.ELEMENT_ID = AbstractAnnotationLayer_t;
+ AbstractAnnotationLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, ForeignData_t};
+ AbstractAnnotationLayer::PROPS.OPTIONAL_ATTRIBS = ID|ANNOTATOR|CONFIDENCE|DATETIME|N;
+ AbstractAnnotationLayer::PROPS.PRINTABLE = false;
+ AbstractAnnotationLayer::PROPS.SETONLY = true;
+ AbstractAnnotationLayer::PROPS.SPEAKABLE = false;
+//------ AbstractCorrectionChild -------
+ AbstractCorrectionChild::PROPS.ELEMENT_ID = AbstractCorrectionChild_t;
+ AbstractCorrectionChild::PROPS.ACCEPTED_DATA += {AbstractSpanAnnotation_t, AbstractStructureElement_t, AbstractTokenAnnotation_t, Correction_t, Description_t, ForeignData_t, Metric_t, PhonContent_t, String_t, TextContent_t};
+ AbstractCorrectionChild::PROPS.OPTIONAL_ATTRIBS = ID|ANNOTATOR|CONFIDENCE|DATETIME|N;
+ AbstractCorrectionChild::PROPS.PRINTABLE = true;
+ AbstractCorrectionChild::PROPS.SPEAKABLE = true;
+ AbstractCorrectionChild::PROPS.TEXTDELIMITER = "NONE";
+//------ AbstractSpanAnnotation -------
+ AbstractSpanAnnotation::PROPS.ELEMENT_ID = AbstractSpanAnnotation_t;
+ AbstractSpanAnnotation::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, ForeignData_t, Metric_t};
+ AbstractSpanAnnotation::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ AbstractSpanAnnotation::PROPS.PRINTABLE = true;
+ AbstractSpanAnnotation::PROPS.SPEAKABLE = true;
+//------ AbstractSpanRole -------
+ AbstractSpanRole::PROPS = AbstractSpanAnnotation::PROPS;
+ AbstractSpanRole::PROPS.ELEMENT_ID = AbstractSpanRole_t;
+ AbstractSpanRole::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Metric_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ AbstractSpanRole::PROPS.OPTIONAL_ATTRIBS = ID|ANNOTATOR|N|DATETIME;
+//------ AbstractStructureElement -------
+ AbstractStructureElement::PROPS.ELEMENT_ID = AbstractStructureElement_t;
+ AbstractStructureElement::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t};
+ AbstractStructureElement::PROPS.AUTO_GENERATE_ID = true;
+ AbstractStructureElement::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ AbstractStructureElement::PROPS.PRINTABLE = true;
+ AbstractStructureElement::PROPS.REQUIRED_ATTRIBS = NO_ATT;
+ AbstractStructureElement::PROPS.SPEAKABLE = true;
+ AbstractStructureElement::PROPS.TEXTDELIMITER = "\n\n";
+//------ AbstractTextMarkup -------
+ AbstractTextMarkup::PROPS.ELEMENT_ID = AbstractTextMarkup_t;
+ AbstractTextMarkup::PROPS.ACCEPTED_DATA += {AbstractTextMarkup_t, Description_t, XmlText_t};
+ AbstractTextMarkup::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ AbstractTextMarkup::PROPS.PRINTABLE = true;
+ AbstractTextMarkup::PROPS.TEXTDELIMITER = "";
+ AbstractTextMarkup::PROPS.XLINK = true;
+//------ AbstractTokenAnnotation -------
+ AbstractTokenAnnotation::PROPS.ELEMENT_ID = AbstractTokenAnnotation_t;
+ AbstractTokenAnnotation::PROPS.ACCEPTED_DATA += {Description_t, Feature_t, ForeignData_t, Metric_t};
+ AbstractTokenAnnotation::PROPS.OCCURRENCES_PER_SET = 1;
+ AbstractTokenAnnotation::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ AbstractTokenAnnotation::PROPS.REQUIRED_ATTRIBS = CLASS;
+//------ AbstractExtendedTokenAnnotation -------
+ AbstractExtendedTokenAnnotation::PROPS = AbstractTokenAnnotation::PROPS;
+ AbstractExtendedTokenAnnotation::PROPS.ELEMENT_ID = AbstractExtendedTokenAnnotation_t;
+//------ AlignReference -------
+ AlignReference::PROPS.ELEMENT_ID = AlignReference_t;
+ AlignReference::PROPS.XMLTAG = "aref";
+//------ Alignment -------
+ Alignment::PROPS.ELEMENT_ID = Alignment_t;
+ Alignment::PROPS.ACCEPTED_DATA += {AlignReference_t, Description_t, Feature_t, ForeignData_t, Metric_t};
+ Alignment::PROPS.ANNOTATIONTYPE = AnnotationType::ALIGNMENT;
+ Alignment::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ Alignment::PROPS.PRINTABLE = false;
+ Alignment::PROPS.REQUIRED_ATTRIBS = NO_ATT;
+ Alignment::PROPS.SPEAKABLE = false;
+ Alignment::PROPS.XLINK = true;
+ Alignment::PROPS.XMLTAG = "alignment";
+//------ Alternative -------
+ Alternative::PROPS.ELEMENT_ID = Alternative_t;
+ Alternative::PROPS.ACCEPTED_DATA += {AbstractTokenAnnotation_t, Correction_t, Description_t, ForeignData_t, MorphologyLayer_t, PhonologyLayer_t};
+ Alternative::PROPS.AUTH = false;
+ Alternative::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ Alternative::PROPS.PRINTABLE = false;
+ Alternative::PROPS.REQUIRED_ATTRIBS = NO_ATT;
+ Alternative::PROPS.SPEAKABLE = false;
+ Alternative::PROPS.XMLTAG = "alt";
+//------ AlternativeLayers -------
+ AlternativeLayers::PROPS.ELEMENT_ID = AlternativeLayers_t;
+ AlternativeLayers::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Description_t, ForeignData_t};
+ AlternativeLayers::PROPS.AUTH = false;
+ AlternativeLayers::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ AlternativeLayers::PROPS.PRINTABLE = false;
+ AlternativeLayers::PROPS.REQUIRED_ATTRIBS = NO_ATT;
+ AlternativeLayers::PROPS.SPEAKABLE = false;
+ AlternativeLayers::PROPS.XMLTAG = "altlayers";
+//------ Caption -------
+ Caption::PROPS = AbstractStructureElement::PROPS;
+ Caption::PROPS.ELEMENT_ID = Caption_t;
+ Caption::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
+ Caption::PROPS.OCCURRENCES = 1;
+ Caption::PROPS.XMLTAG = "caption";
+//------ Cell -------
+ Cell::PROPS = AbstractStructureElement::PROPS;
+ Cell::PROPS.ELEMENT_ID = Cell_t;
+ Cell::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, Feature_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, Metric_t, Note_t, Paragraph_t, Part_t, Reference_t, Sentence_t, String_t, TextContent_t, Whitespace_t, Word_t};
+ Cell::PROPS.TEXTDELIMITER = " | ";
+ Cell::PROPS.XMLTAG = "cell";
+//------ Chunk -------
+ Chunk::PROPS = AbstractSpanAnnotation::PROPS;
+ Chunk::PROPS.ELEMENT_ID = Chunk_t;
+ Chunk::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Metric_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ Chunk::PROPS.ANNOTATIONTYPE = AnnotationType::CHUNKING;
+ Chunk::PROPS.XMLTAG = "chunk";
+//------ ChunkingLayer -------
+ ChunkingLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ ChunkingLayer::PROPS.ELEMENT_ID = ChunkingLayer_t;
+ ChunkingLayer::PROPS.ACCEPTED_DATA += {Chunk_t, Correction_t, Description_t, ForeignData_t};
+ ChunkingLayer::PROPS.ANNOTATIONTYPE = AnnotationType::CHUNKING;
+ ChunkingLayer::PROPS.XMLTAG = "chunking";
+//------ ComplexAlignment -------
+ ComplexAlignment::PROPS.ELEMENT_ID = ComplexAlignment_t;
+ ComplexAlignment::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Metric_t};
+ ComplexAlignment::PROPS.ANNOTATIONTYPE = AnnotationType::COMPLEXALIGNMENT;
+ ComplexAlignment::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ ComplexAlignment::PROPS.PRINTABLE = false;
+ ComplexAlignment::PROPS.REQUIRED_ATTRIBS = NO_ATT;
+ ComplexAlignment::PROPS.SPEAKABLE = false;
+ ComplexAlignment::PROPS.XMLTAG = "complexalignment";
+//------ ComplexAlignmentLayer -------
+ ComplexAlignmentLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ ComplexAlignmentLayer::PROPS.ELEMENT_ID = ComplexAlignmentLayer_t;
+ ComplexAlignmentLayer::PROPS.ACCEPTED_DATA += {ComplexAlignment_t, Correction_t, Description_t, ForeignData_t};
+ ComplexAlignmentLayer::PROPS.ANNOTATIONTYPE = AnnotationType::COMPLEXALIGNMENT;
+ ComplexAlignmentLayer::PROPS.XMLTAG = "complexalignments";
+//------ Content -------
+ Content::PROPS.ELEMENT_ID = Content_t;
+ Content::PROPS.OCCURRENCES = 1;
+ Content::PROPS.XMLTAG = "content";
+//------ CoreferenceChain -------
+ CoreferenceChain::PROPS = AbstractSpanAnnotation::PROPS;
+ CoreferenceChain::PROPS.ELEMENT_ID = CoreferenceChain_t;
+ CoreferenceChain::PROPS.ACCEPTED_DATA += {Alignment_t, CoreferenceLink_t, Description_t, ForeignData_t, Metric_t};
+ CoreferenceChain::PROPS.ANNOTATIONTYPE = AnnotationType::COREFERENCE;
+ CoreferenceChain::PROPS.REQUIRED_DATA += {CoreferenceLink_t};
+ CoreferenceChain::PROPS.XMLTAG = "coreferencechain";
+//------ CoreferenceLayer -------
+ CoreferenceLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ CoreferenceLayer::PROPS.ELEMENT_ID = CoreferenceLayer_t;
+ CoreferenceLayer::PROPS.ACCEPTED_DATA += {CoreferenceChain_t, Correction_t, Description_t, ForeignData_t};
+ CoreferenceLayer::PROPS.ANNOTATIONTYPE = AnnotationType::COREFERENCE;
+ CoreferenceLayer::PROPS.XMLTAG = "coreferences";
+//------ CoreferenceLink -------
+ CoreferenceLink::PROPS = AbstractSpanRole::PROPS;
+ CoreferenceLink::PROPS.ELEMENT_ID = CoreferenceLink_t;
+ CoreferenceLink::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Headspan_t, LevelFeature_t, Metric_t, ModalityFeature_t, TimeFeature_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ CoreferenceLink::PROPS.ANNOTATIONTYPE = AnnotationType::COREFERENCE;
+ CoreferenceLink::PROPS.XMLTAG = "coreferencelink";
+//------ Correction -------
+ Correction::PROPS.ELEMENT_ID = Correction_t;
+ Correction::PROPS.ACCEPTED_DATA += {Current_t, Description_t, ErrorDetection_t, Feature_t, ForeignData_t, Metric_t, New_t, Original_t, Suggestion_t};
+ Correction::PROPS.ANNOTATIONTYPE = AnnotationType::CORRECTION;
+ Correction::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ Correction::PROPS.PRINTABLE = true;
+ Correction::PROPS.SPEAKABLE = true;
+ Correction::PROPS.TEXTDELIMITER = "NONE";
+ Correction::PROPS.XMLTAG = "correction";
+//------ Current -------
+ Current::PROPS = AbstractCorrectionChild::PROPS;
+ Current::PROPS.ELEMENT_ID = Current_t;
+ Current::PROPS.OCCURRENCES = 1;
+ Current::PROPS.OPTIONAL_ATTRIBS = NO_ATT;
+ Current::PROPS.XMLTAG = "current";
+//------ Definition -------
+ Definition::PROPS = AbstractStructureElement::PROPS;
+ Definition::PROPS.ELEMENT_ID = Definition_t;
+ Definition::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, Figure_t, ForeignData_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Word_t};
+ Definition::PROPS.ANNOTATIONTYPE = AnnotationType::DEFINITION;
+ Definition::PROPS.XMLTAG = "def";
+//------ DependenciesLayer -------
+ DependenciesLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ DependenciesLayer::PROPS.ELEMENT_ID = DependenciesLayer_t;
+ DependenciesLayer::PROPS.ACCEPTED_DATA += {Correction_t, Dependency_t, Description_t, ForeignData_t};
+ DependenciesLayer::PROPS.ANNOTATIONTYPE = AnnotationType::DEPENDENCY;
+ DependenciesLayer::PROPS.XMLTAG = "dependencies";
+//------ Dependency -------
+ Dependency::PROPS = AbstractSpanAnnotation::PROPS;
+ Dependency::PROPS.ELEMENT_ID = Dependency_t;
+ Dependency::PROPS.ACCEPTED_DATA += {Alignment_t, DependencyDependent_t, Description_t, Feature_t, ForeignData_t, Headspan_t, Metric_t};
+ Dependency::PROPS.ANNOTATIONTYPE = AnnotationType::DEPENDENCY;
+ Dependency::PROPS.REQUIRED_DATA += {DependencyDependent_t, Headspan_t};
+ Dependency::PROPS.XMLTAG = "dependency";
+//------ DependencyDependent -------
+ DependencyDependent::PROPS = AbstractSpanRole::PROPS;
+ DependencyDependent::PROPS.ELEMENT_ID = DependencyDependent_t;
+ DependencyDependent::PROPS.XMLTAG = "dep";
+//------ Description -------
+ Description::PROPS.ELEMENT_ID = Description_t;
+ Description::PROPS.OCCURRENCES = 1;
+ Description::PROPS.XMLTAG = "desc";
+//------ Division -------
+ Division::PROPS = AbstractStructureElement::PROPS;
+ Division::PROPS.ELEMENT_ID = Division_t;
+ Division::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Sentence_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
+ Division::PROPS.ANNOTATIONTYPE = AnnotationType::DIVISION;
+ Division::PROPS.TEXTDELIMITER = "\n\n\n";
+ Division::PROPS.XMLTAG = "div";
+//------ DomainAnnotation -------
+ DomainAnnotation::PROPS = AbstractExtendedTokenAnnotation::PROPS;
+ DomainAnnotation::PROPS.ELEMENT_ID = DomainAnnotation_t;
+ DomainAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::DOMAIN;
+ DomainAnnotation::PROPS.OCCURRENCES_PER_SET = 0;
+ DomainAnnotation::PROPS.XMLTAG = "domain";
+//------ EntitiesLayer -------
+ EntitiesLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ EntitiesLayer::PROPS.ELEMENT_ID = EntitiesLayer_t;
+ EntitiesLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, Entity_t, ForeignData_t};
+ EntitiesLayer::PROPS.ANNOTATIONTYPE = AnnotationType::ENTITY;
+ EntitiesLayer::PROPS.XMLTAG = "entities";
+//------ Entity -------
+ Entity::PROPS = AbstractSpanAnnotation::PROPS;
+ Entity::PROPS.ELEMENT_ID = Entity_t;
+ Entity::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Metric_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ Entity::PROPS.ANNOTATIONTYPE = AnnotationType::ENTITY;
+ Entity::PROPS.XMLTAG = "entity";
+//------ Entry -------
+ Entry::PROPS = AbstractStructureElement::PROPS;
+ Entry::PROPS.ELEMENT_ID = Entry_t;
+ Entry::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Definition_t, Description_t, Example_t, Feature_t, ForeignData_t, Metric_t, Part_t, Term_t};
+ Entry::PROPS.ANNOTATIONTYPE = AnnotationType::ENTRY;
+ Entry::PROPS.XMLTAG = "entry";
+//------ ErrorDetection -------
+ ErrorDetection::PROPS = AbstractExtendedTokenAnnotation::PROPS;
+ ErrorDetection::PROPS.ELEMENT_ID = ErrorDetection_t;
+ ErrorDetection::PROPS.ANNOTATIONTYPE = AnnotationType::ERRORDETECTION;
+ ErrorDetection::PROPS.OCCURRENCES_PER_SET = 0;
+ ErrorDetection::PROPS.XMLTAG = "errordetection";
+//------ Event -------
+ Event::PROPS = AbstractStructureElement::PROPS;
+ Event::PROPS.ELEMENT_ID = Event_t;
+ Event::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, ActorFeature_t, Alignment_t, Alternative_t, AlternativeLayers_t, BegindatetimeFeature_t, Correction_t, Description_t, Division_t, EnddatetimeFeature_t, Event_t, Example_t, Feature_t, Figure_t, ForeignData_t, Head_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, Word_t};
+ Event::PROPS.ANNOTATIONTYPE = AnnotationType::EVENT;
+ Event::PROPS.XMLTAG = "event";
+//------ Example -------
+ Example::PROPS = AbstractStructureElement::PROPS;
+ Example::PROPS.ELEMENT_ID = Example_t;
+ Example::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, Figure_t, ForeignData_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, Word_t};
+ Example::PROPS.ANNOTATIONTYPE = AnnotationType::EXAMPLE;
+ Example::PROPS.XMLTAG = "ex";
+//------ External -------
+ External::PROPS.ELEMENT_ID = External_t;
+ External::PROPS.ACCEPTED_DATA += {Description_t};
+ External::PROPS.AUTH = true;
+ External::PROPS.OPTIONAL_ATTRIBS = NO_ATT;
+ External::PROPS.PRINTABLE = true;
+ External::PROPS.REQUIRED_ATTRIBS = SRC;
+ External::PROPS.SPEAKABLE = false;
+ External::PROPS.XMLTAG = "external";
+//------ Feature -------
+ Feature::PROPS.ELEMENT_ID = Feature_t;
+ Feature::PROPS.XMLTAG = "feat";
+//------ ActorFeature -------
+ ActorFeature::PROPS = Feature::PROPS;
+ ActorFeature::PROPS.ELEMENT_ID = ActorFeature_t;
+ ActorFeature::PROPS.SUBSET = "actor";
+ ActorFeature::PROPS.XMLTAG = "actor";
+//------ BegindatetimeFeature -------
+ BegindatetimeFeature::PROPS = Feature::PROPS;
+ BegindatetimeFeature::PROPS.ELEMENT_ID = BegindatetimeFeature_t;
+ BegindatetimeFeature::PROPS.SUBSET = "begindatetime";
+ BegindatetimeFeature::PROPS.XMLTAG = "begindatetime";
+//------ EnddatetimeFeature -------
+ EnddatetimeFeature::PROPS = Feature::PROPS;
+ EnddatetimeFeature::PROPS.ELEMENT_ID = EnddatetimeFeature_t;
+ EnddatetimeFeature::PROPS.SUBSET = "enddatetime";
+ EnddatetimeFeature::PROPS.XMLTAG = "enddatetime";
+//------ Figure -------
+ Figure::PROPS = AbstractStructureElement::PROPS;
+ Figure::PROPS.ELEMENT_ID = Figure_t;
+ Figure::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alignment_t, Alternative_t, AlternativeLayers_t, Caption_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, Sentence_t, String_t, TextContent_t};
+ Figure::PROPS.ANNOTATIONTYPE = AnnotationType::FIGURE;
+ Figure::PROPS.SPEAKABLE = false;
+ Figure::PROPS.TEXTDELIMITER = "\n\n";
+ Figure::PROPS.XMLTAG = "figure";
+//------ ForeignData -------
+ ForeignData::PROPS.ELEMENT_ID = ForeignData_t;
+ ForeignData::PROPS.XMLTAG = "foreign-data";
+//------ FunctionFeature -------
+ FunctionFeature::PROPS = Feature::PROPS;
+ FunctionFeature::PROPS.ELEMENT_ID = FunctionFeature_t;
+ FunctionFeature::PROPS.SUBSET = "function";
+ FunctionFeature::PROPS.XMLTAG = "function";
+//------ Gap -------
+ Gap::PROPS.ELEMENT_ID = Gap_t;
+ Gap::PROPS.ACCEPTED_DATA += {Content_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t};
+ Gap::PROPS.ANNOTATIONTYPE = AnnotationType::GAP;
+ Gap::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|DATETIME|SRC|BEGINTIME|ENDTIME;
+ Gap::PROPS.XMLTAG = "gap";
+//------ Head -------
+ Head::PROPS = AbstractStructureElement::PROPS;
+ Head::PROPS.ELEMENT_ID = Head_t;
+ Head::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Event_t, Feature_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, TextContent_t, Whitespace_t, Word_t};
+ Head::PROPS.OCCURRENCES = 1;
+ Head::PROPS.TEXTDELIMITER = "\n\n";
+ Head::PROPS.XMLTAG = "head";
+//------ HeadFeature -------
+ HeadFeature::PROPS = Feature::PROPS;
+ HeadFeature::PROPS.ELEMENT_ID = HeadFeature_t;
+ HeadFeature::PROPS.SUBSET = "head";
+ HeadFeature::PROPS.XMLTAG = "head";
+//------ Headspan -------
+ Headspan::PROPS = AbstractSpanRole::PROPS;
+ Headspan::PROPS.ELEMENT_ID = Headspan_t;
+ Headspan::PROPS.XMLTAG = "hd";
+//------ Label -------
+ Label::PROPS = AbstractStructureElement::PROPS;
+ Label::PROPS.ELEMENT_ID = Label_t;
+ Label::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Reference_t, String_t, TextContent_t, Word_t};
+ Label::PROPS.XMLTAG = "label";
+//------ LangAnnotation -------
+ LangAnnotation::PROPS = AbstractExtendedTokenAnnotation::PROPS;
+ LangAnnotation::PROPS.ELEMENT_ID = LangAnnotation_t;
+ LangAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::LANG;
+ LangAnnotation::PROPS.XMLTAG = "lang";
+//------ LemmaAnnotation -------
+ LemmaAnnotation::PROPS = AbstractTokenAnnotation::PROPS;
+ LemmaAnnotation::PROPS.ELEMENT_ID = LemmaAnnotation_t;
+ LemmaAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::LEMMA;
+ LemmaAnnotation::PROPS.XMLTAG = "lemma";
+//------ LevelFeature -------
+ LevelFeature::PROPS = Feature::PROPS;
+ LevelFeature::PROPS.ELEMENT_ID = LevelFeature_t;
+ LevelFeature::PROPS.SUBSET = "level";
+ LevelFeature::PROPS.XMLTAG = "level";
+//------ Linebreak -------
+ Linebreak::PROPS = AbstractStructureElement::PROPS;
+ Linebreak::PROPS.ELEMENT_ID = Linebreak_t;
+ Linebreak::PROPS.ANNOTATIONTYPE = AnnotationType::LINEBREAK;
+ Linebreak::PROPS.TEXTDELIMITER = "";
+ Linebreak::PROPS.XMLTAG = "br";
+//------ List -------
+ List::PROPS = AbstractStructureElement::PROPS;
+ List::PROPS.ELEMENT_ID = List_t;
+ List::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Caption_t, Correction_t, Description_t, Event_t, Feature_t, ForeignData_t, ListItem_t, Metric_t, Note_t, Part_t, PhonContent_t, Reference_t, String_t, TextContent_t};
+ List::PROPS.ANNOTATIONTYPE = AnnotationType::LIST;
+ List::PROPS.TEXTDELIMITER = "\n\n";
+ List::PROPS.XMLTAG = "list";
+//------ ListItem -------
+ ListItem::PROPS = AbstractStructureElement::PROPS;
+ ListItem::PROPS.ELEMENT_ID = ListItem_t;
+ ListItem::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Event_t, Feature_t, ForeignData_t, Gap_t, Label_t, Linebreak_t, List_t, Metric_t, Note_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
+ ListItem::PROPS.TEXTDELIMITER = "\n";
+ ListItem::PROPS.XMLTAG = "item";
+//------ Metric -------
+ Metric::PROPS.ELEMENT_ID = Metric_t;
+ Metric::PROPS.ACCEPTED_DATA += {Description_t, Feature_t, ForeignData_t, ValueFeature_t};
+ Metric::PROPS.ANNOTATIONTYPE = AnnotationType::METRIC;
+ Metric::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|N|CONFIDENCE|DATETIME|SRC|BEGINTIME|ENDTIME|SPEAKER;
+ Metric::PROPS.XMLTAG = "metric";
+//------ ModalityFeature -------
+ ModalityFeature::PROPS = Feature::PROPS;
+ ModalityFeature::PROPS.ELEMENT_ID = ModalityFeature_t;
+ ModalityFeature::PROPS.SUBSET = "modality";
+ ModalityFeature::PROPS.XMLTAG = "modality";
+//------ Morpheme -------
+ Morpheme::PROPS = AbstractStructureElement::PROPS;
+ Morpheme::PROPS.ELEMENT_ID = Morpheme_t;
+ Morpheme::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, FunctionFeature_t, Metric_t, Morpheme_t, Part_t, PhonContent_t, String_t, TextContent_t};
+ Morpheme::PROPS.ANNOTATIONTYPE = AnnotationType::MORPHOLOGICAL;
+ Morpheme::PROPS.TEXTDELIMITER = "";
+ Morpheme::PROPS.XMLTAG = "morpheme";
+//------ MorphologyLayer -------
+ MorphologyLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ MorphologyLayer::PROPS.ELEMENT_ID = MorphologyLayer_t;
+ MorphologyLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, ForeignData_t, Morpheme_t};
+ MorphologyLayer::PROPS.ANNOTATIONTYPE = AnnotationType::MORPHOLOGICAL;
+ MorphologyLayer::PROPS.XMLTAG = "morphology";
+//------ New -------
+ New::PROPS = AbstractCorrectionChild::PROPS;
+ New::PROPS.ELEMENT_ID = New_t;
+ New::PROPS.OCCURRENCES = 1;
+ New::PROPS.OPTIONAL_ATTRIBS = NO_ATT;
+ New::PROPS.XMLTAG = "new";
+//------ Note -------
+ Note::PROPS = AbstractStructureElement::PROPS;
+ Note::PROPS.ELEMENT_ID = Note_t;
+ Note::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Example_t, Feature_t, Figure_t, ForeignData_t, Head_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, Word_t};
+ Note::PROPS.ANNOTATIONTYPE = AnnotationType::NOTE;
+ Note::PROPS.XMLTAG = "note";
+//------ Original -------
+ Original::PROPS = AbstractCorrectionChild::PROPS;
+ Original::PROPS.ELEMENT_ID = Original_t;
+ Original::PROPS.AUTH = false;
+ Original::PROPS.OCCURRENCES = 1;
+ Original::PROPS.OPTIONAL_ATTRIBS = NO_ATT;
+ Original::PROPS.XMLTAG = "original";
+//------ Paragraph -------
+ Paragraph::PROPS = AbstractStructureElement::PROPS;
+ Paragraph::PROPS.ELEMENT_ID = Paragraph_t;
+ Paragraph::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Sentence_t, String_t, TextContent_t, Whitespace_t, Word_t};
+ Paragraph::PROPS.ANNOTATIONTYPE = AnnotationType::PARAGRAPH;
+ Paragraph::PROPS.TEXTDELIMITER = "\n\n";
+ Paragraph::PROPS.XMLTAG = "p";
+//------ Part -------
+ Part::PROPS = AbstractStructureElement::PROPS;
+ Part::PROPS.ELEMENT_ID = Part_t;
+ Part::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, AbstractStructureElement_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t};
+ Part::PROPS.ANNOTATIONTYPE = AnnotationType::PART;
+ Part::PROPS.TEXTDELIMITER = "NONE";
+ Part::PROPS.XMLTAG = "part";
+//------ PhonContent -------
+ PhonContent::PROPS.ELEMENT_ID = PhonContent_t;
+ PhonContent::PROPS.ACCEPTED_DATA += {Description_t, XmlText_t};
+ PhonContent::PROPS.ANNOTATIONTYPE = AnnotationType::PHON;
+ PhonContent::PROPS.OCCURRENCES = 0;
+ PhonContent::PROPS.OPTIONAL_ATTRIBS = CLASS|ANNOTATOR|CONFIDENCE|DATETIME;
+ PhonContent::PROPS.PRINTABLE = false;
+ PhonContent::PROPS.SPEAKABLE = true;
+ PhonContent::PROPS.XMLTAG = "ph";
+//------ Phoneme -------
+ Phoneme::PROPS = AbstractStructureElement::PROPS;
+ Phoneme::PROPS.ELEMENT_ID = Phoneme_t;
+ Phoneme::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, FunctionFeature_t, Metric_t, Part_t, PhonContent_t, Phoneme_t, String_t, TextContent_t};
+ Phoneme::PROPS.ANNOTATIONTYPE = AnnotationType::PHONOLOGICAL;
+ Phoneme::PROPS.TEXTDELIMITER = "";
+ Phoneme::PROPS.XMLTAG = "phoneme";
+//------ PhonologyLayer -------
+ PhonologyLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ PhonologyLayer::PROPS.ELEMENT_ID = PhonologyLayer_t;
+ PhonologyLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, ForeignData_t, Phoneme_t};
+ PhonologyLayer::PROPS.ANNOTATIONTYPE = AnnotationType::PHONOLOGICAL;
+ PhonologyLayer::PROPS.XMLTAG = "phonology";
+//------ PosAnnotation -------
+ PosAnnotation::PROPS = AbstractTokenAnnotation::PROPS;
+ PosAnnotation::PROPS.ELEMENT_ID = PosAnnotation_t;
+ PosAnnotation::PROPS.ACCEPTED_DATA += {Description_t, Feature_t, ForeignData_t, HeadFeature_t, Metric_t};
+ PosAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::POS;
+ PosAnnotation::PROPS.XMLTAG = "pos";
+//------ Quote -------
+ Quote::PROPS = AbstractStructureElement::PROPS;
+ Quote::PROPS.ELEMENT_ID = Quote_t;
+ Quote::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Division_t, Feature_t, ForeignData_t, Gap_t, Metric_t, Paragraph_t, Part_t, Quote_t, Sentence_t, String_t, TextContent_t, Utterance_t, Word_t};
+ Quote::PROPS.XMLTAG = "quote";
+//------ Reference -------
+ Reference::PROPS = AbstractStructureElement::PROPS;
+ Reference::PROPS.ELEMENT_ID = Reference_t;
+ Reference::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Sentence_t, String_t, TextContent_t, Utterance_t, Word_t};
+ Reference::PROPS.TEXTDELIMITER = "NONE";
+ Reference::PROPS.XMLTAG = "ref";
+//------ Row -------
+ Row::PROPS = AbstractStructureElement::PROPS;
+ Row::PROPS.ELEMENT_ID = Row_t;
+ Row::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Cell_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t};
+ Row::PROPS.TEXTDELIMITER = "\n";
+ Row::PROPS.XMLTAG = "row";
+//------ SemanticRole -------
+ SemanticRole::PROPS = AbstractSpanAnnotation::PROPS;
+ SemanticRole::PROPS.ELEMENT_ID = SemanticRole_t;
+ SemanticRole::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Headspan_t, Metric_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ SemanticRole::PROPS.ANNOTATIONTYPE = AnnotationType::SEMROLE;
+ SemanticRole::PROPS.REQUIRED_ATTRIBS = CLASS;
+ SemanticRole::PROPS.XMLTAG = "semrole";
+//------ SemanticRolesLayer -------
+ SemanticRolesLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ SemanticRolesLayer::PROPS.ELEMENT_ID = SemanticRolesLayer_t;
+ SemanticRolesLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, ForeignData_t, SemanticRole_t};
+ SemanticRolesLayer::PROPS.ANNOTATIONTYPE = AnnotationType::SEMROLE;
+ SemanticRolesLayer::PROPS.XMLTAG = "semroles";
+//------ SenseAnnotation -------
+ SenseAnnotation::PROPS = AbstractTokenAnnotation::PROPS;
+ SenseAnnotation::PROPS.ELEMENT_ID = SenseAnnotation_t;
+ SenseAnnotation::PROPS.ACCEPTED_DATA += {Description_t, Feature_t, ForeignData_t, Metric_t, SynsetFeature_t};
+ SenseAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::SENSE;
+ SenseAnnotation::PROPS.XMLTAG = "sense";
+//------ Sentence -------
+ Sentence::PROPS = AbstractStructureElement::PROPS;
+ Sentence::PROPS.ELEMENT_ID = Sentence_t;
+ Sentence::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, Feature_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, String_t, TextContent_t, Whitespace_t, Word_t};
+ Sentence::PROPS.ANNOTATIONTYPE = AnnotationType::SENTENCE;
+ Sentence::PROPS.TEXTDELIMITER = " ";
+ Sentence::PROPS.XMLTAG = "s";
+//------ Speech -------
+ Speech::PROPS = AbstractStructureElement::PROPS;
+ Speech::PROPS.ELEMENT_ID = Speech_t;
+ Speech::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Feature_t, ForeignData_t, Gap_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Sentence_t, String_t, TextContent_t, Utterance_t, Word_t};
+ Speech::PROPS.TEXTDELIMITER = "\n\n\n";
+ Speech::PROPS.XMLTAG = "speech";
+//------ String -------
+ String::PROPS.ELEMENT_ID = String_t;
+ String::PROPS.ACCEPTED_DATA += {AbstractExtendedTokenAnnotation_t, Alignment_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, PhonContent_t, TextContent_t};
+ String::PROPS.ANNOTATIONTYPE = AnnotationType::STRING;
+ String::PROPS.OCCURRENCES = 0;
+ String::PROPS.OPTIONAL_ATTRIBS = ID|CLASS|ANNOTATOR|CONFIDENCE|DATETIME|N|SRC|BEGINTIME|ENDTIME;
+ String::PROPS.PRINTABLE = true;
+ String::PROPS.XMLTAG = "str";
+//------ StyleFeature -------
+ StyleFeature::PROPS = Feature::PROPS;
+ StyleFeature::PROPS.ELEMENT_ID = StyleFeature_t;
+ StyleFeature::PROPS.SUBSET = "style";
+ StyleFeature::PROPS.XMLTAG = "style";
+//------ SubjectivityAnnotation -------
+ SubjectivityAnnotation::PROPS = AbstractTokenAnnotation::PROPS;
+ SubjectivityAnnotation::PROPS.ELEMENT_ID = SubjectivityAnnotation_t;
+ SubjectivityAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::SUBJECTIVITY;
+ SubjectivityAnnotation::PROPS.XMLTAG = "subjectivity";
+//------ Suggestion -------
+ Suggestion::PROPS = AbstractCorrectionChild::PROPS;
+ Suggestion::PROPS.ELEMENT_ID = Suggestion_t;
+ Suggestion::PROPS.AUTH = false;
+ Suggestion::PROPS.OCCURRENCES = 0;
+ Suggestion::PROPS.XMLTAG = "suggestion";
+//------ SynsetFeature -------
+ SynsetFeature::PROPS = Feature::PROPS;
+ SynsetFeature::PROPS.ELEMENT_ID = SynsetFeature_t;
+ SynsetFeature::PROPS.SUBSET = "synset";
+ SynsetFeature::PROPS.XMLTAG = "synset";
+//------ SyntacticUnit -------
+ SyntacticUnit::PROPS = AbstractSpanAnnotation::PROPS;
+ SyntacticUnit::PROPS.ELEMENT_ID = SyntacticUnit_t;
+ SyntacticUnit::PROPS.ACCEPTED_DATA += {Alignment_t, Description_t, Feature_t, ForeignData_t, Metric_t, SyntacticUnit_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ SyntacticUnit::PROPS.ANNOTATIONTYPE = AnnotationType::SYNTAX;
+ SyntacticUnit::PROPS.XMLTAG = "su";
+//------ SyntaxLayer -------
+ SyntaxLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ SyntaxLayer::PROPS.ELEMENT_ID = SyntaxLayer_t;
+ SyntaxLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, ForeignData_t, SyntacticUnit_t};
+ SyntaxLayer::PROPS.ANNOTATIONTYPE = AnnotationType::SYNTAX;
+ SyntaxLayer::PROPS.XMLTAG = "syntax";
+//------ Table -------
+ Table::PROPS = AbstractStructureElement::PROPS;
+ Table::PROPS.ELEMENT_ID = Table_t;
+ Table::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, Row_t, TableHead_t};
+ Table::PROPS.ANNOTATIONTYPE = AnnotationType::TABLE;
+ Table::PROPS.XMLTAG = "table";
+//------ TableHead -------
+ TableHead::PROPS = AbstractStructureElement::PROPS;
+ TableHead::PROPS.ELEMENT_ID = TableHead_t;
+ TableHead::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, Row_t};
+ TableHead::PROPS.XMLTAG = "tablehead";
+//------ Term -------
+ Term::PROPS = AbstractStructureElement::PROPS;
+ Term::PROPS.ELEMENT_ID = Term_t;
+ Term::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Event_t, Feature_t, Figure_t, ForeignData_t, Gap_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Word_t};
+ Term::PROPS.ANNOTATIONTYPE = AnnotationType::TERM;
+ Term::PROPS.XMLTAG = "term";
+//------ Text -------
+ Text::PROPS = AbstractStructureElement::PROPS;
+ Text::PROPS.ELEMENT_ID = Text_t;
+ Text::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Sentence_t, String_t, Table_t, TextContent_t, Word_t};
+ Text::PROPS.TEXTDELIMITER = "\n\n\n";
+ Text::PROPS.XMLTAG = "text";
+//------ TextContent -------
+ TextContent::PROPS.ELEMENT_ID = TextContent_t;
+ TextContent::PROPS.ACCEPTED_DATA += {AbstractTextMarkup_t, Description_t, Linebreak_t, XmlText_t};
+ TextContent::PROPS.ANNOTATIONTYPE = AnnotationType::TEXT;
+ TextContent::PROPS.OCCURRENCES = 0;
+ TextContent::PROPS.OPTIONAL_ATTRIBS = CLASS|ANNOTATOR|CONFIDENCE|DATETIME;
+ TextContent::PROPS.PRINTABLE = true;
+ TextContent::PROPS.SPEAKABLE = false;
+ TextContent::PROPS.XLINK = true;
+ TextContent::PROPS.XMLTAG = "t";
+//------ TextMarkupCorrection -------
+ TextMarkupCorrection::PROPS = AbstractTextMarkup::PROPS;
+ TextMarkupCorrection::PROPS.ELEMENT_ID = TextMarkupCorrection_t;
+ TextMarkupCorrection::PROPS.ANNOTATIONTYPE = AnnotationType::CORRECTION;
+ TextMarkupCorrection::PROPS.XMLTAG = "t-correction";
+//------ TextMarkupError -------
+ TextMarkupError::PROPS = AbstractTextMarkup::PROPS;
+ TextMarkupError::PROPS.ELEMENT_ID = TextMarkupError_t;
+ TextMarkupError::PROPS.ANNOTATIONTYPE = AnnotationType::ERRORDETECTION;
+ TextMarkupError::PROPS.XMLTAG = "t-error";
+//------ TextMarkupGap -------
+ TextMarkupGap::PROPS = AbstractTextMarkup::PROPS;
+ TextMarkupGap::PROPS.ELEMENT_ID = TextMarkupGap_t;
+ TextMarkupGap::PROPS.ANNOTATIONTYPE = AnnotationType::GAP;
+ TextMarkupGap::PROPS.XMLTAG = "t-gap";
+//------ TextMarkupString -------
+ TextMarkupString::PROPS = AbstractTextMarkup::PROPS;
+ TextMarkupString::PROPS.ELEMENT_ID = TextMarkupString_t;
+ TextMarkupString::PROPS.ANNOTATIONTYPE = AnnotationType::STRING;
+ TextMarkupString::PROPS.XMLTAG = "t-str";
+//------ TextMarkupStyle -------
+ TextMarkupStyle::PROPS = AbstractTextMarkup::PROPS;
+ TextMarkupStyle::PROPS.ELEMENT_ID = TextMarkupStyle_t;
+ TextMarkupStyle::PROPS.ANNOTATIONTYPE = AnnotationType::STYLE;
+ TextMarkupStyle::PROPS.XMLTAG = "t-style";
+//------ TimeFeature -------
+ TimeFeature::PROPS = Feature::PROPS;
+ TimeFeature::PROPS.ELEMENT_ID = TimeFeature_t;
+ TimeFeature::PROPS.SUBSET = "time";
+ TimeFeature::PROPS.XMLTAG = "time";
+//------ TimeSegment -------
+ TimeSegment::PROPS = AbstractSpanAnnotation::PROPS;
+ TimeSegment::PROPS.ELEMENT_ID = TimeSegment_t;
+ TimeSegment::PROPS.ACCEPTED_DATA += {ActorFeature_t, Alignment_t, BegindatetimeFeature_t, Description_t, EnddatetimeFeature_t, Feature_t, ForeignData_t, Metric_t, WordReference_t, Word_t, Morpheme_t, Phoneme_t};
+ TimeSegment::PROPS.ANNOTATIONTYPE = AnnotationType::TIMESEGMENT;
+ TimeSegment::PROPS.XMLTAG = "timesegment";
+//------ TimingLayer -------
+ TimingLayer::PROPS = AbstractAnnotationLayer::PROPS;
+ TimingLayer::PROPS.ELEMENT_ID = TimingLayer_t;
+ TimingLayer::PROPS.ACCEPTED_DATA += {Correction_t, Description_t, ForeignData_t, TimeSegment_t};
+ TimingLayer::PROPS.ANNOTATIONTYPE = AnnotationType::TIMESEGMENT;
+ TimingLayer::PROPS.XMLTAG = "timing";
+//------ Utterance -------
+ Utterance::PROPS = AbstractStructureElement::PROPS;
+ Utterance::PROPS.ELEMENT_ID = Utterance_t;
+ Utterance::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractExtendedTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Gap_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Sentence_t, String_t, TextContent_t, Word_t};
+ Utterance::PROPS.ANNOTATIONTYPE = AnnotationType::UTTERANCE;
+ Utterance::PROPS.TEXTDELIMITER = " ";
+ Utterance::PROPS.XMLTAG = "utt";
+//------ ValueFeature -------
+ ValueFeature::PROPS = Feature::PROPS;
+ ValueFeature::PROPS.ELEMENT_ID = ValueFeature_t;
+ ValueFeature::PROPS.SUBSET = "value";
+ ValueFeature::PROPS.XMLTAG = "value";
+//------ Whitespace -------
+ Whitespace::PROPS = AbstractStructureElement::PROPS;
+ Whitespace::PROPS.ELEMENT_ID = Whitespace_t;
+ Whitespace::PROPS.ANNOTATIONTYPE = AnnotationType::WHITESPACE;
+ Whitespace::PROPS.TEXTDELIMITER = "";
+ Whitespace::PROPS.XMLTAG = "whitespace";
+//------ Word -------
+ Word::PROPS = AbstractStructureElement::PROPS;
+ Word::PROPS.ELEMENT_ID = Word_t;
+ Word::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractTokenAnnotation_t, Alignment_t, Alternative_t, AlternativeLayers_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Reference_t, String_t, TextContent_t};
+ Word::PROPS.ANNOTATIONTYPE = AnnotationType::TOKEN;
+ Word::PROPS.TEXTDELIMITER = " ";
+ Word::PROPS.XMLTAG = "w";
+//------ WordReference -------
+ WordReference::PROPS.ELEMENT_ID = WordReference_t;
+ WordReference::PROPS.XMLTAG = "wref";
+
+//foliaspec:end:setelementproperties
+
+ XmlText::PROPS.XMLTAG = "_XmlText";
+ XmlText::PROPS.ELEMENT_ID = XmlText_t;
+ XmlText::PROPS.TEXTDELIMITER = "*";
+ XmlText::PROPS.PRINTABLE = true;
+ XmlText::PROPS.SPEAKABLE = true;
+
+ XmlComment::PROPS.XMLTAG = "_XmlComment";
+ XmlComment::PROPS.ELEMENT_ID = XmlComment_t;
+
+ PlaceHolder::PROPS = Word::PROPS;
+ PlaceHolder::PROPS.XMLTAG="_PlaceHolder";
+ PlaceHolder::PROPS.ELEMENT_ID = PlaceHolder_t;
+ PlaceHolder::PROPS.REQUIRED_ATTRIBS = NO_ATT;
+
+ }
+
+
+ //foliaspec:typehierarchy
+ static const map<ElementType, set<ElementType> > typeHierarchy = { { AbstractAnnotationLayer_t, { } },
+ { AbstractCorrectionChild_t, { } },
+ { AbstractExtendedTokenAnnotation_t, { AbstractTokenAnnotation_t } },
+ { AbstractSpanAnnotation_t, { } },
+ { AbstractSpanRole_t, { AbstractSpanAnnotation_t } },
+ { AbstractStructureElement_t, { } },
+ { AbstractTextMarkup_t, { } },
+ { AbstractTokenAnnotation_t, { } },
+ { ActorFeature_t, { Feature_t } },
+ { AlignReference_t, { } },
+ { Alignment_t, { } },
+ { Alternative_t, { } },
+ { AlternativeLayers_t, { } },
+ { BegindatetimeFeature_t, { Feature_t } },
+ { Caption_t, { AbstractStructureElement_t } },
+ { Cell_t, { AbstractStructureElement_t } },
+ { Chunk_t, { AbstractSpanAnnotation_t } },
+ { ChunkingLayer_t, { AbstractAnnotationLayer_t } },
+ { ComplexAlignment_t, { } },
+ { ComplexAlignmentLayer_t, { AbstractAnnotationLayer_t } },
+ { Content_t, { } },
+ { CoreferenceChain_t, { AbstractSpanAnnotation_t } },
+ { CoreferenceLayer_t, { AbstractAnnotationLayer_t } },
+ { CoreferenceLink_t, { AbstractSpanRole_t,AbstractSpanAnnotation_t } },
+ { Correction_t, { } },
+ { Current_t, { AbstractCorrectionChild_t } },
+ { Definition_t, { AbstractStructureElement_t } },
+ { DependenciesLayer_t, { AbstractAnnotationLayer_t } },
+ { Dependency_t, { AbstractSpanAnnotation_t } },
+ { DependencyDependent_t, { AbstractSpanRole_t,AbstractSpanAnnotation_t } },
+ { Description_t, { } },
+ { Division_t, { AbstractStructureElement_t } },
+ { DomainAnnotation_t, { AbstractExtendedTokenAnnotation_t,AbstractTokenAnnotation_t } },
+ { EnddatetimeFeature_t, { Feature_t } },
+ { EntitiesLayer_t, { AbstractAnnotationLayer_t } },
+ { Entity_t, { AbstractSpanAnnotation_t } },
+ { Entry_t, { AbstractStructureElement_t } },
+ { ErrorDetection_t, { AbstractExtendedTokenAnnotation_t,AbstractTokenAnnotation_t } },
+ { Event_t, { AbstractStructureElement_t } },
+ { Example_t, { AbstractStructureElement_t } },
+ { External_t, { } },
+ { Feature_t, { } },
+ { Figure_t, { AbstractStructureElement_t } },
+ { ForeignData_t, { } },
+ { FunctionFeature_t, { Feature_t } },
+ { Gap_t, { } },
+ { Head_t, { AbstractStructureElement_t } },
+ { HeadFeature_t, { Feature_t } },
+ { Headspan_t, { AbstractSpanRole_t,AbstractSpanAnnotation_t } },
+ { Label_t, { AbstractStructureElement_t } },
+ { LangAnnotation_t, { AbstractExtendedTokenAnnotation_t,AbstractTokenAnnotation_t } },
+ { LemmaAnnotation_t, { AbstractTokenAnnotation_t } },
+ { LevelFeature_t, { Feature_t } },
+ { Linebreak_t, { AbstractStructureElement_t } },
+ { List_t, { AbstractStructureElement_t } },
+ { ListItem_t, { AbstractStructureElement_t } },
+ { Metric_t, { } },
+ { ModalityFeature_t, { Feature_t } },
+ { Morpheme_t, { AbstractStructureElement_t } },
+ { MorphologyLayer_t, { AbstractAnnotationLayer_t } },
+ { New_t, { AbstractCorrectionChild_t } },
+ { Note_t, { AbstractStructureElement_t } },
+ { Original_t, { AbstractCorrectionChild_t } },
+ { Paragraph_t, { AbstractStructureElement_t } },
+ { Part_t, { AbstractStructureElement_t } },
+ { PhonContent_t, { } },
+ { Phoneme_t, { AbstractStructureElement_t } },
+ { PhonologyLayer_t, { AbstractAnnotationLayer_t } },
+ { PosAnnotation_t, { AbstractTokenAnnotation_t } },
+ { Quote_t, { AbstractStructureElement_t } },
+ { Reference_t, { AbstractStructureElement_t } },
+ { Row_t, { AbstractStructureElement_t } },
+ { SemanticRole_t, { AbstractSpanAnnotation_t } },
+ { SemanticRolesLayer_t, { AbstractAnnotationLayer_t } },
+ { SenseAnnotation_t, { AbstractTokenAnnotation_t } },
+ { Sentence_t, { AbstractStructureElement_t } },
+ { Speech_t, { AbstractStructureElement_t } },
+ { String_t, { } },
+ { StyleFeature_t, { Feature_t } },
+ { SubjectivityAnnotation_t, { AbstractTokenAnnotation_t } },
+ { Suggestion_t, { AbstractCorrectionChild_t } },
+ { SynsetFeature_t, { Feature_t } },
+ { SyntacticUnit_t, { AbstractSpanAnnotation_t } },
+ { SyntaxLayer_t, { AbstractAnnotationLayer_t } },
+ { Table_t, { AbstractStructureElement_t } },
+ { TableHead_t, { AbstractStructureElement_t } },
+ { Term_t, { AbstractStructureElement_t } },
+ { Text_t, { AbstractStructureElement_t } },
+ { TextContent_t, { } },
+ { TextMarkupCorrection_t, { AbstractTextMarkup_t } },
+ { TextMarkupError_t, { AbstractTextMarkup_t } },
+ { TextMarkupGap_t, { AbstractTextMarkup_t } },
+ { TextMarkupString_t, { AbstractTextMarkup_t } },
+ { TextMarkupStyle_t, { AbstractTextMarkup_t } },
+ { TimeFeature_t, { Feature_t } },
+ { TimeSegment_t, { AbstractSpanAnnotation_t } },
+ { TimingLayer_t, { AbstractAnnotationLayer_t } },
+ { Utterance_t, { AbstractStructureElement_t } },
+ { ValueFeature_t, { Feature_t } },
+ { Whitespace_t, { AbstractStructureElement_t } },
+ { Word_t, { AbstractStructureElement_t } },
+ { WordReference_t, { } },
+ { PlaceHolder_t , { Word_t, AbstractStructureElement_t } }
+ };
+
+ properties::properties() {
+ //foliaspec:begin:defaultproperties
+ //Default properties which all elements inherit
+ ELEMENT_ID = BASE;
+ ACCEPTED_DATA.insert(XmlComment_t);
+ ACCEPTED_DATA += {Description_t};
+ ANNOTATIONTYPE = AnnotationType::NO_ANN;
+ AUTH = true;
+ AUTO_GENERATE_ID = false;
+ OCCURRENCES = 0;
+ OCCURRENCES_PER_SET = 0;
+ OPTIONAL_ATTRIBS = NO_ATT;
+ PRINTABLE = false;
+ REQUIRED_ATTRIBS = NO_ATT;
+ REQUIRED_DATA = {};
+ SETONLY = false;
+ SPEAKABLE = false;
+ SUBSET = "";
+ TEXTDELIMITER = "NONE";
+ XLINK = false;
+ XMLTAG = "NONE";
+
+//foliaspec:end:defaultproperties
+ }
+
+ FoliaElement *FoliaImpl::private_createElement( ElementType et ){
+ switch ( et ){
+ case BASE: return new FoLiA();
+ case Text_t: return new Text();
+ case Speech_t: return new Speech();
+ case Utterance_t: return new Utterance();
+ case ForeignData_t: return new ForeignData();
+ case Entry_t: return new Entry();
+ case Example_t: return new Example();
+ case Term_t: return new Term();
+ case Definition_t: return new Definition();
+ case PhonContent_t: return new PhonContent();
+ case Word_t: return new Word();
+ case String_t: return new String();
+ case Event_t: return new Event();
+ case TimeSegment_t: return new TimeSegment();
+ case TimingLayer_t: return new TimingLayer();
+ case Sentence_t: return new Sentence();
+ case TextContent_t: return new TextContent();
+ case Linebreak_t: return new Linebreak();
+ case Whitespace_t: return new Whitespace();
+ case Figure_t: return new Figure();
+ case Caption_t: return new Caption();
+ case Label_t: return new Label();
+ case List_t: return new List();
+ case ListItem_t: return new ListItem();
+ case Paragraph_t: return new Paragraph();
+ case New_t: return new New();
+ case Original_t: return new Original();
+ case Current_t: return new Current();
+ case Suggestion_t: return new Suggestion();
+ case Head_t: return new Head();
+ case Table_t: return new Table();
+ case TableHead_t: return new TableHead();
+ case Cell_t: return new Cell();
+ case Row_t: return new Row();
+ case LangAnnotation_t: return new LangAnnotation();
+ case XmlComment_t: return new XmlComment();
+ case XmlText_t: return new XmlText();
+ case External_t: return new External();
+ case Note_t: return new Note();
+ case Reference_t: return new Reference();
+ case Description_t: return new Description();
+ case Gap_t: return new Gap();
+ case Content_t: return new Content();
+ case Metric_t: return new Metric();
+ case Division_t: return new Division();
+ case PosAnnotation_t: return new PosAnnotation();
+ case LemmaAnnotation_t: return new LemmaAnnotation();
+ case PhonologyLayer_t: return new PhonologyLayer();
+ case Phoneme_t: return new Phoneme();
+ case DomainAnnotation_t: return new DomainAnnotation();
+ case SenseAnnotation_t: return new SenseAnnotation();
+ case SyntaxLayer_t: return new SyntaxLayer();
+ case SubjectivityAnnotation_t: return new SubjectivityAnnotation();
+ case Chunk_t: return new Chunk();
+ case ChunkingLayer_t: return new ChunkingLayer();
+ case Entity_t: return new Entity();
+ case EntitiesLayer_t: return new EntitiesLayer();
+ case SemanticRolesLayer_t: return new SemanticRolesLayer();
+ case SemanticRole_t: return new SemanticRole();
+ case CoreferenceLayer_t: return new CoreferenceLayer();
+ case CoreferenceLink_t: return new CoreferenceLink();
+ case CoreferenceChain_t: return new CoreferenceChain();
+ case Alternative_t: return new Alternative();
+ case PlaceHolder_t: return new PlaceHolder();
+ case AlternativeLayers_t: return new AlternativeLayers();
+ case SyntacticUnit_t: return new SyntacticUnit();
+ case WordReference_t: return new WordReference();
+ case Correction_t: return new Correction();
+ case ErrorDetection_t: return new ErrorDetection();
+ case MorphologyLayer_t: return new MorphologyLayer();
+ case Morpheme_t: return new Morpheme();
+ case Feature_t: return new Feature();
+ case BegindatetimeFeature_t: return new BegindatetimeFeature();
+ case EnddatetimeFeature_t: return new EnddatetimeFeature();
+ case SynsetFeature_t: return new SynsetFeature();
+ case ActorFeature_t: return new ActorFeature();
+ case HeadFeature_t: return new HeadFeature();
+ case ValueFeature_t: return new ValueFeature();
+ case TimeFeature_t: return new TimeFeature();
+ case ModalityFeature_t: return new ModalityFeature();
+ case FunctionFeature_t: return new FunctionFeature();
+ case LevelFeature_t: return new LevelFeature();
+ case Quote_t: return new Quote();
+ case DependenciesLayer_t: return new DependenciesLayer();
+ case Dependency_t: return new Dependency();
+ case DependencyDependent_t: return new DependencyDependent();
+ case Headspan_t: return new Headspan();
+ case ComplexAlignmentLayer_t: return new ComplexAlignmentLayer();
+ case ComplexAlignment_t: return new ComplexAlignment();
+ case Alignment_t: return new Alignment();
+ case AlignReference_t: return new AlignReference();
+ case TextMarkupString_t: return new TextMarkupString();
+ case TextMarkupGap_t: return new TextMarkupGap();
+ case TextMarkupCorrection_t: return new TextMarkupCorrection();
+ case TextMarkupError_t: return new TextMarkupError();
+ case TextMarkupStyle_t: return new TextMarkupStyle();
+ case Part_t: return new Part();
+ case AbstractSpanAnnotation_t:
+ case AbstractSpanRole_t:
+ case AbstractAnnotationLayer_t:
+ case AbstractTextMarkup_t:
+ case AbstractTokenAnnotation_t:
+ case AbstractStructureElement_t:
+ case AbstractCorrectionChild_t:
+ throw ValueError( "you may not create an abstract node of type "
+ + TiCC::toString(int(et)) + ")" );
+ default:
+ throw ValueError( "createElement: unknown elementtype("
+ + TiCC::toString(int(et)) + ")" );
+ }
+ return 0;
+ }
+
+ bool isSubClass( const ElementType e1, const ElementType e2 ){
+ if ( e1 == e2 )
+ return true;
+ const auto& it = typeHierarchy.find( e1 );
+ if ( it != typeHierarchy.end() ){
+ return it->second.find( e2 ) != it->second.end();
+ }
+ return false;
+ }
+
+ bool isSubClass( const FoliaElement *e1, const FoliaElement *e2 ){
+ return isSubClass( e1->element_id(), e2->element_id() );
+ }
+
+ bool FoliaElement::isSubClass( ElementType t ) const {
+ return folia::isSubClass( element_id(), t );
+ }
+
+
+ void print_type_hierarchy( ostream& os ){
+ for ( auto const& top : typeHierarchy ){
+ os << toString(top.first) << endl;
+ for ( auto const& el : top.second ){
+ os << " -- " << toString(el) << endl;
+ }
+ }
+ }
+
+ namespace {
+ struct initializer {
+ initializer() {
+ static_init();
+ // print_type_hierarchy( cout );
+ }
+ ~initializer() {
+ // cout << "Unloading the properties" << endl;
+ // cout << "but don't care.." << endl;
+ }
+ };
+ static initializer i;
+ }
+
+}
diff --git a/src/folia_types.cxx b/src/folia_types.cxx
new file mode 100644
index 0000000..a58cab5
--- /dev/null
+++ b/src/folia_types.cxx
@@ -0,0 +1,93 @@
+/*
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
+ ILK - Tilburg University
+
+ This file is part of libfolia
+
+ libfolia 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 3 of the License, or
+ (at your option) any later version.
+
+ libfolia 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, see <http://www.gnu.org/licenses/>.
+
+ For questions and suggestions, see:
+ https://github.com/LanguageMachines/ticcutils/issues
+ or send mail to:
+ lamasoftware (at ) science.ru.nl
+*/
+
+#include <iostream>
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+#include <list>
+#include "ticcutils/StringOps.h"
+#include "libfolia/folia_properties.h"
+#include "libfolia/folia.h"
+
+using namespace std;
+
+namespace folia {
+
+ string toString( const AnnotationType::AnnotationType& at ){
+ auto result = ant_s_map.find(at);
+ if ( result == ant_s_map.end() ){
+ throw logic_error( "Unknown Annotationtype: index= "
+ + TiCC::toString(int(at)) );
+ };
+ return result->second;
+ }
+
+ AnnotationType::AnnotationType stringToAT( const string& st ){
+ string s = st;
+ if ( s == "div" ){
+ s = "division"; // fix for old (in fact invalid) FoLiA
+ }
+ auto result = s_ant_map.find( s );
+ if ( result == s_ant_map.end() ){
+ throw logic_error( "Unknown translation for annotationtype: '"
+ + s + "'" );
+ }
+ return result->second;
+ }
+
+ AnnotatorType stringToANT( const string& str ){
+ string at = TiCC::uppercase( str );
+ if ( at == "AUTO" )
+ return folia::AUTO;
+ else if ( at == "MANUAL" )
+ return folia::MANUAL;
+ else
+ return folia::UNDEFINED;
+ }
+
+ string toString( const ElementType& et ) {
+ auto result = et_s_map.find(et);
+ if ( result == et_s_map.end() ){
+ throw logic_error( "toString: Unknown Elementtype "
+ + TiCC::toString( int(et) ) );
+ }
+ return result->second;
+ }
+
+ ElementType stringToET( const string& intag ){
+ string tag = intag;
+ if ( tag == "listitem" ){ // erroneous in older FoLiA docs
+ tag = "item";
+ }
+ auto result = s_et_map.find(tag);
+ if ( result == s_et_map.end() ){
+ throw ValueError( "unknown tag <" + tag + ">" );
+ }
+ return result->second;
+ }
+}
diff --git a/src/folia_utils.cxx b/src/folia_utils.cxx
new file mode 100644
index 0000000..0265ca8
--- /dev/null
+++ b/src/folia_utils.cxx
@@ -0,0 +1,480 @@
+/*
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
+ ILK - Tilburg University
+
+ This file is part of libfolia
+
+ libfolia 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 3 of the License, or
+ (at your option) any later version.
+
+ libfolia 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, see <http://www.gnu.org/licenses/>.
+
+ For questions and suggestions, see:
+ https://github.com/LanguageMachines/ticcutils/issues
+ or send mail to:
+ lamasoftware (at ) science.ru.nl
+*/
+
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+#include <list>
+#include <stdexcept>
+#include <algorithm>
+#include "ticcutils/StringOps.h"
+#include "ticcutils/XMLtools.h"
+#include "ticcutils/PrettyPrint.h"
+#include "libfolia/folia.h"
+
+using namespace std;
+using namespace TiCC;
+
+namespace folia {
+
+ UnicodeString UTF8ToUnicode( const string& s ){
+ return UnicodeString::fromUTF8( s );
+ }
+
+ string UnicodeToUTF8( const UnicodeString& s ){
+ string result;
+ s.toUTF8String(result);
+ return result;
+ }
+
+ FoliaElement *FoliaImpl::createElement( const string& tag,
+ Document *doc ){
+
+ ElementType et = BASE;
+ try {
+ et = stringToET( tag );
+ }
+ catch ( ValueError& e ){
+ cerr << e.what() << endl;
+ return 0;
+ }
+ FoliaElement *el = private_createElement( et );
+ if ( doc ){
+ el->assignDoc( doc );
+ }
+ return el;
+ }
+
+ FoliaElement *FoliaImpl::createElement( ElementType et,
+ Document *doc ){
+ FoliaElement *el = private_createElement( et );
+ if ( doc ){
+ el->assignDoc( doc );
+ }
+ return el;
+ }
+
+ KWargs getArgs( const string& s ){
+ KWargs result;
+ bool quoted = false;
+ bool parseatt = true;
+ bool escaped = false;
+ vector<string> parts;
+ string att;
+ string val;
+ for ( const auto& let : s ){
+ if ( let == '\\' ){
+ if ( quoted ){
+ if ( escaped ){
+ val += let;
+ escaped = false;
+ }
+ else {
+ escaped = true;
+ continue;
+ }
+ }
+ else {
+ throw ArgsError( s + ", stray \\" );
+ }
+ }
+ else if ( let == '\'' ){
+ if ( quoted ){
+ if ( escaped ){
+ val += let;
+ escaped = false;
+ }
+ else {
+ if ( att.empty() || val.empty() ){
+ throw ArgsError( s + ", (''?)" );
+ }
+ result[att] = val;
+ att.clear();
+ val.clear();
+ quoted = false;
+ }
+ }
+ else {
+ quoted = true;
+ }
+ }
+ else if ( let == '=' ) {
+ if ( parseatt ){
+ parseatt = false;
+ }
+ else if ( quoted ) {
+ val += let;
+ }
+ else {
+ throw ArgsError( s + ", stray '='?" );
+ }
+ }
+ else if ( let == ',' ){
+ if ( quoted ){
+ val += let;
+ }
+ else if ( !parseatt ){
+ parseatt = true;
+ }
+ else {
+ throw ArgsError( s + ", stray '='?" );
+ }
+ }
+ else if ( let == ' ' ){
+ if ( quoted )
+ val += let;
+ }
+ else if ( parseatt ){
+ att += let;
+ }
+ else if ( quoted ){
+ if ( escaped ){
+ val += "\\";
+ escaped = false;
+ }
+ val += let;
+ }
+ else {
+ throw ArgsError( s + ", unquoted value or missing , ?" );
+ }
+ }
+ if ( quoted )
+ throw ArgsError( s + ", unbalanced '?" );
+ return result;
+ }
+
+ string toString( const KWargs& args ){
+ string result;
+ auto it = args.begin();
+ while ( it != args.end() ){
+ result += it->first + "='" + it->second + "'";
+ ++it;
+ if ( it != args.end() )
+ result += ",";
+ }
+ return result;
+ }
+
+ KWargs getAttributes( const xmlNode *node ){
+ KWargs atts;
+ if ( node ){
+ xmlAttr *a = node->properties;
+ while ( a ){
+ if ( a->atype == XML_ATTRIBUTE_ID && string((char*)a->name) == "id" ){
+ atts["_id"] = (char *)a->children->content;
+ }
+ else if ( a->ns == 0 || a->ns->prefix == 0 ){
+ atts[(char*)a->name] = (char *)a->children->content;
+ }
+ else {
+ string pref = string( (const char*)a->ns->prefix);
+ if ( pref == "xlink" ){ // are there others?
+ atts[(char*)a->name] = (char *)a->children->content;
+ }
+ // else {
+ // cerr << "attribute PREF=" << pref << endl;
+ // }
+ }
+ a = a->next;
+ }
+ }
+ return atts;
+ }
+
+ void addAttributes( xmlNode *node, const KWargs& atts ){
+ KWargs attribs = atts;
+ auto it = attribs.find("_id");
+ if ( it != attribs.end() ){ // _id is special for xml:id
+ xmlSetProp( node, XML_XML_ID, (const xmlChar *)it->second.c_str() );
+ attribs.erase(it);
+ }
+ it = attribs.find("lang");
+ if ( it != attribs.end() ){ // lang is special too
+ xmlNodeSetLang( node, (const xmlChar*)it->second.c_str() );
+ attribs.erase(it);
+ }
+ it = attribs.find("id");
+ if ( it != attribs.end() ){ // id is te be sorted before the rest
+ xmlSetProp( node, (const xmlChar*)("id"), (const xmlChar *)it->second.c_str() );
+ attribs.erase(it);
+ }
+ // and now the rest
+ it = attribs.begin();
+ while ( it != attribs.end() ){
+ xmlSetProp( node,
+ (const xmlChar*)it->first.c_str(),
+ (const xmlChar*)it->second.c_str() );
+ ++it;
+ }
+ }
+
+ int toMonth( const string& ms ){
+ int result = 0;
+ try {
+ result = stringTo<int>( ms );
+ return result - 1;
+ }
+ catch( exception ){
+ string m = TiCC::lowercase( ms );
+ if ( m == "jan" )
+ return 0;
+ else if ( m == "feb" )
+ return 1;
+ else if ( m == "mar" )
+ return 2;
+ else if ( m == "apr" )
+ return 3;
+ else if ( m == "may" )
+ return 4;
+ else if ( m == "jun" )
+ return 5;
+ else if ( m == "jul" )
+ return 6;
+ else if ( m == "aug" )
+ return 7;
+ else if ( m == "sep" )
+ return 8;
+ else if ( m == "oct" )
+ return 9;
+ else if ( m == "nov" )
+ return 10;
+ else if ( m == "dec" )
+ return 11;
+ else
+ throw runtime_error( "invalid month: " + m );
+ }
+ }
+
+ string parseDate( const string& s ){
+ if ( s.empty() ){
+ return "";
+ }
+ // cerr << "try to read a date-time " << s << endl;
+ vector<string> date_time;
+ size_t num = TiCC::split_at( s, date_time, "T");
+ if ( num == 0 ){
+ num = TiCC::split_at( s, date_time, " ");
+ if ( num == 0 ){
+ cerr << "failed to read a date-time " << s << endl;
+ return "";
+ }
+ }
+ // cerr << "found " << num << " parts" << endl;
+ tm *time = new tm();
+ if ( num == 1 || num == 2 ){
+ // cerr << "parse date " << date_time[0] << endl;
+ vector<string> date_parts;
+ size_t dnum = TiCC::split_at( date_time[0], date_parts, "-" );
+ switch ( dnum ){
+ case 3: {
+ int mday = stringTo<int>( date_parts[2] );
+ time->tm_mday = mday;
+ }
+ case 2: {
+ int mon = toMonth( date_parts[1] );
+ time->tm_mon = mon;
+ }
+ case 1: {
+ int year = stringTo<int>( date_parts[0] );
+ time->tm_year = year-1900;
+ }
+ break;
+ default:
+ cerr << "failed to read a date from " << date_time[0] << endl;
+ return "";
+ }
+ }
+ if ( num == 2 ){
+ // cerr << "parse time " << date_time[1] << endl;
+ vector<string> date_parts;
+ num = TiCC::split_at( date_time[1], date_parts, ":" );
+ // cerr << "parts " << date_parts << endl;
+ switch ( num ){
+ case 4:
+ // ignore
+ case 3: {
+ int sec = stringTo<int>( date_parts[2] );
+ time->tm_sec = sec;
+ }
+ case 2: {
+ int min = stringTo<int>( date_parts[1] );
+ time->tm_min = min;
+ }
+ case 1: {
+ int hour = stringTo<int>( date_parts[0] );
+ time->tm_hour = hour;
+ }
+ break;
+ default:
+ cerr << "failed to read a time from " << date_time[1] << endl;
+ return "";
+ }
+ }
+ // cerr << "read _date time = " << toString(time) << endl;
+ char buf[100];
+ strftime( buf, 100, "%Y-%m-%dT%X", time );
+ delete time;
+ return buf;
+ }
+
+ string parseTime( const string& s ){
+ if ( s.empty() ){
+ return "";
+ }
+ // cerr << "try to read a time " << s << endl;
+ vector<string> time_parts;
+ string mil = "000";
+ tm *time = new tm();
+ int num = TiCC::split_at( s, time_parts, ":" );
+ if ( num != 3 ){
+ cerr << "failed to read a time " << s << endl;
+ return "";
+ }
+ time->tm_min = stringTo<int>( time_parts[1] );
+ time->tm_hour = stringTo<int>( time_parts[0] );
+ string secs = time_parts[2];
+ num = TiCC::split_at( secs, time_parts, "." );
+ time->tm_sec = stringTo<int>( time_parts[0] );
+ string mil_sec = "000";
+ if ( num == 2 ){
+ mil_sec = time_parts[1];
+ }
+ char buf[100];
+ strftime( buf, 100, "%X", time );
+ delete time;
+ string result = buf;
+ result += "." + mil_sec;
+ // cerr << "formatted time = " << result << endl;
+ return result;
+ }
+
+ bool AT_sanity_check(){
+ bool sane = true;
+ AnnotationType::AnnotationType at = AnnotationType::NO_ANN;
+ while ( ++at != AnnotationType::LAST_ANN ){
+ string s;
+ try {
+ s = toString( at );
+ }
+ catch (...){
+ cerr << "no string translation for AnnotationType(" << int(at) << ")" << endl;
+ sane = false;
+ }
+ if ( !s.empty() ){
+ try {
+ stringTo<AnnotationType::AnnotationType>( s );
+ }
+ catch ( ValueError& e ){
+ cerr << "no AnnotationType found for string '" << s << "'" << endl;
+ sane = false;
+ }
+ }
+ }
+ return sane;
+ }
+
+ bool ET_sanity_check(){
+ bool sane = true;
+ ElementType et = BASE;
+ while ( ++et != LastElement ){
+ string s;
+ try {
+ toString( et );
+ }
+ catch (...){
+ cerr << "no string translation for ElementType(" << int(et) << ")" << endl;
+ sane = false;
+ }
+ if( !s.empty() ){
+ ElementType et2;
+ try {
+ et2 = stringToET( s );
+ }
+ catch ( ValueError& e ){
+ cerr << "no element type found for string '" << s << "'" << endl;
+ sane = false;
+ continue;
+ }
+ if ( et != et2 ){
+ cerr << "Argl: toString(ET) doesn't match original:" << s
+ << " vs " << toString(et2) << endl;
+ sane = false;
+ continue;
+ }
+ FoliaElement *tmp = 0;
+ try {
+ tmp = FoliaImpl::createElement( s );
+ }
+ catch( ValueError &e ){
+ string err = e.what();
+ if ( !err.find("abstract" ) ){
+ sane = false;
+ }
+ }
+ if ( tmp != 0 ) {
+ if ( et != tmp->element_id() ){
+ cerr << "the element type " << tmp->element_id() << " of " << tmp
+ << " != " << et << " (" << toString(tmp->element_id())
+ << " != " << toString(et) << ")" << endl;
+ sane = false;
+ }
+ if ( s != tmp->xmltag() ){
+ cerr << "the xmltag " << tmp->xmltag() << " != " << s << endl;
+ sane = false;
+ }
+ }
+ }
+ }
+ return sane;
+ }
+
+ bool isNCName( const string& s ){
+ const string extra=".-_";
+ if ( s.empty() ){
+ throw XmlError( "an empty string is not a valid NCName." );
+ }
+ else if ( !isalpha(s[0]) ){
+ throw XmlError( "'"
+ + s
+ + "' is not a valid NCName. (must start with character)." );
+ }
+ else {
+ for ( const auto& let : s ){
+ if ( !isalnum(let) &&
+ extra.find(let) == string::npos ){
+ throw XmlError( "'" + s
+ + "' is not a valid NCName.(invalid '"
+ + char(let) + "' found" );
+ }
+ }
+ }
+ return true;
+ }
+
+} //namespace folia
diff --git a/src/folialint.cxx b/src/folialint.cxx
index 02efe55..4ca376b 100644
--- a/src/folialint.cxx
+++ b/src/folialint.cxx
@@ -1,10 +1,7 @@
/*
- $Id: folialint.cxx 17238 2014-05-22 14:26:29Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/src/folialint.cxx $
-
- Copyright (c) 1998 - 2014
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
ILK - Tilburg University
- CLiPS - University of Antwerp
This file is part of libfolia
@@ -22,42 +19,99 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
+ https://github.com/LanguageMachines/ticcutils/issues
or send mail to:
- timbl at uvt.nl
+ lamasoftware (at ) science.ru.nl
+
*/
#include <iostream>
#include <fstream>
#include <string>
-#include <map>
-#include "libfolia/document.h"
+#include "ticcutils/CommandLine.h"
+#include "libfolia/folia.h"
using namespace std;
void usage(){
- cerr << "usage: folialint <foliafile> [<outputfile>]" << endl;
+ cerr << "usage: folialint [options] <foliafiles>" << endl;
}
int main( int argc, char* argv[] ){
- string outName;
- if ( argc < 2 ){
- usage();
- exit( EXIT_FAILURE);
- }
- if ( argc == 3 ){
- outName == argv[2];
- }
+ string outputName;
+ bool permissive;
+ bool strip;
+ bool nooutput = false;
+ string debug;
+ vector<string> fileNames;
try {
- folia::Document d("file='" + string(argv[1]) + "'"); //,debug='3'");"
- if ( !outName.empty() )
- d.save( outName );
- else
- cout << d;
+ TiCC::CL_Options Opts( "hV",
+ "debug:,permissive,strip,output:,nooutput,help,version");
+ Opts.init(argc, argv );
+ if ( Opts.extract( 'h' )
+ || Opts.extract( "help" ) ){
+ usage();
+ return EXIT_SUCCESS;
+ }
+ if ( Opts.extract( 'V' )
+ || Opts.extract( "version" ) ){
+ cout << "folialint version 0.4" << endl;
+ cout << "based on [" << folia::VersionName() << "]" << endl;
+ return EXIT_SUCCESS;
+ }
+ permissive = Opts.extract("permissive");
+ nooutput = Opts.extract("nooutput");
+ strip = Opts.extract("strip");
+ if ( strip && permissive ){
+ cerr << "conflicting options: 'permissive' and 'strip'" << endl;
+ return EXIT_FAILURE;
+ }
+ Opts.extract( "debug", debug );
+ Opts.extract("output", outputName);
+ if ( !Opts.empty() ){
+ cerr << "unsupported option(s): " << Opts.toString() << endl;
+ return EXIT_FAILURE;
+ }
+ fileNames = Opts.getMassOpts();
+ if ( fileNames.size() == 0 ){
+ cerr << "missing input file" << endl;
+ return EXIT_FAILURE;
+ }
+ if ( fileNames.size() > 1 && !outputName.empty() ){
+ cerr << "--outputname not supported for more then 1 inputfile" << endl;
+ return EXIT_FAILURE;
+ }
+ string inputName = fileNames[0];
+ if ( inputName == outputName ){
+ cerr << "output name cannot be same as input name!" << endl;
+ return EXIT_FAILURE;
+ }
}
catch( exception& e ){
cerr << "FAIL: " << e.what() << endl;
exit( EXIT_FAILURE );
}
+ for ( const auto& inputName : fileNames ){
+ try {
+ string cmd = "file='" + inputName + "'";
+ if ( !debug.empty() )
+ cmd += ", debug='" + debug + "'";
+ if ( permissive )
+ cmd += ", mode='permissive'";
+ else if ( strip )
+ cmd += ", mode='strip'";
+ folia::Document d( cmd );
+ if ( !outputName.empty() ){
+ d.save( outputName );
+ }
+ else if ( !nooutput ){
+ cout << d;
+ }
+ }
+ catch( exception& e ){
+ cerr << "FAIL: " << e.what() << endl;
+ exit( EXIT_FAILURE );
+ }
+ }
exit( EXIT_SUCCESS );
}
diff --git a/src/foliautils.cxx b/src/foliautils.cxx
deleted file mode 100644
index 4f86cbd..0000000
--- a/src/foliautils.cxx
+++ /dev/null
@@ -1,1195 +0,0 @@
-/*
- $Id: foliautils.cxx 17507 2014-08-13 15:20:36Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/src/foliautils.cxx $
-
- Copyright (c) 1998 - 2014
- ILK - Tilburg University
- CLiPS - University of Antwerp
-
- This file is part of libfolia
-
- libfolia 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 3 of the License, or
- (at your option) any later version.
-
- libfolia 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, see <http://www.gnu.org/licenses/>.
-
- For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
- or send mail to:
- timbl at uvt.nl
-*/
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-#include <list>
-#include <stdexcept>
-#include <algorithm>
-#include "ticcutils/StringOps.h"
-#include "ticcutils/XMLtools.h"
-#include "libfolia/document.h"
-
-using namespace std;
-using namespace TiCC;
-
-namespace folia {
-
- UnicodeString UTF8ToUnicode( const string& s ){
- return UnicodeString( s.c_str(), s.length(), "UTF-8" );
- }
-
- string UnicodeToUTF8( const UnicodeString& s ){
- string result;
- int len = s.length();
- if ( len > 0 ){
- char *buf = new char[len*6+1];
- s.extract( 0, len, buf, len*6, "UTF-8" );
- result = buf;
- delete [] buf;
- }
- return result;
- }
-
- string toString( const double d ){
- stringstream dummy;
- if ( !( dummy << d ) ) {
- throw( runtime_error( "conversion to string failed" ) );
- }
- return dummy.str();
- }
-
- string toString( const AnnotationType::AnnotationType& at ){
- string result;
- switch ( at ) {
- case AnnotationType::NO_ANN:
- result = "NoNe";
- break;
- case AnnotationType::TEXT:
- result = "text";
- break;
- case AnnotationType::STRING:
- result = "string";
- break;
- case AnnotationType::TOKEN:
- result = "token";
- break;
- case AnnotationType::DIVISION:
- result = "division"; //adapted from erroneous div
- break;
- case AnnotationType::PARAGRAPH:
- result = "paragraph";
- break;
- case AnnotationType::LIST:
- result = "list";
- break;
- case AnnotationType::FIGURE:
- result = "figure";
- break;
- case AnnotationType::WHITESPACE:
- result = "whitespace";
- break;
- case AnnotationType::LINEBREAK:
- result = "linebreak";
- break;
- case AnnotationType::SENTENCE:
- result = "sentence";
- break;
- case AnnotationType::POS:
- result = "pos";
- break;
- case AnnotationType::LEMMA:
- result = "lemma";
- break;
- case AnnotationType::DOMEIN:
- result = "domain";
- break;
- case AnnotationType::SENSE:
- result = "sense";
- break;
- case AnnotationType::SYNTAX:
- result = "syntax";
- break;
- case AnnotationType::CHUNKING:
- result = "chunking";
- break;
- case AnnotationType::ENTITY:
- result = "entity";
- break;
- case AnnotationType::CORRECTION:
- result = "correction";
- break;
- case AnnotationType::SUGGESTION:
- result = "suggestion";
- break;
- case AnnotationType::ERRORDETECTION:
- result = "errordetection";
- break;
- case AnnotationType::ALTERNATIVE:
- result = "alternative";
- break;
- case AnnotationType::PHON:
- result = "phon";
- break;
- case AnnotationType::SUBJECTIVITY:
- result = "subjectivity";
- break;
- case AnnotationType::MORPHOLOGICAL:
- result = "morphological";
- break;
- case AnnotationType::SUBENTITY:
- result = "subentity";
- break;
- case AnnotationType::EVENT:
- result = "event";
- break;
- case AnnotationType::DEPENDENCY:
- result = "dependency";
- break;
- case AnnotationType::TIMEDEVENT:
- result = "timesegment";
- break;
- case AnnotationType::GAP:
- result = "gap";
- break;
- case AnnotationType::ALIGNMENT:
- result = "alignment";
- break;
- case AnnotationType::COMPLEXALIGNMENT:
- result = "complexalignment";
- break;
- case AnnotationType::COREFERENCE:
- result = "coreference";
- break;
- case AnnotationType::SEMROLE:
- result = "semrole";
- break;
- case AnnotationType::METRIC:
- result = "metric";
- break;
- case AnnotationType::TABLE:
- result = "table";
- break;
- case AnnotationType::LANG:
- result = "lang";
- break;
- case AnnotationType::STYLE:
- result = "style";
- break;
- case AnnotationType::NOTE:
- result = "note";
- break;
- case AnnotationType::LAST_ANN:
- throw logic_error("LAST_ANN");
- };
- return result;
- }
-
- AnnotationType::AnnotationType stringToAT( const string& at ){
- if ( at == "text" )
- return AnnotationType::TEXT;
- if ( at == "string" )
- return AnnotationType::STRING;
- if ( at == "token" )
- return AnnotationType::TOKEN;
- if (( at == "div" ) || ( at == "division")) //patch, documentation and libraries used different terms
- return AnnotationType::DIVISION;
- if ( at == "paragraph" )
- return AnnotationType::PARAGRAPH;
- if ( at == "list" )
- return AnnotationType::LIST;
- if ( at == "figure" )
- return AnnotationType::FIGURE;
- if ( at == "whitespace" )
- return AnnotationType::WHITESPACE;
- if ( at == "linebreak" )
- return AnnotationType::LINEBREAK;
- if ( at == "sentence" )
- return AnnotationType::SENTENCE;
- if ( at == "pos" )
- return AnnotationType::POS;
- if ( at == "lemma" )
- return AnnotationType::LEMMA;
- if ( at == "domain" )
- return AnnotationType::DOMEIN;
- if ( at == "sense" )
- return AnnotationType::SENSE;
- if ( at == "syntax" )
- return AnnotationType::SYNTAX;
- if ( at == "chunking" )
- return AnnotationType::CHUNKING;
- if ( at == "entity" )
- return AnnotationType::ENTITY;
- if ( at == "correction" )
- return AnnotationType::CORRECTION;
- if ( at == "suggestion" )
- return AnnotationType::SUGGESTION;
- if ( at == "errordetection" )
- return AnnotationType::ERRORDETECTION;
- if ( at == "alternative" )
- return AnnotationType::ALTERNATIVE;
- if ( at == "phon" )
- return AnnotationType::PHON;
- if ( at == "subjectivity" )
- return AnnotationType::SUBJECTIVITY;
- if ( at == "morphological" )
- return AnnotationType::MORPHOLOGICAL;
- if ( at == "subentity" )
- return AnnotationType::SUBENTITY;
- if ( at == "event" )
- return AnnotationType::EVENT;
- if ( at == "dependency" )
- return AnnotationType::DEPENDENCY;
- if ( at == "timesegment" )
- return AnnotationType::TIMEDEVENT;
- if ( at == "gap" )
- return AnnotationType::GAP;
- if ( at == "complexalignment" )
- return AnnotationType::COMPLEXALIGNMENT;
- if ( at == "alignment" )
- return AnnotationType::ALIGNMENT;
- if ( at == "semrole" )
- return AnnotationType::SEMROLE;
- if ( at == "coreference" )
- return AnnotationType::COREFERENCE;
- if ( at == "metric" )
- return AnnotationType::METRIC;
- if ( at == "table" )
- return AnnotationType::TABLE;
- if ( at == "lang" )
- return AnnotationType::LANG;
- if ( at == "style" )
- return AnnotationType::STYLE;
- if ( at == "note" )
- return AnnotationType::NOTE;
- throw ValueError( " unknown translation for attribute: " + at );
- }
-
- string toString( const ElementType& et ) {
- string result;
- switch( et ){
- case BASE: result = "BASE"; break;
- case TextContent_t: result = "t"; break;
- case Text_t: result = "text"; break;
- case Event_t: result = "event"; break;
- case TimeSegment_t: result = "timesegment"; break;
- case TimingLayer_t: result = "timing"; break;
- case LineBreak_t: result = "br"; break;
- case WhiteSpace_t: result = "whitespace"; break;
- case Word_t: result = "w"; break;
- case WordReference_t: result = "wref"; break;
- case Str_t: result = "str"; break;
- case Sentence_t: result = "s"; break;
- case Paragraph_t: result = "p"; break;
- case Division_t: result = "div"; break;
- case Head_t: result = "head"; break;
- case Table_t: result = "table"; break;
- case TableHead_t: result = "tablehead"; break;
- case Cell_t: result = "cell"; break;
- case Lang_t: result = "lang"; break;
- case Row_t: result = "row"; break;
- case Caption_t: result = "caption"; break;
- case Label_t: result = "label"; break;
- case List_t: result = "list"; break;
- case Item_t: result = "item"; break;
- case Figure_t: result = "figure"; break;
- case Quote_t: result = "quote"; break;
- case TokenAnnotation_t: result = "tokenannotation"; break;
- case Structure_t: result = "structure"; break;
- case Pos_t: result = "pos"; break;
- case Lemma_t: result = "lemma"; break;
- case Phon_t: result = "phon"; break;
- case Domain_t: result = "domain"; break;
- case Sense_t: result = "sense"; break;
- case Subjectivity_t: result = "subjectivity"; break;
- case Correction_t: result = "correction"; break;
- case AnnotationLayer_t: result = "annotationlayer"; break;
- case SpanAnnotation_t: result = "spanannotation"; break;
- case SyntacticUnit_t: result = "su"; break;
- case SyntaxLayer_t: result = "syntax"; break;
- case Chunk_t: result = "chunk"; break;
- case Chunking_t: result = "chunking"; break;
- case Entity_t: result = "entity"; break;
- case Entities_t: result = "entities"; break;
- case Semroles_t: result = "semroles"; break;
- case Semrole_t: result = "semrole"; break;
- case Coreferences_t: result = "coreferences"; break;
- case CoreferenceLink_t: result = "coreferencelink"; break;
- case CoreferenceChain_t: result = "coreferencechain"; break;
- case Morphology_t: result = "morphology"; break;
- case Morpheme_t: result = "morpheme"; break;
- case ErrorDetection_t: result = "errordetection"; break;
- case New_t: result = "new"; break;
- case Original_t: result = "original"; break;
- case Current_t: result = "current"; break;
- case Suggestion_t: result = "suggestion"; break;
- case Alternative_t: result = "alt"; break;
- case Alternatives_t: result = "altlayers"; break;
- case XmlComment_t: result = "xml-comment"; break;
- case XmlText_t: result = "xml-text"; break;
- case External_t: result = "external"; break;
- case Note_t:result = "note"; break;
- case Reference_t: result = "ref"; break;
- case Description_t: result = "desc"; break;
- case Gap_t: result = "gap"; break;
- case Content_t: result = "content"; break;
- case Metric_t: result = "metric"; break;
- case Feature_t: result = "feat"; break;
- case SynsetFeature_t: result = "synset"; break;
- case ActorFeature_t: result = "actor"; break;
- case HeadFeature_t: result = "headfeature"; break;
- case ValueFeature_t: result = "value"; break;
- case TimeFeature_t: result = "time"; break;
- case ModalityFeature_t: result = "modality"; break;
- case LevelFeature_t: result = "level"; break;
- case FunctionFeature_t: result = "function"; break;
- case BeginDateTimeFeature_t: result = "begindatetime"; break;
- case EndDateTimeFeature_t: result = "enddatetime"; break;
- case PlaceHolder_t: result = "placeholder"; break;
- case Dependencies_t: result = "dependencies"; break;
- case Dependency_t: result = "dependency"; break;
- case DependencyDependent_t: result = "dep"; break;
- case Headwords_t: result = "hd"; break;
- case Alignment_t: result = "alignment"; break;
- case AlignReference_t: result = "aref"; break;
- case AbstractTextMarkup_t: result = "textmarkup"; break;
- case TextMarkupString_t: result = "t-str"; break;
- case TextMarkupGap_t: result = "t-gap"; break;
- case TextMarkupCorrection_t: result = "t-correction"; break;
- case TextMarkupError_t: result = "t-error"; break;
- case TextMarkupStyle_t: result = "t-style"; break;
- default:
- result = "Unknown Elementtype " + folia::toString( int(et) );
- }
- return result;
- }
-
- ElementType stringToET( const string& tag ){
- if ( tag == "FoLiA" ){
- return BASE;
- }
- if ( tag == "text" ){
- return Text_t;
- }
- if ( tag == "w" ){
- return Word_t;
- }
- if ( tag == "str" ){
- return Str_t;
- }
- if ( tag == "event" ){
- return Event_t;
- }
- if ( tag == "timesegment" ){
- return TimeSegment_t;
- }
- if ( tag == "timing" ){
- return TimingLayer_t;
- }
- if ( tag == "s" ){
- return Sentence_t;
- }
- if ( tag == "t" ){
- return TextContent_t;
- }
- if ( tag == "br" ){
- return LineBreak_t;
- }
- if ( tag == "whitespace" ){
- return WhiteSpace_t;
- }
- if ( tag == "figure" ){
- return Figure_t;
- }
- if ( tag == "caption" ){
- return Caption_t;
- }
- if ( tag == "label" ){
- return Label_t;
- }
- if ( tag == "list" ){
- return List_t;
- }
- if ( tag == "listitem" || tag == "item" ){
- return Item_t;
- }
- if ( tag == "p" ){
- return Paragraph_t;
- }
- if ( tag == "new" ){
- return New_t;
- }
- if ( tag == "original" ){
- return Original_t;
- }
- if ( tag == "current" ){
- return Current_t;
- }
- if ( tag == "suggestion" ){
- return Suggestion_t;
- }
- if ( tag == "head" ){
- return Head_t;
- }
- if ( tag == "table" ){
- return Table_t;
- }
- if ( tag == "tablehead" ){
- return TableHead_t;
- }
- if ( tag == "cell" ){
- return Cell_t;
- }
- if ( tag == "row" ){
- return Row_t;
- }
- if ( tag == "lang" ){
- return Lang_t;
- }
- if ( tag == "xml-comment" ){
- return XmlComment_t;
- }
- if ( tag == "xml-text" ){
- return XmlText_t;
- }
- if ( tag == "external" ){
- return External_t;
- }
- if ( tag == "note" ){
- return Note_t;
- }
- if ( tag == "ref" ){
- return Reference_t;
- }
- if ( tag == "desc" ){
- return Description_t;
- }
- if ( tag == "gap" ){
- return Gap_t;
- }
- if ( tag == "content" ){
- return Content_t;
- }
- if ( tag == "metric" ){
- return Metric_t;
- }
- if ( tag == "div" ){
- return Division_t;
- }
- if ( tag == "annotationlayer" ){
- return AnnotationLayer_t;
- }
- if ( tag == "spanannotation" ){
- return SpanAnnotation_t;
- }
- if ( tag == "tokenannotation" ){
- return TokenAnnotation_t;
- }
- if ( tag == "structure" ){
- return Structure_t;
- }
- if ( tag == "pos" ){
- return Pos_t;
- }
- if ( tag == "lemma" ){
- return Lemma_t;
- }
- if ( tag == "phon" ){
- return Phon_t;
- }
- if ( tag == "domain" ){
- return Domain_t;
- }
- if ( tag == "sense" ){
- return Sense_t;
- }
- if ( tag == "syntax" ){
- return SyntaxLayer_t;
- }
- if ( tag == "subjectivity" ){
- return Subjectivity_t;
- }
- if ( tag == "chunk" ){
- return Chunk_t;
- }
- if ( tag == "chunking" ){
- return Chunking_t;
- }
- if ( tag == "entity" ){
- return Entity_t;
- }
- if ( tag == "entities" ){
- return Entities_t;
- }
- if ( tag == "semroles" ){
- return Semroles_t;
- }
- if ( tag == "semrole" ){
- return Semrole_t;
- }
- if ( tag == "coreferences" ){
- return Coreferences_t;
- }
- if ( tag == "coreferencelink" ){
- return CoreferenceLink_t;
- }
- if ( tag == "coreferencechain" ){
- return CoreferenceChain_t;
- }
- if ( tag == "alt" ){
- return Alternative_t;
- }
- if ( tag == "placeholder" ){
- return PlaceHolder_t;
- }
- if ( tag == "altlayers" ){
- return Alternatives_t;
- }
- if ( tag == "su" ){
- return SyntacticUnit_t;
- }
- if ( tag == "wref" ){
- return WordReference_t;
- }
- if ( tag == "correction" ){
- return Correction_t;
- }
- if ( tag == "errordetection" ){
- return ErrorDetection_t;
- }
- if ( tag == "morphology" ){
- return Morphology_t;
- }
- if ( tag == "morpheme" ){
- return Morpheme_t;
- }
- if ( tag == "feat" ){
- return Feature_t;
- }
- if ( tag == "begindatetime" ){
- return BeginDateTimeFeature_t;
- }
- if ( tag == "enddatetime" ){
- return EndDateTimeFeature_t;
- }
- if ( tag == "synset" ){
- return SynsetFeature_t;
- }
- if ( tag == "actor" ){
- return ActorFeature_t;
- }
- if ( tag == "headfeature" ){
- return HeadFeature_t;
- }
- if ( tag == "value" ){
- return ValueFeature_t;
- }
- if ( tag == "time" ){
- return TimeFeature_t;
- }
- if ( tag == "level" ){
- return LevelFeature_t;
- }
- if ( tag == "function" ){
- return FunctionFeature_t;
- }
- if ( tag == "modality" ){
- return ModalityFeature_t;
- }
- if ( tag == "quote" ){
- return Quote_t;
- }
- if ( tag == "dependencies" ){
- return Dependencies_t;
- }
- if ( tag == "dependency" ){
- return Dependency_t;
- }
- if ( tag == "dep" ){
- return DependencyDependent_t;
- }
- if ( tag == "hd" ){
- return Headwords_t;
- }
- if ( tag == "alignment" ){
- return Alignment_t;
- }
- if ( tag == "aref" ){
- return AlignReference_t;
- }
- if ( tag == "textmarkup" ){
- return AbstractTextMarkup_t;
- }
- if ( tag == "t-str" ){
- return TextMarkupString_t;
- }
- if ( tag == "t-gap" ){
- return TextMarkupGap_t;
- }
- if ( tag == "t-correction" ){
- return TextMarkupCorrection_t;
- }
- if ( tag == "t-error" ){
- return TextMarkupError_t;
- }
- if ( tag == "t-style" ){
- return TextMarkupStyle_t;
- }
- else {
- throw ValueError( "unknown tag <" + tag + ">" );
- }
- return BASE;
- }
-
- FoliaElement *FoliaImpl::createElement( Document *doc,
- const string& tag ){
-
- ElementType et = BASE;
- try {
- et = stringToET( tag );
- }
- catch ( ValueError& e ){
- cerr << e.what() << endl;
- return 0;
- }
- switch ( et ){
- case BASE:
- return new FoLiA( doc );
- case Text_t:
- return new Text( doc );
- case Word_t:
- return new Word( doc );
- case Str_t:
- return new String( doc );
- case Event_t:
- return new Event( doc );
- case TimeSegment_t:
- return new TimeSegment( doc );
- case TimingLayer_t:
- return new TimingLayer( doc );
- case Sentence_t:
- return new Sentence( doc );
- case TextContent_t:
- return new TextContent( doc );
- case LineBreak_t:
- return new LineBreak( doc );
- case WhiteSpace_t:
- return new WhiteSpace( doc );
- case Figure_t:
- return new Figure( doc );
- case Caption_t:
- return new Caption( doc );
- case Label_t:
- return new Label( doc );
- case List_t:
- return new List( doc );
- case Item_t:
- return new Item( doc );
- case Paragraph_t:
- return new Paragraph( doc );
- case New_t:
- return new NewElement( doc );
- case Original_t:
- return new Original( doc );
- case Current_t:
- return new Current( doc );
- case Suggestion_t:
- return new Suggestion( doc );
- case Head_t:
- return new Head( doc );
- case Table_t:
- return new Table( doc );
- case TableHead_t:
- return new TableHead( doc );
- case Cell_t:
- return new Cell( doc );
- case Row_t:
- return new Row( doc );
- case Lang_t:
- return new LangAnnotation( doc );
- case SpanAnnotation_t:
- return new AbstractSpanAnnotation( doc );
- case TokenAnnotation_t:
- return new AbstractTokenAnnotation( doc );
- case Structure_t:
- return new AbstractStructureElement( doc );
- case XmlComment_t:
- return new XmlComment( doc );
- case XmlText_t:
- return new XmlText( doc );
- case External_t:
- return new External( doc );
- case Note_t:
- return new Note( doc );
- case Reference_t:
- return new Reference( doc );
- case Description_t:
- return new Description( doc );
- case Gap_t:
- return new Gap( doc );
- case Content_t:
- return new Content( doc );
- case Metric_t:
- return new MetricAnnotation( doc );
- case Division_t:
- return new Division( doc );
- case AnnotationLayer_t:
- return new AbstractAnnotationLayer( doc );
- case Pos_t:
- return new PosAnnotation( doc );
- case Lemma_t:
- return new LemmaAnnotation( doc );
- case Phon_t:
- return new PhonAnnotation( doc );
- case Domain_t:
- return new DomainAnnotation( doc );
- case Sense_t:
- return new SenseAnnotation( doc );
- case SyntaxLayer_t:
- return new SyntaxLayer( doc );
- case Subjectivity_t:
- return new SubjectivityAnnotation( doc );
- case Chunk_t:
- return new Chunk( doc );
- case Chunking_t:
- return new ChunkingLayer( doc );
- case Entity_t:
- return new Entity( doc );
- case Entities_t:
- return new EntitiesLayer( doc );
- case Semroles_t:
- return new SemanticRolesLayer( doc );
- case Semrole_t:
- return new SemanticRole( doc );
- case Coreferences_t:
- return new CoreferenceLayer( doc );
- case CoreferenceLink_t:
- return new CoreferenceLink( doc );
- case CoreferenceChain_t:
- return new CoreferenceChain( doc );
- case Alternative_t:
- return new Alternative( doc );
- case PlaceHolder_t:
- return new PlaceHolder();
- case Alternatives_t:
- return new AlternativeLayers( doc );
- case SyntacticUnit_t:
- return new SyntacticUnit( doc );
- case WordReference_t:
- return new WordReference( doc );
- case Correction_t:
- return new Correction( doc );
- case ErrorDetection_t:
- return new ErrorDetection( doc );
- case Morphology_t:
- return new MorphologyLayer( doc );
- case Morpheme_t:
- return new Morpheme( doc );
- case Feature_t:
- return new Feature( doc );
- case BeginDateTimeFeature_t:
- return new BeginDateTimeFeature( doc );
- case EndDateTimeFeature_t:
- return new EndDateTimeFeature( doc );
- case SynsetFeature_t:
- return new SynsetFeature( doc );
- case ActorFeature_t:
- return new ActorFeature( doc );
- case HeadFeature_t:
- return new HeadFeature( doc );
- case ValueFeature_t:
- return new ValueFeature( doc );
- case TimeFeature_t:
- return new TimeFeature( doc );
- case ModalityFeature_t:
- return new ModalityFeature( doc );
- case FunctionFeature_t:
- return new FunctionFeature( doc );
- case LevelFeature_t:
- return new LevelFeature( doc );
- case Quote_t:
- return new Quote( doc );
- case Dependencies_t:
- return new DependenciesLayer( doc );
- case Dependency_t:
- return new Dependency( doc );
- case DependencyDependent_t:
- return new DependencyDependent( doc );
- case Headwords_t:
- return new Headwords( doc );
- case Alignment_t:
- return new Alignment( doc );
- case AlignReference_t:
- return new AlignReference( doc );
- case AbstractTextMarkup_t:
- return new AbstractTextMarkup( doc );
- case TextMarkupString_t:
- return new TextMarkupString( doc );
- case TextMarkupGap_t:
- return new TextMarkupGap( doc );
- case TextMarkupCorrection_t:
- return new TextMarkupCorrection( doc );
- case TextMarkupError_t:
- return new TextMarkupError( doc );
- case TextMarkupStyle_t:
- return new TextMarkupStyle( doc );
- default:
- throw ValueError( "unknown elementtype(" + toString(int(et)) + ")" );
- }
- return 0;
- }
-
-
- KWargs getArgs( const std::string& s ){
- KWargs result;
- bool quoted = false;
- bool parseatt = true;
- bool escaped = false;
- vector<string> parts;
- string att;
- string val;
- // cerr << "getArgs \\" << s << "\\" << endl;
-
- for ( size_t i=0; i < s.size(); ++i ){
- // cerr << "bekijk " << s[i] << endl;
- // cerr << "quoted = " << (quoted?"YES":"NO")
- // << " parseatt = " << (parseatt?"YES":"NO")
- // << " escaped = " << (escaped?"YES":"NO") << endl;
- if ( s[i] == '\\' ){
- // cerr << "handle backslash " << endl;
- if ( quoted ){
- if ( escaped ){
- val += s[i];
- escaped = false;
- }
- else {
- escaped = true;
- continue;
- }
- }
- else
- throw ArgsError( s + ", stray \\" );
- }
- else if ( s[i] == '\'' ){
- // cerr << "handle single quote " << endl;
- if ( quoted ){
- if ( escaped ){
- val += s[i];
- escaped = false;
- }
- else {
- if ( att.empty() || val.empty() )
- throw ArgsError( s + ", (''?)" );
- result[att] = val;
- // cerr << "added " << att << "='" << val << "'" << endl;
- att.clear();
- val.clear();
- quoted = false;
- }
- }
- else {
- quoted = true;
- }
- }
- else if ( s[i] == '=' ) {
- if ( parseatt ){
- parseatt = false;
- }
- else if ( quoted )
- val += s[i];
- else
- throw ArgsError( s + ", stray '='?" );
- }
- else if ( s[i] == ',' ){
- if ( quoted )
- val += s[i];
- else if ( !parseatt ){
- parseatt = true;
- }
- else
- throw ArgsError( s + ", stray '='?" );
- }
- else if ( s[i] == ' ' ){
- if ( quoted )
- val += s[i];
- }
- else if ( parseatt )
- att += s[i];
- else if ( quoted ){
- if ( escaped ){
- val += "\\";
- escaped = false;
- }
- val += s[i];
- }
- else
- throw ArgsError( s + ", unquoted value or missing , ?" );
- // cerr << "att = '" << att << "'" << endl;
- // cerr << "val = '" << val << "'" << endl;
- }
- if ( quoted )
- throw ArgsError( s + ", unbalanced '?" );
- return result;
- }
-
- std::string toString( const KWargs& args ){
- string result;
- KWargs::const_iterator it = args.begin();
- while ( it != args.end() ){
- result += it->first + "='" + it->second + "'";
- ++it;
- if ( it != args.end() )
- result += ",";
- }
- return result;
- }
-
- KWargs getAttributes( const xmlNode *node ){
- KWargs atts;
- if ( node ){
- xmlAttr *a = node->properties;
- while ( a ){
- if ( a->atype == XML_ATTRIBUTE_ID && string((char*)a->name) == "id" ){
- atts["_id"] = (char *)a->children->content;
- }
- else
- atts[(char*)a->name] = (char *)a->children->content;
- a = a->next;
- }
- }
- return atts;
- }
-
- void addAttributes( xmlNode *node, const KWargs& atts ){
- KWargs attribs = atts;
- KWargs::iterator it = attribs.find("_id");
- if ( it != attribs.end() ){ // _id is special for xml:id
- xmlSetProp( node, XML_XML_ID, (const xmlChar *)it->second.c_str() );
- attribs.erase(it);
- }
- it = attribs.find("lang");
- if ( it != attribs.end() ){ // lang is special too
- xmlNodeSetLang( node, (const xmlChar*)it->second.c_str() );
- attribs.erase(it);
- }
- it = attribs.find("id");
- if ( it != attribs.end() ){ // id is te be sorted before the rest
- xmlSetProp( node, (const xmlChar*)("id"), (const xmlChar *)it->second.c_str() );
- attribs.erase(it);
- }
- // and now the rest
- it = attribs.begin();
- while ( it != attribs.end() ){
- xmlSetProp( node,
- (const xmlChar*)it->first.c_str(),
- (const xmlChar*)it->second.c_str() );
- ++it;
- }
- }
-
- int toMonth( const string& ms ){
- int result = 0;
- try {
- result = stringTo<int>( ms );
- return result - 1;
- }
- catch( exception ){
- string m = TiCC::lowercase( ms );
- if ( m == "jan" )
- return 0;
- else if ( m == "feb" )
- return 1;
- else if ( m == "mar" )
- return 2;
- else if ( m == "apr" )
- return 3;
- else if ( m == "may" )
- return 4;
- else if ( m == "jun" )
- return 5;
- else if ( m == "jul" )
- return 6;
- else if ( m == "aug" )
- return 7;
- else if ( m == "sep" )
- return 8;
- else if ( m == "oct" )
- return 9;
- else if ( m == "nov" )
- return 10;
- else if ( m == "dec" )
- return 11;
- else
- throw runtime_error( "invalid month: " + m );
- }
- }
-
- string parseDate( const string& s ){
- if ( s.empty() )
- return "";
- // cerr << "try to read a date-time " << s << endl;
- vector<string> date_time;
- size_t num = TiCC::split_at( s, date_time, "T");
- if ( num == 0 ){
- num = TiCC::split_at( s, date_time, " ");
- if ( num == 0 ){
- cerr << "failed to read a date-time " << s << endl;
- return 0;
- }
- }
- // cerr << "found " << num << " parts" << endl;
- tm *time = new tm();
- if ( num == 1 || num == 2 ){
- // cerr << "parse date " << date_time[0] << endl;
- vector<string> date_parts;
- size_t dnum = TiCC::split_at( date_time[0], date_parts, "-" );
- switch ( dnum ){
- case 3: {
- int mday = stringTo<int>( date_parts[2] );
- time->tm_mday = mday;
- }
- case 2: {
- int mon = toMonth( date_parts[1] );
- time->tm_mon = mon;
- }
- case 1: {
- int year = stringTo<int>( date_parts[0] );
- time->tm_year = year-1900;
- }
- break;
- default:
- cerr << "failed to read a date from " << date_time[0] << endl;
- return 0;
- }
- }
- if ( num == 2 ){
- // cerr << "parse time " << date_time[1] << endl;
- vector<string> date_parts;
- num = TiCC::split_at( date_time[1], date_parts, ":" );
- // cerr << "parts " << date_parts << endl;
- switch ( num ){
- case 4:
- // ignore
- case 3: {
- int sec = stringTo<int>( date_parts[2] );
- time->tm_sec = sec;
- }
- case 2: {
- int min = stringTo<int>( date_parts[1] );
- time->tm_min = min;
- }
- case 1: {
- int hour = stringTo<int>( date_parts[0] );
- time->tm_hour = hour;
- }
- break;
- default:
- cerr << "failed to read a time from " << date_time[1] << endl;
- return 0;
- }
- }
- // cerr << "read _date time = " << toString(time) << endl;
- char buf[100];
- strftime( buf, 100, "%Y-%m-%dT%X", time );
- delete time;
- return buf;
- }
-
- bool AT_sanity_check(){
- bool sane = true;
- AnnotationType::AnnotationType at = AnnotationType::NO_ANN;
- while ( ++at != AnnotationType::LAST_ANN ){
- string s = toString( at );
- if ( s.empty() ){
- cerr << "no string translation for AnnotationType(" << at << ")" << endl;
- sane = false;
- }
- else {
- try {
- stringTo<AnnotationType::AnnotationType>( s );
- }
- catch ( ValueError& e ){
- cerr << "no AnnotationType found for string '" << s << "'" << endl;
- sane = false;
- }
- }
- }
- return sane;
- }
-
- bool ET_sanity_check(){
- bool sane = true;
- ElementType et = BASE;
- while ( ++et != LastElement ){
- string s = toString( et );
- if ( s.empty() ){
- cerr << "no string translation for ElementType(" << et << ")" << endl;
- sane = false;
- }
- else {
- ElementType et2;
- try {
- et2 = stringToET( s );
- }
- catch ( ValueError& e ){
- cerr << "no element type found for string '" << s << "'" << endl;
- sane = false;
- continue;
- }
- if ( et != et2 ){
- cerr << "Argl: toString(ET) doesn't match original:" << s
- << " vs " << toString(et2) << endl;
- sane = false;
- continue;
- }
- FoliaElement *tmp = FoliaImpl::createElement( 0, s );
- if ( tmp == 0 ) {
- cerr << "no Element created found for string '" << s << "'" << endl;
- sane = false;
- }
- else {
- if ( et != tmp->element_id() ){
- cerr << "the element type of " << tmp << " != " << et << endl;
- sane = false;
- }
- if ( s != tmp->xmltag() ){
- cerr << "the xmltag " << tmp->xmltag() << " != " << s << endl;
- sane = false;
- }
- }
- }
- }
- return sane;
- }
-
- bool isNCName( const std::string& s ){
- const string extra=".-_";
- if ( s.empty() )
- throw XmlError( "an empty string is not a valid NCName." );
- else if ( !isalpha(s[0]) )
- throw XmlError( "'"
- + s
- + "' is not a valid NCName. (must start with character)." );
- else {
- for ( size_t i=1; i < s.length(); ++i ){
- if ( !isalnum(s[i]) &&
- extra.find(s[i]) == string::npos )
- throw XmlError( "'" + s
- + "' is not a valid NCName.(invalid '"
- + char(s[i]) + "' found" );
- }
- }
- return true;
- }
-
-} //namespace folia
diff --git a/src/simpletest.cxx b/src/simpletest.cxx
index 6973781..09b5124 100644
--- a/src/simpletest.cxx
+++ b/src/simpletest.cxx
@@ -1,10 +1,7 @@
/*
- $Id: simpletest.cxx 17507 2014-08-13 15:20:36Z sloot $
- $URL: https://ilk.uvt.nl/svn/sources/libfolia/trunk/src/simpletest.cxx $
-
- Copyright (c) 1998 - 2014
+ Copyright (c) 2006 - 2016
+ CLST - Radboud University
ILK - Tilburg University
- CLiPS - University of Antwerp
This file is part of libfolia
@@ -22,15 +19,17 @@
along with this program; if not, see <http://www.gnu.org/licenses/>.
For questions and suggestions, see:
- http://ilk.uvt.nl/software.html
+ https://github.com/LanguageMachines/ticcutils/issues
or send mail to:
- timbl at uvt.nl
+ lamasoftware (at ) science.ru.nl
+
*/
#include <iostream>
#include <string>
#include <map>
-#include "libfolia/document.h"
+#include "ticcutils/StringOps.h"
+#include "libfolia/folia.h"
using namespace std;
using namespace folia;
@@ -39,12 +38,12 @@ int main() {
cout << "checking sanity" << endl;
cout << "AnnotationType sanity" << endl;
if ( ! AT_sanity_check() ){
- cout << "to bad. no use to continue" << endl;
+ cout << "too bad. no use to continue" << endl;
return EXIT_FAILURE;
}
cout << "ElementType sanity" << endl;
if ( ! ET_sanity_check() ){
- cout << "to bad. no use to continue" << endl;
+ cout << "too bad. no use to continue" << endl;
return EXIT_FAILURE;
}
cout << " Creating a document from scratch: ";
@@ -53,13 +52,15 @@ int main() {
if ( d.defaultset(AnnotationType::TOKEN) != "adhocset"
||
d.defaultannotator(AnnotationType::TOKEN) != "proycon" ){
+ cout << " Defaultset or defaultannotator does not match" << endl;
return EXIT_FAILURE;
}
string id = d.id() + ".text.1";
KWargs kw = getArgs( "id='" + id + "'" );
FoliaElement *text = d.addText( kw );
kw.clear();
- FoliaElement *s = new Sentence( &d, "generate_id='" + text->id() + "'" );
+ kw = getArgs( "generate_id='" + text->id() + "'" );
+ FoliaElement *s = new Sentence( kw, &d );
text->append( s );
kw.clear();
kw["text"] = "De";
@@ -72,11 +73,15 @@ int main() {
s->addWord( kw );
kw["text"] = ".";
s->addWord( kw );
- if ( d[id+".s.1"]->size() != 5 )
+ if ( d[id+".s.1"]->size() != 5 ) {
+ cout << " Unexpected sentence size, " << d[id+".s.1"]->size() << ", expected 5" << endl;
return EXIT_FAILURE;
+ }
UnicodeString txt = s->text();
- if ( txt != "De site staat online ." )
+ if ( txt != "De site staat online ." ) {
+ cout << " Text does not match reference: '" << txt << "' vs reference: 'De site staat online .'" << endl;
return EXIT_FAILURE;
+ }
cout << s->text() << endl;
return EXIT_SUCCESS;
}
diff --git a/test-driver b/test-driver
index d306056..8e575b0 100755
--- a/test-driver
+++ b/test-driver
@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# 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
@@ -106,11 +106,14 @@ trap "st=143; $do_exit" 15
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@ case $estatus:$expect_failure in
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfolia.git
More information about the debian-science-commits
mailing list