{"app_name":"Debian Janitor","binary_packages":["libe-book-0.1-1-dbgsym","libe-book-0.1-1","libe-book-dev","libe-book-tools-dbgsym","libe-book-tools"],"branch_url":"git+ssh://git@salsa.debian.org/libreoffice-team/document-liberation/libe-book.git","build_distribution":"sid","build_log_highlight_lines":[1018,1394],"build_log_include_lines":[1379,1409],"build_log_line_count":3202,"build_log_name":"build.log","campaign":"control","change_set":"e85279e8-401e-42fb-8057-05328e6ded23","codebase":"libe-book","codemod_log_name":"codemod.log","command":"brz up '--revision=git-v1:5f2518d906a160b2ad5603b804ec78bd298b7741'","current_year":"2026","description":"","is_admin":false,"lintian_result":{"groups":[{"group_id":"libe-book_0.1.3-4~jan+control1","input_files":[{"hints":[],"path":"libe-book-0.1-1-dbgsym_0.1.3-4~jan+control1_amd64.deb"},{"hints":[{"experimental":false,"note":"control != sid","pointer":{"item":{"index":"libe-book-0.1-1_0.1.3-4~jan+control1_amd64.deb (installed)","name":"usr/share/doc/libe-book-0.1-1/changelog.Debian.gz"},"line_position":1},"tag":"changelog-distribution-does-not-match-changes-file","visibility":"warning"}],"path":"libe-book-0.1-1_0.1.3-4~jan+control1_amd64.deb"},{"hints":[{"experimental":false,"note":"control != sid","pointer":{"item":{"index":"libe-book-dev_0.1.3-4~jan+control1_amd64.deb (installed)","name":"usr/share/doc/libe-book-dev/changelog.Debian.gz"},"line_position":1},"tag":"changelog-distribution-does-not-match-changes-file","visibility":"warning"}],"path":"libe-book-dev_0.1.3-4~jan+control1_amd64.deb"},{"hints":[],"path":"libe-book-tools-dbgsym_0.1.3-4~jan+control1_amd64.deb"},{"hints":[{"experimental":false,"note":"control != sid","pointer":{"item":{"index":"libe-book-tools_0.1.3-4~jan+control1_amd64.deb (installed)","name":"usr/share/doc/libe-book-tools/changelog.Debian.gz"},"line_position":1},"tag":"changelog-distribution-does-not-match-changes-file","visibility":"warning"},{"experimental":false,"note":"","pointer":{"item":{"index":"libe-book-tools_0.1.3-4~jan+control1_amd64.deb (installed)","name":"usr/bin/ebook2html"},"line_position":0},"tag":"no-manual-page","visibility":"warning"},{"experimental":false,"note":"","pointer":{"item":{"index":"libe-book-tools_0.1.3-4~jan+control1_amd64.deb (installed)","name":"usr/bin/ebook2text"},"line_position":0},"tag":"no-manual-page","visibility":"warning"}],"path":"libe-book-tools_0.1.3-4~jan+control1_amd64.deb"},{"hints":[{"experimental":false,"note":"Build-Depends: pkg-config => pkgconf","tag":"build-depends-on-obsolete-package","visibility":"warning"},{"experimental":false,"note":"","pointer":{"item":{"index":"libe-book_0.1.3-4~jan+control1.dsc (patched)","name":"debian/changelog"},"line_position":1},"tag":"no-nmu-in-changelog","visibility":"warning"},{"experimental":false,"note":"0.1.3-4~jan+control1","pointer":{"item":{"index":"libe-book_0.1.3-4~jan+control1.dsc (patched)","name":"debian/changelog"},"line_position":1},"tag":"source-nmu-has-incorrect-version-number","visibility":"warning"}],"path":"libe-book_0.1.3-4~jan+control1.dsc"},{"hints":[],"path":"libe-book_0.1.3-4~jan+control1_amd64.buildinfo"},{"hints":[{"experimental":false,"note":"sid control","tag":"distribution-and-changes-mismatch","visibility":"warning"}],"path":"libe-book_0.1.3-4~jan+control1_amd64.changes"}],"source_name":"libe-book","source_version":"0.1.3-4~jan+control1"}],"lintian_version":"2.143.0"},"logs":{"build":{"description":"build","name":"build.log","url":"/control/c/libe-book/e85279e8-401e-42fb-8057-05328e6ded23/logs/build.log"},"codemod":{"description":"codemod","name":"codemod.log","url":"/control/c/libe-book/e85279e8-401e-42fb-8057-05328e6ded23/logs/codemod.log"},"worker":{"content":"[2026-11-08T02:53:01Z INFO  janitor_worker] Opening branch at https://salsa.debian.org/libreoffice-team/document-liberation/libe-book.git\n[2026-11-08T02:53:04Z INFO  janitor_worker] Cached branch URL http://janitor.debian.net/git/libe-book missing: http://janitor.debian.net/git/libe-book/\n[2026-11-08T02:53:04Z DEBUG janitor_worker] Workspace path: /srv/worker/output/1/janitor-worker-f0yuYB/libe-book\n[2026-11-08T02:53:04Z DEBUG silver_platter::workspace] Creating sprout from git+ssh://git@salsa.debian.org/libreoffice-team/document-liberation/libe-book.git\nTotal 1118 (delta 70), reused 82 (delta 43), pack-reused 937 (from 1)\n[2026-11-08T02:53:08Z DEBUG silver_platter::utils] Colocated branch vendor not found, skipping\nTotal 8 (delta 1), reused 7 (delta 0), pack-reused 0 (from 0)\nTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)\nTotal 5 (delta 4), reused 2 (delta 1), pack-reused 0 (from 0)\nNothing to delete.\n[2026-11-08T02:53:17Z DEBUG silver_platter::workspace] Fetching colocated branches: {\"upstream\": \"upstream\", \"pristine-tar\": \"pristine-tar\", \"experimental\": \"experimental\", \"vendor\": \"vendor\"}\nTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)\n[2026-11-08T02:53:20Z DEBUG silver_platter::workspace] Successfully fetched colocated branch upstream -> upstream\nTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)\n[2026-11-08T02:53:22Z DEBUG silver_platter::workspace] Successfully fetched colocated branch pristine-tar -> pristine-tar\nTotal 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)\n[2026-11-08T02:53:25Z DEBUG silver_platter::workspace] Successfully fetched colocated branch experimental -> experimental\n[2026-11-08T02:53:25Z INFO  janitor_worker] Workspace ready - starting.\n[2026-11-08T02:53:25Z INFO  janitor_worker::debian] Running [\"brz\", \"up\", \"--revision=git-v1:5f2518d906a160b2ad5603b804ec78bd298b7741\"]\n[2026-11-08T02:53:28Z DEBUG debian_analyzer::detect_gbp_dch] Branch history analysis: changelog_only: 7, other_only: 6, mixed: 12, dch_references: 0, unreleased_references: 4\nfound 630 deltas to reuse\n30)\n[2026-11-08T02:53:32Z INFO  ognibuild::debian::fix_build] Using fixers: [PgBuildExtOutOfDateControlFixer, MissingConfigureFixer, MissingAutomakeInputFixer, MissingConfigStatusInputFixer, MissingPerlFileFixer, DebcargoUnacceptablePredicateFixer, DebcargoUnacceptableComparatorFixer, RetryAptFetchFailure, PackageDependencyFixer]\n[2026-11-08T02:53:32Z DEBUG ognibuild::debian::build] Adding dummy changelog entry 0.1.3-4~jan+control1 for build\n[2026-11-08T02:53:32Z DEBUG ognibuild::debian::build] Writing build log to /srv/worker/output/1/janitor-worker-f0yuYB/build.log\n[2026-11-08T02:53:32Z INFO  ognibuild::debian::build] Building debian packages, running sbuild --chroot-mode=unshare --no-clean-source -A -s -v -d sid.\n[2026-11-08T03:01:14Z INFO  ognibuild::debian::build] Build succeeded.\n[2026-11-08T03:01:14Z INFO  janitor_worker::debian::build] Built [\"/srv/worker/output/1/janitor-worker-f0yuYB/libe-book_0.1.3-4~jan+control1_amd64.changes\", \"/srv/worker/output/1/janitor-worker-f0yuYB/libe-book_0.1.3-4~jan+control1_amd64.buildinfo\"].\n[2026-11-08T03:01:14Z DEBUG janitor_worker::debian::lintian] Running lintian: cd \"/srv/worker/output/1/janitor-worker-f0yuYB\" && \"lintian\" \"--exp-output=format=json\" \"--allow-root\" \"/srv/worker/output/1/janitor-worker-f0yuYB/libe-book_0.1.3-4~jan+control1_amd64.changes\" \"/srv/worker/output/1/janitor-worker-f0yuYB/libe-book_0.1.3-4~jan+control1_amd64.buildinfo\"\n[2026-11-08T03:01:20Z INFO  janitor_worker] Pushing result branch to http://janitor.debian.net/git/libe-book\nfound 0 deltas to reuse\n[2026-11-08T03:01:21Z INFO  janitor_worker::vcs] Pushing packaging branch cache to http://janitor.debian.net/git/libe-book,branch=debian%2Flatest\nfound 24 deltas to reuse\ngit: cannot lock ref 'refs/heads/debian/latest': reference already exists\n[2026-11-08T03:01:21Z WARN  janitor_worker::vcs] unable to push to cache URL http://janitor.debian.net/git/libe-book,branch=debian%2Flatest: Remote Git error: reference already exists\n","description":"worker","name":"worker.log","url":"/control/c/libe-book/e85279e8-401e-42fb-8057-05328e6ded23/logs/worker.log"}},"my_review":null,"other_reviews":[],"primary_log":"worker","publish_history":[],"queue_position":1,"result_code":"success","resume_from":null,"reviews":[],"revision":"git-v1:5f2518d906a160b2ad5603b804ec78bd298b7741","run":{"branch_url":"git+ssh://git@salsa.debian.org/libreoffice-team/document-liberation/libe-book.git","build_version":null,"change_set":"e85279e8-401e-42fb-8057-05328e6ded23","codebase":"libe-book","command":"brz up '--revision=git-v1:5f2518d906a160b2ad5603b804ec78bd298b7741'","context":null,"debian_build_distribution":"sid","debian_build_version":null,"description":"","duration_seconds":502,"failure_stage":null,"failure_transient":null,"finish_time":"2026-11-08T03:01:22.765998Z","id":"e85279e8-401e-42fb-8057-05328e6ded23","logfilenames":["worker.log","codemod.log","build.log"],"main_branch_revision":"git-v1:b5b606b75aae150c7226639cae1965237bdb9940","publish_status":"unknown","result_branches":[{"absorbed":false,"base_revision":"git-v1:b5b606b75aae150c7226639cae1965237bdb9940","diff":"diff --git a/ChangeLog b/ChangeLog\nindex 959dab7..7806edd 100644\n--- a/ChangeLog\n+++ b/ChangeLog\n@@ -1,174 +1,3 @@\n-2026-07-19  Caolán McNamara  <caolan.mcnamara@collabora.com>  [70c3e2590e3ed0ce08b007601e9ea49a2d3b3685]\n-\n-\tprepare for release\n-\n-\n-2026-06-01  Caolán McNamara  <caolan.mcnamara@collabora.com>  [56385c0208afdd7ffe5262461345618509215436]\n-\n-\tclamp FictionBook2 table cell spans\n-\n-\tClamp the parsed col/row spans to a range no real table reaches.\n-\n-\tSame type of fix as used for table-cell in a similar libabw case\n-\thttps://gerrit.libreoffice.org/c/libabw/+/205595\n-\n-2026-06-01  Caolán McNamara  <caolan.mcnamara@collabora.com>  [c4bd348df7c4c5278a47019f0a8a3fce4af4d46e]\n-\n-\tcap BBeB object nesting depth\n-\n-\tThe entry.reading flag rejects a cycle, but a deep chain of distinct\n-\tobjects could still be problematic.\n-\n-\tBound the chain length with a nesting counter, matching the\n-\tlibcdr parseRecords cap at https://gerrit.libreoffice.org/c/libcdr/+/205588\n-\n-2026-06-01  Caolán McNamara  <caolan.mcnamara@collabora.com>  [d3c4b694c6d7333f3b5be83106bd7eb4db7164cb]\n-\n-\treject oversized SoftBook LZSS window size\n-\n-\toffsetBits is the window size read from the !!cm record and then used in\n-\t1 << offsetBits, so a bogus file value can reach it directly.\n-\n-\tBest to explicitly refuse those instead of asserting it shouldn't/can't happen.\n-\n-2026-06-01  Caolán McNamara  <caolan.mcnamara@collabora.com>  [015cffe2c1a41b29837e41bfaac70e37f24fcf70]\n-\n-\tavoid integer wrap in EBOOKMemoryStream/EBOOKStreamView read bounds check\n-\n-\tCompute remaining bytes as m_length - m_pos (m_end - pos in\n-\tEBOOKStreamView) and take the smaller of numBytes and remaining.\n-\n-\tSame ideas as the librevenge RVNGStringStream::read fix of\n-\thttps://sourceforge.net/p/libwpd/librevenge/ci/f8a5ed5f6bcdabdf62a0b273ce3e256c21f375a9/\n-\n-2026-06-01  Stephan Bergmann  <stephan.bergmann@allotropia.de>  [9d71324210661162f1d8b46d2bd7c88c30577e87]\n-\n-\texternal/libebook: operation between different enumeration types\n-\n-\t> EBOOKDocument.cpp:150:37: error: invalid bitwise operation between different enumeration types ('libebook::EBOOKHTMLToken::(unnamed enum at ./EBOOKHTMLToken.h:21:1)' and 'libebook::EBOOKHTMLToken::Namespace')\n-\t>   150 |           if ((EBOOKHTMLToken::html | EBOOKHTMLToken::NS_html) == getHTMLTokenId(name, uri))\n-\t>       |                ~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~\n-\n-\tetc. as reported now with --with-latest-c++ (i.e., in C++26 mode) by Clang 18\n-\ttrunk since\n-\t<https://github.com/llvm/llvm-project/commit/1cbd52f791d3f088246526c0801634edb65cee31>\n-\t\"[Clang] Implement P2864R2 Remove Deprecated Arithmetic Conversion on\n-\tEnumerations (#73105)\"\n-\n-2026-06-01  Stephan Bergmann  <sbergman@redhat.com>  [03e8014838742fea0c3b9bfe69714ebeff360612]\n-\n-\texternal/libebook: Missing include (for std::min)\n-\n-\t...as reported now by various Windows builders after\n-\te0f1b5bd94550835c639efda4e4c9a801c78dbe9 \"Upgrade external/boost to latest\n-\tBoost 1.75.0\"\n-\n-2021-05-20  David Tardon  <dtardon@redhat.com>  [edc7a50a06f56992fe21a80afb4f20fbdc5654ed]\n-\n-\tfix build with ICU 68\n-\n-\n-2019-09-08  David Tardon  <dtardon@redhat.com>  [5b014205fcd4cd31bf295013282fdf7453f3fe11]\n-\n-\tFictionBook2: skip broken images\n-\n-\tFixes: #4\n-\n-2019-08-12  David Tardon  <dtardon@redhat.com>  [a61d69a4b805b5f2db72ec9adfca83e4f1b8264d]\n-\n-\trecover on parsing errors\n-\n-\n-2019-08-12  David Tardon  <dtardon@redhat.com>  [357c6e55149d86be5d68bcd96fe2ee0357730904]\n-\n-\tput our own header first\n-\n-\n-2019-08-12  David Tardon  <dtardon@redhat.com>  [b899c5d2076b3177ea53bbee643d10d4a94cd757]\n-\n-\tignore blank nodes too\n-\n-\n-2019-08-12  David Tardon  <dtardon@redhat.com>  [4f6969e4fb3e886bec9af3fcad43c29109f2c6ea]\n-\n-\tdisable network access from XML parser\n-\n-\n-2018-03-24  David Tardon  <dtardon@redhat.com>  [1542c489376defef98ec61047ff434bff0bbe83a]\n-\n-\tuse unique_ptr\n-\n-\n-2018-03-24  David Tardon  <dtardon@redhat.com>  [f8ba347d5ee9547623026c6529ef12868a112add]\n-\n-\tdrop unused functions\n-\n-\n-2018-01-29  David Tardon  <dtardon@redhat.com>  [c931a81769a63bb160bfb4f89df482f9dae4a250]\n-\n-\tavoid possible memory leak\n-\n-\n-2018-01-29  David Tardon  <dtardon@redhat.com>  [4d1df988eda700e00cee6f272ebf3361ac3f8bb8]\n-\n-\tdrop extra variable\n-\n-\n-2018-01-29  David Tardon  <dtardon@redhat.com>  [f0c686cd63161ffc2697d289e64d461c34267cdc]\n-\n-\tmove creation of XML reader to one place\n-\n-\n-2018-01-29  David Tardon  <dtardon@redhat.com>  [2d8c049808f216a9cb867f3651c458e384fc7170]\n-\n-\tofz#5706 fix leak\n-\n-\n-2018-01-29  David Tardon  <dtardon@redhat.com>  [b8ecee35420b8237ca15e8085760f38f06dcc1f9]\n-\n-\tofz#5776 be more careful when determining note ID\n-\n-\tAny element can have an ID.\n-\n-2018-01-23  David Tardon  <dtardon@redhat.com>  [f1dfa0572db5fc0b9946062979da01b70b17608d]\n-\n-\tofz#5585 check that substream exists before using it\n-\n-\n-2018-01-22  David Tardon  <dtardon@redhat.com>  [52c585090fb34dcb9d7abd44a050f6a8d4e556af]\n-\n-\tuse shared_ptr\n-\n-\n-2018-01-18  David Tardon  <dtardon@redhat.com>  [aac6cf88dd9e6c4df583dbb22fda37835d991109]\n-\n-\tfix syntax\n-\n-\n-2018-01-18  David Tardon  <dtardon@redhat.com>  [ac0248f2f7aaef2df67c2a6cd0800e976f10a634]\n-\n-\tadd dictionary for FB2 fuzzer\n-\n-\n-2018-01-18  David Tardon  <dtardon@redhat.com>  [8d55742249fe122a23b87da4e681a02352f001bb]\n-\n-\tadd FictionBook2 fuzzer\n-\n-\n-2018-01-05  Miklos Vajna  <vmiklos@collabora.co.uk>  [6f7a3e6d0edb89fbf8fa1c2971adbf176423633e]\n-\n-\tm4: MSVC defines __cplusplus as 199711L still\n-\n-\tSee e.g.\n-\t<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>,\n-\ton MSVC we can't depend on the value of __cplusplus, since that one is a\n-\ttoo low value, even if everything else works fine.\n-\n-2018-01-01  David Tardon  <dtardon@redhat.com>  [dd91437a9d2e9e0b84ba9091cef25992967ab962]\n-\n-\tbump version\n-\n-\n 2018-01-01  David Tardon  <dtardon@redhat.com>  [a0ac7bf84105e6fe7437ff3f920c82c29d1b14a7]\n \n \tfix typo\ndiff --git a/Makefile.in b/Makefile.in\nindex 4469183..3bd7ddd 100644\n--- a/Makefile.in\n+++ b/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -157,9 +155,10 @@ am__base_list = \\\n   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\\n/ /g' | \\\n   sed '$$!N;$$!N;$$!N;$$!N;s/\\n/ /g'\n am__uninstall_files_from_dir = { \\\n-  { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n-  || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n-       $(am__cd) \"$$dir\" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \\\n+  test -z \"$$files\" \\\n+    || { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n+    || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n+         $(am__cd) \"$$dir\" && rm -f $$files; }; \\\n   }\n am__installdirs = \"$(DESTDIR)$(pkgconfdir)\"\n DATA = $(pkgconf_DATA)\n@@ -170,9 +169,9 @@ am__recursive_targets = \\\n   $(RECURSIVE_CLEAN_TARGETS) \\\n   $(am__extra_recursive_targets)\n AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \\\n-\tcscope distdir distdir-am dist dist-all distcheck\n-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \\\n-\tconfig.h.in\n+\tcscope distdir dist dist-all distcheck\n+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \\\n+\t$(LISP)config.h.in\n # Read a list of newline-separated strings from the standard input,\n # and print each of them once, without duplicates.  Input order is\n # *not* preserved.\n@@ -189,18 +188,21 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n+CSCOPE = cscope\n DIST_SUBDIRS = $(SUBDIRS)\n am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \\\n \t$(srcdir)/libe-book.pc.in AUTHORS COPYING NEWS README TODO \\\n-\tar-lib compile config.guess config.sub install-sh ltmain.sh \\\n-\tmissing\n+\tar-lib compile config.guess config.sub depcomp install-sh \\\n+\tltmain.sh missing\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n distdir = $(PACKAGE)-$(VERSION)\n top_distdir = $(distdir)\n am__remove_distdir = \\\n   if test -d \"$(distdir)\"; then \\\n-    find \"$(distdir)\" -type d ! -perm -700 -exec chmod u+rwx {} ';' \\\n-      ; rm -rf \"$(distdir)\" \\\n+    find \"$(distdir)\" -type d ! -perm -200 -exec chmod u+w {} ';' \\\n+      && rm -rf \"$(distdir)\" \\\n       || { sleep 5 && rm -rf \"$(distdir)\"; }; \\\n   else :; fi\n am__post_remove_distdir = $(am__remove_distdir)\n@@ -230,16 +232,12 @@ am__relativize = \\\n   done; \\\n   reldir=\"$$dir2\"\n DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz\n-GZIP_ENV = -9\n+GZIP_ENV = --best\n DIST_TARGETS = dist-xz dist-bzip2 dist-gzip\n-# Exists only to be overridden by the user if desired.\n-AM_DISTCHECK_DVI_TARGET = dvi\n distuninstallcheck_listfiles = find . -type f -print\n am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \\\n   | sed 's|^\\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'\n-distcleancheck_listfiles = \\\n-  find . \\( -type f -a \\! \\\n-            \\( -name .nfs* -o -name .smb* -o -name .__afs* \\) \\) -print\n+distcleancheck_listfiles = find . -type f -print\n ACLOCAL = @ACLOCAL@\n AMTAR = @AMTAR@\n AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@\n@@ -257,10 +255,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -285,10 +281,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -367,10 +361,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -403,7 +395,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -449,8 +440,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t    echo ' $(SHELL) ./config.status'; \\\n \t    $(SHELL) ./config.status;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -467,12 +458,12 @@ config.h: stamp-h1\n \t@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1\n \n stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status\n-\t$(AM_V_at)rm -f stamp-h1\n-\t$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h\n+\t@rm -f stamp-h1\n+\tcd $(top_builddir) && $(SHELL) ./config.status config.h\n $(srcdir)/config.h.in:  $(am__configure_deps) \n-\t$(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))\n-\t$(AM_V_at)rm -f stamp-h1\n-\t$(AM_V_at)touch $@\n+\t($(am__cd) $(top_srcdir) && $(AUTOHEADER))\n+\trm -f stamp-h1\n+\ttouch $@\n \n distclean-hdr:\n \t-rm -f config.h stamp-h1\n@@ -612,12 +603,10 @@ cscopelist-am: $(am__tagged_files)\n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n \t-rm -f cscope.out cscope.in.out cscope.po.out cscope.files\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t$(am__remove_distdir)\n-\t$(AM_V_at)$(MKDIR_P) \"$(distdir)\"\n+\ttest -d \"$(distdir)\" || mkdir \"$(distdir)\"\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -696,10 +685,6 @@ dist-xz: distdir\n \ttardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz\n \t$(am__post_remove_distdir)\n \n-dist-zstd: distdir\n-\ttardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst\n-\t$(am__post_remove_distdir)\n-\n dist-tarZ: distdir\n \t@echo WARNING: \"Support for distribution archives compressed with\" \\\n \t\t       \"legacy program 'compress' is deprecated.\" >&2\n@@ -729,7 +714,7 @@ dist dist-all:\n distcheck: dist\n \tcase '$(DIST_ARCHIVES)' in \\\n \t*.tar.gz*) \\\n-\t  eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\\\n+\t  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\\\n \t*.tar.bz2*) \\\n \t  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\\\n \t*.tar.lz*) \\\n@@ -739,11 +724,9 @@ distcheck: dist\n \t*.tar.Z*) \\\n \t  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\\\n \t*.shar.gz*) \\\n-\t  eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\\\n+\t  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\\\n \t*.zip*) \\\n \t  unzip $(distdir).zip ;;\\\n-\t*.tar.zst*) \\\n-\t  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\\\n \tesac\n \tchmod -R a-w $(distdir)\n \tchmod u+w $(distdir)\n@@ -759,7 +742,7 @@ distcheck: dist\n \t    $(DISTCHECK_CONFIGURE_FLAGS) \\\n \t    --srcdir=../.. --prefix=\"$$dc_install_base\" \\\n \t  && $(MAKE) $(AM_MAKEFLAGS) \\\n-\t  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \\\n+\t  && $(MAKE) $(AM_MAKEFLAGS) dvi \\\n \t  && $(MAKE) $(AM_MAKEFLAGS) check \\\n \t  && $(MAKE) $(AM_MAKEFLAGS) install \\\n \t  && $(MAKE) $(AM_MAKEFLAGS) installcheck \\\n@@ -842,8 +825,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -924,7 +907,7 @@ uninstall-am: uninstall-pkgconfDATA\n \tam--refresh check check-am clean clean-cscope clean-generic \\\n \tclean-libtool cscope cscopelist-am ctags ctags-am dist \\\n \tdist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \\\n-\tdist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \\\n+\tdist-tarZ dist-xz dist-zip distcheck distclean \\\n \tdistclean-generic distclean-hdr distclean-libtool \\\n \tdistclean-local distclean-tags distcleancheck distdir \\\n \tdistuninstallcheck dvi dvi-am html html-am info info-am \\\n@@ -953,10 +936,3 @@ astyle:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/NEWS b/NEWS\nindex 05b5c7b..3174910 100644\n--- a/NEWS\n+++ b/NEWS\n@@ -1,12 +1,3 @@\n-libe-book 0.1.4\n-\n-- Fix various problems when reading broken files, found with the help of\n-  american-fuzzy-lop and oss-fuzz.\n-- Do not access the network when parsing XML.\n-- Add a fuzzer for FictionBook v.2.\n-- Fix build with ICU 68.\n-- Fix build with recent MSVC.\n-\n libe-book 0.1.3\n \n - Fix various problems when reading broken files, found with the help of\ndiff --git a/aclocal.m4 b/aclocal.m4\nindex aeb3e6c..8f7312e 100644\n--- a/aclocal.m4\n+++ b/aclocal.m4\n@@ -1,6 +1,6 @@\n-# generated automatically by aclocal 1.17 -*- Autoconf -*-\n+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-\n \n-# Copyright (C) 1996-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1996-2017 Free Software Foundation, Inc.\n \n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -14,14 +14,52 @@\n m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])\n m4_ifndef([AC_AUTOCONF_VERSION],\n   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl\n-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,\n-[m4_warning([this file was generated for autoconf 2.72.\n+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,\n+[m4_warning([this file was generated for autoconf 2.69.\n You have another version of autoconf.  It may work, but is not guaranteed to.\n If you have problems, you may need to regenerate the build system entirely.\n To do so, use the procedure documented by the package, typically 'autoreconf'.])])\n \n-# pkg.m4 - Macros to locate and use pkg-config.   -*- Autoconf -*-\n-# serial 12 (pkg-config-0.29.2)\n+# ===========================================================================\n+#    https://www.gnu.org/software/autoconf-archive/ax_require_defined.html\n+# ===========================================================================\n+#\n+# SYNOPSIS\n+#\n+#   AX_REQUIRE_DEFINED(MACRO)\n+#\n+# DESCRIPTION\n+#\n+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have\n+#   been defined and thus are available for use.  This avoids random issues\n+#   where a macro isn't expanded.  Instead the configure script emits a\n+#   non-fatal:\n+#\n+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found\n+#\n+#   It's like AC_REQUIRE except it doesn't expand the required macro.\n+#\n+#   Here's an example:\n+#\n+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])\n+#\n+# LICENSE\n+#\n+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>\n+#\n+#   Copying and distribution of this file, with or without modification, are\n+#   permitted in any medium without royalty provided the copyright notice\n+#   and this notice are preserved. This file is offered as-is, without any\n+#   warranty.\n+\n+#serial 2\n+\n+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl\n+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])\n+])dnl AX_REQUIRE_DEFINED\n+\n+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-\n+# serial 11 (pkg-config-0.29.1)\n \n dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.\n dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>\n@@ -63,13 +101,13 @@ dnl\n dnl See the \"Since\" comment for each macro you use to see what version\n dnl of the macros you require.\n m4_defun([PKG_PREREQ],\n-[m4_define([PKG_MACROS_VERSION], [0.29.2])\n+[m4_define([PKG_MACROS_VERSION], [0.29.1])\n m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,\n     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])\n ])dnl PKG_PREREQ\n \n-dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])\n-dnl ---------------------------------------------------------\n+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])\n+dnl ----------------------------------\n dnl Since: 0.16\n dnl\n dnl Search for the pkg-config tool and set the PKG_CONFIG variable to\n@@ -77,12 +115,6 @@ dnl first found in the path. Checks that the version of pkg-config found\n dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is\n dnl used since that's the first version where most current features of\n dnl pkg-config existed.\n-dnl\n-dnl If pkg-config is not found or older than specified, it will result\n-dnl in an empty PKG_CONFIG variable. To avoid widespread issues with\n-dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.\n-dnl You can specify [PKG_CONFIG=false] as an action instead, which would\n-dnl result in pkg-config tests failing, but no bogus error messages.\n AC_DEFUN([PKG_PROG_PKG_CONFIG],\n [m4_pattern_forbid([^_?PKG_[A-Z_]+$])\n m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])\n@@ -103,9 +135,6 @@ if test -n \"$PKG_CONFIG\"; then\n \t\tAC_MSG_RESULT([no])\n \t\tPKG_CONFIG=\"\"\n \tfi\n-fi\n-if test -z \"$PKG_CONFIG\"; then\n-\tm4_default([$2], [AC_MSG_ERROR([pkg-config not found])])\n fi[]dnl\n ])dnl PKG_PROG_PKG_CONFIG\n \n@@ -117,7 +146,7 @@ dnl Check to see whether a particular set of modules exists. Similar to\n dnl PKG_CHECK_MODULES(), but does not set variables or print errors.\n dnl\n dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])\n-dnl only at the first occurrence in configure.ac, so if the first place\n+dnl only at the first occurence in configure.ac, so if the first place\n dnl it's called might be skipped (such as if it is within an \"if\", you\n dnl have to call PKG_CHECK_EXISTS manually\n AC_DEFUN([PKG_CHECK_EXISTS],\n@@ -173,7 +202,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl\n AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl\n \n pkg_failed=no\n-AC_MSG_CHECKING([for $2])\n+AC_MSG_CHECKING([for $1])\n \n _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])\n _PKG_CONFIG([$1][_LIBS], [libs], [$2])\n@@ -183,17 +212,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.])\n \n if test $pkg_failed = yes; then\n-        AC_MSG_RESULT([no])\n+   \tAC_MSG_RESULT([no])\n         _PKG_SHORT_ERRORS_SUPPORTED\n         if test $_pkg_short_errors_supported = yes; then\n-                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"$2\" 2>&1`\n-        else\n-                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"$2\" 2>&1`\n+\t        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"$2\" 2>&1`\n+        else \n+\t        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"$2\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$$1[]_PKG_ERRORS\" >&AS_MESSAGE_LOG_FD\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$$1[]_PKG_ERRORS\" >&AS_MESSAGE_LOG_FD\n \n-        m4_default([$4], [AC_MSG_ERROR(\n+\tm4_default([$4], [AC_MSG_ERROR(\n [Package requirements ($2) were not met:\n \n $$1_PKG_ERRORS\n@@ -204,8 +233,8 @@ installed software in a non-standard prefix.\n _PKG_TEXT])[]dnl\n         ])\n elif test $pkg_failed = untried; then\n-        AC_MSG_RESULT([no])\n-        m4_default([$4], [AC_MSG_FAILURE(\n+     \tAC_MSG_RESULT([no])\n+\tm4_default([$4], [AC_MSG_FAILURE(\n [The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -215,10 +244,10 @@ _PKG_TEXT\n To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl\n         ])\n else\n-        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS\n-        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS\n+\t$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS\n+\t$1[]_LIBS=$pkg_cv_[]$1[]_LIBS\n         AC_MSG_RESULT([yes])\n-        $3\n+\t$3\n fi[]dnl\n ])dnl PKG_CHECK_MODULES\n \n@@ -373,7 +402,7 @@ AS_IF([test \"$AS_TR_SH([with_]m4_tolower([$1]))\" = \"yes\"],\n         [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])\n ])dnl PKG_HAVE_DEFINE_WITH_MODULES\n \n-# Copyright (C) 2002-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2002-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -385,10 +414,10 @@ AS_IF([test \"$AS_TR_SH([with_]m4_tolower([$1]))\" = \"yes\"],\n # generated from the m4 files accompanying Automake X.Y.\n # (This private macro should not be called outside this file.)\n AC_DEFUN([AM_AUTOMAKE_VERSION],\n-[am__api_version='1.17'\n+[am__api_version='1.15'\n dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to\n dnl require some minimum version.  Point them to the right macro.\n-m4_if([$1], [1.17], [],\n+m4_if([$1], [1.15.1], [],\n       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl\n ])\n \n@@ -404,12 +433,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])\n # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.\n # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.\n AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],\n-[AM_AUTOMAKE_VERSION([1.17])dnl\n+[AM_AUTOMAKE_VERSION([1.15.1])dnl\n m4_ifndef([AC_AUTOCONF_VERSION],\n   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl\n _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])\n \n-# Copyright (C) 2011-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2011-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -423,18 +452,16 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])\n AC_DEFUN([AM_PROG_AR],\n [AC_BEFORE([$0], [LT_INIT])dnl\n AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl\n-AC_BEFORE([$0], [AC_PROG_AR])dnl\n AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl\n AC_REQUIRE_AUX_FILE([ar-lib])dnl\n AC_CHECK_TOOLS([AR], [ar lib \"link -lib\"], [false])\n : ${AR=ar}\n-: ${ARFLAGS=cr}\n \n AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],\n   [AC_LANG_PUSH([C])\n    am_cv_ar_interface=ar\n    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],\n-     [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'\n+     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'\n       AC_TRY_EVAL([am_ar_try])\n       if test \"$ac_status\" -eq 0; then\n         am_cv_ar_interface=ar\n@@ -473,7 +500,7 @@ AC_SUBST([AR])dnl\n \n # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-\n \n-# Copyright (C) 2001-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2001-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -525,7 +552,7 @@ am_aux_dir=`cd \"$ac_aux_dir\" && pwd`\n \n # AM_CONDITIONAL                                            -*- Autoconf -*-\n \n-# Copyright (C) 1997-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1997-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -556,7 +583,7 @@ AC_CONFIG_COMMANDS_PRE(\n Usually this means the macro was only invoked conditionally.]])\n fi])])\n \n-# Copyright (C) 1999-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1999-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -688,7 +715,7 @@ AC_CACHE_CHECK([dependency style of $depcc],\n       # icc doesn't choke on unknown options, it will just issue warnings\n       # or remarks (even with -Werror).  So we grep stderr for any message\n       # that says an option was ignored or not supported.\n-      # When given -MP, icc 7.0 and 7.1 complain thus:\n+      # When given -MP, icc 7.0 and 7.1 complain thusly:\n       #   icc: Command line warning: ignoring option '-M'; no argument required\n       # The diagnosis changed in icc 8.0:\n       #   icc: Command line remark: option '-MP' not supported\n@@ -747,12 +774,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl\n \n # Generate code to set up dependency tracking.              -*- Autoconf -*-\n \n-# Copyright (C) 1999-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1999-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n # with or without modifications, as long as this notice is preserved.\n \n+\n # _AM_OUTPUT_DEPENDENCY_COMMANDS\n # ------------------------------\n AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],\n@@ -760,43 +788,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],\n   # Older Autoconf quotes --file arguments for eval, but not when files\n   # are listed without --file.  Let's play safe and only enable the eval\n   # if we detect the quoting.\n-  # TODO: see whether this extra hack can be removed once we start\n-  # requiring Autoconf 2.70 or later.\n-  AS_CASE([$CONFIG_FILES],\n-          [*\\'*], [eval set x \"$CONFIG_FILES\"],\n-          [*], [set x $CONFIG_FILES])\n+  case $CONFIG_FILES in\n+  *\\'*) eval set x \"$CONFIG_FILES\" ;;\n+  *)   set x $CONFIG_FILES ;;\n+  esac\n   shift\n-  # Used to flag and report bootstrapping failures.\n-  am_rc=0\n-  for am_mf\n+  for mf\n   do\n     # Strip MF so we end up with the name of the file.\n-    am_mf=`AS_ECHO([\"$am_mf\"]) | sed -e 's/:.*$//'`\n-    # Check whether this is an Automake generated Makefile which includes\n-    # dependency-tracking related rules and includes.\n-    # Grep'ing the whole file directly is not great: AIX grep has a line\n+    mf=`echo \"$mf\" | sed -e 's/:.*$//'`\n+    # Check whether this is an Automake generated Makefile or not.\n+    # We used to match only the files named 'Makefile.in', but\n+    # some people rename them; so instead we look at the file content.\n+    # Grep'ing the first line is not enough: some people post-process\n+    # each Makefile.in and add a new line on top of each file to say so.\n+    # Grep'ing the whole file is not good either: AIX grep has a line\n     # limit of 2048, but all sed's we know have understand at least 4000.\n-    sed -n 's,^am--depfiles:.*,X,p' \"$am_mf\" | grep X >/dev/null 2>&1 \\\n-      || continue\n-    am_dirpart=`AS_DIRNAME([\"$am_mf\"])`\n-    am_filepart=`AS_BASENAME([\"$am_mf\"])`\n-    AM_RUN_LOG([cd \"$am_dirpart\" \\\n-      && sed -e '/# am--include-marker/d' \"$am_filepart\" \\\n-        | $MAKE -f - am--depfiles]) || am_rc=$?\n+    if sed -n 's,^#.*generated by automake.*,X,p' \"$mf\" | grep X >/dev/null 2>&1; then\n+      dirpart=`AS_DIRNAME(\"$mf\")`\n+    else\n+      continue\n+    fi\n+    # Extract the definition of DEPDIR, am__include, and am__quote\n+    # from the Makefile without running 'make'.\n+    DEPDIR=`sed -n 's/^DEPDIR = //p' < \"$mf\"`\n+    test -z \"$DEPDIR\" && continue\n+    am__include=`sed -n 's/^am__include = //p' < \"$mf\"`\n+    test -z \"$am__include\" && continue\n+    am__quote=`sed -n 's/^am__quote = //p' < \"$mf\"`\n+    # Find all dependency output files, they are included files with\n+    # $(DEPDIR) in their names.  We invoke sed twice because it is the\n+    # simplest approach to changing $(DEPDIR) to its actual value in the\n+    # expansion.\n+    for file in `sed -n \"\n+      s/^$am__include $am__quote\\(.*(DEPDIR).*\\)$am__quote\"'$/\\1/p' <\"$mf\" | \\\n+\t sed -e 's/\\$(DEPDIR)/'\"$DEPDIR\"'/g'`; do\n+      # Make sure the directory exists.\n+      test -f \"$dirpart/$file\" && continue\n+      fdir=`AS_DIRNAME([\"$file\"])`\n+      AS_MKDIR_P([$dirpart/$fdir])\n+      # echo \"creating $dirpart/$file\"\n+      echo '# dummy' > \"$dirpart/$file\"\n+    done\n   done\n-  if test $am_rc -ne 0; then\n-    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments\n-    for automatic dependency tracking.  If GNU make was not used, consider\n-    re-running the configure script with MAKE=\"gmake\" (or whatever is\n-    necessary).  You can also try re-running configure with the\n-    '--disable-dependency-tracking' option to at least be able to build\n-    the package (albeit without support for automatic dependency tracking).])\n-  fi\n-  AS_UNSET([am_dirpart])\n-  AS_UNSET([am_filepart])\n-  AS_UNSET([am_mf])\n-  AS_UNSET([am_rc])\n-  rm -f conftest-deps.mk\n }\n ])# _AM_OUTPUT_DEPENDENCY_COMMANDS\n \n@@ -805,17 +839,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],\n # -----------------------------\n # This macro should only be invoked once -- use via AC_REQUIRE.\n #\n-# This code is only required when automatic dependency tracking is enabled.\n-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in\n-# order to bootstrap the dependency handling code.\n+# This code is only required when automatic dependency tracking\n+# is enabled.  FIXME.  This creates each '.P' file that we will\n+# need in order to bootstrap the dependency handling code.\n AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],\n [AC_CONFIG_COMMANDS([depfiles],\n      [test x\"$AMDEP_TRUE\" != x\"\" || _AM_OUTPUT_DEPENDENCY_COMMANDS],\n-     [AMDEP_TRUE=\"$AMDEP_TRUE\" MAKE=\"${MAKE-make}\"])])\n+     [AMDEP_TRUE=\"$AMDEP_TRUE\" ac_aux_dir=\"$ac_aux_dir\"])\n+])\n \n # Do all the work for Automake.                             -*- Autoconf -*-\n \n-# Copyright (C) 1996-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1996-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -843,10 +878,6 @@ m4_defn([AC_PROG_CC])\n # release and drop the old call support.\n AC_DEFUN([AM_INIT_AUTOMAKE],\n [AC_PREREQ([2.65])dnl\n-m4_ifdef([_$0_ALREADY_INIT],\n-  [m4_fatal([$0 expanded multiple times\n-]m4_defn([_$0_ALREADY_INIT]))],\n-  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl\n dnl Autoconf wants to disallow AM_ names.  We explicitly allow\n dnl the ones we care about.\n m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl\n@@ -883,7 +914,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl\n [_AM_SET_OPTIONS([$1])dnl\n dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.\n m4_if(\n-  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),\n+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),\n   [ok:ok],,\n   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl\n  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl\n@@ -906,8 +937,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl\n AC_REQUIRE([AC_PROG_MKDIR_P])dnl\n # For better backward compatibility.  To be removed once Automake 1.9.x\n # dies out for good.  For more background, see:\n-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>\n-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>\n+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>\n+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>\n AC_SUBST([mkdir_p], ['$(MKDIR_P)'])\n # We need awk for the \"check\" target (and possibly the TAP driver).  The\n # system \"awk\" is bad on some platforms.\n@@ -935,21 +966,7 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],\n \t\t  [m4_define([AC_PROG_OBJCXX],\n \t\t\t     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl\n ])\n-# Variables for tags utilities; see am/tags.am\n-if test -z \"$CTAGS\"; then\n-  CTAGS=ctags\n-fi\n-AC_SUBST([CTAGS])\n-if test -z \"$ETAGS\"; then\n-  ETAGS=etags\n-fi\n-AC_SUBST([ETAGS])\n-if test -z \"$CSCOPE\"; then\n-  CSCOPE=cscope\n-fi\n-AC_SUBST([CSCOPE])\n-\n-AC_REQUIRE([_AM_SILENT_RULES])dnl\n+AC_REQUIRE([AM_SILENT_RULES])dnl\n dnl The testsuite driver may need to know about EXEEXT, so add the\n dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This\n dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.\n@@ -957,9 +974,47 @@ AC_CONFIG_COMMANDS_PRE(dnl\n [m4_provide_if([_AM_COMPILER_EXEEXT],\n   [AM_CONDITIONAL([am__EXEEXT], [test -n \"$EXEEXT\"])])])dnl\n \n-AC_REQUIRE([_AM_PROG_RM_F])\n-AC_REQUIRE([_AM_PROG_XARGS_N])\n+# POSIX will say in a future version that running \"rm -f\" with no argument\n+# is OK; and we want to be able to make that assumption in our Makefile\n+# recipes.  So use an aggressive probe to check that the usage we want is\n+# actually supported \"in the wild\" to an acceptable degree.\n+# See automake bug#10828.\n+# To make any issue more visible, cause the running configure to be aborted\n+# by default if the 'rm' program in use doesn't match our expectations; the\n+# user can still override this though.\n+if rm -f && rm -fr && rm -rf; then : OK; else\n+  cat >&2 <<'END'\n+Oops!\n+\n+Your 'rm' program seems unable to run without file operands specified\n+on the command line, even when the '-f' option is present.  This is contrary\n+to the behaviour of most rm programs out there, and not conforming with\n+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>\n+\n+Please tell bug-automake@gnu.org about your system, including the value\n+of your $PATH and any error possibly output before this message.  This\n+can help us improve future automake versions.\n+\n+END\n+  if test x\"$ACCEPT_INFERIOR_RM_PROGRAM\" = x\"yes\"; then\n+    echo 'Configuration will proceed anyway, since you have set the' >&2\n+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to \"yes\"' >&2\n+    echo >&2\n+  else\n+    cat >&2 <<'END'\n+Aborting the configuration process, to ensure you take notice of the issue.\n+\n+You can download and install GNU coreutils to get an 'rm' implementation\n+that behaves properly: <http://www.gnu.org/software/coreutils/>.\n+\n+If you want to complete the configuration process using your problematic\n+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM\n+to \"yes\", and re-run configure.\n \n+END\n+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])\n+  fi\n+fi\n dnl The trailing newline in this macro's definition is deliberate, for\n dnl backward compatibility and to allow trailing 'dnl'-style comments\n dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.\n@@ -992,7 +1047,7 @@ for _am_header in $config_headers :; do\n done\n echo \"timestamp for $_am_arg\" >`AS_DIRNAME([\"$_am_arg\"])`/stamp-h[]$_am_stamp_count])\n \n-# Copyright (C) 2001-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2001-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1013,7 +1068,7 @@ if test x\"${install_sh+set}\" != xset; then\n fi\n AC_SUBST([install_sh])])\n \n-# Copyright (C) 2003-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2003-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1034,7 +1089,7 @@ AC_SUBST([am__leading_dot])])\n \n # Check to see how 'make' treats includes.\t            -*- Autoconf -*-\n \n-# Copyright (C) 2001-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2001-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1042,42 +1097,49 @@ AC_SUBST([am__leading_dot])])\n \n # AM_MAKE_INCLUDE()\n # -----------------\n-# Check whether make has an 'include' directive that can support all\n-# the idioms we need for our automatic dependency tracking code.\n+# Check to see how make treats includes.\n AC_DEFUN([AM_MAKE_INCLUDE],\n-[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])\n-cat > confinc.mk << 'END'\n+[am_make=${MAKE-make}\n+cat > confinc << 'END'\n am__doit:\n-\t@echo this is the am__doit target >confinc.out\n+\t@echo this is the am__doit target\n .PHONY: am__doit\n END\n+# If we don't find an include directive, just comment out the code.\n+AC_MSG_CHECKING([for style of include used by $am_make])\n am__include=\"#\"\n am__quote=\n-# BSD make does it like this.\n-echo '.include \"confinc.mk\" # ignored' > confmf.BSD\n-# Other make implementations (GNU, Solaris 10, AIX) do it like this.\n-echo 'include confinc.mk # ignored' > confmf.GNU\n-_am_result=no\n-for s in GNU BSD; do\n-  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])\n-  AS_CASE([$?:`cat confinc.out 2>/dev/null`],\n-      ['0:this is the am__doit target'],\n-      [AS_CASE([$s],\n-          [BSD], [am__include='.include' am__quote='\"'],\n-          [am__include='include' am__quote=''])])\n-  if test \"$am__include\" != \"#\"; then\n-    _am_result=\"yes ($s style)\"\n-    break\n-  fi\n-done\n-rm -f confinc.* confmf.*\n-AC_MSG_RESULT([${_am_result}])\n-AC_SUBST([am__include])])\n-AC_SUBST([am__quote])])\n+_am_result=none\n+# First try GNU make style include.\n+echo \"include confinc\" > confmf\n+# Ignore all kinds of additional output from 'make'.\n+case `$am_make -s -f confmf 2> /dev/null` in #(\n+*the\\ am__doit\\ target*)\n+  am__include=include\n+  am__quote=\n+  _am_result=GNU\n+  ;;\n+esac\n+# Now try BSD make style include.\n+if test \"$am__include\" = \"#\"; then\n+   echo '.include \"confinc\"' > confmf\n+   case `$am_make -s -f confmf 2> /dev/null` in #(\n+   *the\\ am__doit\\ target*)\n+     am__include=.include\n+     am__quote=\"\\\"\"\n+     _am_result=BSD\n+     ;;\n+   esac\n+fi\n+AC_SUBST([am__include])\n+AC_SUBST([am__quote])\n+AC_MSG_RESULT([$_am_result])\n+rm -f confinc confmf\n+])\n \n # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-\n \n-# Copyright (C) 1997-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1997-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1098,7 +1160,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN],\n [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl\n AC_REQUIRE_AUX_FILE([missing])dnl\n if test x\"${MISSING+set}\" != xset; then\n-  MISSING=\"\\${SHELL} '$am_aux_dir/missing'\"\n+  case $am_aux_dir in\n+  *\\ * | *\\\t*)\n+    MISSING=\"\\${SHELL} \\\"$am_aux_dir/missing\\\"\" ;;\n+  *)\n+    MISSING=\"\\${SHELL} $am_aux_dir/missing\" ;;\n+  esac\n fi\n # Use eval to expand $SHELL\n if eval \"$MISSING --is-lightweight\"; then\n@@ -1111,7 +1178,7 @@ fi\n \n # Helper functions for option handling.                     -*- Autoconf -*-\n \n-# Copyright (C) 2001-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2001-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1140,7 +1207,7 @@ AC_DEFUN([_AM_SET_OPTIONS],\n AC_DEFUN([_AM_IF_OPTION],\n [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])\n \n-# Copyright (C) 1999-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1999-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1187,23 +1254,7 @@ AC_LANG_POP([C])])\n # For backward compatibility.\n AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])\n \n-# Copyright (C) 2022-2024 Free Software Foundation, Inc.\n-#\n-# This file is free software; the Free Software Foundation\n-# gives unlimited permission to copy and/or distribute it,\n-# with or without modifications, as long as this notice is preserved.\n-\n-# _AM_PROG_RM_F\n-# ---------------\n-# Check whether 'rm -f' without any arguments works.\n-# https://bugs.gnu.org/10828\n-AC_DEFUN([_AM_PROG_RM_F],\n-[am__rm_f_notfound=\n-AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='\"\"'])\n-AC_SUBST(am__rm_f_notfound)\n-])\n-\n-# Copyright (C) 2001-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2001-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1222,169 +1273,16 @@ AC_DEFUN([AM_RUN_LOG],\n \n # Check to make sure that the build environment is sane.    -*- Autoconf -*-\n \n-# Copyright (C) 1996-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1996-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n # with or without modifications, as long as this notice is preserved.\n \n-# _AM_SLEEP_FRACTIONAL_SECONDS\n-# ----------------------------\n-AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl\n-AC_CACHE_CHECK([whether sleep supports fractional seconds],\n-               am_cv_sleep_fractional_seconds, [dnl\n-AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],\n-                                 [am_cv_sleep_fractional_seconds=no])\n-])])\n-\n-# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION\n-# -----------------------------------\n-# Determine the filesystem's resolution for file modification\n-# timestamps.  The coarsest we know of is FAT, with a resolution\n-# of only two seconds, even with the most recent \"exFAT\" extensions.\n-# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one\n-# nanosecond, matching clock_gettime.  However, it is probably not\n-# possible to delay execution of a shell script for less than one\n-# millisecond, due to process creation overhead and scheduling\n-# granularity, so we don't check for anything finer than that. (See below.)\n-AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl\n-AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])\n-AC_CACHE_CHECK([filesystem timestamp resolution],\n-               am_cv_filesystem_timestamp_resolution, [dnl\n-# Default to the worst case.\n-am_cv_filesystem_timestamp_resolution=2\n-\n-# Only try to go finer than 1 sec if sleep can do it.\n-# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,\n-# - 1 sec is not much of a win compared to 2 sec, and\n-# - it takes 2 seconds to perform the test whether 1 sec works.\n-# \n-# Instead, just use the default 2s on platforms that have 1s resolution,\n-# accept the extra 1s delay when using $sleep in the Automake tests, in\n-# exchange for not incurring the 2s delay for running the test for all\n-# packages.\n-#\n-am_try_resolutions=\n-if test \"$am_cv_sleep_fractional_seconds\" = yes; then\n-  # Even a millisecond often causes a bunch of false positives,\n-  # so just try a hundredth of a second. The time saved between .001 and\n-  # .01 is not terribly consequential.\n-  am_try_resolutions=\"0.01 0.1 $am_try_resolutions\"\n-fi\n-\n-# In order to catch current-generation FAT out, we must *modify* files\n-# that already exist; the *creation* timestamp is finer.  Use names\n-# that make ls -t sort them differently when they have equal\n-# timestamps than when they have distinct timestamps, keeping\n-# in mind that ls -t prints the *newest* file first.\n-rm -f conftest.ts?\n-: > conftest.ts1\n-: > conftest.ts2\n-: > conftest.ts3\n-\n-# Make sure ls -t actually works.  Do 'set' in a subshell so we don't\n-# clobber the current shell's arguments. (Outer-level square brackets\n-# are removed by m4; they're present so that m4 does not expand\n-# <dollar><star>; be careful, easy to get confused.)\n-if (\n-     set X `[ls -t conftest.ts[12]]` &&\n-     {\n-       test \"$[]*\" != \"X conftest.ts1 conftest.ts2\" ||\n-       test \"$[]*\" != \"X conftest.ts2 conftest.ts1\";\n-     }\n-); then :; else\n-  # If neither matched, then we have a broken ls.  This can happen\n-  # if, for instance, CONFIG_SHELL is bash and it inherits a\n-  # broken ls alias from the environment.  This has actually\n-  # happened.  Such a system could not be considered \"sane\".\n-  _AS_ECHO_UNQUOTED(\n-    [\"Bad output from ls -t: \\\"`[ls -t conftest.ts[12]]`\\\"\"],\n-    [AS_MESSAGE_LOG_FD])\n-  AC_MSG_FAILURE([ls -t produces unexpected output.\n-Make sure there is not a broken ls alias in your environment.])\n-fi\n-\n-for am_try_res in $am_try_resolutions; do\n-  # Any one fine-grained sleep might happen to cross the boundary\n-  # between two values of a coarser actual resolution, but if we do\n-  # two fine-grained sleeps in a row, at least one of them will fall\n-  # entirely within a coarse interval.\n-  echo alpha > conftest.ts1\n-  sleep $am_try_res\n-  echo beta > conftest.ts2\n-  sleep $am_try_res\n-  echo gamma > conftest.ts3\n-\n-  # We assume that 'ls -t' will make use of high-resolution\n-  # timestamps if the operating system supports them at all.\n-  if (set X `ls -t conftest.ts?` &&\n-      test \"$[]2\" = conftest.ts3 &&\n-      test \"$[]3\" = conftest.ts2 &&\n-      test \"$[]4\" = conftest.ts1); then\n-    #\n-    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,\n-    # because we don't need to test make.\n-    make_ok=true\n-    if test $am_try_res != 1; then\n-      # But if we've succeeded so far with a subsecond resolution, we\n-      # have one more thing to check: make. It can happen that\n-      # everything else supports the subsecond mtimes, but make doesn't;\n-      # notably on macOS, which ships make 3.81 from 2006 (the last one\n-      # released under GPLv2). https://bugs.gnu.org/68808\n-      # \n-      # We test $MAKE if it is defined in the environment, else \"make\".\n-      # It might get overridden later, but our hope is that in practice\n-      # it does not matter: it is the system \"make\" which is (by far)\n-      # the most likely to be broken, whereas if the user overrides it,\n-      # probably they did so with a better, or at least not worse, make.\n-      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html\n-      #\n-      # Create a Makefile (real tab character here):\n-      rm -f conftest.mk\n-      echo 'conftest.ts1: conftest.ts2' >conftest.mk\n-      echo '\ttouch conftest.ts2' >>conftest.mk\n-      #\n-      # Now, running\n-      #   touch conftest.ts1; touch conftest.ts2; make\n-      # should touch ts1 because ts2 is newer. This could happen by luck,\n-      # but most often, it will fail if make's support is insufficient. So\n-      # test for several consecutive successes.\n-      #\n-      # (We reuse conftest.ts[12] because we still want to modify existing\n-      # files, not create new ones, per above.)\n-      n=0\n-      make=${MAKE-make}\n-      until test $n -eq 3; do\n-        echo one > conftest.ts1\n-        sleep $am_try_res\n-        echo two > conftest.ts2 # ts2 should now be newer than ts1\n-        if $make -f conftest.mk | grep 'up to date' >/dev/null; then\n-          make_ok=false\n-          break # out of $n loop\n-        fi\n-        n=`expr $n + 1`\n-      done\n-    fi\n-    #\n-    if $make_ok; then\n-      # Everything we know to check worked out, so call this resolution good.\n-      am_cv_filesystem_timestamp_resolution=$am_try_res\n-      break # out of $am_try_res loop\n-    fi\n-    # Otherwise, we'll go on to check the next resolution.\n-  fi\n-done\n-rm -f conftest.ts?\n-# (end _am_filesystem_timestamp_resolution)\n-])])\n-\n # AM_SANITY_CHECK\n # ---------------\n AC_DEFUN([AM_SANITY_CHECK],\n-[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])\n-# This check should not be cached, as it may vary across builds of\n-# different projects.\n-AC_MSG_CHECKING([whether build environment is sane])\n+[AC_MSG_CHECKING([whether build environment is sane])\n # Reject unsafe characters in $srcdir or the absolute working directory\n # name.  Accept space and tab only in the latter.\n am_lf='\n@@ -1403,40 +1301,49 @@ esac\n # symlink; some systems play weird games with the mod time of symlinks\n # (eg FreeBSD returns the mod time of the symlink's containing\n # directory).\n-am_build_env_is_sane=no\n-am_has_slept=no\n-rm -f conftest.file\n-for am_try in 1 2; do\n-  echo \"timestamp, slept: $am_has_slept\" > conftest.file\n-  if (\n-    set X `ls -Lt \"$srcdir/configure\" conftest.file 2> /dev/null`\n-    if test \"$[]*\" = \"X\"; then\n-      # -L didn't work.\n-      set X `ls -t \"$srcdir/configure\" conftest.file`\n-    fi\n-    test \"$[]2\" = conftest.file\n-  ); then\n-    am_build_env_is_sane=yes\n-    break\n-  fi\n-  # Just in case.\n-  sleep \"$am_cv_filesystem_timestamp_resolution\"\n-  am_has_slept=yes\n-done\n-\n-AC_MSG_RESULT([$am_build_env_is_sane])\n-if test \"$am_build_env_is_sane\" = no; then\n-  AC_MSG_ERROR([newly created file is older than distributed files!\n+if (\n+   am_has_slept=no\n+   for am_try in 1 2; do\n+     echo \"timestamp, slept: $am_has_slept\" > conftest.file\n+     set X `ls -Lt \"$srcdir/configure\" conftest.file 2> /dev/null`\n+     if test \"$[*]\" = \"X\"; then\n+\t# -L didn't work.\n+\tset X `ls -t \"$srcdir/configure\" conftest.file`\n+     fi\n+     if test \"$[*]\" != \"X $srcdir/configure conftest.file\" \\\n+\t&& test \"$[*]\" != \"X conftest.file $srcdir/configure\"; then\n+\n+\t# If neither matched, then we have a broken ls.  This can happen\n+\t# if, for instance, CONFIG_SHELL is bash and it inherits a\n+\t# broken ls alias from the environment.  This has actually\n+\t# happened.  Such a system could not be considered \"sane\".\n+\tAC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken\n+  alias in your environment])\n+     fi\n+     if test \"$[2]\" = conftest.file || test $am_try -eq 2; then\n+       break\n+     fi\n+     # Just in case.\n+     sleep 1\n+     am_has_slept=yes\n+   done\n+   test \"$[2]\" = conftest.file\n+   )\n+then\n+   # Ok.\n+   :\n+else\n+   AC_MSG_ERROR([newly created file is older than distributed files!\n Check your system clock])\n fi\n-\n+AC_MSG_RESULT([yes])\n # If we didn't sleep, we still need to ensure time stamps of config.status and\n # generated files are strictly newer.\n am_sleep_pid=\n-AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl\n-  ( sleep \"$am_cv_filesystem_timestamp_resolution\" ) &\n+if grep 'slept: no' conftest.file >/dev/null 2>&1; then\n+  ( sleep 1 ) &\n   am_sleep_pid=$!\n-])\n+fi\n AC_CONFIG_COMMANDS_PRE(\n   [AC_MSG_CHECKING([that generated files are newer than configure])\n    if test -n \"$am_sleep_pid\"; then\n@@ -1447,18 +1354,18 @@ AC_CONFIG_COMMANDS_PRE(\n rm -f conftest.file\n ])\n \n-# Copyright (C) 2009-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2009-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n # with or without modifications, as long as this notice is preserved.\n \n-# _AM_SILENT_RULES\n-# ----------------\n-# Enable less verbose build rules support.\n-AC_DEFUN([_AM_SILENT_RULES],\n-[AM_DEFAULT_VERBOSITY=1\n-AC_ARG_ENABLE([silent-rules], [dnl\n+# AM_SILENT_RULES([DEFAULT])\n+# --------------------------\n+# Enable less verbose build rules; with the default set to DEFAULT\n+# (\"yes\" being less verbose, \"no\" or empty being verbose).\n+AC_DEFUN([AM_SILENT_RULES],\n+[AC_ARG_ENABLE([silent-rules], [dnl\n AS_HELP_STRING(\n   [--enable-silent-rules],\n   [less verbose build output (undo: \"make V=1\")])\n@@ -1466,6 +1373,11 @@ AS_HELP_STRING(\n   [--disable-silent-rules],\n   [verbose build output (undo: \"make V=0\")])dnl\n ])\n+case $enable_silent_rules in @%:@ (((\n+  yes) AM_DEFAULT_VERBOSITY=0;;\n+   no) AM_DEFAULT_VERBOSITY=1;;\n+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;\n+esac\n dnl\n dnl A few 'make' implementations (e.g., NonStop OS and NextStep)\n dnl do not support nested variable expansions.\n@@ -1484,21 +1396,6 @@ am__doit:\n else\n   am_cv_make_support_nested_variables=no\n fi])\n-AC_SUBST([AM_V])dnl\n-AM_SUBST_NOTMAKE([AM_V])dnl\n-AC_SUBST([AM_DEFAULT_V])dnl\n-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl\n-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl\n-AM_BACKSLASH='\\'\n-AC_SUBST([AM_BACKSLASH])dnl\n-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl\n-dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls\n-dnl to AM_SILENT_RULES to change the default value.\n-AC_CONFIG_COMMANDS_PRE([dnl\n-case $enable_silent_rules in @%:@ (((\n-  yes) AM_DEFAULT_VERBOSITY=0;;\n-   no) AM_DEFAULT_VERBOSITY=1;;\n-esac\n if test $am_cv_make_support_nested_variables = yes; then\n   dnl Using '$V' instead of '$(V)' breaks IRIX make.\n   AM_V='$(V)'\n@@ -1507,18 +1404,17 @@ else\n   AM_V=$AM_DEFAULT_VERBOSITY\n   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY\n fi\n-])dnl\n+AC_SUBST([AM_V])dnl\n+AM_SUBST_NOTMAKE([AM_V])dnl\n+AC_SUBST([AM_DEFAULT_V])dnl\n+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl\n+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl\n+AM_BACKSLASH='\\'\n+AC_SUBST([AM_BACKSLASH])dnl\n+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl\n ])\n \n-# AM_SILENT_RULES([DEFAULT])\n-# --------------------------\n-# Set the default verbosity level to DEFAULT (\"yes\" being less verbose, \"no\" or\n-# empty being verbose).\n-AC_DEFUN([AM_SILENT_RULES],\n-[AC_REQUIRE([_AM_SILENT_RULES])\n-AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])\n-\n-# Copyright (C) 2001-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2001-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1546,7 +1442,7 @@ fi\n INSTALL_STRIP_PROGRAM=\"\\$(install_sh) -c -s\"\n AC_SUBST([INSTALL_STRIP_PROGRAM])])\n \n-# Copyright (C) 2006-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2006-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1565,7 +1461,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])\n \n # Check how to create a tarball.                            -*- Autoconf -*-\n \n-# Copyright (C) 2004-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2004-2017 Free Software Foundation, Inc.\n #\n # This file is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -1611,19 +1507,15 @@ m4_if([$1], [v7],\n       am_uid=`id -u || echo unknown`\n       am_gid=`id -g || echo unknown`\n       AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])\n-      if test x$am_uid = xunknown; then\n-        AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])\n-      elif test $am_uid -le $am_max_uid; then\n-        AC_MSG_RESULT([yes])\n+      if test $am_uid -le $am_max_uid; then\n+         AC_MSG_RESULT([yes])\n       else\n-        AC_MSG_RESULT([no])\n-        _am_tools=none\n+         AC_MSG_RESULT([no])\n+         _am_tools=none\n       fi\n       AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])\n-      if test x$gm_gid = xunknown; then\n-        AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])\n-      elif test $am_gid -le $am_max_gid; then\n-        AC_MSG_RESULT([yes])\n+      if test $am_gid -le $am_max_gid; then\n+         AC_MSG_RESULT([yes])\n       else\n         AC_MSG_RESULT([no])\n         _am_tools=none\n@@ -1700,26 +1592,6 @@ AC_SUBST([am__tar])\n AC_SUBST([am__untar])\n ]) # _AM_PROG_TAR\n \n-# Copyright (C) 2022-2024 Free Software Foundation, Inc.\n-#\n-# This file is free software; the Free Software Foundation\n-# gives unlimited permission to copy and/or distribute it,\n-# with or without modifications, as long as this notice is preserved.\n-\n-# _AM_PROG_XARGS_N\n-# ----------------\n-# Check whether 'xargs -n' works.  It should work everywhere, so the fallback\n-# is not optimized at all as we never expect to use it.\n-AC_DEFUN([_AM_PROG_XARGS_N],\n-[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl\n-AS_IF([test \"`echo 1 2 3 | xargs -n2 echo`\" = \"1 2\n-3\"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])\n-AS_IF([test \"$am_cv_xargs_n_works\" = yes], [am__xargs_n='xargs -n'], [dnl\n-  am__xargs_n='am__xargs_n () { shift; sed \"s/ /\\\\n/g\" | while read am__xargs_n_arg; do \"$@\" \"$am__xargs_n_arg\"; done; }'\n-])dnl\n-AC_SUBST(am__xargs_n)\n-])\n-\n m4_include([m4/ax_cxx_compile_stdcxx.m4])\n m4_include([m4/ax_cxx_compile_stdcxx_11.m4])\n m4_include([m4/ax_gcc_func_attribute.m4])\ndiff --git a/ar-lib b/ar-lib\nindex 1521987..0f62c6f 100755\n--- a/ar-lib\n+++ b/ar-lib\n@@ -2,9 +2,9 @@\n # Wrapper for Microsoft lib.exe\n \n me=ar-lib\n-scriptversion=2024-06-19.01; # UTC\n+scriptversion=2012-03-01.08; # UTC\n \n-# Copyright (C) 2010-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2010, 2012 Free Software Foundation, Inc.\n # Written by Peter Rosin <peda@lysator.liu.se>.\n #\n # This program is free software; you can redistribute it and/or modify\n@@ -18,7 +18,7 @@ scriptversion=2024-06-19.01; # UTC\n # GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program.  If not, see <https://www.gnu.org/licenses/>.\n+# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n \n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n@@ -53,7 +53,7 @@ func_file_conv ()\n \t  MINGW*)\n \t    file_conv=mingw\n \t    ;;\n-\t  CYGWIN* | MSYS*)\n+\t  CYGWIN*)\n \t    file_conv=cygwin\n \t    ;;\n \t  *)\n@@ -65,7 +65,7 @@ func_file_conv ()\n \tmingw)\n \t  file=`cmd //C echo \"$file \" | sed -e 's/\"\\(.*\\) \" *$/\\1/'`\n \t  ;;\n-\tcygwin | msys)\n+\tcygwin)\n \t  file=`cygpath -m \"$file\" || echo \"$file\"`\n \t  ;;\n \twine)\n@@ -105,15 +105,11 @@ case $1 in\n Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]\n \n Members may be specified in a file named with @FILE.\n-\n-Report bugs to <bug-automake@gnu.org>.\n-GNU Automake home page: <https://www.gnu.org/software/automake/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\n EOF\n     exit $?\n     ;;\n   -v | --v*)\n-    echo \"$me (GNU Automake) $scriptversion\"\n+    echo \"$me, version $scriptversion\"\n     exit $?\n     ;;\n esac\n@@ -139,10 +135,6 @@ do\n       AR=\"$AR $1\"\n       shift\n       ;;\n-    -nologo | -NOLOGO)\n-      # We always invoke AR with -nologo, so don't need to add it again.\n-      shift\n-      ;;\n     *)\n       action=$1\n       shift\n@@ -232,11 +224,10 @@ elif test -n \"$extract\"; then\n       esac\n     done\n   else\n-    $AR -NOLOGO -LIST \"$archive\" | tr -d '\\r' | sed -e 's/\\\\/\\\\\\\\/g' \\\n-      | while read member\n-        do\n-          $AR -NOLOGO -EXTRACT:\"$member\" \"$archive\" || exit $?\n-        done\n+    $AR -NOLOGO -LIST \"$archive\" | sed -e 's/\\\\/\\\\\\\\/g' | while read member\n+    do\n+      $AR -NOLOGO -EXTRACT:\"$member\" \"$archive\" || exit $?\n+    done\n   fi\n \n elif test -n \"$quick$replace\"; then\ndiff --git a/build/Makefile.in b/build/Makefile.in\nindex a0e1ca0..250a811 100644\n--- a/build/Makefile.in\n+++ b/build/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -138,7 +136,7 @@ am__recursive_targets = \\\n   $(RECURSIVE_CLEAN_TARGETS) \\\n   $(am__extra_recursive_targets)\n AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \\\n-\tdistdir distdir-am\n+\tdistdir\n am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)\n # Read a list of newline-separated strings from the standard input,\n # and print each of them once, without duplicates.  Input order is\n@@ -156,6 +154,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n DIST_SUBDIRS = $(SUBDIRS)\n am__DIST_COMMON = $(srcdir)/Makefile.in\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -201,10 +201,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -229,10 +227,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -311,10 +307,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -347,7 +341,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -377,8 +370,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -494,10 +487,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -581,8 +572,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -674,10 +665,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/build/win32/Makefile.in b/build/win32/Makefile.in\nindex d138232..0a9f1f7 100644\n--- a/build/win32/Makefile.in\n+++ b/build/win32/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -143,10 +141,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -171,10 +167,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -253,10 +247,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -289,7 +281,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -322,8 +313,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -346,10 +337,8 @@ ctags CTAGS:\n \n cscope cscopelist:\n \n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -407,8 +396,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -499,10 +488,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/compile b/compile\nindex 49b3d05..2ab71e4 100755\n--- a/compile\n+++ b/compile\n@@ -1,9 +1,9 @@\n #! /bin/sh\n # Wrapper for compilers which do not understand '-c -o'.\n \n-scriptversion=2024-06-19.01; # UTC\n+scriptversion=2016-01-11.22; # UTC\n \n-# Copyright (C) 1999-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1999-2017 Free Software Foundation, Inc.\n # Written by Tom Tromey <tromey@cygnus.com>.\n #\n # This program is free software; you can redistribute it and/or modify\n@@ -17,7 +17,7 @@ scriptversion=2024-06-19.01; # UTC\n # GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program.  If not, see <https://www.gnu.org/licenses/>.\n+# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n \n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n@@ -53,7 +53,7 @@ func_file_conv ()\n \t  MINGW*)\n \t    file_conv=mingw\n \t    ;;\n-\t  CYGWIN* | MSYS*)\n+\t  CYGWIN*)\n \t    file_conv=cygwin\n \t    ;;\n \t  *)\n@@ -67,7 +67,7 @@ func_file_conv ()\n \tmingw/*)\n \t  file=`cmd //C echo \"$file \" | sed -e 's/\"\\(.*\\) \" *$/\\1/'`\n \t  ;;\n-\tcygwin/* | msys/*)\n+\tcygwin/*)\n \t  file=`cygpath -m \"$file\" || echo \"$file\"`\n \t  ;;\n \twine/*)\n@@ -143,7 +143,7 @@ func_cl_wrapper ()\n \t  # configure might choose to run compile as 'compile cc -o foo foo.c'.\n \t  eat=1\n \t  case $2 in\n-\t    *.o | *.lo | *.[oO][bB][jJ])\n+\t    *.o | *.[oO][bB][jJ])\n \t      func_file_conv \"$2\"\n \t      set x \"$@\" -Fo\"$file\"\n \t      shift\n@@ -248,17 +248,14 @@ If you are trying to build a whole package this is not the\n right script to run: please start by reading the file 'INSTALL'.\n \n Report bugs to <bug-automake@gnu.org>.\n-GNU Automake home page: <https://www.gnu.org/software/automake/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\n EOF\n     exit $?\n     ;;\n   -v | --v*)\n-    echo \"compile (GNU Automake) $scriptversion\"\n+    echo \"compile $scriptversion\"\n     exit $?\n     ;;\n   cl | *[/\\\\]cl | cl.exe | *[/\\\\]cl.exe | \\\n-  clang-cl | *[/\\\\]clang-cl | clang-cl.exe | *[/\\\\]clang-cl.exe | \\\n   icl | *[/\\\\]icl | icl.exe | *[/\\\\]icl.exe )\n     func_cl_wrapper \"$@\"      # Doesn't return...\n     ;;\n@@ -343,7 +340,7 @@ exit $ret\n # Local Variables:\n # mode: shell-script\n # sh-indentation: 2\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"scriptversion=\"\n # time-stamp-format: \"%:y-%02m-%02d.%02H\"\n # time-stamp-time-zone: \"UTC0\"\ndiff --git a/config.guess b/config.guess\nindex b790fcb..d622a44 100755\n--- a/config.guess\n+++ b/config.guess\n@@ -1,14 +1,14 @@\n-#!/usr/bin/sh\n+#! /bin/sh\n # Attempt to guess a canonical system name.\n-#   Copyright 1992-2024 Free Software Foundation, Inc.\n+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,\n+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,\n+#   2011, 2012 Free Software Foundation, Inc.\n \n-# shellcheck disable=SC2006,SC2268 # see below for rationale\n-\n-timestamp='2024-07-27'\n+timestamp='2012-02-10'\n \n # This file is free software; you can redistribute it and/or modify it\n # under the terms of the GNU General Public License as published by\n-# the Free Software Foundation, either version 3 of the License, or\n+# the Free Software Foundation; either version 2 of the License, or\n # (at your option) any later version.\n #\n # This program is distributed in the hope that it will be useful, but\n@@ -17,39 +17,33 @@ timestamp='2024-07-27'\n # General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program; if not, see <https://www.gnu.org/licenses/>.\n+# along with this program; if not, see <http://www.gnu.org/licenses/>.\n #\n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n # configuration script generated by Autoconf, you may include it under\n-# the same distribution terms that you use for the rest of that\n-# program.  This Exception is an additional permission under section 7\n-# of the GNU General Public License, version 3 (\"GPLv3\").\n+# the same distribution terms that you use for the rest of that program.\n+\n+\n+# Originally written by Per Bothner.  Please send patches (context\n+# diff format) to <config-patches@gnu.org> and include a ChangeLog\n+# entry.\n #\n-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.\n+# This script attempts to guess a canonical system name similar to\n+# config.sub.  If it succeeds, it prints the system name on stdout, and\n+# exits with 0.  Otherwise, it exits with 1.\n #\n # You can get the latest version of this script from:\n-# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess\n-#\n-# Please send patches to <config-patches@gnu.org>.\n-\n-\n-# The \"shellcheck disable\" line above the timestamp inhibits complaints\n-# about features and limitations of the classic Bourne shell that were\n-# superseded or lifted in POSIX.  However, this script identifies a wide\n-# variety of pre-POSIX systems that do not have POSIX shells at all, and\n-# even some reasonably current systems (Solaris 10 as case-in-point) still\n-# have a pre-POSIX /bin/sh.\n-\n+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD\n \n me=`echo \"$0\" | sed -e 's,.*/,,'`\n \n usage=\"\\\n Usage: $0 [OPTION]\n \n-Output the configuration name of the system '$me' is run on.\n+Output the configuration name of the system \\`$me' is run on.\n \n-Options:\n+Operation modes:\n   -h, --help         print this help, then exit\n   -t, --time-stamp   print date of last modification, then exit\n   -v, --version      print version number, then exit\n@@ -60,13 +54,15 @@ version=\"\\\n GNU config.guess ($timestamp)\n \n Originally written by Per Bothner.\n-Copyright 1992-2024 Free Software Foundation, Inc.\n+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,\n+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\n+Free Software Foundation, Inc.\n \n This is free software; see the source for copying conditions.  There is NO\n warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\"\n \n help=\"\n-Try '$me --help' for more information.\"\n+Try \\`$me --help' for more information.\"\n \n # Parse command line\n while test $# -gt 0 ; do\n@@ -94,109 +90,57 @@ if test $# != 0; then\n   exit 1\n fi\n \n-# Just in case it came from the environment.\n-GUESS=\n+trap 'exit 1' 1 2 15\n \n # CC_FOR_BUILD -- compiler used by this script. Note that the use of a\n # compiler to aid in system detection is discouraged as it requires\n # temporary files to be created and, as you can see below, it is a\n # headache to deal with in a portable fashion.\n \n-# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still\n-# use 'HOST_CC' if defined, but it is deprecated.\n+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still\n+# use `HOST_CC' if defined, but it is deprecated.\n \n # Portable tmp directory creation inspired by the Autoconf team.\n \n-tmp=\n-# shellcheck disable=SC2172\n-trap 'test -z \"$tmp\" || rm -fr \"$tmp\"' 0 1 2 13 15\n-\n-set_cc_for_build() {\n-    # prevent multiple calls if $tmp is already set\n-    test \"$tmp\" && return 0\n-    : \"${TMPDIR=/tmp}\"\n-    # shellcheck disable=SC2039,SC3028\n-    { tmp=`(umask 077 && mktemp -d \"$TMPDIR/cgXXXXXX\") 2>/dev/null` && test -n \"$tmp\" && test -d \"$tmp\" ; } ||\n-\t{ test -n \"$RANDOM\" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir \"$tmp\" 2>/dev/null) ; } ||\n-\t{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir \"$tmp\" 2>/dev/null) && echo \"Warning: creating insecure temp directory\" >&2 ; } ||\n-\t{ echo \"$me: cannot create a temporary directory in $TMPDIR\" >&2 ; exit 1 ; }\n-    dummy=$tmp/dummy\n-    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in\n-\t,,)    echo \"int x;\" > \"$dummy.c\"\n-\t       for driver in cc gcc c17 c99 c89 ; do\n-\t\t   if ($driver -c -o \"$dummy.o\" \"$dummy.c\") >/dev/null 2>&1 ; then\n-\t\t       CC_FOR_BUILD=$driver\n-\t\t       break\n-\t\t   fi\n-\t       done\n-\t       if test x\"$CC_FOR_BUILD\" = x ; then\n-\t\t   CC_FOR_BUILD=no_compiler_found\n-\t       fi\n-\t       ;;\n-\t,,*)   CC_FOR_BUILD=$CC ;;\n-\t,*,*)  CC_FOR_BUILD=$HOST_CC ;;\n-    esac\n-}\n+set_cc_for_build='\n+trap \"exitcode=\\$?; (rm -f \\$tmpfiles 2>/dev/null; rmdir \\$tmp 2>/dev/null) && exit \\$exitcode\" 0 ;\n+trap \"rm -f \\$tmpfiles 2>/dev/null; rmdir \\$tmp 2>/dev/null; exit 1\" 1 2 13 15 ;\n+: ${TMPDIR=/tmp} ;\n+ { tmp=`(umask 077 && mktemp -d \"$TMPDIR/cgXXXXXX\") 2>/dev/null` && test -n \"$tmp\" && test -d \"$tmp\" ; } ||\n+ { test -n \"$RANDOM\" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||\n+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo \"Warning: creating insecure temp directory\" >&2 ; } ||\n+ { echo \"$me: cannot create a temporary directory in $TMPDIR\" >&2 ; exit 1 ; } ;\n+dummy=$tmp/dummy ;\n+tmpfiles=\"$dummy.c $dummy.o $dummy.rel $dummy\" ;\n+case $CC_FOR_BUILD,$HOST_CC,$CC in\n+ ,,)    echo \"int x;\" > $dummy.c ;\n+\tfor c in cc gcc c89 c99 ; do\n+\t  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then\n+\t     CC_FOR_BUILD=\"$c\"; break ;\n+\t  fi ;\n+\tdone ;\n+\tif test x\"$CC_FOR_BUILD\" = x ; then\n+\t  CC_FOR_BUILD=no_compiler_found ;\n+\tfi\n+\t;;\n+ ,,*)   CC_FOR_BUILD=$CC ;;\n+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;\n+esac ; set_cc_for_build= ;'\n \n # This is needed to find uname on a Pyramid OSx when run in the BSD universe.\n # (ghazi@noc.rutgers.edu 1994-08-24)\n-if test -f /.attbin/uname ; then\n+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then\n \tPATH=$PATH:/.attbin ; export PATH\n fi\n \n UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown\n UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown\n-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown\n+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown\n UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown\n \n-case $UNAME_SYSTEM in\n-Linux|GNU|GNU/*)\n-\tLIBC=unknown\n-\n-\tset_cc_for_build\n-\tcat <<-EOF > \"$dummy.c\"\n-\t#if defined(__ANDROID__)\n-\tLIBC=android\n-\t#else\n-\t#include <features.h>\n-\t#if defined(__UCLIBC__)\n-\tLIBC=uclibc\n-\t#elif defined(__dietlibc__)\n-\tLIBC=dietlibc\n-\t#elif defined(__GLIBC__)\n-\tLIBC=gnu\n-\t#elif defined(__LLVM_LIBC__)\n-\tLIBC=llvm\n-\t#else\n-\t#include <stdarg.h>\n-\t/* First heuristic to detect musl libc.  */\n-\t#ifdef __DEFINED_va_list\n-\tLIBC=musl\n-\t#endif\n-\t#endif\n-\t#endif\n-\tEOF\n-\tcc_set_libc=`$CC_FOR_BUILD -E \"$dummy.c\" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`\n-\teval \"$cc_set_libc\"\n-\n-\t# Second heuristic to detect musl libc.\n-\tif [ \"$LIBC\" = unknown ] &&\n-\t   command -v ldd >/dev/null &&\n-\t   ldd --version 2>&1 | grep -q ^musl; then\n-\t\tLIBC=musl\n-\tfi\n-\n-\t# If the system lacks a compiler, then just pick glibc.\n-\t# We could probably try harder.\n-\tif [ \"$LIBC\" = unknown ]; then\n-\t\tLIBC=gnu\n-\tfi\n-\t;;\n-esac\n-\n # Note: order is significant - the case branches are not exclusive.\n \n-case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in\n+case \"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}\" in\n     *:NetBSD:*:*)\n \t# NetBSD (nbsd) targets should (where applicable) match one or\n \t# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,\n@@ -208,32 +152,22 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in\n \t#\n \t# Note: NetBSD doesn't particularly care about the vendor\n \t# portion of the name.  We always set it to \"unknown\".\n-\tUNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \\\n-\t    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \\\n-\t    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \\\n-\t    echo unknown)`\n-\tcase $UNAME_MACHINE_ARCH in\n-\t    aarch64eb) machine=aarch64_be-unknown ;;\n+\tsysctl=\"sysctl -n hw.machine_arch\"\n+\tUNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \\\n+\t    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`\n+\tcase \"${UNAME_MACHINE_ARCH}\" in\n \t    armeb) machine=armeb-unknown ;;\n \t    arm*) machine=arm-unknown ;;\n \t    sh3el) machine=shl-unknown ;;\n \t    sh3eb) machine=sh-unknown ;;\n \t    sh5el) machine=sh5le-unknown ;;\n-\t    earmv*)\n-\t\tarch=`echo \"$UNAME_MACHINE_ARCH\" | sed -e 's,^e\\(armv[0-9]\\).*$,\\1,'`\n-\t\tendian=`echo \"$UNAME_MACHINE_ARCH\" | sed -ne 's,^.*\\(eb\\)$,\\1,p'`\n-\t\tmachine=${arch}${endian}-unknown\n-\t\t;;\n-\t    *) machine=$UNAME_MACHINE_ARCH-unknown ;;\n+\t    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;\n \tesac\n \t# The Operating System including object format, if it has switched\n-\t# to ELF recently (or will in the future) and ABI.\n-\tcase $UNAME_MACHINE_ARCH in\n-\t    earm*)\n-\t\tos=netbsdelf\n-\t\t;;\n+\t# to ELF recently, or will in the future.\n+\tcase \"${UNAME_MACHINE_ARCH}\" in\n \t    arm*|i386|m68k|ns32k|sh3*|sparc|vax)\n-\t\tset_cc_for_build\n+\t\teval $set_cc_for_build\n \t\tif echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \\\n \t\t\t| grep -q __ELF__\n \t\tthen\n@@ -248,80 +182,41 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in\n \t\tos=netbsd\n \t\t;;\n \tesac\n-\t# Determine ABI tags.\n-\tcase $UNAME_MACHINE_ARCH in\n-\t    earm*)\n-\t\texpr='s/^earmv[0-9]/-eabi/;s/eb$//'\n-\t\tabi=`echo \"$UNAME_MACHINE_ARCH\" | sed -e \"$expr\"`\n-\t\t;;\n-\tesac\n \t# The OS release\n \t# Debian GNU/NetBSD machines have a different userland, and\n \t# thus, need a distinct triplet. However, they do not need\n \t# kernel version information, so it can be replaced with a\n \t# suitable tag, in the style of linux-gnu.\n-\tcase $UNAME_VERSION in\n+\tcase \"${UNAME_VERSION}\" in\n \t    Debian*)\n \t\trelease='-gnu'\n \t\t;;\n \t    *)\n-\t\trelease=`echo \"$UNAME_RELEASE\" | sed -e 's/[-_].*//' | cut -d. -f1,2`\n+\t\trelease=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\\./'`\n \t\t;;\n \tesac\n \t# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:\n \t# contains redundant information, the shorter form:\n \t# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.\n-\tGUESS=$machine-${os}${release}${abi-}\n-\t;;\n-    *:Bitrig:*:*)\n-\tUNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`\n-\tGUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE\n-\t;;\n+\techo \"${machine}-${os}${release}\"\n+\texit ;;\n     *:OpenBSD:*:*)\n \tUNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`\n-\tGUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE\n-\t;;\n-    *:SecBSD:*:*)\n-\tUNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`\n-\tGUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE\n-\t;;\n-    *:LibertyBSD:*:*)\n-\tUNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\\.//'`\n-\tGUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE\n-\t;;\n-    *:MidnightBSD:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}\n+\texit ;;\n     *:ekkoBSD:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}\n+\texit ;;\n     *:SolidBSD:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE\n-\t;;\n-    *:OS108:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}\n+\texit ;;\n     macppc:MirBSD:*:*)\n-\tGUESS=powerpc-unknown-mirbsd$UNAME_RELEASE\n-\t;;\n+\techo powerpc-unknown-mirbsd${UNAME_RELEASE}\n+\texit ;;\n     *:MirBSD:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE\n-\t;;\n-    *:Sortix:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-sortix\n-\t;;\n-    *:Twizzler:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-twizzler\n-\t;;\n-    *:Redox:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-redox\n-\t;;\n-    mips:OSF1:*.*)\n-\tGUESS=mips-dec-osf1\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}\n+\texit ;;\n     alpha:OSF1:*:*)\n-\t# Reset EXIT trap before exiting to avoid spurious non-zero exit code.\n-\ttrap '' 0\n \tcase $UNAME_RELEASE in\n \t*4.0)\n \t\tUNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`\n@@ -335,158 +230,163 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in\n \t# covers most systems running today.  This code pipes the CPU\n \t# types through head -n 1, so we only detect the type of CPU 0.\n \tALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \\(.*\\) processor.*$/\\1/p' | head -n 1`\n-\tcase $ALPHA_CPU_TYPE in\n+\tcase \"$ALPHA_CPU_TYPE\" in\n \t    \"EV4 (21064)\")\n-\t\tUNAME_MACHINE=alpha ;;\n+\t\tUNAME_MACHINE=\"alpha\" ;;\n \t    \"EV4.5 (21064)\")\n-\t\tUNAME_MACHINE=alpha ;;\n+\t\tUNAME_MACHINE=\"alpha\" ;;\n \t    \"LCA4 (21066/21068)\")\n-\t\tUNAME_MACHINE=alpha ;;\n+\t\tUNAME_MACHINE=\"alpha\" ;;\n \t    \"EV5 (21164)\")\n-\t\tUNAME_MACHINE=alphaev5 ;;\n+\t\tUNAME_MACHINE=\"alphaev5\" ;;\n \t    \"EV5.6 (21164A)\")\n-\t\tUNAME_MACHINE=alphaev56 ;;\n+\t\tUNAME_MACHINE=\"alphaev56\" ;;\n \t    \"EV5.6 (21164PC)\")\n-\t\tUNAME_MACHINE=alphapca56 ;;\n+\t\tUNAME_MACHINE=\"alphapca56\" ;;\n \t    \"EV5.7 (21164PC)\")\n-\t\tUNAME_MACHINE=alphapca57 ;;\n+\t\tUNAME_MACHINE=\"alphapca57\" ;;\n \t    \"EV6 (21264)\")\n-\t\tUNAME_MACHINE=alphaev6 ;;\n+\t\tUNAME_MACHINE=\"alphaev6\" ;;\n \t    \"EV6.7 (21264A)\")\n-\t\tUNAME_MACHINE=alphaev67 ;;\n+\t\tUNAME_MACHINE=\"alphaev67\" ;;\n \t    \"EV6.8CB (21264C)\")\n-\t\tUNAME_MACHINE=alphaev68 ;;\n+\t\tUNAME_MACHINE=\"alphaev68\" ;;\n \t    \"EV6.8AL (21264B)\")\n-\t\tUNAME_MACHINE=alphaev68 ;;\n+\t\tUNAME_MACHINE=\"alphaev68\" ;;\n \t    \"EV6.8CX (21264D)\")\n-\t\tUNAME_MACHINE=alphaev68 ;;\n+\t\tUNAME_MACHINE=\"alphaev68\" ;;\n \t    \"EV6.9A (21264/EV69A)\")\n-\t\tUNAME_MACHINE=alphaev69 ;;\n+\t\tUNAME_MACHINE=\"alphaev69\" ;;\n \t    \"EV7 (21364)\")\n-\t\tUNAME_MACHINE=alphaev7 ;;\n+\t\tUNAME_MACHINE=\"alphaev7\" ;;\n \t    \"EV7.9 (21364A)\")\n-\t\tUNAME_MACHINE=alphaev79 ;;\n+\t\tUNAME_MACHINE=\"alphaev79\" ;;\n \tesac\n \t# A Pn.n version is a patched version.\n \t# A Vn.n version is a released version.\n \t# A Tn.n version is a released field test version.\n \t# A Xn.n version is an unreleased experimental baselevel.\n \t# 1.2 uses \"1.2\" for uname -r.\n-\tOSF_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`\n-\tGUESS=$UNAME_MACHINE-dec-osf$OSF_REL\n-\t;;\n+\techo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`\n+\t# Reset EXIT trap before exiting to avoid spurious non-zero exit code.\n+\texitcode=$?\n+\ttrap '' 0\n+\texit $exitcode ;;\n+    Alpha\\ *:Windows_NT*:*)\n+\t# How do we know it's Interix rather than the generic POSIX subsystem?\n+\t# Should we change UNAME_MACHINE based on the output of uname instead\n+\t# of the specific Alpha model?\n+\techo alpha-pc-interix\n+\texit ;;\n+    21064:Windows_NT:50:3)\n+\techo alpha-dec-winnt3.5\n+\texit ;;\n     Amiga*:UNIX_System_V:4.0:*)\n-\tGUESS=m68k-unknown-sysv4\n-\t;;\n+\techo m68k-unknown-sysv4\n+\texit ;;\n     *:[Aa]miga[Oo][Ss]:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-amigaos\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-amigaos\n+\texit ;;\n     *:[Mm]orph[Oo][Ss]:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-morphos\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-morphos\n+\texit ;;\n     *:OS/390:*:*)\n-\tGUESS=i370-ibm-openedition\n-\t;;\n+\techo i370-ibm-openedition\n+\texit ;;\n     *:z/VM:*:*)\n-\tGUESS=s390-ibm-zvmoe\n-\t;;\n+\techo s390-ibm-zvmoe\n+\texit ;;\n     *:OS400:*:*)\n-\tGUESS=powerpc-ibm-os400\n-\t;;\n+\techo powerpc-ibm-os400\n+\texit ;;\n     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)\n-\tGUESS=arm-acorn-riscix$UNAME_RELEASE\n-\t;;\n-    arm*:riscos:*:*|arm*:RISCOS:*:*)\n-\tGUESS=arm-unknown-riscos\n-\t;;\n+\techo arm-acorn-riscix${UNAME_RELEASE}\n+\texit ;;\n+    arm:riscos:*:*|arm:RISCOS:*:*)\n+\techo arm-unknown-riscos\n+\texit ;;\n     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)\n-\tGUESS=hppa1.1-hitachi-hiuxmpp\n-\t;;\n+\techo hppa1.1-hitachi-hiuxmpp\n+\texit ;;\n     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)\n \t# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.\n-\tcase `(/bin/universe) 2>/dev/null` in\n-\t    att) GUESS=pyramid-pyramid-sysv3 ;;\n-\t    *)   GUESS=pyramid-pyramid-bsd   ;;\n-\tesac\n-\t;;\n+\tif test \"`(/bin/universe) 2>/dev/null`\" = att ; then\n+\t\techo pyramid-pyramid-sysv3\n+\telse\n+\t\techo pyramid-pyramid-bsd\n+\tfi\n+\texit ;;\n     NILE*:*:*:dcosx)\n-\tGUESS=pyramid-pyramid-svr4\n-\t;;\n+\techo pyramid-pyramid-svr4\n+\texit ;;\n     DRS?6000:unix:4.0:6*)\n-\tGUESS=sparc-icl-nx6\n-\t;;\n+\techo sparc-icl-nx6\n+\texit ;;\n     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)\n \tcase `/usr/bin/uname -p` in\n-\t    sparc) GUESS=sparc-icl-nx7 ;;\n-\tesac\n-\t;;\n+\t    sparc) echo sparc-icl-nx7; exit ;;\n+\tesac ;;\n     s390x:SunOS:*:*)\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*//'`\n-\tGUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL\n-\t;;\n+\techo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`\n+\texit ;;\n     sun4H:SunOS:5.*:*)\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*//'`\n-\tGUESS=sparc-hal-solaris2$SUN_REL\n-\t;;\n+\techo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`\n+\texit ;;\n     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*//'`\n-\tGUESS=sparc-sun-solaris2$SUN_REL\n-\t;;\n+\techo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`\n+\texit ;;\n     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)\n-\tGUESS=i386-pc-auroraux$UNAME_RELEASE\n-\t;;\n+\techo i386-pc-auroraux${UNAME_RELEASE}\n+\texit ;;\n     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)\n-\tset_cc_for_build\n-\tSUN_ARCH=i386\n+\teval $set_cc_for_build\n+\tSUN_ARCH=\"i386\"\n \t# If there is a compiler, see if it is configured for 64-bit objects.\n \t# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.\n \t# This test works for both compilers.\n-\tif test \"$CC_FOR_BUILD\" != no_compiler_found; then\n+\tif [ \"$CC_FOR_BUILD\" != 'no_compiler_found' ]; then\n \t    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \\\n-\t\t(CCOPTS=\"\" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \\\n+\t\t(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \\\n \t\tgrep IS_64BIT_ARCH >/dev/null\n \t    then\n-\t\tSUN_ARCH=x86_64\n+\t\tSUN_ARCH=\"x86_64\"\n \t    fi\n \tfi\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*//'`\n-\tGUESS=$SUN_ARCH-pc-solaris2$SUN_REL\n-\t;;\n+\techo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`\n+\texit ;;\n     sun4*:SunOS:6*:*)\n \t# According to config.sub, this is the proper way to canonicalize\n \t# SunOS6.  Hard to guess exactly what SunOS6 will be like, but\n \t# it's likely to be more like Solaris than SunOS4.\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*//'`\n-\tGUESS=sparc-sun-solaris3$SUN_REL\n-\t;;\n+\techo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`\n+\texit ;;\n     sun4*:SunOS:*:*)\n-\tcase `/usr/bin/arch -k` in\n+\tcase \"`/usr/bin/arch -k`\" in\n \t    Series*|S4*)\n \t\tUNAME_RELEASE=`uname -v`\n \t\t;;\n \tesac\n-\t# Japanese Language versions have a version number like '4.1.3-JL'.\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/-/_/'`\n-\tGUESS=sparc-sun-sunos$SUN_REL\n-\t;;\n+\t# Japanese Language versions have a version number like `4.1.3-JL'.\n+\techo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`\n+\texit ;;\n     sun3*:SunOS:*:*)\n-\tGUESS=m68k-sun-sunos$UNAME_RELEASE\n-\t;;\n+\techo m68k-sun-sunos${UNAME_RELEASE}\n+\texit ;;\n     sun*:*:4.2BSD:*)\n \tUNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`\n-\ttest \"x$UNAME_RELEASE\" = x && UNAME_RELEASE=3\n-\tcase `/bin/arch` in\n+\ttest \"x${UNAME_RELEASE}\" = \"x\" && UNAME_RELEASE=3\n+\tcase \"`/bin/arch`\" in\n \t    sun3)\n-\t\tGUESS=m68k-sun-sunos$UNAME_RELEASE\n+\t\techo m68k-sun-sunos${UNAME_RELEASE}\n \t\t;;\n \t    sun4)\n-\t\tGUESS=sparc-sun-sunos$UNAME_RELEASE\n+\t\techo sparc-sun-sunos${UNAME_RELEASE}\n \t\t;;\n \tesac\n-\t;;\n+\texit ;;\n     aushp:SunOS:*:*)\n-\tGUESS=sparc-auspex-sunos$UNAME_RELEASE\n-\t;;\n+\techo sparc-auspex-sunos${UNAME_RELEASE}\n+\texit ;;\n     # The situation for MiNT is a little confusing.  The machine name\n     # can be virtually everything (everything which is not\n     # \"atarist\" or \"atariste\" at least should have a processor\n@@ -496,44 +396,44 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in\n     # MiNT.  But MiNT is downward compatible to TOS, so this should\n     # be no problem.\n     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)\n-\tGUESS=m68k-atari-mint$UNAME_RELEASE\n-\t;;\n+\techo m68k-atari-mint${UNAME_RELEASE}\n+\texit ;;\n     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)\n-\tGUESS=m68k-atari-mint$UNAME_RELEASE\n-\t;;\n+\techo m68k-atari-mint${UNAME_RELEASE}\n+\texit ;;\n     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)\n-\tGUESS=m68k-atari-mint$UNAME_RELEASE\n-\t;;\n+\techo m68k-atari-mint${UNAME_RELEASE}\n+\texit ;;\n     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)\n-\tGUESS=m68k-milan-mint$UNAME_RELEASE\n-\t;;\n+\techo m68k-milan-mint${UNAME_RELEASE}\n+\texit ;;\n     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)\n-\tGUESS=m68k-hades-mint$UNAME_RELEASE\n-\t;;\n+\techo m68k-hades-mint${UNAME_RELEASE}\n+\texit ;;\n     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)\n-\tGUESS=m68k-unknown-mint$UNAME_RELEASE\n-\t;;\n+\techo m68k-unknown-mint${UNAME_RELEASE}\n+\texit ;;\n     m68k:machten:*:*)\n-\tGUESS=m68k-apple-machten$UNAME_RELEASE\n-\t;;\n+\techo m68k-apple-machten${UNAME_RELEASE}\n+\texit ;;\n     powerpc:machten:*:*)\n-\tGUESS=powerpc-apple-machten$UNAME_RELEASE\n-\t;;\n+\techo powerpc-apple-machten${UNAME_RELEASE}\n+\texit ;;\n     RISC*:Mach:*:*)\n-\tGUESS=mips-dec-mach_bsd4.3\n-\t;;\n+\techo mips-dec-mach_bsd4.3\n+\texit ;;\n     RISC*:ULTRIX:*:*)\n-\tGUESS=mips-dec-ultrix$UNAME_RELEASE\n-\t;;\n+\techo mips-dec-ultrix${UNAME_RELEASE}\n+\texit ;;\n     VAX*:ULTRIX*:*:*)\n-\tGUESS=vax-dec-ultrix$UNAME_RELEASE\n-\t;;\n+\techo vax-dec-ultrix${UNAME_RELEASE}\n+\texit ;;\n     2020:CLIX:*:* | 2430:CLIX:*:*)\n-\tGUESS=clipper-intergraph-clix$UNAME_RELEASE\n-\t;;\n+\techo clipper-intergraph-clix${UNAME_RELEASE}\n+\texit ;;\n     mips:*:*:UMIPS | mips:*:*:RISCos)\n-\tset_cc_for_build\n-\tsed 's/^\t//' << EOF > \"$dummy.c\"\n+\teval $set_cc_for_build\n+\tsed 's/^\t//' << EOF >$dummy.c\n #ifdef __cplusplus\n #include <stdio.h>  /* for printf() prototype */\n \tint main (int argc, char *argv[]) {\n@@ -542,100 +442,98 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in\n #endif\n \t#if defined (host_mips) && defined (MIPSEB)\n \t#if defined (SYSTYPE_SYSV)\n-\t  printf (\"mips-mips-riscos%ssysv\\\\n\", argv[1]); exit (0);\n+\t  printf (\"mips-mips-riscos%ssysv\\n\", argv[1]); exit (0);\n \t#endif\n \t#if defined (SYSTYPE_SVR4)\n-\t  printf (\"mips-mips-riscos%ssvr4\\\\n\", argv[1]); exit (0);\n+\t  printf (\"mips-mips-riscos%ssvr4\\n\", argv[1]); exit (0);\n \t#endif\n \t#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)\n-\t  printf (\"mips-mips-riscos%sbsd\\\\n\", argv[1]); exit (0);\n+\t  printf (\"mips-mips-riscos%sbsd\\n\", argv[1]); exit (0);\n \t#endif\n \t#endif\n \t  exit (-1);\n \t}\n EOF\n-\t$CC_FOR_BUILD -o \"$dummy\" \"$dummy.c\" &&\n-\t  dummyarg=`echo \"$UNAME_RELEASE\" | sed -n 's/\\([0-9]*\\).*/\\1/p'` &&\n-\t  SYSTEM_NAME=`\"$dummy\" \"$dummyarg\"` &&\n+\t$CC_FOR_BUILD -o $dummy $dummy.c &&\n+\t  dummyarg=`echo \"${UNAME_RELEASE}\" | sed -n 's/\\([0-9]*\\).*/\\1/p'` &&\n+\t  SYSTEM_NAME=`$dummy $dummyarg` &&\n \t    { echo \"$SYSTEM_NAME\"; exit; }\n-\tGUESS=mips-mips-riscos$UNAME_RELEASE\n-\t;;\n+\techo mips-mips-riscos${UNAME_RELEASE}\n+\texit ;;\n     Motorola:PowerMAX_OS:*:*)\n-\tGUESS=powerpc-motorola-powermax\n-\t;;\n+\techo powerpc-motorola-powermax\n+\texit ;;\n     Motorola:*:4.3:PL8-*)\n-\tGUESS=powerpc-harris-powermax\n-\t;;\n+\techo powerpc-harris-powermax\n+\texit ;;\n     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)\n-\tGUESS=powerpc-harris-powermax\n-\t;;\n+\techo powerpc-harris-powermax\n+\texit ;;\n     Night_Hawk:Power_UNIX:*:*)\n-\tGUESS=powerpc-harris-powerunix\n-\t;;\n+\techo powerpc-harris-powerunix\n+\texit ;;\n     m88k:CX/UX:7*:*)\n-\tGUESS=m88k-harris-cxux7\n-\t;;\n+\techo m88k-harris-cxux7\n+\texit ;;\n     m88k:*:4*:R4*)\n-\tGUESS=m88k-motorola-sysv4\n-\t;;\n+\techo m88k-motorola-sysv4\n+\texit ;;\n     m88k:*:3*:R3*)\n-\tGUESS=m88k-motorola-sysv3\n-\t;;\n+\techo m88k-motorola-sysv3\n+\texit ;;\n     AViiON:dgux:*:*)\n \t# DG/UX returns AViiON for all architectures\n \tUNAME_PROCESSOR=`/usr/bin/uname -p`\n-\tif test \"$UNAME_PROCESSOR\" = mc88100 || test \"$UNAME_PROCESSOR\" = mc88110\n+\tif [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]\n \tthen\n-\t    if test \"$TARGET_BINARY_INTERFACE\"x = m88kdguxelfx || \\\n-\t       test \"$TARGET_BINARY_INTERFACE\"x = x\n+\t    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \\\n+\t       [ ${TARGET_BINARY_INTERFACE}x = x ]\n \t    then\n-\t\tGUESS=m88k-dg-dgux$UNAME_RELEASE\n+\t\techo m88k-dg-dgux${UNAME_RELEASE}\n \t    else\n-\t\tGUESS=m88k-dg-dguxbcs$UNAME_RELEASE\n+\t\techo m88k-dg-dguxbcs${UNAME_RELEASE}\n \t    fi\n \telse\n-\t    GUESS=i586-dg-dgux$UNAME_RELEASE\n+\t    echo i586-dg-dgux${UNAME_RELEASE}\n \tfi\n-\t;;\n+\texit ;;\n     M88*:DolphinOS:*:*)\t# DolphinOS (SVR3)\n-\tGUESS=m88k-dolphin-sysv3\n-\t;;\n+\techo m88k-dolphin-sysv3\n+\texit ;;\n     M88*:*:R3*:*)\n \t# Delta 88k system running SVR3\n-\tGUESS=m88k-motorola-sysv3\n-\t;;\n+\techo m88k-motorola-sysv3\n+\texit ;;\n     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)\n-\tGUESS=m88k-tektronix-sysv3\n-\t;;\n+\techo m88k-tektronix-sysv3\n+\texit ;;\n     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)\n-\tGUESS=m68k-tektronix-bsd\n-\t;;\n+\techo m68k-tektronix-bsd\n+\texit ;;\n     *:IRIX*:*:*)\n-\tIRIX_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/-/_/g'`\n-\tGUESS=mips-sgi-irix$IRIX_REL\n-\t;;\n+\techo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`\n+\texit ;;\n     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.\n-\tGUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id\n-\t;;                    # Note that: echo \"'`uname -s`'\" gives 'AIX '\n+\techo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id\n+\texit ;;               # Note that: echo \"'`uname -s`'\" gives 'AIX '\n     i*86:AIX:*:*)\n-\tGUESS=i386-ibm-aix\n-\t;;\n+\techo i386-ibm-aix\n+\texit ;;\n     ia64:AIX:*:*)\n-\tif test -x /usr/bin/oslevel ; then\n+\tif [ -x /usr/bin/oslevel ] ; then\n \t\tIBM_REV=`/usr/bin/oslevel`\n \telse\n-\t\tIBM_REV=$UNAME_VERSION.$UNAME_RELEASE\n+\t\tIBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}\n \tfi\n-\tGUESS=$UNAME_MACHINE-ibm-aix$IBM_REV\n-\t;;\n+\techo ${UNAME_MACHINE}-ibm-aix${IBM_REV}\n+\texit ;;\n     *:AIX:2:3)\n \tif grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then\n-\t\tset_cc_for_build\n-\t\tsed 's/^\t\t//' << EOF > \"$dummy.c\"\n+\t\teval $set_cc_for_build\n+\t\tsed 's/^\t\t//' << EOF >$dummy.c\n \t\t#include <sys/systemcfg.h>\n \n-\t\tint\n-\t\tmain ()\n+\t\tmain()\n \t\t\t{\n \t\t\tif (!__power_pc())\n \t\t\t\texit(1);\n@@ -643,84 +541,82 @@ EOF\n \t\t\texit(0);\n \t\t\t}\n EOF\n-\t\tif $CC_FOR_BUILD -o \"$dummy\" \"$dummy.c\" && SYSTEM_NAME=`\"$dummy\"`\n+\t\tif $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`\n \t\tthen\n-\t\t\tGUESS=$SYSTEM_NAME\n+\t\t\techo \"$SYSTEM_NAME\"\n \t\telse\n-\t\t\tGUESS=rs6000-ibm-aix3.2.5\n+\t\t\techo rs6000-ibm-aix3.2.5\n \t\tfi\n \telif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then\n-\t\tGUESS=rs6000-ibm-aix3.2.4\n+\t\techo rs6000-ibm-aix3.2.4\n \telse\n-\t\tGUESS=rs6000-ibm-aix3.2\n+\t\techo rs6000-ibm-aix3.2\n \tfi\n-\t;;\n+\texit ;;\n     *:AIX:*:[4567])\n \tIBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`\n-\tif /usr/sbin/lsattr -El \"$IBM_CPU_ID\" | grep ' POWER' >/dev/null 2>&1; then\n+\tif /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then\n \t\tIBM_ARCH=rs6000\n \telse\n \t\tIBM_ARCH=powerpc\n \tfi\n-\tif test -x /usr/bin/lslpp ; then\n-\t\tIBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \\\n-\t\t\t   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`\n+\tif [ -x /usr/bin/oslevel ] ; then\n+\t\tIBM_REV=`/usr/bin/oslevel`\n \telse\n-\t\tIBM_REV=$UNAME_VERSION.$UNAME_RELEASE\n+\t\tIBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}\n \tfi\n-\tGUESS=$IBM_ARCH-ibm-aix$IBM_REV\n-\t;;\n+\techo ${IBM_ARCH}-ibm-aix${IBM_REV}\n+\texit ;;\n     *:AIX:*:*)\n-\tGUESS=rs6000-ibm-aix\n-\t;;\n-    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)\n-\tGUESS=romp-ibm-bsd4.4\n-\t;;\n+\techo rs6000-ibm-aix\n+\texit ;;\n+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)\n+\techo romp-ibm-bsd4.4\n+\texit ;;\n     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and\n-\tGUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to\n-\t;;                                  # report: romp-ibm BSD 4.3\n+\techo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to\n+\texit ;;                             # report: romp-ibm BSD 4.3\n     *:BOSX:*:*)\n-\tGUESS=rs6000-bull-bosx\n-\t;;\n+\techo rs6000-bull-bosx\n+\texit ;;\n     DPX/2?00:B.O.S.:*:*)\n-\tGUESS=m68k-bull-sysv3\n-\t;;\n+\techo m68k-bull-sysv3\n+\texit ;;\n     9000/[34]??:4.3bsd:1.*:*)\n-\tGUESS=m68k-hp-bsd\n-\t;;\n+\techo m68k-hp-bsd\n+\texit ;;\n     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)\n-\tGUESS=m68k-hp-bsd4.4\n-\t;;\n+\techo m68k-hp-bsd4.4\n+\texit ;;\n     9000/[34678]??:HP-UX:*:*)\n-\tHPUX_REV=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*.[0B]*//'`\n-\tcase $UNAME_MACHINE in\n-\t    9000/31?)            HP_ARCH=m68000 ;;\n-\t    9000/[34]??)         HP_ARCH=m68k ;;\n+\tHPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`\n+\tcase \"${UNAME_MACHINE}\" in\n+\t    9000/31? )            HP_ARCH=m68000 ;;\n+\t    9000/[34]?? )         HP_ARCH=m68k ;;\n \t    9000/[678][0-9][0-9])\n-\t\tif test -x /usr/bin/getconf; then\n+\t\tif [ -x /usr/bin/getconf ]; then\n \t\t    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`\n \t\t    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`\n-\t\t    case $sc_cpu_version in\n-\t\t      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0\n-\t\t      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1\n+\t\t    case \"${sc_cpu_version}\" in\n+\t\t      523) HP_ARCH=\"hppa1.0\" ;; # CPU_PA_RISC1_0\n+\t\t      528) HP_ARCH=\"hppa1.1\" ;; # CPU_PA_RISC1_1\n \t\t      532)                      # CPU_PA_RISC2_0\n-\t\t\tcase $sc_kernel_bits in\n-\t\t\t  32) HP_ARCH=hppa2.0n ;;\n-\t\t\t  64) HP_ARCH=hppa2.0w ;;\n-\t\t\t  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20\n+\t\t\tcase \"${sc_kernel_bits}\" in\n+\t\t\t  32) HP_ARCH=\"hppa2.0n\" ;;\n+\t\t\t  64) HP_ARCH=\"hppa2.0w\" ;;\n+\t\t\t  '') HP_ARCH=\"hppa2.0\" ;;   # HP-UX 10.20\n \t\t\tesac ;;\n \t\t    esac\n \t\tfi\n-\t\tif test \"$HP_ARCH\" = \"\"; then\n-\t\t    set_cc_for_build\n-\t\t    sed 's/^\t\t//' << EOF > \"$dummy.c\"\n+\t\tif [ \"${HP_ARCH}\" = \"\" ]; then\n+\t\t    eval $set_cc_for_build\n+\t\t    sed 's/^\t\t//' << EOF >$dummy.c\n \n \t\t#define _HPUX_SOURCE\n \t\t#include <stdlib.h>\n \t\t#include <unistd.h>\n \n-\t\tint\n-\t\tmain ()\n+\t\tint main ()\n \t\t{\n \t\t#if defined(_SC_KERNEL_BITS)\n \t\t    long bits = sysconf(_SC_KERNEL_BITS);\n@@ -747,13 +643,13 @@ EOF\n \t\t    exit (0);\n \t\t}\n EOF\n-\t\t    (CCOPTS=\"\" $CC_FOR_BUILD -o \"$dummy\" \"$dummy.c\" 2>/dev/null) && HP_ARCH=`\"$dummy\"`\n+\t\t    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`\n \t\t    test -z \"$HP_ARCH\" && HP_ARCH=hppa\n \t\tfi ;;\n \tesac\n-\tif test \"$HP_ARCH\" = hppa2.0w\n+\tif [ ${HP_ARCH} = \"hppa2.0w\" ]\n \tthen\n-\t    set_cc_for_build\n+\t    eval $set_cc_for_build\n \n \t    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating\n \t    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler\n@@ -764,23 +660,23 @@ EOF\n \t    # $ CC_FOR_BUILD=\"cc +DA2.0w\" ./config.guess\n \t    # => hppa64-hp-hpux11.23\n \n-\t    if echo __LP64__ | (CCOPTS=\"\" $CC_FOR_BUILD -E - 2>/dev/null) |\n+\t    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |\n \t\tgrep -q __LP64__\n \t    then\n-\t\tHP_ARCH=hppa2.0w\n+\t\tHP_ARCH=\"hppa2.0w\"\n \t    else\n-\t\tHP_ARCH=hppa64\n+\t\tHP_ARCH=\"hppa64\"\n \t    fi\n \tfi\n-\tGUESS=$HP_ARCH-hp-hpux$HPUX_REV\n-\t;;\n+\techo ${HP_ARCH}-hp-hpux${HPUX_REV}\n+\texit ;;\n     ia64:HP-UX:*:*)\n-\tHPUX_REV=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*.[0B]*//'`\n-\tGUESS=ia64-hp-hpux$HPUX_REV\n-\t;;\n+\tHPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`\n+\techo ia64-hp-hpux${HPUX_REV}\n+\texit ;;\n     3050*:HI-UX:*:*)\n-\tset_cc_for_build\n-\tsed 's/^\t//' << EOF > \"$dummy.c\"\n+\teval $set_cc_for_build\n+\tsed 's/^\t//' << EOF >$dummy.c\n \t#include <unistd.h>\n \tint\n \tmain ()\n@@ -805,38 +701,38 @@ EOF\n \t  exit (0);\n \t}\n EOF\n-\t$CC_FOR_BUILD -o \"$dummy\" \"$dummy.c\" && SYSTEM_NAME=`\"$dummy\"` &&\n+\t$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&\n \t\t{ echo \"$SYSTEM_NAME\"; exit; }\n-\tGUESS=unknown-hitachi-hiuxwe2\n-\t;;\n-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)\n-\tGUESS=hppa1.1-hp-bsd\n-\t;;\n+\techo unknown-hitachi-hiuxwe2\n+\texit ;;\n+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )\n+\techo hppa1.1-hp-bsd\n+\texit ;;\n     9000/8??:4.3bsd:*:*)\n-\tGUESS=hppa1.0-hp-bsd\n-\t;;\n+\techo hppa1.0-hp-bsd\n+\texit ;;\n     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)\n-\tGUESS=hppa1.0-hp-mpeix\n-\t;;\n-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)\n-\tGUESS=hppa1.1-hp-osf\n-\t;;\n+\techo hppa1.0-hp-mpeix\n+\texit ;;\n+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )\n+\techo hppa1.1-hp-osf\n+\texit ;;\n     hp8??:OSF1:*:*)\n-\tGUESS=hppa1.0-hp-osf\n-\t;;\n+\techo hppa1.0-hp-osf\n+\texit ;;\n     i*86:OSF1:*:*)\n-\tif test -x /usr/sbin/sysversion ; then\n-\t    GUESS=$UNAME_MACHINE-unknown-osf1mk\n+\tif [ -x /usr/sbin/sysversion ] ; then\n+\t    echo ${UNAME_MACHINE}-unknown-osf1mk\n \telse\n-\t    GUESS=$UNAME_MACHINE-unknown-osf1\n+\t    echo ${UNAME_MACHINE}-unknown-osf1\n \tfi\n-\t;;\n+\texit ;;\n     parisc*:Lites*:*:*)\n-\tGUESS=hppa1.1-hp-lites\n-\t;;\n+\techo hppa1.1-hp-lites\n+\texit ;;\n     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)\n-\tGUESS=c1-convex-bsd\n-\t;;\n+\techo c1-convex-bsd\n+\texit ;;\n     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)\n \tif getsysinfo -f scalar_acc\n \tthen echo c32-convex-bsd\n@@ -844,174 +740,136 @@ EOF\n \tfi\n \texit ;;\n     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)\n-\tGUESS=c34-convex-bsd\n-\t;;\n+\techo c34-convex-bsd\n+\texit ;;\n     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)\n-\tGUESS=c38-convex-bsd\n-\t;;\n+\techo c38-convex-bsd\n+\texit ;;\n     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)\n-\tGUESS=c4-convex-bsd\n-\t;;\n+\techo c4-convex-bsd\n+\texit ;;\n     CRAY*Y-MP:*:*:*)\n-\tCRAY_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/\\.[^.]*$/.X/'`\n-\tGUESS=ymp-cray-unicos$CRAY_REL\n-\t;;\n+\techo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\\.[^.]*$/.X/'\n+\texit ;;\n     CRAY*[A-Z]90:*:*:*)\n-\techo \"$UNAME_MACHINE\"-cray-unicos\"$UNAME_RELEASE\" \\\n+\techo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \\\n \t| sed -e 's/CRAY.*\\([A-Z]90\\)/\\1/' \\\n \t      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \\\n \t      -e 's/\\.[^.]*$/.X/'\n \texit ;;\n     CRAY*TS:*:*:*)\n-\tCRAY_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/\\.[^.]*$/.X/'`\n-\tGUESS=t90-cray-unicos$CRAY_REL\n-\t;;\n+\techo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\\.[^.]*$/.X/'\n+\texit ;;\n     CRAY*T3E:*:*:*)\n-\tCRAY_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/\\.[^.]*$/.X/'`\n-\tGUESS=alphaev5-cray-unicosmk$CRAY_REL\n-\t;;\n+\techo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\\.[^.]*$/.X/'\n+\texit ;;\n     CRAY*SV1:*:*:*)\n-\tCRAY_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/\\.[^.]*$/.X/'`\n-\tGUESS=sv1-cray-unicos$CRAY_REL\n-\t;;\n+\techo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\\.[^.]*$/.X/'\n+\texit ;;\n     *:UNICOS/mp:*:*)\n-\tCRAY_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/\\.[^.]*$/.X/'`\n-\tGUESS=craynv-cray-unicosmp$CRAY_REL\n-\t;;\n+\techo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\\.[^.]*$/.X/'\n+\texit ;;\n     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)\n-\tFUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`\n-\tFUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\\///'`\n-\tFUJITSU_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/ /_/'`\n-\tGUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}\n-\t;;\n+\tFUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`\n+\tFUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\\///'`\n+\tFUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`\n+\techo \"${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}\"\n+\texit ;;\n     5000:UNIX_System_V:4.*:*)\n-\tFUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\\///'`\n-\tFUJITSU_REL=`echo \"$UNAME_RELEASE\" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`\n-\tGUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}\n-\t;;\n+\tFUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\\///'`\n+\tFUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`\n+\techo \"sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}\"\n+\texit ;;\n     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\\ Embedded/OS:*:*)\n-\tGUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}\n+\texit ;;\n     sparc*:BSD/OS:*:*)\n-\tGUESS=sparc-unknown-bsdi$UNAME_RELEASE\n-\t;;\n+\techo sparc-unknown-bsdi${UNAME_RELEASE}\n+\texit ;;\n     *:BSD/OS:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE\n-\t;;\n-    arm:FreeBSD:*:*)\n-\tUNAME_PROCESSOR=`uname -p`\n-\tset_cc_for_build\n-\tif echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \\\n-\t    | grep -q __ARM_PCS_VFP\n-\tthen\n-\t    FREEBSD_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[-(].*//'`\n-\t    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi\n-\telse\n-\t    FREEBSD_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[-(].*//'`\n-\t    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf\n-\tfi\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}\n+\texit ;;\n     *:FreeBSD:*:*)\n-\tUNAME_PROCESSOR=`uname -p`\n-\tcase $UNAME_PROCESSOR in\n+\tUNAME_PROCESSOR=`/usr/bin/uname -p`\n+\tcase ${UNAME_PROCESSOR} in\n \t    amd64)\n-\t\tUNAME_PROCESSOR=x86_64 ;;\n-\t    i386)\n-\t\tUNAME_PROCESSOR=i586 ;;\n+\t\techo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;\n+\t    *)\n+\t\techo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;\n \tesac\n-\tFREEBSD_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[-(].*//'`\n-\tGUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL\n-\t;;\n+\texit ;;\n     i*:CYGWIN*:*)\n-\tGUESS=$UNAME_MACHINE-pc-cygwin\n-\t;;\n-    *:MINGW64*:*)\n-\tGUESS=$UNAME_MACHINE-pc-mingw64\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-cygwin\n+\texit ;;\n     *:MINGW*:*)\n-\tGUESS=$UNAME_MACHINE-pc-mingw32\n-\t;;\n-    *:MSYS*:*)\n-\tGUESS=$UNAME_MACHINE-pc-msys\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-mingw32\n+\texit ;;\n+    i*:MSYS*:*)\n+\techo ${UNAME_MACHINE}-pc-msys\n+\texit ;;\n+    i*:windows32*:*)\n+\t# uname -m includes \"-pc\" on this system.\n+\techo ${UNAME_MACHINE}-mingw32\n+\texit ;;\n     i*:PW*:*)\n-\tGUESS=$UNAME_MACHINE-pc-pw32\n-\t;;\n-    *:SerenityOS:*:*)\n-        GUESS=$UNAME_MACHINE-pc-serenity\n-        ;;\n+\techo ${UNAME_MACHINE}-pc-pw32\n+\texit ;;\n     *:Interix*:*)\n-\tcase $UNAME_MACHINE in\n+\tcase ${UNAME_MACHINE} in\n \t    x86)\n-\t\tGUESS=i586-pc-interix$UNAME_RELEASE\n-\t\t;;\n+\t\techo i586-pc-interix${UNAME_RELEASE}\n+\t\texit ;;\n \t    authenticamd | genuineintel | EM64T)\n-\t\tGUESS=x86_64-unknown-interix$UNAME_RELEASE\n-\t\t;;\n+\t\techo x86_64-unknown-interix${UNAME_RELEASE}\n+\t\texit ;;\n \t    IA64)\n-\t\tGUESS=ia64-unknown-interix$UNAME_RELEASE\n-\t\t;;\n+\t\techo ia64-unknown-interix${UNAME_RELEASE}\n+\t\texit ;;\n \tesac ;;\n-    i*:UWIN*:*)\n-\tGUESS=$UNAME_MACHINE-pc-uwin\n-\t;;\n+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)\n+\techo i${UNAME_MACHINE}-pc-mks\n+\texit ;;\n+    8664:Windows_NT:*)\n+\techo x86_64-pc-mks\n+\texit ;;\n+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)\n+\t# How do we know it's Interix rather than the generic POSIX subsystem?\n+\t# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we\n+\t# UNAME_MACHINE based on the output of uname instead of i386?\n+\techo i586-pc-interix\n+\texit ;;\n+    i*:UWIN*:*)\n+\techo ${UNAME_MACHINE}-pc-uwin\n+\texit ;;\n     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)\n-\tGUESS=x86_64-pc-cygwin\n-\t;;\n+\techo x86_64-unknown-cygwin\n+\texit ;;\n+    p*:CYGWIN*:*)\n+\techo powerpcle-unknown-cygwin\n+\texit ;;\n     prep*:SunOS:5.*:*)\n-\tSUN_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[^.]*//'`\n-\tGUESS=powerpcle-unknown-solaris2$SUN_REL\n-\t;;\n+\techo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`\n+\texit ;;\n     *:GNU:*:*)\n \t# the GNU system\n-\tGNU_ARCH=`echo \"$UNAME_MACHINE\" | sed -e 's,[-/].*$,,'`\n-\tGNU_REL=`echo \"$UNAME_RELEASE\" | sed -e 's,/.*$,,'`\n-\tGUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL\n-\t;;\n+\techo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`\n+\texit ;;\n     *:GNU/*:*:*)\n \t# other systems with GNU libc and userland\n-\tGNU_SYS=`echo \"$UNAME_SYSTEM\" | sed 's,^[^/]*/,,' | tr \"[:upper:]\" \"[:lower:]\"`\n-\tGNU_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[-(].*//'`\n-\tGUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC\n-\t;;\n-    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)\n-\tGUESS=\"$UNAME_MACHINE-pc-managarm-mlibc\"\n-\t;;\n-    *:[Mm]anagarm:*:*)\n-\tGUESS=\"$UNAME_MACHINE-unknown-managarm-mlibc\"\n-\t;;\n-    *:Minix:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-minix\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu\n+\texit ;;\n+    i*86:Minix:*:*)\n+\techo ${UNAME_MACHINE}-pc-minix\n+\texit ;;\n     aarch64:Linux:*:*)\n-\tset_cc_for_build\n-\tCPU=$UNAME_MACHINE\n-\tLIBCABI=$LIBC\n-\tif test \"$CC_FOR_BUILD\" != no_compiler_found; then\n-\t    ABI=64\n-\t    sed 's/^\t    //' << EOF > \"$dummy.c\"\n-\t    #ifdef __ARM_EABI__\n-\t    #ifdef __ARM_PCS_VFP\n-\t    ABI=eabihf\n-\t    #else\n-\t    ABI=eabi\n-\t    #endif\n-\t    #endif\n-EOF\n-\t    cc_set_abi=`$CC_FOR_BUILD -E \"$dummy.c\" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`\n-\t    eval \"$cc_set_abi\"\n-\t    case $ABI in\n-\t\teabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;\n-\t    esac\n-\tfi\n-\tGUESS=$CPU-unknown-linux-$LIBCABI\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     aarch64_be:Linux:*:*)\n \tUNAME_MACHINE=aarch64_be\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     alpha:Linux:*:*)\n-\tcase `sed -n '/^cpu model/s/^.*: \\(.*\\)/\\1/p' /proc/cpuinfo 2>/dev/null` in\n+\tcase `sed -n '/^cpu model/s/^.*: \\(.*\\)/\\1/p' < /proc/cpuinfo` in\n \t  EV5)   UNAME_MACHINE=alphaev5 ;;\n \t  EV56)  UNAME_MACHINE=alphaev56 ;;\n \t  PCA56) UNAME_MACHINE=alphapca56 ;;\n@@ -1021,246 +879,168 @@ EOF\n \t  EV68*) UNAME_MACHINE=alphaev68 ;;\n \tesac\n \tobjdump --private-headers /bin/sh | grep -q ld.so.1\n-\tif test \"$?\" = 0 ; then LIBC=gnulibc1 ; fi\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n-    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\tif test \"$?\" = 0 ; then LIBC=\"libc1\" ; else LIBC=\"\" ; fi\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}\n+\texit ;;\n     arm*:Linux:*:*)\n-\tset_cc_for_build\n+\teval $set_cc_for_build\n \tif echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \\\n \t    | grep -q __ARM_EABI__\n \tthen\n-\t    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n+\t    echo ${UNAME_MACHINE}-unknown-linux-gnu\n \telse\n \t    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \\\n \t\t| grep -q __ARM_PCS_VFP\n \t    then\n-\t\tGUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi\n+\t\techo ${UNAME_MACHINE}-unknown-linux-gnueabi\n \t    else\n-\t\tGUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf\n+\t\techo ${UNAME_MACHINE}-unknown-linux-gnueabihf\n \t    fi\n \tfi\n-\t;;\n+\texit ;;\n     avr32*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     cris:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-axis-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-axis-linux-gnu\n+\texit ;;\n     crisv32:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-axis-linux-$LIBC\n-\t;;\n-    e2k:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-axis-linux-gnu\n+\texit ;;\n     frv:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     hexagon:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     i*86:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-pc-linux-$LIBC\n-\t;;\n+\tLIBC=gnu\n+\teval $set_cc_for_build\n+\tsed 's/^\t//' << EOF >$dummy.c\n+\t#ifdef __dietlibc__\n+\tLIBC=dietlibc\n+\t#endif\n+EOF\n+\teval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`\n+\techo \"${UNAME_MACHINE}-pc-linux-${LIBC}\"\n+\texit ;;\n     ia64:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n-    k1om:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n-    kvx:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n-    kvx:cos:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-cos\n-\t;;\n-    kvx:mbr:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-mbr\n-\t;;\n-    loongarch32:Linux:*:* | loongarch64:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     m32r*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     m68*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     mips:Linux:*:* | mips64:Linux:*:*)\n-\tset_cc_for_build\n-\tIS_GLIBC=0\n-\ttest x\"${LIBC}\" = xgnu && IS_GLIBC=1\n-\tsed 's/^\t//' << EOF > \"$dummy.c\"\n+\teval $set_cc_for_build\n+\tsed 's/^\t//' << EOF >$dummy.c\n \t#undef CPU\n-\t#undef mips\n-\t#undef mipsel\n-\t#undef mips64\n-\t#undef mips64el\n-\t#if ${IS_GLIBC} && defined(_ABI64)\n-\tLIBCABI=gnuabi64\n-\t#else\n-\t#if ${IS_GLIBC} && defined(_ABIN32)\n-\tLIBCABI=gnuabin32\n-\t#else\n-\tLIBCABI=${LIBC}\n-\t#endif\n-\t#endif\n-\n-\t#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6\n-\tCPU=mipsisa64r6\n-\t#else\n-\t#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6\n-\tCPU=mipsisa32r6\n-\t#else\n-\t#if defined(__mips64)\n-\tCPU=mips64\n-\t#else\n-\tCPU=mips\n-\t#endif\n-\t#endif\n-\t#endif\n-\n+\t#undef ${UNAME_MACHINE}\n+\t#undef ${UNAME_MACHINE}el\n \t#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)\n-\tMIPS_ENDIAN=el\n+\tCPU=${UNAME_MACHINE}el\n \t#else\n \t#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)\n-\tMIPS_ENDIAN=\n+\tCPU=${UNAME_MACHINE}\n \t#else\n-\tMIPS_ENDIAN=\n+\tCPU=\n \t#endif\n \t#endif\n EOF\n-\tcc_set_vars=`$CC_FOR_BUILD -E \"$dummy.c\" 2>/dev/null | grep '^CPU\\|^MIPS_ENDIAN\\|^LIBCABI'`\n-\teval \"$cc_set_vars\"\n-\ttest \"x$CPU\" != x && { echo \"$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI\"; exit; }\n-\t;;\n-    mips64el:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n-    openrisc*:Linux:*:*)\n-\tGUESS=or1k-unknown-linux-$LIBC\n-\t;;\n-    or32:Linux:*:* | or1k*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n+\teval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`\n+\ttest x\"${CPU}\" != x && { echo \"${CPU}-unknown-linux-gnu\"; exit; }\n \t;;\n+    or32:Linux:*:*)\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     padre:Linux:*:*)\n-\tGUESS=sparc-unknown-linux-$LIBC\n-\t;;\n+\techo sparc-unknown-linux-gnu\n+\texit ;;\n     parisc64:Linux:*:* | hppa64:Linux:*:*)\n-\tGUESS=hppa64-unknown-linux-$LIBC\n-\t;;\n+\techo hppa64-unknown-linux-gnu\n+\texit ;;\n     parisc:Linux:*:* | hppa:Linux:*:*)\n \t# Look for CPU level\n \tcase `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in\n-\t  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;\n-\t  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;\n-\t  *)    GUESS=hppa-unknown-linux-$LIBC ;;\n+\t  PA7*) echo hppa1.1-unknown-linux-gnu ;;\n+\t  PA8*) echo hppa2.0-unknown-linux-gnu ;;\n+\t  *)    echo hppa-unknown-linux-gnu ;;\n \tesac\n-\t;;\n+\texit ;;\n     ppc64:Linux:*:*)\n-\tGUESS=powerpc64-unknown-linux-$LIBC\n-\t;;\n+\techo powerpc64-unknown-linux-gnu\n+\texit ;;\n     ppc:Linux:*:*)\n-\tGUESS=powerpc-unknown-linux-$LIBC\n-\t;;\n-    ppc64le:Linux:*:*)\n-\tGUESS=powerpc64le-unknown-linux-$LIBC\n-\t;;\n-    ppcle:Linux:*:*)\n-\tGUESS=powerpcle-unknown-linux-$LIBC\n-\t;;\n-    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo powerpc-unknown-linux-gnu\n+\texit ;;\n     s390:Linux:*:* | s390x:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-ibm-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-ibm-linux\n+\texit ;;\n     sh64*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     sh*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     sparc:Linux:*:* | sparc64:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     tile*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     vax:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-dec-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-dec-linux-gnu\n+\texit ;;\n     x86_64:Linux:*:*)\n-\tset_cc_for_build\n-\tCPU=$UNAME_MACHINE\n-\tLIBCABI=$LIBC\n-\tif test \"$CC_FOR_BUILD\" != no_compiler_found; then\n-\t    ABI=64\n-\t    sed 's/^\t    //' << EOF > \"$dummy.c\"\n-\t    #ifdef __i386__\n-\t    ABI=x86\n-\t    #else\n-\t    #ifdef __ILP32__\n-\t    ABI=x32\n-\t    #endif\n-\t    #endif\n-EOF\n-\t    cc_set_abi=`$CC_FOR_BUILD -E \"$dummy.c\" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`\n-\t    eval \"$cc_set_abi\"\n-\t    case $ABI in\n-\t\tx86) CPU=i686 ;;\n-\t\tx32) LIBCABI=${LIBC}x32 ;;\n-\t    esac\n-\tfi\n-\tGUESS=$CPU-pc-linux-$LIBCABI\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     xtensa*:Linux:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-linux-$LIBC\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-linux-gnu\n+\texit ;;\n     i*86:DYNIX/ptx:4*:*)\n \t# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.\n \t# earlier versions are messed up and put the nodename in both\n \t# sysname and nodename.\n-\tGUESS=i386-sequent-sysv4\n-\t;;\n+\techo i386-sequent-sysv4\n+\texit ;;\n     i*86:UNIX_SV:4.2MP:2.*)\n \t# Unixware is an offshoot of SVR4, but it has its own version\n \t# number series starting with 2...\n \t# I am not positive that other SVR4 systems won't match this,\n \t# I just have to hope.  -- rms.\n \t# Use sysv4.2uw... so that sysv4* matches it.\n-\tGUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}\n+\texit ;;\n     i*86:OS/2:*:*)\n-\t# If we were able to find 'uname', then EMX Unix compatibility\n+\t# If we were able to find `uname', then EMX Unix compatibility\n \t# is probably installed.\n-\tGUESS=$UNAME_MACHINE-pc-os2-emx\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-os2-emx\n+\texit ;;\n     i*86:XTS-300:*:STOP)\n-\tGUESS=$UNAME_MACHINE-unknown-stop\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-stop\n+\texit ;;\n     i*86:atheos:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-atheos\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-atheos\n+\texit ;;\n     i*86:syllable:*:*)\n-\tGUESS=$UNAME_MACHINE-pc-syllable\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-syllable\n+\texit ;;\n     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)\n-\tGUESS=i386-unknown-lynxos$UNAME_RELEASE\n-\t;;\n+\techo i386-unknown-lynxos${UNAME_RELEASE}\n+\texit ;;\n     i*86:*DOS:*:*)\n-\tGUESS=$UNAME_MACHINE-pc-msdosdjgpp\n-\t;;\n-    i*86:*:4.*:*)\n-\tUNAME_REL=`echo \"$UNAME_RELEASE\" | sed 's/\\/MP$//'`\n+\techo ${UNAME_MACHINE}-pc-msdosdjgpp\n+\texit ;;\n+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)\n+\tUNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\\/MP$//'`\n \tif grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then\n-\t\tGUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL\n+\t\techo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}\n \telse\n-\t\tGUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL\n+\t\techo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}\n \tfi\n-\t;;\n+\texit ;;\n     i*86:*:5:[678]*)\n \t# UnixWare 7.x, OpenUNIX and OpenServer 6.\n \tcase `/bin/uname -X | grep \"^Machine\"` in\n@@ -1268,12 +1048,12 @@ EOF\n \t    *Pentium)\t     UNAME_MACHINE=i586 ;;\n \t    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;\n \tesac\n-\tGUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}\n+\texit ;;\n     i*86:*:3.2:*)\n \tif test -f /usr/options/cb.name; then\n \t\tUNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`\n-\t\tGUESS=$UNAME_MACHINE-pc-isc$UNAME_REL\n+\t\techo ${UNAME_MACHINE}-pc-isc$UNAME_REL\n \telif /bin/uname -X 2>/dev/null >/dev/null ; then\n \t\tUNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`\n \t\t(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486\n@@ -1283,43 +1063,43 @@ EOF\n \t\t\t&& UNAME_MACHINE=i686\n \t\t(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \\\n \t\t\t&& UNAME_MACHINE=i686\n-\t\tGUESS=$UNAME_MACHINE-pc-sco$UNAME_REL\n+\t\techo ${UNAME_MACHINE}-pc-sco$UNAME_REL\n \telse\n-\t\tGUESS=$UNAME_MACHINE-pc-sysv32\n+\t\techo ${UNAME_MACHINE}-pc-sysv32\n \tfi\n-\t;;\n+\texit ;;\n     pc:*:*:*)\n \t# Left here for compatibility:\n \t# uname -m prints for DJGPP always 'pc', but it prints nothing about\n \t# the processor, so we play safe by assuming i586.\n \t# Note: whatever this is, it MUST be the same as what config.sub\n-\t# prints for the \"djgpp\" host, or else GDB configure will decide that\n+\t# prints for the \"djgpp\" host, or else GDB configury will decide that\n \t# this is a cross-build.\n-\tGUESS=i586-pc-msdosdjgpp\n-\t;;\n+\techo i586-pc-msdosdjgpp\n+\texit ;;\n     Intel:Mach:3*:*)\n-\tGUESS=i386-pc-mach3\n-\t;;\n+\techo i386-pc-mach3\n+\texit ;;\n     paragon:*:*:*)\n-\tGUESS=i860-intel-osf1\n-\t;;\n+\techo i860-intel-osf1\n+\texit ;;\n     i860:*:4.*:*) # i860-SVR4\n \tif grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then\n-\t  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4\n+\t  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4\n \telse # Add other i860-SVR4 vendors below as they are discovered.\n-\t  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4\n+\t  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4\n \tfi\n-\t;;\n+\texit ;;\n     mini*:CTIX:SYS*5:*)\n \t# \"miniframe\"\n-\tGUESS=m68010-convergent-sysv\n-\t;;\n+\techo m68010-convergent-sysv\n+\texit ;;\n     mc68k:UNIX:SYSTEM5:3.51m)\n-\tGUESS=m68k-convergent-sysv\n-\t;;\n+\techo m68k-convergent-sysv\n+\texit ;;\n     M680?0:D-NIX:5.3:*)\n-\tGUESS=m68k-diab-dnix\n-\t;;\n+\techo m68k-diab-dnix\n+\texit ;;\n     M68*:*:R3V[5678]*:*)\n \ttest -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;\n     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)\n@@ -1327,9 +1107,9 @@ EOF\n \ttest -r /etc/.relid \\\n \t&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \\([0-9][0-9]\\).*/\\1/p' < /etc/.relid`\n \t/bin/uname -p 2>/dev/null | grep 86 >/dev/null \\\n-\t  && { echo i486-ncr-sysv4.3\"$OS_REL\"; exit; }\n+\t  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }\n \t/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \\\n-\t  && { echo i586-ncr-sysv4.3\"$OS_REL\"; exit; } ;;\n+\t  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;\n     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)\n \t/bin/uname -p 2>/dev/null | grep 86 >/dev/null \\\n \t  && { echo i486-ncr-sysv4; exit; } ;;\n@@ -1338,292 +1118,227 @@ EOF\n \ttest -r /etc/.relid \\\n \t    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \\([0-9][0-9]\\).*/\\1/p' < /etc/.relid`\n \t/bin/uname -p 2>/dev/null | grep 86 >/dev/null \\\n-\t    && { echo i486-ncr-sysv4.3\"$OS_REL\"; exit; }\n+\t    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }\n \t/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \\\n-\t    && { echo i586-ncr-sysv4.3\"$OS_REL\"; exit; }\n+\t    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }\n \t/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \\\n-\t    && { echo i586-ncr-sysv4.3\"$OS_REL\"; exit; } ;;\n+\t    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;\n     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)\n-\tGUESS=m68k-unknown-lynxos$UNAME_RELEASE\n-\t;;\n+\techo m68k-unknown-lynxos${UNAME_RELEASE}\n+\texit ;;\n     mc68030:UNIX_System_V:4.*:*)\n-\tGUESS=m68k-atari-sysv4\n-\t;;\n+\techo m68k-atari-sysv4\n+\texit ;;\n     TSUNAMI:LynxOS:2.*:*)\n-\tGUESS=sparc-unknown-lynxos$UNAME_RELEASE\n-\t;;\n+\techo sparc-unknown-lynxos${UNAME_RELEASE}\n+\texit ;;\n     rs6000:LynxOS:2.*:*)\n-\tGUESS=rs6000-unknown-lynxos$UNAME_RELEASE\n-\t;;\n+\techo rs6000-unknown-lynxos${UNAME_RELEASE}\n+\texit ;;\n     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)\n-\tGUESS=powerpc-unknown-lynxos$UNAME_RELEASE\n-\t;;\n+\techo powerpc-unknown-lynxos${UNAME_RELEASE}\n+\texit ;;\n     SM[BE]S:UNIX_SV:*:*)\n-\tGUESS=mips-dde-sysv$UNAME_RELEASE\n-\t;;\n+\techo mips-dde-sysv${UNAME_RELEASE}\n+\texit ;;\n     RM*:ReliantUNIX-*:*:*)\n-\tGUESS=mips-sni-sysv4\n-\t;;\n+\techo mips-sni-sysv4\n+\texit ;;\n     RM*:SINIX-*:*:*)\n-\tGUESS=mips-sni-sysv4\n-\t;;\n+\techo mips-sni-sysv4\n+\texit ;;\n     *:SINIX-*:*:*)\n \tif uname -p 2>/dev/null >/dev/null ; then\n \t\tUNAME_MACHINE=`(uname -p) 2>/dev/null`\n-\t\tGUESS=$UNAME_MACHINE-sni-sysv4\n+\t\techo ${UNAME_MACHINE}-sni-sysv4\n \telse\n-\t\tGUESS=ns32k-sni-sysv\n+\t\techo ns32k-sni-sysv\n \tfi\n-\t;;\n-    PENTIUM:*:4.0*:*)\t# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort\n+\texit ;;\n+    PENTIUM:*:4.0*:*)\t# Unisys `ClearPath HMP IX 4000' SVR4/MP effort\n \t\t\t# says <Richard.M.Bartel@ccMail.Census.GOV>\n-\tGUESS=i586-unisys-sysv4\n-\t;;\n+\techo i586-unisys-sysv4\n+\texit ;;\n     *:UNIX_System_V:4*:FTX*)\n \t# From Gerald Hewes <hewes@openmarket.com>.\n \t# How about differentiating between stratus architectures? -djm\n-\tGUESS=hppa1.1-stratus-sysv4\n-\t;;\n+\techo hppa1.1-stratus-sysv4\n+\texit ;;\n     *:*:*:FTX*)\n \t# From seanf@swdc.stratus.com.\n-\tGUESS=i860-stratus-sysv4\n-\t;;\n+\techo i860-stratus-sysv4\n+\texit ;;\n     i*86:VOS:*:*)\n \t# From Paul.Green@stratus.com.\n-\tGUESS=$UNAME_MACHINE-stratus-vos\n-\t;;\n+\techo ${UNAME_MACHINE}-stratus-vos\n+\texit ;;\n     *:VOS:*:*)\n \t# From Paul.Green@stratus.com.\n-\tGUESS=hppa1.1-stratus-vos\n-\t;;\n+\techo hppa1.1-stratus-vos\n+\texit ;;\n     mc68*:A/UX:*:*)\n-\tGUESS=m68k-apple-aux$UNAME_RELEASE\n-\t;;\n+\techo m68k-apple-aux${UNAME_RELEASE}\n+\texit ;;\n     news*:NEWS-OS:6*:*)\n-\tGUESS=mips-sony-newsos6\n-\t;;\n+\techo mips-sony-newsos6\n+\texit ;;\n     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)\n-\tif test -d /usr/nec; then\n-\t\tGUESS=mips-nec-sysv$UNAME_RELEASE\n+\tif [ -d /usr/nec ]; then\n+\t\techo mips-nec-sysv${UNAME_RELEASE}\n \telse\n-\t\tGUESS=mips-unknown-sysv$UNAME_RELEASE\n+\t\techo mips-unknown-sysv${UNAME_RELEASE}\n \tfi\n-\t;;\n+\texit ;;\n     BeBox:BeOS:*:*)\t# BeOS running on hardware made by Be, PPC only.\n-\tGUESS=powerpc-be-beos\n-\t;;\n+\techo powerpc-be-beos\n+\texit ;;\n     BeMac:BeOS:*:*)\t# BeOS running on Mac or Mac clone, PPC only.\n-\tGUESS=powerpc-apple-beos\n-\t;;\n+\techo powerpc-apple-beos\n+\texit ;;\n     BePC:BeOS:*:*)\t# BeOS running on Intel PC compatible.\n-\tGUESS=i586-pc-beos\n-\t;;\n+\techo i586-pc-beos\n+\texit ;;\n     BePC:Haiku:*:*)\t# Haiku running on Intel PC compatible.\n-\tGUESS=i586-pc-haiku\n-\t;;\n-    ppc:Haiku:*:*)\t# Haiku running on Apple PowerPC\n-\tGUESS=powerpc-apple-haiku\n-\t;;\n-    *:Haiku:*:*)\t# Haiku modern gcc (not bound by BeOS compat)\n-\tGUESS=$UNAME_MACHINE-unknown-haiku\n-\t;;\n+\techo i586-pc-haiku\n+\texit ;;\n     SX-4:SUPER-UX:*:*)\n-\tGUESS=sx4-nec-superux$UNAME_RELEASE\n-\t;;\n+\techo sx4-nec-superux${UNAME_RELEASE}\n+\texit ;;\n     SX-5:SUPER-UX:*:*)\n-\tGUESS=sx5-nec-superux$UNAME_RELEASE\n-\t;;\n+\techo sx5-nec-superux${UNAME_RELEASE}\n+\texit ;;\n     SX-6:SUPER-UX:*:*)\n-\tGUESS=sx6-nec-superux$UNAME_RELEASE\n-\t;;\n+\techo sx6-nec-superux${UNAME_RELEASE}\n+\texit ;;\n     SX-7:SUPER-UX:*:*)\n-\tGUESS=sx7-nec-superux$UNAME_RELEASE\n-\t;;\n+\techo sx7-nec-superux${UNAME_RELEASE}\n+\texit ;;\n     SX-8:SUPER-UX:*:*)\n-\tGUESS=sx8-nec-superux$UNAME_RELEASE\n-\t;;\n+\techo sx8-nec-superux${UNAME_RELEASE}\n+\texit ;;\n     SX-8R:SUPER-UX:*:*)\n-\tGUESS=sx8r-nec-superux$UNAME_RELEASE\n-\t;;\n-    SX-ACE:SUPER-UX:*:*)\n-\tGUESS=sxace-nec-superux$UNAME_RELEASE\n-\t;;\n+\techo sx8r-nec-superux${UNAME_RELEASE}\n+\texit ;;\n     Power*:Rhapsody:*:*)\n-\tGUESS=powerpc-apple-rhapsody$UNAME_RELEASE\n-\t;;\n+\techo powerpc-apple-rhapsody${UNAME_RELEASE}\n+\texit ;;\n     *:Rhapsody:*:*)\n-\tGUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE\n-\t;;\n-    arm64:Darwin:*:*)\n-\tGUESS=aarch64-apple-darwin$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}\n+\texit ;;\n     *:Darwin:*:*)\n-\tUNAME_PROCESSOR=`uname -p`\n+\tUNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown\n \tcase $UNAME_PROCESSOR in\n+\t    i386)\n+\t\teval $set_cc_for_build\n+\t\tif [ \"$CC_FOR_BUILD\" != 'no_compiler_found' ]; then\n+\t\t  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \\\n+\t\t      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \\\n+\t\t      grep IS_64BIT_ARCH >/dev/null\n+\t\t  then\n+\t\t      UNAME_PROCESSOR=\"x86_64\"\n+\t\t  fi\n+\t\tfi ;;\n \t    unknown) UNAME_PROCESSOR=powerpc ;;\n \tesac\n-\tif command -v xcode-select > /dev/null 2> /dev/null && \\\n-\t\t! xcode-select --print-path > /dev/null 2> /dev/null ; then\n-\t    # Avoid executing cc if there is no toolchain installed as\n-\t    # cc will be a stub that puts up a graphical alert\n-\t    # prompting the user to install developer tools.\n-\t    CC_FOR_BUILD=no_compiler_found\n-\telse\n-\t    set_cc_for_build\n-\tfi\n-\tif test \"$CC_FOR_BUILD\" != no_compiler_found; then\n-\t    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \\\n-\t\t   (CCOPTS=\"\" $CC_FOR_BUILD -E - 2>/dev/null) | \\\n-\t\t   grep IS_64BIT_ARCH >/dev/null\n-\t    then\n-\t\tcase $UNAME_PROCESSOR in\n-\t\t    i386) UNAME_PROCESSOR=x86_64 ;;\n-\t\t    powerpc) UNAME_PROCESSOR=powerpc64 ;;\n-\t\tesac\n-\t    fi\n-\t    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc\n-\t    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \\\n-\t\t   (CCOPTS=\"\" $CC_FOR_BUILD -E - 2>/dev/null) | \\\n-\t\t   grep IS_PPC >/dev/null\n-\t    then\n-\t\tUNAME_PROCESSOR=powerpc\n-\t    fi\n-\telif test \"$UNAME_PROCESSOR\" = i386 ; then\n-\t    # uname -m returns i386 or x86_64\n-\t    UNAME_PROCESSOR=$UNAME_MACHINE\n-\tfi\n-\tGUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}\n+\texit ;;\n     *:procnto*:*:* | *:QNX:[0123456789]*:*)\n \tUNAME_PROCESSOR=`uname -p`\n-\tif test \"$UNAME_PROCESSOR\" = x86; then\n+\tif test \"$UNAME_PROCESSOR\" = \"x86\"; then\n \t\tUNAME_PROCESSOR=i386\n \t\tUNAME_MACHINE=pc\n \tfi\n-\tGUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}\n+\texit ;;\n     *:QNX:*:4*)\n-\tGUESS=i386-pc-qnx\n-\t;;\n-    NEO-*:NONSTOP_KERNEL:*:*)\n-\tGUESS=neo-tandem-nsk$UNAME_RELEASE\n-\t;;\n-    NSE-*:NONSTOP_KERNEL:*:*)\n-\tGUESS=nse-tandem-nsk$UNAME_RELEASE\n-\t;;\n-    NSR-*:NONSTOP_KERNEL:*:*)\n-\tGUESS=nsr-tandem-nsk$UNAME_RELEASE\n-\t;;\n-    NSV-*:NONSTOP_KERNEL:*:*)\n-\tGUESS=nsv-tandem-nsk$UNAME_RELEASE\n-\t;;\n-    NSX-*:NONSTOP_KERNEL:*:*)\n-\tGUESS=nsx-tandem-nsk$UNAME_RELEASE\n-\t;;\n+\techo i386-pc-qnx\n+\texit ;;\n+    NEO-?:NONSTOP_KERNEL:*:*)\n+\techo neo-tandem-nsk${UNAME_RELEASE}\n+\texit ;;\n+    NSE-?:NONSTOP_KERNEL:*:*)\n+\techo nse-tandem-nsk${UNAME_RELEASE}\n+\texit ;;\n+    NSR-?:NONSTOP_KERNEL:*:*)\n+\techo nsr-tandem-nsk${UNAME_RELEASE}\n+\texit ;;\n     *:NonStop-UX:*:*)\n-\tGUESS=mips-compaq-nonstopux\n-\t;;\n+\techo mips-compaq-nonstopux\n+\texit ;;\n     BS2000:POSIX*:*:*)\n-\tGUESS=bs2000-siemens-sysv\n-\t;;\n+\techo bs2000-siemens-sysv\n+\texit ;;\n     DS/*:UNIX_System_V:*:*)\n-\tGUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE\n-\t;;\n+\techo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}\n+\texit ;;\n     *:Plan9:*:*)\n \t# \"uname -m\" is not consistent, so use $cputype instead. 386\n \t# is converted to i386 for consistency with other x86\n \t# operating systems.\n-\tif test \"${cputype-}\" = 386; then\n+\tif test \"$cputype\" = \"386\"; then\n \t    UNAME_MACHINE=i386\n-\telif test \"x${cputype-}\" != x; then\n-\t    UNAME_MACHINE=$cputype\n+\telse\n+\t    UNAME_MACHINE=\"$cputype\"\n \tfi\n-\tGUESS=$UNAME_MACHINE-unknown-plan9\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-plan9\n+\texit ;;\n     *:TOPS-10:*:*)\n-\tGUESS=pdp10-unknown-tops10\n-\t;;\n+\techo pdp10-unknown-tops10\n+\texit ;;\n     *:TENEX:*:*)\n-\tGUESS=pdp10-unknown-tenex\n-\t;;\n+\techo pdp10-unknown-tenex\n+\texit ;;\n     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)\n-\tGUESS=pdp10-dec-tops20\n-\t;;\n+\techo pdp10-dec-tops20\n+\texit ;;\n     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)\n-\tGUESS=pdp10-xkl-tops20\n-\t;;\n+\techo pdp10-xkl-tops20\n+\texit ;;\n     *:TOPS-20:*:*)\n-\tGUESS=pdp10-unknown-tops20\n-\t;;\n+\techo pdp10-unknown-tops20\n+\texit ;;\n     *:ITS:*:*)\n-\tGUESS=pdp10-unknown-its\n-\t;;\n+\techo pdp10-unknown-its\n+\texit ;;\n     SEI:*:*:SEIUX)\n-\tGUESS=mips-sei-seiux$UNAME_RELEASE\n-\t;;\n+\techo mips-sei-seiux${UNAME_RELEASE}\n+\texit ;;\n     *:DragonFly:*:*)\n-\tDRAGONFLY_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/[-(].*//'`\n-\tGUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`\n+\texit ;;\n     *:*VMS:*:*)\n \tUNAME_MACHINE=`(uname -p) 2>/dev/null`\n-\tcase $UNAME_MACHINE in\n-\t    A*) GUESS=alpha-dec-vms ;;\n-\t    I*) GUESS=ia64-dec-vms ;;\n-\t    V*) GUESS=vax-dec-vms ;;\n+\tcase \"${UNAME_MACHINE}\" in\n+\t    A*) echo alpha-dec-vms ; exit ;;\n+\t    I*) echo ia64-dec-vms ; exit ;;\n+\t    V*) echo vax-dec-vms ; exit ;;\n \tesac ;;\n     *:XENIX:*:SysV)\n-\tGUESS=i386-pc-xenix\n-\t;;\n+\techo i386-pc-xenix\n+\texit ;;\n     i*86:skyos:*:*)\n-\tSKYOS_REL=`echo \"$UNAME_RELEASE\" | sed -e 's/ .*$//'`\n-\tGUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'\n+\texit ;;\n     i*86:rdos:*:*)\n-\tGUESS=$UNAME_MACHINE-pc-rdos\n-\t;;\n-    i*86:Fiwix:*:*)\n-\tGUESS=$UNAME_MACHINE-pc-fiwix\n-\t;;\n-    *:AROS:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-aros\n-\t;;\n+\techo ${UNAME_MACHINE}-pc-rdos\n+\texit ;;\n+    i*86:AROS:*:*)\n+\techo ${UNAME_MACHINE}-pc-aros\n+\texit ;;\n     x86_64:VMkernel:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-esx\n-\t;;\n-    amd64:Isilon\\ OneFS:*:*)\n-\tGUESS=x86_64-unknown-onefs\n-\t;;\n-    *:Unleashed:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE\n-\t;;\n-    *:Ironclad:*:*)\n-\tGUESS=$UNAME_MACHINE-unknown-ironclad\n-\t;;\n+\techo ${UNAME_MACHINE}-unknown-esx\n+\texit ;;\n esac\n \n-# Do we have a guess based on uname results?\n-if test \"x$GUESS\" != x; then\n-    echo \"$GUESS\"\n-    exit\n-fi\n+#echo '(No uname command or uname output not recognized.)' 1>&2\n+#echo \"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}\" 1>&2\n \n-# No uname command or uname output not recognized.\n-set_cc_for_build\n-cat > \"$dummy.c\" <<EOF\n+eval $set_cc_for_build\n+cat >$dummy.c <<EOF\n #ifdef _SEQUENT_\n-#include <sys/types.h>\n-#include <sys/utsname.h>\n-#endif\n-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)\n-#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)\n-#include <signal.h>\n-#if defined(_SIZE_T_) || defined(SIGLOST)\n-#include <sys/utsname.h>\n-#endif\n-#endif\n+# include <sys/types.h>\n+# include <sys/utsname.h>\n #endif\n-int\n main ()\n {\n #if defined (sony)\n@@ -1635,14 +1350,22 @@ main ()\n #include <sys/param.h>\n   printf (\"m68k-sony-newsos%s\\n\",\n #ifdef NEWSOS4\n-  \"4\"\n+\t\"4\"\n #else\n-  \"\"\n+\t\"\"\n #endif\n-  ); exit (0);\n+\t); exit (0);\n #endif\n #endif\n \n+#if defined (__arm) && defined (__acorn) && defined (__unix)\n+  printf (\"arm-acorn-riscix\\n\"); exit (0);\n+#endif\n+\n+#if defined (hp300) && !defined (hpux)\n+  printf (\"m68k-hp-bsd\\n\"); exit (0);\n+#endif\n+\n #if defined (NeXT)\n #if !defined (__ARCHITECTURE__)\n #define __ARCHITECTURE__ \"m68k\"\n@@ -1682,54 +1405,39 @@ main ()\n #endif\n \n #if defined (_SEQUENT_)\n-  struct utsname un;\n+    struct utsname un;\n+\n+    uname(&un);\n+\n+    if (strncmp(un.version, \"V2\", 2) == 0) {\n+\tprintf (\"i386-sequent-ptx2\\n\"); exit (0);\n+    }\n+    if (strncmp(un.version, \"V1\", 2) == 0) { /* XXX is V1 correct? */\n+\tprintf (\"i386-sequent-ptx1\\n\"); exit (0);\n+    }\n+    printf (\"i386-sequent-ptx\\n\"); exit (0);\n \n-  uname(&un);\n-  if (strncmp(un.version, \"V2\", 2) == 0) {\n-    printf (\"i386-sequent-ptx2\\n\"); exit (0);\n-  }\n-  if (strncmp(un.version, \"V1\", 2) == 0) { /* XXX is V1 correct? */\n-    printf (\"i386-sequent-ptx1\\n\"); exit (0);\n-  }\n-  printf (\"i386-sequent-ptx\\n\"); exit (0);\n #endif\n \n #if defined (vax)\n-#if !defined (ultrix)\n-#include <sys/param.h>\n-#if defined (BSD)\n-#if BSD == 43\n-  printf (\"vax-dec-bsd4.3\\n\"); exit (0);\n-#else\n-#if BSD == 199006\n-  printf (\"vax-dec-bsd4.3reno\\n\"); exit (0);\n-#else\n-  printf (\"vax-dec-bsd\\n\"); exit (0);\n-#endif\n-#endif\n-#else\n-  printf (\"vax-dec-bsd\\n\"); exit (0);\n-#endif\n-#else\n-#if defined(_SIZE_T_) || defined(SIGLOST)\n-  struct utsname un;\n-  uname (&un);\n-  printf (\"vax-dec-ultrix%s\\n\", un.release); exit (0);\n-#else\n-  printf (\"vax-dec-ultrix\\n\"); exit (0);\n-#endif\n-#endif\n-#endif\n-#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)\n-#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)\n-#if defined(_SIZE_T_) || defined(SIGLOST)\n-  struct utsname *un;\n-  uname (&un);\n-  printf (\"mips-dec-ultrix%s\\n\", un.release); exit (0);\n-#else\n-  printf (\"mips-dec-ultrix\\n\"); exit (0);\n-#endif\n-#endif\n+# if !defined (ultrix)\n+#  include <sys/param.h>\n+#  if defined (BSD)\n+#   if BSD == 43\n+      printf (\"vax-dec-bsd4.3\\n\"); exit (0);\n+#   else\n+#    if BSD == 199006\n+      printf (\"vax-dec-bsd4.3reno\\n\"); exit (0);\n+#    else\n+      printf (\"vax-dec-bsd\\n\"); exit (0);\n+#    endif\n+#   endif\n+#  else\n+    printf (\"vax-dec-bsd\\n\"); exit (0);\n+#  endif\n+# else\n+    printf (\"vax-dec-ultrix\\n\"); exit (0);\n+# endif\n #endif\n \n #if defined (alliant) && defined (i860)\n@@ -1740,46 +1448,54 @@ main ()\n }\n EOF\n \n-$CC_FOR_BUILD -o \"$dummy\" \"$dummy.c\" 2>/dev/null && SYSTEM_NAME=`\"$dummy\"` &&\n+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&\n \t{ echo \"$SYSTEM_NAME\"; exit; }\n \n # Apollos put the system type in the environment.\n-test -d /usr/apollo && { echo \"$ISP-apollo-$SYSTYPE\"; exit; }\n \n-echo \"$0: unable to guess system type\" >&2\n+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }\n \n-case $UNAME_MACHINE:$UNAME_SYSTEM in\n-    mips:Linux | mips64:Linux)\n-\t# If we got here on MIPS GNU/Linux, output extra information.\n-\tcat >&2 <<EOF\n+# Convex versions that predate uname can use getsysinfo(1)\n \n-NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize\n-the system type. Please install a C compiler and try again.\n-EOF\n-\t;;\n-esac\n+if [ -x /usr/convex/getsysinfo ]\n+then\n+    case `getsysinfo -f cpu_type` in\n+    c1*)\n+\techo c1-convex-bsd\n+\texit ;;\n+    c2*)\n+\tif getsysinfo -f scalar_acc\n+\tthen echo c32-convex-bsd\n+\telse echo c2-convex-bsd\n+\tfi\n+\texit ;;\n+    c34*)\n+\techo c34-convex-bsd\n+\texit ;;\n+    c38*)\n+\techo c38-convex-bsd\n+\texit ;;\n+    c4*)\n+\techo c4-convex-bsd\n+\texit ;;\n+    esac\n+fi\n \n cat >&2 <<EOF\n+$0: unable to guess system type\n \n-This script (version $timestamp), has failed to recognize the\n-operating system you are using. If your script is old, overwrite *all*\n-copies of config.guess and config.sub with the latest versions from:\n+This script, last modified $timestamp, has failed to recognize\n+the operating system you are using. It is advised that you\n+download the most up to date version of the config scripts from\n \n-  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess\n+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD\n and\n-  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub\n-EOF\n+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD\n \n-our_year=`echo $timestamp | sed 's,-.*,,'`\n-thisyear=`date +%Y`\n-# shellcheck disable=SC2003\n-script_age=`expr \"$thisyear\" - \"$our_year\"`\n-if test \"$script_age\" -lt 3 ; then\n-   cat >&2 <<EOF\n-\n-If $0 has already been updated, send the following data and any\n-information you think might be pertinent to config-patches@gnu.org to\n-provide the necessary information to handle your system.\n+If the version you run ($0) is already up to date, please\n+send the following data and any information you think might be\n+pertinent to <config-patches@gnu.org> in order to provide the needed\n+information to handle your system.\n \n config.guess timestamp = $timestamp\n \n@@ -1798,17 +1514,16 @@ hostinfo               = `(hostinfo) 2>/dev/null`\n /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`\n /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`\n \n-UNAME_MACHINE = \"$UNAME_MACHINE\"\n-UNAME_RELEASE = \"$UNAME_RELEASE\"\n-UNAME_SYSTEM  = \"$UNAME_SYSTEM\"\n-UNAME_VERSION = \"$UNAME_VERSION\"\n+UNAME_MACHINE = ${UNAME_MACHINE}\n+UNAME_RELEASE = ${UNAME_RELEASE}\n+UNAME_SYSTEM  = ${UNAME_SYSTEM}\n+UNAME_VERSION = ${UNAME_VERSION}\n EOF\n-fi\n \n exit 1\n \n # Local variables:\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"timestamp='\"\n # time-stamp-format: \"%:y-%02m-%02d\"\n # time-stamp-end: \"'\"\ndiff --git a/config.h.in b/config.h.in\nindex 3b21d17..fb2af85 100644\n--- a/config.h.in\n+++ b/config.h.in\n@@ -47,12 +47,12 @@\n /* Define to 1 if you have the <inttypes.h> header file. */\n #undef HAVE_INTTYPES_H\n \n+/* Define to 1 if you have the <memory.h> header file. */\n+#undef HAVE_MEMORY_H\n+\n /* Define to 1 if you have the <stdint.h> header file. */\n #undef HAVE_STDINT_H\n \n-/* Define to 1 if you have the <stdio.h> header file. */\n-#undef HAVE_STDIO_H\n-\n /* Define to 1 if you have the <stdlib.h> header file. */\n #undef HAVE_STDLIB_H\n \n@@ -95,9 +95,7 @@\n /* Define to the version of this package. */\n #undef PACKAGE_VERSION\n \n-/* Define to 1 if all of the C89 standard headers exist (not just the ones\n-   required in a freestanding environment). This macro is provided for\n-   backward compatibility; new code need not use it. */\n+/* Define to 1 if you have the ANSI C header files. */\n #undef STDC_HEADERS\n \n /* Version number of package */\ndiff --git a/config.sub b/config.sub\nindex 743b8c2..c894da4 100755\n--- a/config.sub\n+++ b/config.sub\n@@ -1,33 +1,36 @@\n-#!/usr/bin/sh\n+#! /bin/sh\n # Configuration validation subroutine script.\n-#   Copyright 1992-2024 Free Software Foundation, Inc.\n+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,\n+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,\n+#   2011, 2012 Free Software Foundation, Inc.\n \n-# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale\n+timestamp='2012-02-10'\n \n-timestamp='2024-05-27'\n-\n-# This file is free software; you can redistribute it and/or modify it\n-# under the terms of the GNU General Public License as published by\n-# the Free Software Foundation, either version 3 of the License, or\n+# This file is (in principle) common to ALL GNU software.\n+# The presence of a machine in this file suggests that SOME GNU software\n+# can handle that machine.  It does not imply ALL GNU software can.\n+#\n+# This file is free software; you can redistribute it and/or modify\n+# it under the terms of the GNU General Public License as published by\n+# the Free Software Foundation; either version 2 of the License, or\n # (at your option) any later version.\n #\n-# This program is distributed in the hope that it will be useful, but\n-# WITHOUT ANY WARRANTY; without even the implied warranty of\n-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n-# General Public License for more details.\n+# This program is distributed in the hope that it will be useful,\n+# but WITHOUT ANY WARRANTY; without even the implied warranty of\n+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n+# GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program; if not, see <https://www.gnu.org/licenses/>.\n+# along with this program; if not, see <http://www.gnu.org/licenses/>.\n #\n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n # configuration script generated by Autoconf, you may include it under\n-# the same distribution terms that you use for the rest of that\n-# program.  This Exception is an additional permission under section 7\n-# of the GNU General Public License, version 3 (\"GPLv3\").\n+# the same distribution terms that you use for the rest of that program.\n \n \n-# Please send patches to <config-patches@gnu.org>.\n+# Please send patches to <config-patches@gnu.org>.  Submit a context\n+# diff and a properly formatted GNU ChangeLog entry.\n #\n # Configuration subroutine to validate and canonicalize a configuration type.\n # Supply the specified configuration type as an argument.\n@@ -35,7 +38,7 @@ timestamp='2024-05-27'\n # Otherwise, we print the canonical config type on stdout and succeed.\n \n # You can get the latest version of this script from:\n-# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub\n+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD\n \n # This file is supposed to be the same for all GNU packages\n # and recognize all the CPU types, system types and aliases\n@@ -52,21 +55,15 @@ timestamp='2024-05-27'\n #\tCPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM\n # It is wrong to echo any other type of specification.\n \n-# The \"shellcheck disable\" line above the timestamp inhibits complaints\n-# about features and limitations of the classic Bourne shell that were\n-# superseded or lifted in POSIX.  However, this script identifies a wide\n-# variety of pre-POSIX systems that do not have POSIX shells at all, and\n-# even some reasonably current systems (Solaris 10 as case-in-point) still\n-# have a pre-POSIX /bin/sh.\n-\n me=`echo \"$0\" | sed -e 's,.*/,,'`\n \n usage=\"\\\n-Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS\n+Usage: $0 [OPTION] CPU-MFR-OPSYS\n+       $0 [OPTION] ALIAS\n \n Canonicalize a configuration name.\n \n-Options:\n+Operation modes:\n   -h, --help         print this help, then exit\n   -t, --time-stamp   print date of last modification, then exit\n   -v, --version      print version number, then exit\n@@ -76,13 +73,15 @@ Report bugs and patches to <config-patches@gnu.org>.\"\n version=\"\\\n GNU config.sub ($timestamp)\n \n-Copyright 1992-2024 Free Software Foundation, Inc.\n+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,\n+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\n+Free Software Foundation, Inc.\n \n This is free software; see the source for copying conditions.  There is NO\n warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\"\n \n help=\"\n-Try '$me --help' for more information.\"\n+Try \\`$me --help' for more information.\"\n \n # Parse command line\n while test $# -gt 0 ; do\n@@ -98,12 +97,12 @@ while test $# -gt 0 ; do\n     - )\t# Use stdin as input.\n        break ;;\n     -* )\n-       echo \"$me: invalid option $1$help\" >&2\n+       echo \"$me: invalid option $1$help\"\n        exit 1 ;;\n \n     *local*)\n        # First pass through any local machine types.\n-       echo \"$1\"\n+       echo $1\n        exit ;;\n \n     * )\n@@ -119,1619 +118,1394 @@ case $# in\n     exit 1;;\n esac\n \n-# Split fields of configuration type\n-saved_IFS=$IFS\n-IFS=\"-\" read field1 field2 field3 field4 <<EOF\n-$1\n-EOF\n-IFS=$saved_IFS\n+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).\n+# Here we must recognize all the valid KERNEL-OS combinations.\n+maybe_os=`echo $1 | sed 's/^\\(.*\\)-\\([^-]*-[^-]*\\)$/\\2/'`\n+case $maybe_os in\n+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \\\n+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \\\n+  knetbsd*-gnu* | netbsd*-gnu* | \\\n+  kopensolaris*-gnu* | \\\n+  storm-chaos* | os2-emx* | rtmk-nova*)\n+    os=-$maybe_os\n+    basic_machine=`echo $1 | sed 's/^\\(.*\\)-\\([^-]*-[^-]*\\)$/\\1/'`\n+    ;;\n+  android-linux)\n+    os=-linux-android\n+    basic_machine=`echo $1 | sed 's/^\\(.*\\)-\\([^-]*-[^-]*\\)$/\\1/'`-unknown\n+    ;;\n+  *)\n+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`\n+    if [ $basic_machine != $1 ]\n+    then os=`echo $1 | sed 's/.*-/-/'`\n+    else os=; fi\n+    ;;\n+esac\n \n-# Separate into logical components for further validation\n-case $1 in\n-\t*-*-*-*-*)\n-\t\techo \"Invalid configuration '$1': more than four components\" >&2\n-\t\texit 1\n+### Let's recognize common machines as not being operating systems so\n+### that things like config.sub decstation-3100 work.  We also\n+### recognize some manufacturers as not being operating systems, so we\n+### can provide default operating systems below.\n+case $os in\n+\t-sun*os*)\n+\t\t# Prevent following clause from handling this invalid input.\n+\t\t;;\n+\t-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \\\n+\t-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \\\n+\t-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \\\n+\t-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\\\n+\t-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \\\n+\t-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \\\n+\t-apple | -axis | -knuth | -cray | -microblaze)\n+\t\tos=\n+\t\tbasic_machine=$1\n \t\t;;\n-\t*-*-*-*)\n-\t\tbasic_machine=$field1-$field2\n-\t\tbasic_os=$field3-$field4\n+\t-bluegene*)\n+\t\tos=-cnk\n \t\t;;\n-\t*-*-*)\n-\t\t# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two\n-\t\t# parts\n-\t\tmaybe_os=$field2-$field3\n-\t\tcase $maybe_os in\n-\t\t\t  cloudabi*-eabi* \\\n-\t\t\t| kfreebsd*-gnu* \\\n-\t\t\t| knetbsd*-gnu* \\\n-\t\t\t| kopensolaris*-gnu* \\\n-\t\t\t| linux-* \\\n-\t\t\t| managarm-* \\\n-\t\t\t| netbsd*-eabi* \\\n-\t\t\t| netbsd*-gnu* \\\n-\t\t\t| nto-qnx* \\\n-\t\t\t| os2-emx* \\\n-\t\t\t| rtmk-nova* \\\n-\t\t\t| storm-chaos* \\\n-\t\t\t| uclinux-gnu* \\\n-\t\t\t| uclinux-uclibc* \\\n-\t\t\t| windows-* )\n-\t\t\t\tbasic_machine=$field1\n-\t\t\t\tbasic_os=$maybe_os\n-\t\t\t\t;;\n-\t\t\tandroid-linux)\n-\t\t\t\tbasic_machine=$field1-unknown\n-\t\t\t\tbasic_os=linux-android\n-\t\t\t\t;;\n-\t\t\t*)\n-\t\t\t\tbasic_machine=$field1-$field2\n-\t\t\t\tbasic_os=$field3\n-\t\t\t\t;;\n-\t\tesac\n+\t-sim | -cisco | -oki | -wec | -winbond)\n+\t\tos=\n+\t\tbasic_machine=$1\n \t\t;;\n-\t*-*)\n-\t\tcase $field1-$field2 in\n-\t\t\t# Shorthands that happen to contain a single dash\n-\t\t\tconvex-c[12] | convex-c3[248])\n-\t\t\t\tbasic_machine=$field2-convex\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tdecstation-3100)\n-\t\t\t\tbasic_machine=mips-dec\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\t*-*)\n-\t\t\t\t# Second component is usually, but not always the OS\n-\t\t\t\tcase $field2 in\n-\t\t\t\t\t# Do not treat sunos as a manufacturer\n-\t\t\t\t\tsun*os*)\n-\t\t\t\t\t\tbasic_machine=$field1\n-\t\t\t\t\t\tbasic_os=$field2\n-\t\t\t\t\t\t;;\n-\t\t\t\t\t# Manufacturers\n-\t\t\t\t\t  3100* \\\n-\t\t\t\t\t| 32* \\\n-\t\t\t\t\t| 3300* \\\n-\t\t\t\t\t| 3600* \\\n-\t\t\t\t\t| 7300* \\\n-\t\t\t\t\t| acorn \\\n-\t\t\t\t\t| altos* \\\n-\t\t\t\t\t| apollo \\\n-\t\t\t\t\t| apple \\\n-\t\t\t\t\t| atari \\\n-\t\t\t\t\t| att* \\\n-\t\t\t\t\t| axis \\\n-\t\t\t\t\t| be \\\n-\t\t\t\t\t| bull \\\n-\t\t\t\t\t| cbm \\\n-\t\t\t\t\t| ccur \\\n-\t\t\t\t\t| cisco \\\n-\t\t\t\t\t| commodore \\\n-\t\t\t\t\t| convergent* \\\n-\t\t\t\t\t| convex* \\\n-\t\t\t\t\t| cray \\\n-\t\t\t\t\t| crds \\\n-\t\t\t\t\t| dec* \\\n-\t\t\t\t\t| delta* \\\n-\t\t\t\t\t| dg \\\n-\t\t\t\t\t| digital \\\n-\t\t\t\t\t| dolphin \\\n-\t\t\t\t\t| encore* \\\n-\t\t\t\t\t| gould \\\n-\t\t\t\t\t| harris \\\n-\t\t\t\t\t| highlevel \\\n-\t\t\t\t\t| hitachi* \\\n-\t\t\t\t\t| hp \\\n-\t\t\t\t\t| ibm* \\\n-\t\t\t\t\t| intergraph \\\n-\t\t\t\t\t| isi* \\\n-\t\t\t\t\t| knuth \\\n-\t\t\t\t\t| masscomp \\\n-\t\t\t\t\t| microblaze* \\\n-\t\t\t\t\t| mips* \\\n-\t\t\t\t\t| motorola* \\\n-\t\t\t\t\t| ncr* \\\n-\t\t\t\t\t| news \\\n-\t\t\t\t\t| next \\\n-\t\t\t\t\t| ns \\\n-\t\t\t\t\t| oki \\\n-\t\t\t\t\t| omron* \\\n-\t\t\t\t\t| pc533* \\\n-\t\t\t\t\t| rebel \\\n-\t\t\t\t\t| rom68k \\\n-\t\t\t\t\t| rombug \\\n-\t\t\t\t\t| semi \\\n-\t\t\t\t\t| sequent* \\\n-\t\t\t\t\t| siemens \\\n-\t\t\t\t\t| sgi* \\\n-\t\t\t\t\t| siemens \\\n-\t\t\t\t\t| sim \\\n-\t\t\t\t\t| sni \\\n-\t\t\t\t\t| sony* \\\n-\t\t\t\t\t| stratus \\\n-\t\t\t\t\t| sun \\\n-\t\t\t\t\t| sun[234]* \\\n-\t\t\t\t\t| tektronix \\\n-\t\t\t\t\t| tti* \\\n-\t\t\t\t\t| ultra \\\n-\t\t\t\t\t| unicom* \\\n-\t\t\t\t\t| wec \\\n-\t\t\t\t\t| winbond \\\n-\t\t\t\t\t| wrs)\n-\t\t\t\t\t\tbasic_machine=$field1-$field2\n-\t\t\t\t\t\tbasic_os=\n-\t\t\t\t\t\t;;\n-\t\t\t\t\tzephyr*)\n-\t\t\t\t\t\tbasic_machine=$field1-unknown\n-\t\t\t\t\t\tbasic_os=$field2\n-\t\t\t\t\t\t;;\n-\t\t\t\t\t*)\n-\t\t\t\t\t\tbasic_machine=$field1\n-\t\t\t\t\t\tbasic_os=$field2\n-\t\t\t\t\t\t;;\n-\t\t\t\tesac\n-\t\t\t;;\n-\t\tesac\n+\t-scout)\n \t\t;;\n-\t*)\n-\t\t# Convert single-component short-hands not valid as part of\n-\t\t# multi-component configurations.\n-\t\tcase $field1 in\n-\t\t\t386bsd)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=bsd\n-\t\t\t\t;;\n-\t\t\ta29khif)\n-\t\t\t\tbasic_machine=a29k-amd\n-\t\t\t\tbasic_os=udi\n-\t\t\t\t;;\n-\t\t\tadobe68k)\n-\t\t\t\tbasic_machine=m68010-adobe\n-\t\t\t\tbasic_os=scout\n-\t\t\t\t;;\n-\t\t\talliant)\n-\t\t\t\tbasic_machine=fx80-alliant\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\taltos | altos3068)\n-\t\t\t\tbasic_machine=m68k-altos\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tam29k)\n-\t\t\t\tbasic_machine=a29k-none\n-\t\t\t\tbasic_os=bsd\n-\t\t\t\t;;\n-\t\t\tamdahl)\n-\t\t\t\tbasic_machine=580-amdahl\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tamiga)\n-\t\t\t\tbasic_machine=m68k-unknown\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tamigaos | amigados)\n-\t\t\t\tbasic_machine=m68k-unknown\n-\t\t\t\tbasic_os=amigaos\n-\t\t\t\t;;\n-\t\t\tamigaunix | amix)\n-\t\t\t\tbasic_machine=m68k-unknown\n-\t\t\t\tbasic_os=sysv4\n-\t\t\t\t;;\n-\t\t\tapollo68)\n-\t\t\t\tbasic_machine=m68k-apollo\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tapollo68bsd)\n-\t\t\t\tbasic_machine=m68k-apollo\n-\t\t\t\tbasic_os=bsd\n-\t\t\t\t;;\n-\t\t\taros)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=aros\n-\t\t\t\t;;\n-\t\t\taux)\n-\t\t\t\tbasic_machine=m68k-apple\n-\t\t\t\tbasic_os=aux\n-\t\t\t\t;;\n-\t\t\tbalance)\n-\t\t\t\tbasic_machine=ns32k-sequent\n-\t\t\t\tbasic_os=dynix\n-\t\t\t\t;;\n-\t\t\tblackfin)\n-\t\t\t\tbasic_machine=bfin-unknown\n-\t\t\t\tbasic_os=linux\n-\t\t\t\t;;\n-\t\t\tcegcc)\n-\t\t\t\tbasic_machine=arm-unknown\n-\t\t\t\tbasic_os=cegcc\n-\t\t\t\t;;\n-\t\t\tcray)\n-\t\t\t\tbasic_machine=j90-cray\n-\t\t\t\tbasic_os=unicos\n-\t\t\t\t;;\n-\t\t\tcrds | unos)\n-\t\t\t\tbasic_machine=m68k-crds\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tda30)\n-\t\t\t\tbasic_machine=m68k-da30\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tdecstation | pmax | pmin | dec3100 | decstatn)\n-\t\t\t\tbasic_machine=mips-dec\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tdelta88)\n-\t\t\t\tbasic_machine=m88k-motorola\n-\t\t\t\tbasic_os=sysv3\n-\t\t\t\t;;\n-\t\t\tdicos)\n-\t\t\t\tbasic_machine=i686-pc\n-\t\t\t\tbasic_os=dicos\n-\t\t\t\t;;\n-\t\t\tdjgpp)\n-\t\t\t\tbasic_machine=i586-pc\n-\t\t\t\tbasic_os=msdosdjgpp\n-\t\t\t\t;;\n-\t\t\tebmon29k)\n-\t\t\t\tbasic_machine=a29k-amd\n-\t\t\t\tbasic_os=ebmon\n-\t\t\t\t;;\n-\t\t\tes1800 | OSE68k | ose68k | ose | OSE)\n-\t\t\t\tbasic_machine=m68k-ericsson\n-\t\t\t\tbasic_os=ose\n-\t\t\t\t;;\n-\t\t\tgmicro)\n-\t\t\t\tbasic_machine=tron-gmicro\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tgo32)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=go32\n-\t\t\t\t;;\n-\t\t\th8300hms)\n-\t\t\t\tbasic_machine=h8300-hitachi\n-\t\t\t\tbasic_os=hms\n-\t\t\t\t;;\n-\t\t\th8300xray)\n-\t\t\t\tbasic_machine=h8300-hitachi\n-\t\t\t\tbasic_os=xray\n-\t\t\t\t;;\n-\t\t\th8500hms)\n-\t\t\t\tbasic_machine=h8500-hitachi\n-\t\t\t\tbasic_os=hms\n-\t\t\t\t;;\n-\t\t\tharris)\n-\t\t\t\tbasic_machine=m88k-harris\n-\t\t\t\tbasic_os=sysv3\n-\t\t\t\t;;\n-\t\t\thp300 | hp300hpux)\n-\t\t\t\tbasic_machine=m68k-hp\n-\t\t\t\tbasic_os=hpux\n-\t\t\t\t;;\n-\t\t\thp300bsd)\n-\t\t\t\tbasic_machine=m68k-hp\n-\t\t\t\tbasic_os=bsd\n-\t\t\t\t;;\n-\t\t\thppaosf)\n-\t\t\t\tbasic_machine=hppa1.1-hp\n-\t\t\t\tbasic_os=osf\n-\t\t\t\t;;\n-\t\t\thppro)\n-\t\t\t\tbasic_machine=hppa1.1-hp\n-\t\t\t\tbasic_os=proelf\n-\t\t\t\t;;\n-\t\t\ti386mach)\n-\t\t\t\tbasic_machine=i386-mach\n-\t\t\t\tbasic_os=mach\n-\t\t\t\t;;\n-\t\t\tisi68 | isi)\n-\t\t\t\tbasic_machine=m68k-isi\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tm68knommu)\n-\t\t\t\tbasic_machine=m68k-unknown\n-\t\t\t\tbasic_os=linux\n-\t\t\t\t;;\n-\t\t\tmagnum | m3230)\n-\t\t\t\tbasic_machine=mips-mips\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tmerlin)\n-\t\t\t\tbasic_machine=ns32k-utek\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tmingw64)\n-\t\t\t\tbasic_machine=x86_64-pc\n-\t\t\t\tbasic_os=mingw64\n-\t\t\t\t;;\n-\t\t\tmingw32)\n-\t\t\t\tbasic_machine=i686-pc\n-\t\t\t\tbasic_os=mingw32\n-\t\t\t\t;;\n-\t\t\tmingw32ce)\n-\t\t\t\tbasic_machine=arm-unknown\n-\t\t\t\tbasic_os=mingw32ce\n-\t\t\t\t;;\n-\t\t\tmonitor)\n-\t\t\t\tbasic_machine=m68k-rom68k\n-\t\t\t\tbasic_os=coff\n-\t\t\t\t;;\n-\t\t\tmorphos)\n-\t\t\t\tbasic_machine=powerpc-unknown\n-\t\t\t\tbasic_os=morphos\n-\t\t\t\t;;\n-\t\t\tmoxiebox)\n-\t\t\t\tbasic_machine=moxie-unknown\n-\t\t\t\tbasic_os=moxiebox\n-\t\t\t\t;;\n-\t\t\tmsdos)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=msdos\n-\t\t\t\t;;\n-\t\t\tmsys)\n-\t\t\t\tbasic_machine=i686-pc\n-\t\t\t\tbasic_os=msys\n-\t\t\t\t;;\n-\t\t\tmvs)\n-\t\t\t\tbasic_machine=i370-ibm\n-\t\t\t\tbasic_os=mvs\n-\t\t\t\t;;\n-\t\t\tnacl)\n-\t\t\t\tbasic_machine=le32-unknown\n-\t\t\t\tbasic_os=nacl\n-\t\t\t\t;;\n-\t\t\tncr3000)\n-\t\t\t\tbasic_machine=i486-ncr\n-\t\t\t\tbasic_os=sysv4\n-\t\t\t\t;;\n-\t\t\tnetbsd386)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=netbsd\n-\t\t\t\t;;\n-\t\t\tnetwinder)\n-\t\t\t\tbasic_machine=armv4l-rebel\n-\t\t\t\tbasic_os=linux\n-\t\t\t\t;;\n-\t\t\tnews | news700 | news800 | news900)\n-\t\t\t\tbasic_machine=m68k-sony\n-\t\t\t\tbasic_os=newsos\n-\t\t\t\t;;\n-\t\t\tnews1000)\n-\t\t\t\tbasic_machine=m68030-sony\n-\t\t\t\tbasic_os=newsos\n-\t\t\t\t;;\n-\t\t\tnecv70)\n-\t\t\t\tbasic_machine=v70-nec\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tnh3000)\n-\t\t\t\tbasic_machine=m68k-harris\n-\t\t\t\tbasic_os=cxux\n-\t\t\t\t;;\n-\t\t\tnh[45]000)\n-\t\t\t\tbasic_machine=m88k-harris\n-\t\t\t\tbasic_os=cxux\n-\t\t\t\t;;\n-\t\t\tnindy960)\n-\t\t\t\tbasic_machine=i960-intel\n-\t\t\t\tbasic_os=nindy\n-\t\t\t\t;;\n-\t\t\tmon960)\n-\t\t\t\tbasic_machine=i960-intel\n-\t\t\t\tbasic_os=mon960\n-\t\t\t\t;;\n-\t\t\tnonstopux)\n-\t\t\t\tbasic_machine=mips-compaq\n-\t\t\t\tbasic_os=nonstopux\n-\t\t\t\t;;\n-\t\t\tos400)\n-\t\t\t\tbasic_machine=powerpc-ibm\n-\t\t\t\tbasic_os=os400\n-\t\t\t\t;;\n-\t\t\tOSE68000 | ose68000)\n-\t\t\t\tbasic_machine=m68000-ericsson\n-\t\t\t\tbasic_os=ose\n-\t\t\t\t;;\n-\t\t\tos68k)\n-\t\t\t\tbasic_machine=m68k-none\n-\t\t\t\tbasic_os=os68k\n-\t\t\t\t;;\n-\t\t\tparagon)\n-\t\t\t\tbasic_machine=i860-intel\n-\t\t\t\tbasic_os=osf\n-\t\t\t\t;;\n-\t\t\tparisc)\n-\t\t\t\tbasic_machine=hppa-unknown\n-\t\t\t\tbasic_os=linux\n-\t\t\t\t;;\n-\t\t\tpsp)\n-\t\t\t\tbasic_machine=mipsallegrexel-sony\n-\t\t\t\tbasic_os=psp\n-\t\t\t\t;;\n-\t\t\tpw32)\n-\t\t\t\tbasic_machine=i586-unknown\n-\t\t\t\tbasic_os=pw32\n-\t\t\t\t;;\n-\t\t\trdos | rdos64)\n-\t\t\t\tbasic_machine=x86_64-pc\n-\t\t\t\tbasic_os=rdos\n-\t\t\t\t;;\n-\t\t\trdos32)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=rdos\n-\t\t\t\t;;\n-\t\t\trom68k)\n-\t\t\t\tbasic_machine=m68k-rom68k\n-\t\t\t\tbasic_os=coff\n-\t\t\t\t;;\n-\t\t\tsa29200)\n-\t\t\t\tbasic_machine=a29k-amd\n-\t\t\t\tbasic_os=udi\n-\t\t\t\t;;\n-\t\t\tsei)\n-\t\t\t\tbasic_machine=mips-sei\n-\t\t\t\tbasic_os=seiux\n-\t\t\t\t;;\n-\t\t\tsequent)\n-\t\t\t\tbasic_machine=i386-sequent\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tsps7)\n-\t\t\t\tbasic_machine=m68k-bull\n-\t\t\t\tbasic_os=sysv2\n-\t\t\t\t;;\n-\t\t\tst2000)\n-\t\t\t\tbasic_machine=m68k-tandem\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tstratus)\n-\t\t\t\tbasic_machine=i860-stratus\n-\t\t\t\tbasic_os=sysv4\n-\t\t\t\t;;\n-\t\t\tsun2)\n-\t\t\t\tbasic_machine=m68000-sun\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tsun2os3)\n-\t\t\t\tbasic_machine=m68000-sun\n-\t\t\t\tbasic_os=sunos3\n-\t\t\t\t;;\n-\t\t\tsun2os4)\n-\t\t\t\tbasic_machine=m68000-sun\n-\t\t\t\tbasic_os=sunos4\n-\t\t\t\t;;\n-\t\t\tsun3)\n-\t\t\t\tbasic_machine=m68k-sun\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tsun3os3)\n-\t\t\t\tbasic_machine=m68k-sun\n-\t\t\t\tbasic_os=sunos3\n-\t\t\t\t;;\n-\t\t\tsun3os4)\n-\t\t\t\tbasic_machine=m68k-sun\n-\t\t\t\tbasic_os=sunos4\n-\t\t\t\t;;\n-\t\t\tsun4)\n-\t\t\t\tbasic_machine=sparc-sun\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tsun4os3)\n-\t\t\t\tbasic_machine=sparc-sun\n-\t\t\t\tbasic_os=sunos3\n-\t\t\t\t;;\n-\t\t\tsun4os4)\n-\t\t\t\tbasic_machine=sparc-sun\n-\t\t\t\tbasic_os=sunos4\n-\t\t\t\t;;\n-\t\t\tsun4sol2)\n-\t\t\t\tbasic_machine=sparc-sun\n-\t\t\t\tbasic_os=solaris2\n-\t\t\t\t;;\n-\t\t\tsun386 | sun386i | roadrunner)\n-\t\t\t\tbasic_machine=i386-sun\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\t\tsv1)\n-\t\t\t\tbasic_machine=sv1-cray\n-\t\t\t\tbasic_os=unicos\n-\t\t\t\t;;\n-\t\t\tsymmetry)\n-\t\t\t\tbasic_machine=i386-sequent\n-\t\t\t\tbasic_os=dynix\n-\t\t\t\t;;\n-\t\t\tt3e)\n-\t\t\t\tbasic_machine=alphaev5-cray\n-\t\t\t\tbasic_os=unicos\n-\t\t\t\t;;\n-\t\t\tt90)\n-\t\t\t\tbasic_machine=t90-cray\n-\t\t\t\tbasic_os=unicos\n-\t\t\t\t;;\n-\t\t\ttoad1)\n-\t\t\t\tbasic_machine=pdp10-xkl\n-\t\t\t\tbasic_os=tops20\n-\t\t\t\t;;\n-\t\t\ttpf)\n-\t\t\t\tbasic_machine=s390x-ibm\n-\t\t\t\tbasic_os=tpf\n-\t\t\t\t;;\n-\t\t\tudi29k)\n-\t\t\t\tbasic_machine=a29k-amd\n-\t\t\t\tbasic_os=udi\n-\t\t\t\t;;\n-\t\t\tultra3)\n-\t\t\t\tbasic_machine=a29k-nyu\n-\t\t\t\tbasic_os=sym1\n-\t\t\t\t;;\n-\t\t\tv810 | necv810)\n-\t\t\t\tbasic_machine=v810-nec\n-\t\t\t\tbasic_os=none\n-\t\t\t\t;;\n-\t\t\tvaxv)\n-\t\t\t\tbasic_machine=vax-dec\n-\t\t\t\tbasic_os=sysv\n-\t\t\t\t;;\n-\t\t\tvms)\n-\t\t\t\tbasic_machine=vax-dec\n-\t\t\t\tbasic_os=vms\n-\t\t\t\t;;\n-\t\t\tvsta)\n-\t\t\t\tbasic_machine=i386-pc\n-\t\t\t\tbasic_os=vsta\n-\t\t\t\t;;\n-\t\t\tvxworks960)\n-\t\t\t\tbasic_machine=i960-wrs\n-\t\t\t\tbasic_os=vxworks\n-\t\t\t\t;;\n-\t\t\tvxworks68)\n-\t\t\t\tbasic_machine=m68k-wrs\n-\t\t\t\tbasic_os=vxworks\n-\t\t\t\t;;\n-\t\t\tvxworks29k)\n-\t\t\t\tbasic_machine=a29k-wrs\n-\t\t\t\tbasic_os=vxworks\n-\t\t\t\t;;\n-\t\t\txbox)\n-\t\t\t\tbasic_machine=i686-pc\n-\t\t\t\tbasic_os=mingw32\n-\t\t\t\t;;\n-\t\t\tymp)\n-\t\t\t\tbasic_machine=ymp-cray\n-\t\t\t\tbasic_os=unicos\n-\t\t\t\t;;\n-\t\t\t*)\n-\t\t\t\tbasic_machine=$1\n-\t\t\t\tbasic_os=\n-\t\t\t\t;;\n-\t\tesac\n+\t-wrs)\n+\t\tos=-vxworks\n+\t\tbasic_machine=$1\n+\t\t;;\n+\t-chorusos*)\n+\t\tos=-chorusos\n+\t\tbasic_machine=$1\n+\t\t;;\n+\t-chorusrdb)\n+\t\tos=-chorusrdb\n+\t\tbasic_machine=$1\n+\t\t;;\n+\t-hiux*)\n+\t\tos=-hiuxwe2\n+\t\t;;\n+\t-sco6)\n+\t\tos=-sco5v6\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-sco5)\n+\t\tos=-sco3.2v5\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-sco4)\n+\t\tos=-sco3.2v4\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-sco3.2.[4-9]*)\n+\t\tos=`echo $os | sed -e 's/sco3.2./sco3.2v/'`\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-sco3.2v[4-9]*)\n+\t\t# Don't forget version if it is 3.2v4 or newer.\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-sco5v6*)\n+\t\t# Don't forget version if it is 3.2v4 or newer.\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-sco*)\n+\t\tos=-sco3.2v2\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-udk*)\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-isc)\n+\t\tos=-isc2.2\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-clix*)\n+\t\tbasic_machine=clipper-intergraph\n+\t\t;;\n+\t-isc*)\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`\n+\t\t;;\n+\t-lynx*)\n+\t\tos=-lynxos\n+\t\t;;\n+\t-ptx*)\n+\t\tbasic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`\n+\t\t;;\n+\t-windowsnt*)\n+\t\tos=`echo $os | sed -e 's/windowsnt/winnt/'`\n+\t\t;;\n+\t-psos*)\n+\t\tos=-psos\n+\t\t;;\n+\t-mint | -mint[0-9]*)\n+\t\tbasic_machine=m68k-atari\n+\t\tos=-mint\n \t\t;;\n esac\n \n-# Decode 1-component or ad-hoc basic machines\n+# Decode aliases for certain CPU-COMPANY combinations.\n case $basic_machine in\n-\t# Here we handle the default manufacturer of certain CPU types.  It is in\n-\t# some cases the only manufacturer, in others, it is the most popular.\n-\tw89k)\n-\t\tcpu=hppa1.1\n-\t\tvendor=winbond\n+\t# Recognize the basic CPU types without company name.\n+\t# Some are omitted here because they have special meanings below.\n+\t1750a | 580 \\\n+\t| a29k \\\n+\t| aarch64 | aarch64_be \\\n+\t| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \\\n+\t| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \\\n+\t| am33_2.0 \\\n+\t| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \\\n+        | be32 | be64 \\\n+\t| bfin \\\n+\t| c4x | clipper \\\n+\t| d10v | d30v | dlx | dsp16xx \\\n+\t| epiphany \\\n+\t| fido | fr30 | frv \\\n+\t| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \\\n+\t| hexagon \\\n+\t| i370 | i860 | i960 | ia64 \\\n+\t| ip2k | iq2000 \\\n+\t| le32 | le64 \\\n+\t| lm32 \\\n+\t| m32c | m32r | m32rle | m68000 | m68k | m88k \\\n+\t| maxq | mb | microblaze | mcore | mep | metag \\\n+\t| mips | mipsbe | mipseb | mipsel | mipsle \\\n+\t| mips16 \\\n+\t| mips64 | mips64el \\\n+\t| mips64octeon | mips64octeonel \\\n+\t| mips64orion | mips64orionel \\\n+\t| mips64r5900 | mips64r5900el \\\n+\t| mips64vr | mips64vrel \\\n+\t| mips64vr4100 | mips64vr4100el \\\n+\t| mips64vr4300 | mips64vr4300el \\\n+\t| mips64vr5000 | mips64vr5000el \\\n+\t| mips64vr5900 | mips64vr5900el \\\n+\t| mipsisa32 | mipsisa32el \\\n+\t| mipsisa32r2 | mipsisa32r2el \\\n+\t| mipsisa64 | mipsisa64el \\\n+\t| mipsisa64r2 | mipsisa64r2el \\\n+\t| mipsisa64sb1 | mipsisa64sb1el \\\n+\t| mipsisa64sr71k | mipsisa64sr71kel \\\n+\t| mipstx39 | mipstx39el \\\n+\t| mn10200 | mn10300 \\\n+\t| moxie \\\n+\t| mt \\\n+\t| msp430 \\\n+\t| nds32 | nds32le | nds32be \\\n+\t| nios | nios2 \\\n+\t| ns16k | ns32k \\\n+\t| open8 \\\n+\t| or32 \\\n+\t| pdp10 | pdp11 | pj | pjl \\\n+\t| powerpc | powerpc64 | powerpc64le | powerpcle \\\n+\t| pyramid \\\n+\t| rl78 | rx \\\n+\t| score \\\n+\t| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \\\n+\t| sh64 | sh64le \\\n+\t| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \\\n+\t| sparcv8 | sparcv9 | sparcv9b | sparcv9v \\\n+\t| spu \\\n+\t| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \\\n+\t| ubicom32 \\\n+\t| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \\\n+\t| we32k \\\n+\t| x86 | xc16x | xstormy16 | xtensa \\\n+\t| z8k | z80)\n+\t\tbasic_machine=$basic_machine-unknown\n+\t\t;;\n+\tc54x)\n+\t\tbasic_machine=tic54x-unknown\n+\t\t;;\n+\tc55x)\n+\t\tbasic_machine=tic55x-unknown\n+\t\t;;\n+\tc6x)\n+\t\tbasic_machine=tic6x-unknown\n+\t\t;;\n+\tm6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)\n+\t\tbasic_machine=$basic_machine-unknown\n+\t\tos=-none\n+\t\t;;\n+\tm88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)\n+\t\t;;\n+\tms1)\n+\t\tbasic_machine=mt-unknown\n \t\t;;\n-\top50n)\n-\t\tcpu=hppa1.1\n-\t\tvendor=oki\n+\n+\tstrongarm | thumb | xscale)\n+\t\tbasic_machine=arm-unknown\n \t\t;;\n-\top60c)\n-\t\tcpu=hppa1.1\n-\t\tvendor=oki\n+\txgate)\n+\t\tbasic_machine=$basic_machine-unknown\n+\t\tos=-none\n \t\t;;\n-\tibm*)\n-\t\tcpu=i370\n-\t\tvendor=ibm\n+\txscaleeb)\n+\t\tbasic_machine=armeb-unknown\n \t\t;;\n-\torion105)\n-\t\tcpu=clipper\n-\t\tvendor=highlevel\n+\n+\txscaleel)\n+\t\tbasic_machine=armel-unknown\n \t\t;;\n-\tmac | mpw | mac-mpw)\n-\t\tcpu=m68k\n-\t\tvendor=apple\n+\n+\t# We use `pc' rather than `unknown'\n+\t# because (1) that's what they normally are, and\n+\t# (2) the word \"unknown\" tends to confuse beginning users.\n+\ti*86 | x86_64)\n+\t  basic_machine=$basic_machine-pc\n+\t  ;;\n+\t# Object if more than one company name word.\n+\t*-*-*)\n+\t\techo Invalid configuration \\`$1\\': machine \\`$basic_machine\\' not recognized 1>&2\n+\t\texit 1\n \t\t;;\n-\tpmac | pmac-mpw)\n-\t\tcpu=powerpc\n-\t\tvendor=apple\n+\t# Recognize the basic CPU types with company name.\n+\t580-* \\\n+\t| a29k-* \\\n+\t| aarch64-* | aarch64_be-* \\\n+\t| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \\\n+\t| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \\\n+\t| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \\\n+\t| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \\\n+\t| avr-* | avr32-* \\\n+\t| be32-* | be64-* \\\n+\t| bfin-* | bs2000-* \\\n+\t| c[123]* | c30-* | [cjt]90-* | c4x-* \\\n+\t| clipper-* | craynv-* | cydra-* \\\n+\t| d10v-* | d30v-* | dlx-* \\\n+\t| elxsi-* \\\n+\t| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \\\n+\t| h8300-* | h8500-* \\\n+\t| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \\\n+\t| hexagon-* \\\n+\t| i*86-* | i860-* | i960-* | ia64-* \\\n+\t| ip2k-* | iq2000-* \\\n+\t| le32-* | le64-* \\\n+\t| lm32-* \\\n+\t| m32c-* | m32r-* | m32rle-* \\\n+\t| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \\\n+\t| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \\\n+\t| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \\\n+\t| mips16-* \\\n+\t| mips64-* | mips64el-* \\\n+\t| mips64octeon-* | mips64octeonel-* \\\n+\t| mips64orion-* | mips64orionel-* \\\n+\t| mips64r5900-* | mips64r5900el-* \\\n+\t| mips64vr-* | mips64vrel-* \\\n+\t| mips64vr4100-* | mips64vr4100el-* \\\n+\t| mips64vr4300-* | mips64vr4300el-* \\\n+\t| mips64vr5000-* | mips64vr5000el-* \\\n+\t| mips64vr5900-* | mips64vr5900el-* \\\n+\t| mipsisa32-* | mipsisa32el-* \\\n+\t| mipsisa32r2-* | mipsisa32r2el-* \\\n+\t| mipsisa64-* | mipsisa64el-* \\\n+\t| mipsisa64r2-* | mipsisa64r2el-* \\\n+\t| mipsisa64sb1-* | mipsisa64sb1el-* \\\n+\t| mipsisa64sr71k-* | mipsisa64sr71kel-* \\\n+\t| mipstx39-* | mipstx39el-* \\\n+\t| mmix-* \\\n+\t| mt-* \\\n+\t| msp430-* \\\n+\t| nds32-* | nds32le-* | nds32be-* \\\n+\t| nios-* | nios2-* \\\n+\t| none-* | np1-* | ns16k-* | ns32k-* \\\n+\t| open8-* \\\n+\t| orion-* \\\n+\t| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \\\n+\t| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \\\n+\t| pyramid-* \\\n+\t| rl78-* | romp-* | rs6000-* | rx-* \\\n+\t| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \\\n+\t| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \\\n+\t| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \\\n+\t| sparclite-* \\\n+\t| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \\\n+\t| tahoe-* \\\n+\t| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \\\n+\t| tile*-* \\\n+\t| tron-* \\\n+\t| ubicom32-* \\\n+\t| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \\\n+\t| vax-* \\\n+\t| we32k-* \\\n+\t| x86-* | x86_64-* | xc16x-* | xps100-* \\\n+\t| xstormy16-* | xtensa*-* \\\n+\t| ymp-* \\\n+\t| z8k-* | z80-*)\n+\t\t;;\n+\t# Recognize the basic CPU types without company name, with glob match.\n+\txtensa*)\n+\t\tbasic_machine=$basic_machine-unknown\n \t\t;;\n-\n \t# Recognize the various machine names and aliases which stand\n \t# for a CPU type and a company and sometimes even an OS.\n+\t386bsd)\n+\t\tbasic_machine=i386-unknown\n+\t\tos=-bsd\n+\t\t;;\n \t3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)\n-\t\tcpu=m68000\n-\t\tvendor=att\n+\t\tbasic_machine=m68000-att\n \t\t;;\n \t3b*)\n-\t\tcpu=we32k\n-\t\tvendor=att\n+\t\tbasic_machine=we32k-att\n+\t\t;;\n+\ta29khif)\n+\t\tbasic_machine=a29k-amd\n+\t\tos=-udi\n+\t\t;;\n+\tabacus)\n+\t\tbasic_machine=abacus-unknown\n+\t\t;;\n+\tadobe68k)\n+\t\tbasic_machine=m68010-adobe\n+\t\tos=-scout\n+\t\t;;\n+\talliant | fx80)\n+\t\tbasic_machine=fx80-alliant\n+\t\t;;\n+\taltos | altos3068)\n+\t\tbasic_machine=m68k-altos\n+\t\t;;\n+\tam29k)\n+\t\tbasic_machine=a29k-none\n+\t\tos=-bsd\n+\t\t;;\n+\tamd64)\n+\t\tbasic_machine=x86_64-pc\n+\t\t;;\n+\tamd64-*)\n+\t\tbasic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\t;;\n+\tamdahl)\n+\t\tbasic_machine=580-amdahl\n+\t\tos=-sysv\n+\t\t;;\n+\tamiga | amiga-*)\n+\t\tbasic_machine=m68k-unknown\n+\t\t;;\n+\tamigaos | amigados)\n+\t\tbasic_machine=m68k-unknown\n+\t\tos=-amigaos\n+\t\t;;\n+\tamigaunix | amix)\n+\t\tbasic_machine=m68k-unknown\n+\t\tos=-sysv4\n+\t\t;;\n+\tapollo68)\n+\t\tbasic_machine=m68k-apollo\n+\t\tos=-sysv\n+\t\t;;\n+\tapollo68bsd)\n+\t\tbasic_machine=m68k-apollo\n+\t\tos=-bsd\n+\t\t;;\n+\taros)\n+\t\tbasic_machine=i386-pc\n+\t\tos=-aros\n+\t\t;;\n+\taux)\n+\t\tbasic_machine=m68k-apple\n+\t\tos=-aux\n+\t\t;;\n+\tbalance)\n+\t\tbasic_machine=ns32k-sequent\n+\t\tos=-dynix\n+\t\t;;\n+\tblackfin)\n+\t\tbasic_machine=bfin-unknown\n+\t\tos=-linux\n+\t\t;;\n+\tblackfin-*)\n+\t\tbasic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\tos=-linux\n \t\t;;\n \tbluegene*)\n-\t\tcpu=powerpc\n-\t\tvendor=ibm\n-\t\tbasic_os=cnk\n+\t\tbasic_machine=powerpc-ibm\n+\t\tos=-cnk\n+\t\t;;\n+\tc54x-*)\n+\t\tbasic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\t;;\n+\tc55x-*)\n+\t\tbasic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\t;;\n+\tc6x-*)\n+\t\tbasic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\t;;\n+\tc90)\n+\t\tbasic_machine=c90-cray\n+\t\tos=-unicos\n+\t\t;;\n+\tcegcc)\n+\t\tbasic_machine=arm-unknown\n+\t\tos=-cegcc\n+\t\t;;\n+\tconvex-c1)\n+\t\tbasic_machine=c1-convex\n+\t\tos=-bsd\n+\t\t;;\n+\tconvex-c2)\n+\t\tbasic_machine=c2-convex\n+\t\tos=-bsd\n+\t\t;;\n+\tconvex-c32)\n+\t\tbasic_machine=c32-convex\n+\t\tos=-bsd\n+\t\t;;\n+\tconvex-c34)\n+\t\tbasic_machine=c34-convex\n+\t\tos=-bsd\n+\t\t;;\n+\tconvex-c38)\n+\t\tbasic_machine=c38-convex\n+\t\tos=-bsd\n+\t\t;;\n+\tcray | j90)\n+\t\tbasic_machine=j90-cray\n+\t\tos=-unicos\n+\t\t;;\n+\tcraynv)\n+\t\tbasic_machine=craynv-cray\n+\t\tos=-unicosmp\n+\t\t;;\n+\tcr16 | cr16-*)\n+\t\tbasic_machine=cr16-unknown\n+\t\tos=-elf\n+\t\t;;\n+\tcrds | unos)\n+\t\tbasic_machine=m68k-crds\n+\t\t;;\n+\tcrisv32 | crisv32-* | etraxfs*)\n+\t\tbasic_machine=crisv32-axis\n+\t\t;;\n+\tcris | cris-* | etrax*)\n+\t\tbasic_machine=cris-axis\n+\t\t;;\n+\tcrx)\n+\t\tbasic_machine=crx-unknown\n+\t\tos=-elf\n+\t\t;;\n+\tda30 | da30-*)\n+\t\tbasic_machine=m68k-da30\n+\t\t;;\n+\tdecstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)\n+\t\tbasic_machine=mips-dec\n \t\t;;\n \tdecsystem10* | dec10*)\n-\t\tcpu=pdp10\n-\t\tvendor=dec\n-\t\tbasic_os=tops10\n+\t\tbasic_machine=pdp10-dec\n+\t\tos=-tops10\n \t\t;;\n \tdecsystem20* | dec20*)\n-\t\tcpu=pdp10\n-\t\tvendor=dec\n-\t\tbasic_os=tops20\n-\t\t;;\n-\tdelta | 3300 | delta-motorola | 3300-motorola | motorola-delta | motorola-3300)\n-\t\tcpu=m68k\n-\t\tvendor=motorola\n-\t\t;;\n-\t# This used to be dpx2*, but that gets the RS6000-based\n-\t# DPX/20 and the x86-based DPX/2-100 wrong.  See\n-\t# https://oldskool.silicium.org/stations/bull_dpx20.htm\n-\t# https://www.feb-patrimoine.com/english/bull_dpx2.htm\n-\t# https://www.feb-patrimoine.com/english/unix_and_bull.htm\n-\tdpx2 | dpx2[23]00 | dpx2[23]xx)\n-\t\tcpu=m68k\n-\t\tvendor=bull\n-\t\t;;\n-\tdpx2100 | dpx21xx)\n-\t\tcpu=i386\n-\t\tvendor=bull\n-\t\t;;\n-\tdpx20)\n-\t\tcpu=rs6000\n-\t\tvendor=bull\n+\t\tbasic_machine=pdp10-dec\n+\t\tos=-tops20\n \t\t;;\n-\tencore | umax | mmax)\n-\t\tcpu=ns32k\n-\t\tvendor=encore\n+\tdelta | 3300 | motorola-3300 | motorola-delta \\\n+\t      | 3300-motorola | delta-motorola)\n+\t\tbasic_machine=m68k-motorola\n+\t\t;;\n+\tdelta88)\n+\t\tbasic_machine=m88k-motorola\n+\t\tos=-sysv3\n+\t\t;;\n+\tdicos)\n+\t\tbasic_machine=i686-pc\n+\t\tos=-dicos\n+\t\t;;\n+\tdjgpp)\n+\t\tbasic_machine=i586-pc\n+\t\tos=-msdosdjgpp\n+\t\t;;\n+\tdpx20 | dpx20-*)\n+\t\tbasic_machine=rs6000-bull\n+\t\tos=-bosx\n+\t\t;;\n+\tdpx2* | dpx2*-bull)\n+\t\tbasic_machine=m68k-bull\n+\t\tos=-sysv3\n+\t\t;;\n+\tebmon29k)\n+\t\tbasic_machine=a29k-amd\n+\t\tos=-ebmon\n \t\t;;\n \telxsi)\n-\t\tcpu=elxsi\n-\t\tvendor=elxsi\n-\t\tbasic_os=${basic_os:-bsd}\n+\t\tbasic_machine=elxsi-elxsi\n+\t\tos=-bsd\n+\t\t;;\n+\tencore | umax | mmax)\n+\t\tbasic_machine=ns32k-encore\n+\t\t;;\n+\tes1800 | OSE68k | ose68k | ose | OSE)\n+\t\tbasic_machine=m68k-ericsson\n+\t\tos=-ose\n \t\t;;\n \tfx2800)\n-\t\tcpu=i860\n-\t\tvendor=alliant\n+\t\tbasic_machine=i860-alliant\n \t\t;;\n \tgenix)\n-\t\tcpu=ns32k\n-\t\tvendor=ns\n+\t\tbasic_machine=ns32k-ns\n+\t\t;;\n+\tgmicro)\n+\t\tbasic_machine=tron-gmicro\n+\t\tos=-sysv\n+\t\t;;\n+\tgo32)\n+\t\tbasic_machine=i386-pc\n+\t\tos=-go32\n \t\t;;\n \th3050r* | hiux*)\n-\t\tcpu=hppa1.1\n-\t\tvendor=hitachi\n-\t\tbasic_os=hiuxwe2\n+\t\tbasic_machine=hppa1.1-hitachi\n+\t\tos=-hiuxwe2\n+\t\t;;\n+\th8300hms)\n+\t\tbasic_machine=h8300-hitachi\n+\t\tos=-hms\n+\t\t;;\n+\th8300xray)\n+\t\tbasic_machine=h8300-hitachi\n+\t\tos=-xray\n+\t\t;;\n+\th8500hms)\n+\t\tbasic_machine=h8500-hitachi\n+\t\tos=-hms\n+\t\t;;\n+\tharris)\n+\t\tbasic_machine=m88k-harris\n+\t\tos=-sysv3\n+\t\t;;\n+\thp300-*)\n+\t\tbasic_machine=m68k-hp\n+\t\t;;\n+\thp300bsd)\n+\t\tbasic_machine=m68k-hp\n+\t\tos=-bsd\n+\t\t;;\n+\thp300hpux)\n+\t\tbasic_machine=m68k-hp\n+\t\tos=-hpux\n \t\t;;\n \thp3k9[0-9][0-9] | hp9[0-9][0-9])\n-\t\tcpu=hppa1.0\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.0-hp\n \t\t;;\n \thp9k2[0-9][0-9] | hp9k31[0-9])\n-\t\tcpu=m68000\n-\t\tvendor=hp\n+\t\tbasic_machine=m68000-hp\n \t\t;;\n \thp9k3[2-9][0-9])\n-\t\tcpu=m68k\n-\t\tvendor=hp\n+\t\tbasic_machine=m68k-hp\n \t\t;;\n \thp9k6[0-9][0-9] | hp6[0-9][0-9])\n-\t\tcpu=hppa1.0\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.0-hp\n \t\t;;\n \thp9k7[0-79][0-9] | hp7[0-79][0-9])\n-\t\tcpu=hppa1.1\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.1-hp\n \t\t;;\n \thp9k78[0-9] | hp78[0-9])\n \t\t# FIXME: really hppa2.0-hp\n-\t\tcpu=hppa1.1\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.1-hp\n \t\t;;\n \thp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)\n \t\t# FIXME: really hppa2.0-hp\n-\t\tcpu=hppa1.1\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.1-hp\n \t\t;;\n \thp9k8[0-9][13679] | hp8[0-9][13679])\n-\t\tcpu=hppa1.1\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.1-hp\n \t\t;;\n \thp9k8[0-9][0-9] | hp8[0-9][0-9])\n-\t\tcpu=hppa1.0\n-\t\tvendor=hp\n+\t\tbasic_machine=hppa1.0-hp\n+\t\t;;\n+\thppa-next)\n+\t\tos=-nextstep3\n+\t\t;;\n+\thppaosf)\n+\t\tbasic_machine=hppa1.1-hp\n+\t\tos=-osf\n+\t\t;;\n+\thppro)\n+\t\tbasic_machine=hppa1.1-hp\n+\t\tos=-proelf\n+\t\t;;\n+\ti370-ibm* | ibm*)\n+\t\tbasic_machine=i370-ibm\n \t\t;;\n \ti*86v32)\n-\t\tcpu=`echo \"$1\" | sed -e 's/86.*/86/'`\n-\t\tvendor=pc\n-\t\tbasic_os=sysv32\n+\t\tbasic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`\n+\t\tos=-sysv32\n \t\t;;\n \ti*86v4*)\n-\t\tcpu=`echo \"$1\" | sed -e 's/86.*/86/'`\n-\t\tvendor=pc\n-\t\tbasic_os=sysv4\n+\t\tbasic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`\n+\t\tos=-sysv4\n \t\t;;\n \ti*86v)\n-\t\tcpu=`echo \"$1\" | sed -e 's/86.*/86/'`\n-\t\tvendor=pc\n-\t\tbasic_os=sysv\n+\t\tbasic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`\n+\t\tos=-sysv\n \t\t;;\n \ti*86sol2)\n-\t\tcpu=`echo \"$1\" | sed -e 's/86.*/86/'`\n-\t\tvendor=pc\n-\t\tbasic_os=solaris2\n+\t\tbasic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`\n+\t\tos=-solaris2\n+\t\t;;\n+\ti386mach)\n+\t\tbasic_machine=i386-mach\n+\t\tos=-mach\n \t\t;;\n-\tj90 | j90-cray)\n-\t\tcpu=j90\n-\t\tvendor=cray\n-\t\tbasic_os=${basic_os:-unicos}\n+\ti386-vsta | vsta)\n+\t\tbasic_machine=i386-unknown\n+\t\tos=-vsta\n \t\t;;\n \tiris | iris4d)\n-\t\tcpu=mips\n-\t\tvendor=sgi\n-\t\tcase $basic_os in\n-\t\t    irix*)\n+\t\tbasic_machine=mips-sgi\n+\t\tcase $os in\n+\t\t    -irix*)\n \t\t\t;;\n \t\t    *)\n-\t\t\tbasic_os=irix4\n+\t\t\tos=-irix4\n \t\t\t;;\n \t\tesac\n \t\t;;\n+\tisi68 | isi)\n+\t\tbasic_machine=m68k-isi\n+\t\tos=-sysv\n+\t\t;;\n+\tm68knommu)\n+\t\tbasic_machine=m68k-unknown\n+\t\tos=-linux\n+\t\t;;\n+\tm68knommu-*)\n+\t\tbasic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\tos=-linux\n+\t\t;;\n+\tm88k-omron*)\n+\t\tbasic_machine=m88k-omron\n+\t\t;;\n+\tmagnum | m3230)\n+\t\tbasic_machine=mips-mips\n+\t\tos=-sysv\n+\t\t;;\n+\tmerlin)\n+\t\tbasic_machine=ns32k-utek\n+\t\tos=-sysv\n+\t\t;;\n+\tmicroblaze)\n+\t\tbasic_machine=microblaze-xilinx\n+\t\t;;\n+\tmingw32)\n+\t\tbasic_machine=i386-pc\n+\t\tos=-mingw32\n+\t\t;;\n+\tmingw32ce)\n+\t\tbasic_machine=arm-unknown\n+\t\tos=-mingw32ce\n+\t\t;;\n \tminiframe)\n-\t\tcpu=m68000\n-\t\tvendor=convergent\n+\t\tbasic_machine=m68000-convergent\n+\t\t;;\n+\t*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)\n+\t\tbasic_machine=m68k-atari\n+\t\tos=-mint\n+\t\t;;\n+\tmips3*-*)\n+\t\tbasic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`\n+\t\t;;\n+\tmips3*)\n+\t\tbasic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown\n \t\t;;\n-\t*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)\n-\t\tcpu=m68k\n-\t\tvendor=atari\n-\t\tbasic_os=mint\n+\tmonitor)\n+\t\tbasic_machine=m68k-rom68k\n+\t\tos=-coff\n+\t\t;;\n+\tmorphos)\n+\t\tbasic_machine=powerpc-unknown\n+\t\tos=-morphos\n+\t\t;;\n+\tmsdos)\n+\t\tbasic_machine=i386-pc\n+\t\tos=-msdos\n+\t\t;;\n+\tms1-*)\n+\t\tbasic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`\n+\t\t;;\n+\tmsys)\n+\t\tbasic_machine=i386-pc\n+\t\tos=-msys\n+\t\t;;\n+\tmvs)\n+\t\tbasic_machine=i370-ibm\n+\t\tos=-mvs\n+\t\t;;\n+\tnacl)\n+\t\tbasic_machine=le32-unknown\n+\t\tos=-nacl\n+\t\t;;\n+\tncr3000)\n+\t\tbasic_machine=i486-ncr\n+\t\tos=-sysv4\n+\t\t;;\n+\tnetbsd386)\n+\t\tbasic_machine=i386-unknown\n+\t\tos=-netbsd\n+\t\t;;\n+\tnetwinder)\n+\t\tbasic_machine=armv4l-rebel\n+\t\tos=-linux\n+\t\t;;\n+\tnews | news700 | news800 | news900)\n+\t\tbasic_machine=m68k-sony\n+\t\tos=-newsos\n+\t\t;;\n+\tnews1000)\n+\t\tbasic_machine=m68030-sony\n+\t\tos=-newsos\n \t\t;;\n \tnews-3600 | risc-news)\n-\t\tcpu=mips\n-\t\tvendor=sony\n-\t\tbasic_os=newsos\n+\t\tbasic_machine=mips-sony\n+\t\tos=-newsos\n \t\t;;\n-\tnext | m*-next)\n-\t\tcpu=m68k\n-\t\tvendor=next\n+\tnecv70)\n+\t\tbasic_machine=v70-nec\n+\t\tos=-sysv\n+\t\t;;\n+\tnext | m*-next )\n+\t\tbasic_machine=m68k-next\n+\t\tcase $os in\n+\t\t    -nextstep* )\n+\t\t\t;;\n+\t\t    -ns2*)\n+\t\t      os=-nextstep2\n+\t\t\t;;\n+\t\t    *)\n+\t\t      os=-nextstep3\n+\t\t\t;;\n+\t\tesac\n+\t\t;;\n+\tnh3000)\n+\t\tbasic_machine=m68k-harris\n+\t\tos=-cxux\n+\t\t;;\n+\tnh[45]000)\n+\t\tbasic_machine=m88k-harris\n+\t\tos=-cxux\n+\t\t;;\n+\tnindy960)\n+\t\tbasic_machine=i960-intel\n+\t\tos=-nindy\n+\t\t;;\n+\tmon960)\n+\t\tbasic_machine=i960-intel\n+\t\tos=-mon960\n+\t\t;;\n+\tnonstopux)\n+\t\tbasic_machine=mips-compaq\n+\t\tos=-nonstopux\n \t\t;;\n \tnp1)\n-\t\tcpu=np1\n-\t\tvendor=gould\n+\t\tbasic_machine=np1-gould\n+\t\t;;\n+\tneo-tandem)\n+\t\tbasic_machine=neo-tandem\n+\t\t;;\n+\tnse-tandem)\n+\t\tbasic_machine=nse-tandem\n+\t\t;;\n+\tnsr-tandem)\n+\t\tbasic_machine=nsr-tandem\n \t\t;;\n \top50n-* | op60c-*)\n-\t\tcpu=hppa1.1\n-\t\tvendor=oki\n-\t\tbasic_os=proelf\n+\t\tbasic_machine=hppa1.1-oki\n+\t\tos=-proelf\n+\t\t;;\n+\topenrisc | openrisc-*)\n+\t\tbasic_machine=or32-unknown\n+\t\t;;\n+\tos400)\n+\t\tbasic_machine=powerpc-ibm\n+\t\tos=-os400\n+\t\t;;\n+\tOSE68000 | ose68000)\n+\t\tbasic_machine=m68000-ericsson\n+\t\tos=-ose\n+\t\t;;\n+\tos68k)\n+\t\tbasic_machine=m68k-none\n+\t\tos=-os68k\n \t\t;;\n \tpa-hitachi)\n-\t\tcpu=hppa1.1\n-\t\tvendor=hitachi\n-\t\tbasic_os=hiuxwe2\n+\t\tbasic_machine=hppa1.1-hitachi\n+\t\tos=-hiuxwe2\n+\t\t;;\n+\tparagon)\n+\t\tbasic_machine=i860-intel\n+\t\tos=-osf\n+\t\t;;\n+\tparisc)\n+\t\tbasic_machine=hppa-unknown\n+\t\tos=-linux\n+\t\t;;\n+\tparisc-*)\n+\t\tbasic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`\n+\t\tos=-linux\n \t\t;;\n \tpbd)\n-\t\tcpu=sparc\n-\t\tvendor=tti\n+\t\tbasic_machine=sparc-tti\n \t\t;;\n \tpbb)\n-\t\tcpu=m68k\n-\t\tvendor=tti\n+\t\tbasic_machine=m68k-tti\n \t\t;;\n-\tpc532)\n-\t\tcpu=ns32k\n-\t\tvendor=pc532\n+\tpc532 | pc532-*)\n+\t\tbasic_machine=ns32k-pc532\n \t\t;;\n-\tpn)\n-\t\tcpu=pn\n-\t\tvendor=gould\n+\tpc98)\n+\t\tbasic_machine=i386-pc\n \t\t;;\n-\tpower)\n-\t\tcpu=power\n-\t\tvendor=ibm\n+\tpc98-*)\n+\t\tbasic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tps2)\n-\t\tcpu=i386\n-\t\tvendor=ibm\n+\tpentium | p5 | k5 | k6 | nexgen | viac3)\n+\t\tbasic_machine=i586-pc\n \t\t;;\n-\trm[46]00)\n-\t\tcpu=mips\n-\t\tvendor=siemens\n+\tpentiumpro | p6 | 6x86 | athlon | athlon_*)\n+\t\tbasic_machine=i686-pc\n \t\t;;\n-\trtpc | rtpc-*)\n-\t\tcpu=romp\n-\t\tvendor=ibm\n+\tpentiumii | pentium2 | pentiumiii | pentium3)\n+\t\tbasic_machine=i686-pc\n \t\t;;\n-\tsde)\n-\t\tcpu=mipsisa32\n-\t\tvendor=sde\n-\t\tbasic_os=${basic_os:-elf}\n+\tpentium4)\n+\t\tbasic_machine=i786-pc\n \t\t;;\n-\tsimso-wrs)\n-\t\tcpu=sparclite\n-\t\tvendor=wrs\n-\t\tbasic_os=vxworks\n+\tpentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)\n+\t\tbasic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\ttower | tower-32)\n-\t\tcpu=m68k\n-\t\tvendor=ncr\n+\tpentiumpro-* | p6-* | 6x86-* | athlon-*)\n+\t\tbasic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tvpp*|vx|vx-*)\n-\t\tcpu=f301\n-\t\tvendor=fujitsu\n+\tpentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)\n+\t\tbasic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tw65)\n-\t\tcpu=w65\n-\t\tvendor=wdc\n+\tpentium4-*)\n+\t\tbasic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tw89k-*)\n-\t\tcpu=hppa1.1\n-\t\tvendor=winbond\n-\t\tbasic_os=proelf\n+\tpn)\n+\t\tbasic_machine=pn-gould\n \t\t;;\n-\tnone)\n-\t\tcpu=none\n-\t\tvendor=none\n+\tpower)\tbasic_machine=power-ibm\n \t\t;;\n-\tleon|leon[3-9])\n-\t\tcpu=sparc\n-\t\tvendor=$basic_machine\n+\tppc | ppcbe)\tbasic_machine=powerpc-unknown\n \t\t;;\n-\tleon-*|leon[3-9]-*)\n-\t\tcpu=sparc\n-\t\tvendor=`echo \"$basic_machine\" | sed 's/-.*//'`\n+\tppc-* | ppcbe-*)\n+\t\tbasic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\n-\t*-*)\n-\t\tsaved_IFS=$IFS\n-\t\tIFS=\"-\" read cpu vendor <<EOF\n-$basic_machine\n-EOF\n-\t\tIFS=$saved_IFS\n-\t\t;;\n-\t# We use 'pc' rather than 'unknown'\n-\t# because (1) that's what they normally are, and\n-\t# (2) the word \"unknown\" tends to confuse beginning users.\n-\ti*86 | x86_64)\n-\t\tcpu=$basic_machine\n-\t\tvendor=pc\n+\tppcle | powerpclittle | ppc-le | powerpc-little)\n+\t\tbasic_machine=powerpcle-unknown\n \t\t;;\n-\t# These rules are duplicated from below for sake of the special case above;\n-\t# i.e. things that normalized to x86 arches should also default to \"pc\"\n-\tpc98)\n-\t\tcpu=i386\n-\t\tvendor=pc\n+\tppcle-* | powerpclittle-*)\n+\t\tbasic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tx64 | amd64)\n-\t\tcpu=x86_64\n-\t\tvendor=pc\n+\tppc64)\tbasic_machine=powerpc64-unknown\n \t\t;;\n-\t# Recognize the basic CPU types without company name.\n-\t*)\n-\t\tcpu=$basic_machine\n-\t\tvendor=unknown\n+\tppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-esac\n-\n-unset -v basic_machine\n-\n-# Decode basic machines in the full and proper CPU-Company form.\n-case $cpu-$vendor in\n-\t# Here we handle the default manufacturer of certain CPU types in canonical form.\n-\t# It is in some cases the only manufacturer, in others, it is the most popular.\n-\tc[12]-convex | c[12]-unknown | c3[248]-convex | c3[248]-unknown)\n-\t\tvendor=convex\n-\t\tbasic_os=${basic_os:-bsd}\n+\tppc64le | powerpc64little | ppc64-le | powerpc64-little)\n+\t\tbasic_machine=powerpc64le-unknown\n \t\t;;\n-\tcraynv-unknown)\n-\t\tvendor=cray\n-\t\tbasic_os=${basic_os:-unicosmp}\n+\tppc64le-* | powerpc64little-*)\n+\t\tbasic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tc90-unknown | c90-cray)\n-\t\tvendor=cray\n-\t\tbasic_os=${basic_os:-unicos}\n+\tps2)\n+\t\tbasic_machine=i386-ibm\n \t\t;;\n-\tfx80-unknown)\n-\t\tvendor=alliant\n+\tpw32)\n+\t\tbasic_machine=i586-unknown\n+\t\tos=-pw32\n \t\t;;\n-\tromp-unknown)\n-\t\tvendor=ibm\n+\trdos)\n+\t\tbasic_machine=i386-pc\n+\t\tos=-rdos\n \t\t;;\n-\tmmix-unknown)\n-\t\tvendor=knuth\n+\trom68k)\n+\t\tbasic_machine=m68k-rom68k\n+\t\tos=-coff\n \t\t;;\n-\tmicroblaze-unknown | microblazeel-unknown)\n-\t\tvendor=xilinx\n+\trm[46]00)\n+\t\tbasic_machine=mips-siemens\n \t\t;;\n-\trs6000-unknown)\n-\t\tvendor=ibm\n+\trtpc | rtpc-*)\n+\t\tbasic_machine=romp-ibm\n \t\t;;\n-\tvax-unknown)\n-\t\tvendor=dec\n+\ts390 | s390-*)\n+\t\tbasic_machine=s390-ibm\n \t\t;;\n-\tpdp11-unknown)\n-\t\tvendor=dec\n+\ts390x | s390x-*)\n+\t\tbasic_machine=s390x-ibm\n \t\t;;\n-\twe32k-unknown)\n-\t\tvendor=att\n+\tsa29200)\n+\t\tbasic_machine=a29k-amd\n+\t\tos=-udi\n \t\t;;\n-\tcydra-unknown)\n-\t\tvendor=cydrome\n+\tsb1)\n+\t\tbasic_machine=mipsisa64sb1-unknown\n \t\t;;\n-\ti370-ibm*)\n-\t\tvendor=ibm\n+\tsb1el)\n+\t\tbasic_machine=mipsisa64sb1el-unknown\n \t\t;;\n-\torion-unknown)\n-\t\tvendor=highlevel\n+\tsde)\n+\t\tbasic_machine=mipsisa32-sde\n+\t\tos=-elf\n \t\t;;\n-\txps-unknown | xps100-unknown)\n-\t\tcpu=xps100\n-\t\tvendor=honeywell\n+\tsei)\n+\t\tbasic_machine=mips-sei\n+\t\tos=-seiux\n \t\t;;\n-\n-\t# Here we normalize CPU types with a missing or matching vendor\n-\tarmh-unknown | armh-alt)\n-\t\tcpu=armv7l\n-\t\tvendor=alt\n-\t\tbasic_os=${basic_os:-linux-gnueabihf}\n+\tsequent)\n+\t\tbasic_machine=i386-sequent\n \t\t;;\n-\n-\t# Normalized CPU+vendor pairs that imply an OS, if not otherwise specified\n-\tm68k-isi)\n-\t\tbasic_os=${basic_os:-sysv}\n+\tsh)\n+\t\tbasic_machine=sh-hitachi\n+\t\tos=-hms\n \t\t;;\n-\tm68k-sony)\n-\t\tbasic_os=${basic_os:-newsos}\n+\tsh5el)\n+\t\tbasic_machine=sh5le-unknown\n \t\t;;\n-\tm68k-tektronix)\n-\t\tbasic_os=${basic_os:-bsd}\n+\tsh64)\n+\t\tbasic_machine=sh64-unknown\n \t\t;;\n-\tm88k-harris)\n-\t\tbasic_os=${basic_os:-sysv3}\n+\tsparclite-wrs | simso-wrs)\n+\t\tbasic_machine=sparclite-wrs\n+\t\tos=-vxworks\n \t\t;;\n-\ti386-bull | m68k-bull)\n-\t\tbasic_os=${basic_os:-sysv3}\n+\tsps7)\n+\t\tbasic_machine=m68k-bull\n+\t\tos=-sysv2\n \t\t;;\n-\trs6000-bull)\n-\t\tbasic_os=${basic_os:-bosx}\n+\tspur)\n+\t\tbasic_machine=spur-unknown\n \t\t;;\n-\tmips-sni)\n-\t\tbasic_os=${basic_os:-sysv4}\n+\tst2000)\n+\t\tbasic_machine=m68k-tandem\n \t\t;;\n-\n-\t# Here we normalize CPU types irrespective of the vendor\n-\tamd64-*)\n-\t\tcpu=x86_64\n+\tstratus)\n+\t\tbasic_machine=i860-stratus\n+\t\tos=-sysv4\n \t\t;;\n-\tblackfin-*)\n-\t\tcpu=bfin\n-\t\tbasic_os=${basic_os:-linux}\n+\tstrongarm-* | thumb-*)\n+\t\tbasic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`\n \t\t;;\n-\tc54x-*)\n-\t\tcpu=tic54x\n+\tsun2)\n+\t\tbasic_machine=m68000-sun\n \t\t;;\n-\tc55x-*)\n-\t\tcpu=tic55x\n+\tsun2os3)\n+\t\tbasic_machine=m68000-sun\n+\t\tos=-sunos3\n \t\t;;\n-\tc6x-*)\n-\t\tcpu=tic6x\n+\tsun2os4)\n+\t\tbasic_machine=m68000-sun\n+\t\tos=-sunos4\n \t\t;;\n-\te500v[12]-*)\n-\t\tcpu=powerpc\n-\t\tbasic_os=${basic_os}\"spe\"\n+\tsun3os3)\n+\t\tbasic_machine=m68k-sun\n+\t\tos=-sunos3\n \t\t;;\n-\tmips3*-*)\n-\t\tcpu=mips64\n+\tsun3os4)\n+\t\tbasic_machine=m68k-sun\n+\t\tos=-sunos4\n \t\t;;\n-\tms1-*)\n-\t\tcpu=mt\n+\tsun4os3)\n+\t\tbasic_machine=sparc-sun\n+\t\tos=-sunos3\n \t\t;;\n-\tm68knommu-*)\n-\t\tcpu=m68k\n-\t\tbasic_os=${basic_os:-linux}\n+\tsun4os4)\n+\t\tbasic_machine=sparc-sun\n+\t\tos=-sunos4\n \t\t;;\n-\tm9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)\n-\t\tcpu=s12z\n+\tsun4sol2)\n+\t\tbasic_machine=sparc-sun\n+\t\tos=-solaris2\n \t\t;;\n-\topenrisc-*)\n-\t\tcpu=or32\n+\tsun3 | sun3-*)\n+\t\tbasic_machine=m68k-sun\n \t\t;;\n-\tparisc-*)\n-\t\tcpu=hppa\n-\t\tbasic_os=${basic_os:-linux}\n+\tsun4)\n+\t\tbasic_machine=sparc-sun\n \t\t;;\n-\tpentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)\n-\t\tcpu=i586\n+\tsun386 | sun386i | roadrunner)\n+\t\tbasic_machine=i386-sun\n \t\t;;\n-\tpentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)\n-\t\tcpu=i686\n+\tsv1)\n+\t\tbasic_machine=sv1-cray\n+\t\tos=-unicos\n \t\t;;\n-\tpentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)\n-\t\tcpu=i686\n+\tsymmetry)\n+\t\tbasic_machine=i386-sequent\n+\t\tos=-dynix\n \t\t;;\n-\tpentium4-*)\n-\t\tcpu=i786\n+\tt3e)\n+\t\tbasic_machine=alphaev5-cray\n+\t\tos=-unicos\n \t\t;;\n-\tppc-* | ppcbe-*)\n-\t\tcpu=powerpc\n+\tt90)\n+\t\tbasic_machine=t90-cray\n+\t\tos=-unicos\n \t\t;;\n-\tppcle-* | powerpclittle-*)\n-\t\tcpu=powerpcle\n+\ttile*)\n+\t\tbasic_machine=$basic_machine-unknown\n+\t\tos=-linux-gnu\n \t\t;;\n-\tppc64-*)\n-\t\tcpu=powerpc64\n+\ttx39)\n+\t\tbasic_machine=mipstx39-unknown\n \t\t;;\n-\tppc64le-* | powerpc64little-*)\n-\t\tcpu=powerpc64le\n+\ttx39el)\n+\t\tbasic_machine=mipstx39el-unknown\n \t\t;;\n-\tsb1-*)\n-\t\tcpu=mipsisa64sb1\n+\ttoad1)\n+\t\tbasic_machine=pdp10-xkl\n+\t\tos=-tops20\n \t\t;;\n-\tsb1el-*)\n-\t\tcpu=mipsisa64sb1el\n+\ttower | tower-32)\n+\t\tbasic_machine=m68k-ncr\n \t\t;;\n-\tsh5e[lb]-*)\n-\t\tcpu=`echo \"$cpu\" | sed 's/^\\(sh.\\)e\\(.\\)$/\\1\\2e/'`\n+\ttpf)\n+\t\tbasic_machine=s390x-ibm\n+\t\tos=-tpf\n \t\t;;\n-\tspur-*)\n-\t\tcpu=spur\n+\tudi29k)\n+\t\tbasic_machine=a29k-amd\n+\t\tos=-udi\n \t\t;;\n-\tstrongarm-* | thumb-*)\n-\t\tcpu=arm\n+\tultra3)\n+\t\tbasic_machine=a29k-nyu\n+\t\tos=-sym1\n \t\t;;\n-\ttx39-*)\n-\t\tcpu=mipstx39\n+\tv810 | necv810)\n+\t\tbasic_machine=v810-nec\n+\t\tos=-none\n \t\t;;\n-\ttx39el-*)\n-\t\tcpu=mipstx39el\n+\tvaxv)\n+\t\tbasic_machine=vax-dec\n+\t\tos=-sysv\n \t\t;;\n-\txscale-* | xscalee[bl]-*)\n-\t\tcpu=`echo \"$cpu\" | sed 's/^xscale/arm/'`\n+\tvms)\n+\t\tbasic_machine=vax-dec\n+\t\tos=-vms\n \t\t;;\n-\tarm64-* | aarch64le-*)\n-\t\tcpu=aarch64\n+\tvpp*|vx|vx-*)\n+\t\tbasic_machine=f301-fujitsu\n \t\t;;\n-\n-\t# Recognize the canonical CPU Types that limit and/or modify the\n-\t# company names they are paired with.\n-\tcr16-*)\n-\t\tbasic_os=${basic_os:-elf}\n+\tvxworks960)\n+\t\tbasic_machine=i960-wrs\n+\t\tos=-vxworks\n \t\t;;\n-\tcrisv32-* | etraxfs*-*)\n-\t\tcpu=crisv32\n-\t\tvendor=axis\n+\tvxworks68)\n+\t\tbasic_machine=m68k-wrs\n+\t\tos=-vxworks\n \t\t;;\n-\tcris-* | etrax*-*)\n-\t\tcpu=cris\n-\t\tvendor=axis\n+\tvxworks29k)\n+\t\tbasic_machine=a29k-wrs\n+\t\tos=-vxworks\n \t\t;;\n-\tcrx-*)\n-\t\tbasic_os=${basic_os:-elf}\n+\tw65*)\n+\t\tbasic_machine=w65-wdc\n+\t\tos=-none\n \t\t;;\n-\tneo-tandem)\n-\t\tcpu=neo\n-\t\tvendor=tandem\n+\tw89k-*)\n+\t\tbasic_machine=hppa1.1-winbond\n+\t\tos=-proelf\n \t\t;;\n-\tnse-tandem)\n-\t\tcpu=nse\n-\t\tvendor=tandem\n+\txbox)\n+\t\tbasic_machine=i686-pc\n+\t\tos=-mingw32\n \t\t;;\n-\tnsr-tandem)\n-\t\tcpu=nsr\n-\t\tvendor=tandem\n+\txps | xps100)\n+\t\tbasic_machine=xps100-honeywell\n \t\t;;\n-\tnsv-tandem)\n-\t\tcpu=nsv\n-\t\tvendor=tandem\n+\txscale-* | xscalee[bl]-*)\n+\t\tbasic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`\n \t\t;;\n-\tnsx-tandem)\n-\t\tcpu=nsx\n-\t\tvendor=tandem\n+\tymp)\n+\t\tbasic_machine=ymp-cray\n+\t\tos=-unicos\n \t\t;;\n-\tmipsallegrexel-sony)\n-\t\tcpu=mipsallegrexel\n-\t\tvendor=sony\n+\tz8k-*-coff)\n+\t\tbasic_machine=z8k-unknown\n+\t\tos=-sim\n \t\t;;\n-\ttile*-*)\n-\t\tbasic_os=${basic_os:-linux-gnu}\n+\tz80-*-coff)\n+\t\tbasic_machine=z80-unknown\n+\t\tos=-sim\n \t\t;;\n-\n-\t*)\n-\t\t# Recognize the canonical CPU types that are allowed with any\n-\t\t# company name.\n-\t\tcase $cpu in\n-\t\t\t  1750a \\\n-\t\t\t| 580 \\\n-\t\t\t| [cjt]90 \\\n-\t\t\t| a29k \\\n-\t\t\t| aarch64 \\\n-\t\t\t| aarch64_be \\\n-\t\t\t| aarch64c \\\n-\t\t\t| abacus \\\n-\t\t\t| alpha \\\n-\t\t\t| alpha64 \\\n-\t\t\t| alpha64ev56 \\\n-\t\t\t| alpha64ev6[78] \\\n-\t\t\t| alpha64ev[4-8] \\\n-\t\t\t| alpha64pca5[67] \\\n-\t\t\t| alphaev56 \\\n-\t\t\t| alphaev6[78] \\\n-\t\t\t| alphaev[4-8] \\\n-\t\t\t| alphapca5[67] \\\n-\t\t\t| am33_2.0 \\\n-\t\t\t| amdgcn \\\n-\t\t\t| arc \\\n-\t\t\t| arc32 \\\n-\t\t\t| arc64 \\\n-\t\t\t| arceb \\\n-\t\t\t| arm \\\n-\t\t\t| arm64e \\\n-\t\t\t| arm64ec \\\n-\t\t\t| arm[lb]e \\\n-\t\t\t| arme[lb] \\\n-\t\t\t| armv* \\\n-\t\t\t| asmjs \\\n-\t\t\t| avr \\\n-\t\t\t| avr32 \\\n-\t\t\t| ba \\\n-\t\t\t| be32 \\\n-\t\t\t| be64 \\\n-\t\t\t| bfin \\\n-\t\t\t| bpf \\\n-\t\t\t| bs2000 \\\n-\t\t\t| c30 \\\n-\t\t\t| c4x \\\n-\t\t\t| c8051 \\\n-\t\t\t| c[123]* \\\n-\t\t\t| clipper \\\n-\t\t\t| craynv \\\n-\t\t\t| csky \\\n-\t\t\t| cydra \\\n-\t\t\t| d10v \\\n-\t\t\t| d30v \\\n-\t\t\t| dlx \\\n-\t\t\t| dsp16xx \\\n-\t\t\t| e2k \\\n-\t\t\t| elxsi \\\n-\t\t\t| epiphany \\\n-\t\t\t| f30[01] \\\n-\t\t\t| f700 \\\n-\t\t\t| fido \\\n-\t\t\t| fr30 \\\n-\t\t\t| frv \\\n-\t\t\t| ft32 \\\n-\t\t\t| fx80 \\\n-\t\t\t| h8300 \\\n-\t\t\t| h8500 \\\n-\t\t\t| hexagon \\\n-\t\t\t| hppa \\\n-\t\t\t| hppa1.[01] \\\n-\t\t\t| hppa2.0 \\\n-\t\t\t| hppa2.0[nw] \\\n-\t\t\t| hppa64 \\\n-\t\t\t| i*86 \\\n-\t\t\t| i370 \\\n-\t\t\t| i860 \\\n-\t\t\t| i960 \\\n-\t\t\t| ia16 \\\n-\t\t\t| ia64 \\\n-\t\t\t| ip2k \\\n-\t\t\t| iq2000 \\\n-\t\t\t| javascript \\\n-\t\t\t| k1om \\\n-\t\t\t| kvx \\\n-\t\t\t| le32 \\\n-\t\t\t| le64 \\\n-\t\t\t| lm32 \\\n-\t\t\t| loongarch32 \\\n-\t\t\t| loongarch64 \\\n-\t\t\t| m32c \\\n-\t\t\t| m32r \\\n-\t\t\t| m32rle \\\n-\t\t\t| m5200 \\\n-\t\t\t| m68000 \\\n-\t\t\t| m680[012346]0 \\\n-\t\t\t| m6811 \\\n-\t\t\t| m6812 \\\n-\t\t\t| m68360 \\\n-\t\t\t| m683?2 \\\n-\t\t\t| m68hc11 \\\n-\t\t\t| m68hc12 \\\n-\t\t\t| m68hcs12x \\\n-\t\t\t| m68k \\\n-\t\t\t| m88110 \\\n-\t\t\t| m88k \\\n-\t\t\t| maxq \\\n-\t\t\t| mb \\\n-\t\t\t| mcore \\\n-\t\t\t| mep \\\n-\t\t\t| metag \\\n-\t\t\t| microblaze \\\n-\t\t\t| microblazeel \\\n-\t\t\t| mips* \\\n-\t\t\t| mmix \\\n-\t\t\t| mn10200 \\\n-\t\t\t| mn10300 \\\n-\t\t\t| moxie \\\n-\t\t\t| msp430 \\\n-\t\t\t| mt \\\n-\t\t\t| nanomips* \\\n-\t\t\t| nds32 \\\n-\t\t\t| nds32be \\\n-\t\t\t| nds32le \\\n-\t\t\t| nfp \\\n-\t\t\t| nios \\\n-\t\t\t| nios2 \\\n-\t\t\t| nios2eb \\\n-\t\t\t| nios2el \\\n-\t\t\t| none \\\n-\t\t\t| np1 \\\n-\t\t\t| ns16k \\\n-\t\t\t| ns32k \\\n-\t\t\t| nvptx \\\n-\t\t\t| open8 \\\n-\t\t\t| or1k* \\\n-\t\t\t| or32 \\\n-\t\t\t| orion \\\n-\t\t\t| pdp10 \\\n-\t\t\t| pdp11 \\\n-\t\t\t| picochip \\\n-\t\t\t| pj \\\n-\t\t\t| pjl \\\n-\t\t\t| pn \\\n-\t\t\t| power \\\n-\t\t\t| powerpc \\\n-\t\t\t| powerpc64 \\\n-\t\t\t| powerpc64le \\\n-\t\t\t| powerpcle \\\n-\t\t\t| powerpcspe \\\n-\t\t\t| pru \\\n-\t\t\t| pyramid \\\n-\t\t\t| riscv \\\n-\t\t\t| riscv32 \\\n-\t\t\t| riscv32be \\\n-\t\t\t| riscv64 \\\n-\t\t\t| riscv64be \\\n-\t\t\t| rl78 \\\n-\t\t\t| romp \\\n-\t\t\t| rs6000 \\\n-\t\t\t| rx \\\n-\t\t\t| s390 \\\n-\t\t\t| s390x \\\n-\t\t\t| score \\\n-\t\t\t| sh \\\n-\t\t\t| sh64 \\\n-\t\t\t| sh64le \\\n-\t\t\t| sh[12345][lb]e \\\n-\t\t\t| sh[1234] \\\n-\t\t\t| sh[1234]e[lb] \\\n-\t\t\t| sh[23]e \\\n-\t\t\t| sh[23]ele \\\n-\t\t\t| sh[24]a \\\n-\t\t\t| sh[24]ae[lb] \\\n-\t\t\t| sh[lb]e \\\n-\t\t\t| she[lb] \\\n-\t\t\t| shl \\\n-\t\t\t| sparc \\\n-\t\t\t| sparc64 \\\n-\t\t\t| sparc64b \\\n-\t\t\t| sparc64v \\\n-\t\t\t| sparc86x \\\n-\t\t\t| sparclet \\\n-\t\t\t| sparclite \\\n-\t\t\t| sparcv8 \\\n-\t\t\t| sparcv9 \\\n-\t\t\t| sparcv9b \\\n-\t\t\t| sparcv9v \\\n-\t\t\t| spu \\\n-\t\t\t| sv1 \\\n-\t\t\t| sx* \\\n-\t\t\t| tahoe \\\n-\t\t\t| thumbv7* \\\n-\t\t\t| tic30 \\\n-\t\t\t| tic4x \\\n-\t\t\t| tic54x \\\n-\t\t\t| tic55x \\\n-\t\t\t| tic6x \\\n-\t\t\t| tic80 \\\n-\t\t\t| tron \\\n-\t\t\t| ubicom32 \\\n-\t\t\t| v70 \\\n-\t\t\t| v810 \\\n-\t\t\t| v850 \\\n-\t\t\t| v850e \\\n-\t\t\t| v850e1 \\\n-\t\t\t| v850e2 \\\n-\t\t\t| v850e2v3 \\\n-\t\t\t| v850es \\\n-\t\t\t| vax \\\n-\t\t\t| vc4 \\\n-\t\t\t| visium \\\n-\t\t\t| w65 \\\n-\t\t\t| wasm32 \\\n-\t\t\t| wasm64 \\\n-\t\t\t| we32k \\\n-\t\t\t| x86 \\\n-\t\t\t| x86_64 \\\n-\t\t\t| xc16x \\\n-\t\t\t| xgate \\\n-\t\t\t| xps100 \\\n-\t\t\t| xstormy16 \\\n-\t\t\t| xtensa* \\\n-\t\t\t| ymp \\\n-\t\t\t| z80 \\\n-\t\t\t| z8k)\n-\t\t\t\t;;\n-\n-\t\t\t*)\n-\t\t\t\techo \"Invalid configuration '$1': machine '$cpu-$vendor' not recognized\" 1>&2\n-\t\t\t\texit 1\n-\t\t\t\t;;\n-\t\tesac\n+\tnone)\n+\t\tbasic_machine=none-none\n+\t\tos=-none\n \t\t;;\n-esac\n \n-# Here we canonicalize certain aliases for manufacturers.\n-case $vendor in\n-\tdigital*)\n-\t\tvendor=dec\n+# Here we handle the default manufacturer of certain CPU types.  It is in\n+# some cases the only manufacturer, in others, it is the most popular.\n+\tw89k)\n+\t\tbasic_machine=hppa1.1-winbond\n \t\t;;\n-\tcommodore*)\n-\t\tvendor=cbm\n+\top50n)\n+\t\tbasic_machine=hppa1.1-oki\n \t\t;;\n-\t*)\n+\top60c)\n+\t\tbasic_machine=hppa1.1-oki\n \t\t;;\n-esac\n-\n-# Decode manufacturer-specific aliases for certain operating systems.\n-\n-if test x\"$basic_os\" != x\n-then\n-\n-# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just\n-# set os.\n-obj=\n-case $basic_os in\n-\tgnu/linux*)\n-\t\tkernel=linux\n-\t\tos=`echo \"$basic_os\" | sed -e 's|gnu/linux|gnu|'`\n-\t\t;;\n-\tos2-emx)\n-\t\tkernel=os2\n-\t\tos=`echo \"$basic_os\" | sed -e 's|os2-emx|emx|'`\n-\t\t;;\n-\tnto-qnx*)\n-\t\tkernel=nto\n-\t\tos=`echo \"$basic_os\" | sed -e 's|nto-qnx|qnx|'`\n-\t\t;;\n-\t*-*)\n-\t\tsaved_IFS=$IFS\n-\t\tIFS=\"-\" read kernel os <<EOF\n-$basic_os\n-EOF\n-\t\tIFS=$saved_IFS\n-\t\t;;\n-\t# Default OS when just kernel was specified\n-\tnto*)\n-\t\tkernel=nto\n-\t\tos=`echo \"$basic_os\" | sed -e 's|nto|qnx|'`\n-\t\t;;\n-\tlinux*)\n-\t\tkernel=linux\n-\t\tos=`echo \"$basic_os\" | sed -e 's|linux|gnu|'`\n-\t\t;;\n-\tmanagarm*)\n-\t\tkernel=managarm\n-\t\tos=`echo \"$basic_os\" | sed -e 's|managarm|mlibc|'`\n+\tromp)\n+\t\tbasic_machine=romp-ibm\n \t\t;;\n-\t*)\n-\t\tkernel=\n-\t\tos=$basic_os\n+\tmmix)\n+\t\tbasic_machine=mmix-knuth\n \t\t;;\n-esac\n-\n-# Now, normalize the OS (knowing we just have one component, it's not a kernel,\n-# etc.)\n-case $os in\n-\t# First match some system type aliases that might get confused\n-\t# with valid system types.\n-\t# solaris* is a basic system type, with this one exception.\n-\tauroraux)\n-\t\tos=auroraux\n+\trs6000)\n+\t\tbasic_machine=rs6000-ibm\n \t\t;;\n-\tbluegene*)\n-\t\tos=cnk\n+\tvax)\n+\t\tbasic_machine=vax-dec\n \t\t;;\n-\tsolaris1 | solaris1.*)\n-\t\tos=`echo \"$os\" | sed -e 's|solaris1|sunos4|'`\n+\tpdp10)\n+\t\t# there are many clones, so DEC is not a safe bet\n+\t\tbasic_machine=pdp10-unknown\n \t\t;;\n-\tsolaris)\n-\t\tos=solaris2\n+\tpdp11)\n+\t\tbasic_machine=pdp11-dec\n \t\t;;\n-\tunixware*)\n-\t\tos=sysv4.2uw\n+\twe32k)\n+\t\tbasic_machine=we32k-att\n \t\t;;\n-\t# The marketing names for NeXT's operating systems were\n-\t# NeXTSTEP, NeXTSTEP 2, OpenSTEP 3, OpenSTEP 4.  'openstep' is\n-\t# mapped to 'openstep3', but 'openstep1' and 'openstep2' are\n-\t# mapped to 'nextstep' and 'nextstep2', consistent with the\n-\t# treatment of SunOS/Solaris.\n-\tns | ns1 | nextstep | nextstep1 | openstep1)\n-\t\tos=nextstep\n+\tsh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)\n+\t\tbasic_machine=sh-unknown\n \t\t;;\n-\tns2 | nextstep2 | openstep2)\n-\t\tos=nextstep2\n+\tsparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)\n+\t\tbasic_machine=sparc-sun\n \t\t;;\n-\tns3 | nextstep3 | openstep | openstep3)\n-\t\tos=openstep3\n+\tcydra)\n+\t\tbasic_machine=cydra-cydrome\n \t\t;;\n-\tns4 | nextstep4 | openstep4)\n-\t\tos=openstep4\n+\torion)\n+\t\tbasic_machine=orion-highlevel\n \t\t;;\n-\t# es1800 is here to avoid being matched by es* (a different OS)\n-\tes1800*)\n-\t\tos=ose\n+\torion105)\n+\t\tbasic_machine=clipper-highlevel\n \t\t;;\n-\t# Some version numbers need modification\n-\tchorusos*)\n-\t\tos=chorusos\n+\tmac | mpw | mac-mpw)\n+\t\tbasic_machine=m68k-apple\n \t\t;;\n-\tisc)\n-\t\tos=isc2.2\n+\tpmac | pmac-mpw)\n+\t\tbasic_machine=powerpc-apple\n \t\t;;\n-\tsco6)\n-\t\tos=sco5v6\n+\t*-unknown)\n+\t\t# Make sure to match an already-canonicalized machine name.\n \t\t;;\n-\tsco5)\n-\t\tos=sco3.2v5\n+\t*)\n+\t\techo Invalid configuration \\`$1\\': machine \\`$basic_machine\\' not recognized 1>&2\n+\t\texit 1\n \t\t;;\n-\tsco4)\n-\t\tos=sco3.2v4\n+esac\n+\n+# Here we canonicalize certain aliases for manufacturers.\n+case $basic_machine in\n+\t*-digital*)\n+\t\tbasic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`\n \t\t;;\n-\tsco3.2.[4-9]*)\n-\t\tos=`echo \"$os\" | sed -e 's/sco3.2./sco3.2v/'`\n+\t*-commodore*)\n+\t\tbasic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`\n \t\t;;\n-\tsco*v* | scout)\n-\t\t# Don't match below\n+\t*)\n \t\t;;\n-\tsco*)\n-\t\tos=sco3.2v2\n+esac\n+\n+# Decode manufacturer-specific aliases for certain operating systems.\n+\n+if [ x\"$os\" != x\"\" ]\n+then\n+case $os in\n+\t# First match some system type aliases\n+\t# that might get confused with valid system types.\n+\t# -solaris* is a basic system type, with this one exception.\n+\t-auroraux)\n+\t\tos=-auroraux\n+\t\t;;\n+\t-solaris1 | -solaris1.*)\n+\t\tos=`echo $os | sed -e 's|solaris1|sunos4|'`\n+\t\t;;\n+\t-solaris)\n+\t\tos=-solaris2\n+\t\t;;\n+\t-svr4*)\n+\t\tos=-sysv4\n+\t\t;;\n+\t-unixware*)\n+\t\tos=-sysv4.2uw\n+\t\t;;\n+\t-gnu/linux*)\n+\t\tos=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`\n+\t\t;;\n+\t# First accept the basic system types.\n+\t# The portable systems comes first.\n+\t# Each alternative MUST END IN A *, to match a version number.\n+\t# -sysv* is not here because it comes later, after sysvr4.\n+\t-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \\\n+\t      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\\\n+\t      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \\\n+\t      | -sym* | -kopensolaris* \\\n+\t      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \\\n+\t      | -aos* | -aros* \\\n+\t      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \\\n+\t      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \\\n+\t      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \\\n+\t      | -openbsd* | -solidbsd* \\\n+\t      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \\\n+\t      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \\\n+\t      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \\\n+\t      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \\\n+\t      | -chorusos* | -chorusrdb* | -cegcc* \\\n+\t      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \\\n+\t      | -mingw32* | -linux-gnu* | -linux-android* \\\n+\t      | -linux-newlib* | -linux-uclibc* \\\n+\t      | -uxpv* | -beos* | -mpeix* | -udk* \\\n+\t      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \\\n+\t      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \\\n+\t      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \\\n+\t      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \\\n+\t      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \\\n+\t      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \\\n+\t      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)\n+\t# Remember, each alternative MUST END IN *, to match a version number.\n+\t\t;;\n+\t-qnx*)\n+\t\tcase $basic_machine in\n+\t\t    x86-* | i*86-*)\n+\t\t\t;;\n+\t\t    *)\n+\t\t\tos=-nto$os\n+\t\t\t;;\n+\t\tesac\n \t\t;;\n-\tpsos*)\n-\t\tos=psos\n+\t-nto-qnx*)\n \t\t;;\n-\tqnx*)\n-\t\tos=qnx\n+\t-nto*)\n+\t\tos=`echo $os | sed -e 's|nto|nto-qnx|'`\n \t\t;;\n-\thiux*)\n-\t\tos=hiuxwe2\n+\t-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \\\n+\t      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \\\n+\t      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)\n \t\t;;\n-\tlynx*178)\n-\t\tos=lynxos178\n+\t-mac*)\n+\t\tos=`echo $os | sed -e 's|mac|macos|'`\n \t\t;;\n-\tlynx*5)\n-\t\tos=lynxos5\n+\t-linux-dietlibc)\n+\t\tos=-linux-dietlibc\n \t\t;;\n-\tlynxos*)\n-\t\t# don't get caught up in next wildcard\n+\t-linux*)\n+\t\tos=`echo $os | sed -e 's|linux|linux-gnu|'`\n \t\t;;\n-\tlynx*)\n-\t\tos=lynxos\n+\t-sunos5*)\n+\t\tos=`echo $os | sed -e 's|sunos5|solaris2|'`\n \t\t;;\n-\tmac[0-9]*)\n-\t\tos=`echo \"$os\" | sed -e 's|mac|macos|'`\n+\t-sunos6*)\n+\t\tos=`echo $os | sed -e 's|sunos6|solaris3|'`\n \t\t;;\n-\topened*)\n-\t\tos=openedition\n+\t-opened*)\n+\t\tos=-openedition\n \t\t;;\n-\tos400*)\n-\t\tos=os400\n+\t-os400*)\n+\t\tos=-os400\n \t\t;;\n-\tsunos5*)\n-\t\tos=`echo \"$os\" | sed -e 's|sunos5|solaris2|'`\n+\t-wince*)\n+\t\tos=-wince\n \t\t;;\n-\tsunos6*)\n-\t\tos=`echo \"$os\" | sed -e 's|sunos6|solaris3|'`\n+\t-osfrose*)\n+\t\tos=-osfrose\n \t\t;;\n-\twince*)\n-\t\tos=wince\n+\t-osf*)\n+\t\tos=-osf\n \t\t;;\n-\tutek*)\n-\t\tos=bsd\n-\t\tvendor=`echo \"$vendor\" | sed -e 's|^unknown$|tektronix|'`\n+\t-utek*)\n+\t\tos=-bsd\n \t\t;;\n-\tdynix*)\n-\t\tos=bsd\n+\t-dynix*)\n+\t\tos=-bsd\n \t\t;;\n-\tacis*)\n-\t\tos=aos\n+\t-acis*)\n+\t\tos=-aos\n \t\t;;\n-\tatheos*)\n-\t\tos=atheos\n+\t-atheos*)\n+\t\tos=-atheos\n \t\t;;\n-\tsyllable*)\n-\t\tos=syllable\n+\t-syllable*)\n+\t\tos=-syllable\n \t\t;;\n-\t386bsd)\n-\t\tos=bsd\n+\t-386bsd)\n+\t\tos=-bsd\n \t\t;;\n-\tctix*)\n-\t\tos=sysv\n-\t\tvendor=`echo \"$vendor\" | sed -e 's|^unknown$|convergent|'`\n+\t-ctix* | -uts*)\n+\t\tos=-sysv\n \t\t;;\n-\tuts*)\n-\t\tos=sysv\n+\t-nova*)\n+\t\tos=-rtmk-nova\n \t\t;;\n-\tnova*)\n-\t\tkernel=rtmk\n-\t\tos=nova\n+\t-ns2 )\n+\t\tos=-nextstep2\n+\t\t;;\n+\t-nsk*)\n+\t\tos=-nsk\n \t\t;;\n \t# Preserve the version number of sinix5.\n-\tsinix5.*)\n-\t\tos=`echo \"$os\" | sed -e 's|sinix|sysv|'`\n-\t\tvendor=`echo \"$vendor\" | sed -e 's|^unknown$|sni|'`\n+\t-sinix5.*)\n+\t\tos=`echo $os | sed -e 's|sinix|sysv|'`\n \t\t;;\n-\tsinix*)\n-\t\tos=sysv4\n-\t\tvendor=`echo \"$vendor\" | sed -e 's|^unknown$|sni|'`\n+\t-sinix*)\n+\t\tos=-sysv4\n \t\t;;\n-\ttpf*)\n-\t\tos=tpf\n+\t-tpf*)\n+\t\tos=-tpf\n \t\t;;\n-\ttriton*)\n-\t\tos=sysv3\n+\t-triton*)\n+\t\tos=-sysv3\n \t\t;;\n-\toss*)\n-\t\tos=sysv3\n+\t-oss*)\n+\t\tos=-sysv3\n \t\t;;\n-\tsvr4*)\n-\t\tos=sysv4\n+\t-svr4)\n+\t\tos=-sysv4\n \t\t;;\n-\tsvr3)\n-\t\tos=sysv3\n+\t-svr3)\n+\t\tos=-sysv3\n \t\t;;\n-\tsysvr4)\n-\t\tos=sysv4\n+\t-sysvr4)\n+\t\tos=-sysv4\n \t\t;;\n-\tose*)\n-\t\tos=ose\n+\t# This must come after -sysvr4.\n+\t-sysv*)\n \t\t;;\n-\t*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)\n-\t\tos=mint\n+\t-ose*)\n+\t\tos=-ose\n \t\t;;\n-\tdicos*)\n-\t\tos=dicos\n+\t-es1800*)\n+\t\tos=-ose\n \t\t;;\n-\tpikeos*)\n-\t\t# Until real need of OS specific support for\n-\t\t# particular features comes up, bare metal\n-\t\t# configurations are quite functional.\n-\t\tcase $cpu in\n-\t\t    arm*)\n-\t\t\tos=eabi\n-\t\t\t;;\n-\t\t    *)\n-\t\t\tos=\n-\t\t\tobj=elf\n-\t\t\t;;\n-\t\tesac\n+\t-xenix)\n+\t\tos=-xenix\n \t\t;;\n-\taout* | coff* | elf* | pe*)\n-\t\t# These are machine code file formats, not OSes\n-\t\tobj=$os\n-\t\tos=\n+\t-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)\n+\t\tos=-mint\n+\t\t;;\n+\t-aros*)\n+\t\tos=-aros\n+\t\t;;\n+\t-kaos*)\n+\t\tos=-kaos\n+\t\t;;\n+\t-zvmoe)\n+\t\tos=-zvmoe\n+\t\t;;\n+\t-dicos*)\n+\t\tos=-dicos\n+\t\t;;\n+\t-nacl*)\n+\t\t;;\n+\t-none)\n \t\t;;\n \t*)\n-\t\t# No normalization, but not necessarily accepted, that comes below.\n+\t\t# Get rid of the `-' at the beginning of $os.\n+\t\tos=`echo $os | sed 's/[^-]*-//'`\n+\t\techo Invalid configuration \\`$1\\': system \\`$os\\' not recognized 1>&2\n+\t\texit 1\n \t\t;;\n esac\n-\n else\n \n # Here we handle the default operating systems that come with various machines.\n@@ -1744,610 +1518,255 @@ else\n # will signal an error saying that MANUFACTURER isn't an operating\n # system, and we'll never get to this point.\n \n-kernel=\n-obj=\n-case $cpu-$vendor in\n+case $basic_machine in\n \tscore-*)\n-\t\tos=\n-\t\tobj=elf\n+\t\tos=-elf\n \t\t;;\n \tspu-*)\n-\t\tos=\n-\t\tobj=elf\n+\t\tos=-elf\n \t\t;;\n \t*-acorn)\n-\t\tos=riscix1.2\n+\t\tos=-riscix1.2\n \t\t;;\n \tarm*-rebel)\n-\t\tkernel=linux\n-\t\tos=gnu\n+\t\tos=-linux\n \t\t;;\n \tarm*-semi)\n-\t\tos=\n-\t\tobj=aout\n+\t\tos=-aout\n \t\t;;\n \tc4x-* | tic4x-*)\n-\t\tos=\n-\t\tobj=coff\n-\t\t;;\n-\tc8051-*)\n-\t\tos=\n-\t\tobj=elf\n-\t\t;;\n-\tclipper-intergraph)\n-\t\tos=clix\n-\t\t;;\n-\thexagon-*)\n-\t\tos=\n-\t\tobj=elf\n+\t\tos=-coff\n \t\t;;\n \ttic54x-*)\n-\t\tos=\n-\t\tobj=coff\n+\t\tos=-coff\n \t\t;;\n \ttic55x-*)\n-\t\tos=\n-\t\tobj=coff\n+\t\tos=-coff\n \t\t;;\n \ttic6x-*)\n-\t\tos=\n-\t\tobj=coff\n+\t\tos=-coff\n \t\t;;\n \t# This must come before the *-dec entry.\n \tpdp10-*)\n-\t\tos=tops20\n+\t\tos=-tops20\n \t\t;;\n \tpdp11-*)\n-\t\tos=none\n+\t\tos=-none\n \t\t;;\n \t*-dec | vax-*)\n-\t\tos=ultrix4.2\n+\t\tos=-ultrix4.2\n \t\t;;\n \tm68*-apollo)\n-\t\tos=domain\n+\t\tos=-domain\n \t\t;;\n \ti386-sun)\n-\t\tos=sunos4.0.2\n+\t\tos=-sunos4.0.2\n \t\t;;\n \tm68000-sun)\n-\t\tos=sunos3\n+\t\tos=-sunos3\n \t\t;;\n \tm68*-cisco)\n-\t\tos=\n-\t\tobj=aout\n+\t\tos=-aout\n \t\t;;\n \tmep-*)\n-\t\tos=\n-\t\tobj=elf\n-\t\t;;\n-\t# The -sgi and -siemens entries must be before the mips- entry\n-\t# or we get the wrong os.\n-\t*-sgi)\n-\t\tos=irix\n-\t\t;;\n-\t*-siemens)\n-\t\tos=sysv4\n+\t\tos=-elf\n \t\t;;\n \tmips*-cisco)\n-\t\tos=\n-\t\tobj=elf\n+\t\tos=-elf\n \t\t;;\n-\tmips*-*|nanomips*-*)\n-\t\tos=\n-\t\tobj=elf\n+\tmips*-*)\n+\t\tos=-elf\n \t\t;;\n \tor32-*)\n-\t\tos=\n-\t\tobj=coff\n+\t\tos=-coff\n \t\t;;\n-\t# This must be before the sparc-* entry or we get the wrong os.\n-\t*-tti)\n-\t\tos=sysv3\n+\t*-tti)\t# must be before sparc entry or we get the wrong os.\n+\t\tos=-sysv3\n \t\t;;\n \tsparc-* | *-sun)\n-\t\tos=sunos4.1.1\n-\t\t;;\n-\tpru-*)\n-\t\tos=\n-\t\tobj=elf\n+\t\tos=-sunos4.1.1\n \t\t;;\n \t*-be)\n-\t\tos=beos\n+\t\tos=-beos\n+\t\t;;\n+\t*-haiku)\n+\t\tos=-haiku\n \t\t;;\n \t*-ibm)\n-\t\tos=aix\n+\t\tos=-aix\n \t\t;;\n \t*-knuth)\n-\t\tos=mmixware\n+\t\tos=-mmixware\n \t\t;;\n \t*-wec)\n-\t\tos=proelf\n+\t\tos=-proelf\n \t\t;;\n \t*-winbond)\n-\t\tos=proelf\n+\t\tos=-proelf\n \t\t;;\n \t*-oki)\n-\t\tos=proelf\n+\t\tos=-proelf\n \t\t;;\n \t*-hp)\n-\t\tos=hpux\n+\t\tos=-hpux\n \t\t;;\n \t*-hitachi)\n-\t\tos=hiuxwe2\n+\t\tos=-hiux\n \t\t;;\n \ti860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)\n-\t\tos=sysv\n+\t\tos=-sysv\n \t\t;;\n \t*-cbm)\n-\t\tos=amigaos\n+\t\tos=-amigaos\n \t\t;;\n \t*-dg)\n-\t\tos=dgux\n+\t\tos=-dgux\n \t\t;;\n \t*-dolphin)\n-\t\tos=sysv3\n+\t\tos=-sysv3\n \t\t;;\n \tm68k-ccur)\n-\t\tos=rtu\n+\t\tos=-rtu\n \t\t;;\n \tm88k-omron*)\n-\t\tos=luna\n+\t\tos=-luna\n \t\t;;\n-\t*-next)\n-\t\tos=nextstep\n+\t*-next )\n+\t\tos=-nextstep\n \t\t;;\n \t*-sequent)\n-\t\tos=ptx\n+\t\tos=-ptx\n \t\t;;\n \t*-crds)\n-\t\tos=unos\n+\t\tos=-unos\n \t\t;;\n \t*-ns)\n-\t\tos=genix\n+\t\tos=-genix\n \t\t;;\n \ti370-*)\n-\t\tos=mvs\n+\t\tos=-mvs\n+\t\t;;\n+\t*-next)\n+\t\tos=-nextstep3\n \t\t;;\n \t*-gould)\n-\t\tos=sysv\n+\t\tos=-sysv\n \t\t;;\n \t*-highlevel)\n-\t\tos=bsd\n+\t\tos=-bsd\n \t\t;;\n \t*-encore)\n-\t\tos=bsd\n+\t\tos=-bsd\n+\t\t;;\n+\t*-sgi)\n+\t\tos=-irix\n+\t\t;;\n+\t*-siemens)\n+\t\tos=-sysv4\n \t\t;;\n \t*-masscomp)\n-\t\tos=rtu\n+\t\tos=-rtu\n \t\t;;\n \tf30[01]-fujitsu | f700-fujitsu)\n-\t\tos=uxpv\n+\t\tos=-uxpv\n \t\t;;\n \t*-rom68k)\n-\t\tos=\n-\t\tobj=coff\n+\t\tos=-coff\n \t\t;;\n \t*-*bug)\n-\t\tos=\n-\t\tobj=coff\n+\t\tos=-coff\n \t\t;;\n \t*-apple)\n-\t\tos=macos\n+\t\tos=-macos\n \t\t;;\n \t*-atari*)\n-\t\tos=mint\n-\t\t;;\n-\t*-wrs)\n-\t\tos=vxworks\n+\t\tos=-mint\n \t\t;;\n \t*)\n-\t\tos=none\n+\t\tos=-none\n \t\t;;\n esac\n-\n fi\n \n-# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).\n-\n-case $os in\n-\t# Sometimes we do \"kernel-libc\", so those need to count as OSes.\n-\tllvm* | musl* | newlib* | relibc* | uclibc*)\n-\t\t;;\n-\t# Likewise for \"kernel-abi\"\n-\teabi* | gnueabi*)\n-\t\t;;\n-\t# VxWorks passes extra cpu info in the 4th filed.\n-\tsimlinux | simwindows | spe)\n-\t\t;;\n-\t# See `case $cpu-$os` validation below\n-\tghcjs)\n-\t\t;;\n-\t# Now accept the basic system types.\n-\t# Each alternative MUST end in a * to match a version number.\n-\t  abug \\\n-\t| aix* \\\n-\t| amdhsa* \\\n-\t| amigados* \\\n-\t| amigaos* \\\n-\t| android* \\\n-\t| aof* \\\n-\t| aos* \\\n-\t| aros* \\\n-\t| atheos* \\\n-\t| auroraux* \\\n-\t| aux* \\\n-\t| beos* \\\n-\t| bitrig* \\\n-\t| bme* \\\n-\t| bosx* \\\n-\t| bsd* \\\n-\t| cegcc* \\\n-\t| chorusos* \\\n-\t| chorusrdb* \\\n-\t| clix* \\\n-\t| cloudabi* \\\n-\t| cnk* \\\n-\t| conix* \\\n-\t| cos* \\\n-\t| cxux* \\\n-\t| cygwin* \\\n-\t| darwin* \\\n-\t| dgux* \\\n-\t| dicos* \\\n-\t| dnix* \\\n-\t| domain* \\\n-\t| dragonfly* \\\n-\t| drops* \\\n-\t| ebmon* \\\n-\t| ecoff* \\\n-\t| ekkobsd* \\\n-\t| emscripten* \\\n-\t| emx* \\\n-\t| es* \\\n-\t| fiwix* \\\n-\t| freebsd* \\\n-\t| fuchsia* \\\n-\t| genix* \\\n-\t| genode* \\\n-\t| glidix* \\\n-\t| gnu* \\\n-\t| go32* \\\n-\t| haiku* \\\n-\t| hcos* \\\n-\t| hiux* \\\n-\t| hms* \\\n-\t| hpux* \\\n-\t| ieee* \\\n-\t| interix* \\\n-\t| ios* \\\n-\t| iris* \\\n-\t| irix* \\\n-\t| ironclad* \\\n-\t| isc* \\\n-\t| its* \\\n-\t| l4re* \\\n-\t| libertybsd* \\\n-\t| lites* \\\n-\t| lnews* \\\n-\t| luna* \\\n-\t| lynxos* \\\n-\t| mach* \\\n-\t| macos* \\\n-\t| magic* \\\n-\t| mbr* \\\n-\t| midipix* \\\n-\t| midnightbsd* \\\n-\t| mingw32* \\\n-\t| mingw64* \\\n-\t| minix* \\\n-\t| mint* \\\n-\t| mirbsd* \\\n-\t| mks* \\\n-\t| mlibc* \\\n-\t| mmixware* \\\n-\t| mon960* \\\n-\t| morphos* \\\n-\t| moss* \\\n-\t| moxiebox* \\\n-\t| mpeix* \\\n-\t| mpw* \\\n-\t| msdos* \\\n-\t| msys* \\\n-\t| mvs* \\\n-\t| nacl* \\\n-\t| netbsd* \\\n-\t| netware* \\\n-\t| newsos* \\\n-\t| nextstep* \\\n-\t| nindy* \\\n-\t| nonstopux* \\\n-\t| nova* \\\n-\t| nsk* \\\n-\t| nucleus* \\\n-\t| nx6 \\\n-\t| nx7 \\\n-\t| oabi* \\\n-\t| ohos* \\\n-\t| onefs* \\\n-\t| openbsd* \\\n-\t| openedition* \\\n-\t| openstep* \\\n-\t| os108* \\\n-\t| os2* \\\n-\t| os400* \\\n-\t| os68k* \\\n-\t| os9* \\\n-\t| ose* \\\n-\t| osf* \\\n-\t| oskit* \\\n-\t| osx* \\\n-\t| palmos* \\\n-\t| phoenix* \\\n-\t| plan9* \\\n-\t| powermax* \\\n-\t| powerunix* \\\n-\t| proelf* \\\n-\t| psos* \\\n-\t| psp* \\\n-\t| ptx* \\\n-\t| pw32* \\\n-\t| qnx* \\\n-\t| rdos* \\\n-\t| redox* \\\n-\t| rhapsody* \\\n-\t| riscix* \\\n-\t| riscos* \\\n-\t| rtems* \\\n-\t| rtmk* \\\n-\t| rtu* \\\n-\t| scout* \\\n-\t| secbsd* \\\n-\t| sei* \\\n-\t| serenity* \\\n-\t| sim* \\\n-\t| skyos* \\\n-\t| solaris* \\\n-\t| solidbsd* \\\n-\t| sortix* \\\n-\t| storm-chaos* \\\n-\t| sunos \\\n-\t| sunos[34]* \\\n-\t| superux* \\\n-\t| syllable* \\\n-\t| sym* \\\n-\t| sysv* \\\n-\t| tenex* \\\n-\t| tirtos* \\\n-\t| toppers* \\\n-\t| tops10* \\\n-\t| tops20* \\\n-\t| tpf* \\\n-\t| tvos* \\\n-\t| twizzler* \\\n-\t| uclinux* \\\n-\t| udi* \\\n-\t| udk* \\\n-\t| ultrix* \\\n-\t| unicos* \\\n-\t| uniplus* \\\n-\t| unleashed* \\\n-\t| unos* \\\n-\t| uwin* \\\n-\t| uxpv* \\\n-\t| v88r* \\\n-\t|*vms* \\\n-\t| vos* \\\n-\t| vsta* \\\n-\t| vxsim* \\\n-\t| vxworks* \\\n-\t| wasi* \\\n-\t| watchos* \\\n-\t| wince* \\\n-\t| windiss* \\\n-\t| windows* \\\n-\t| winnt* \\\n-\t| xenix* \\\n-\t| xray* \\\n-\t| zephyr* \\\n-\t| zvmoe* )\n-\t\t;;\n-\t# This one is extra strict with allowed versions\n-\tsco3.2v2 | sco3.2v[4-9]* | sco5v6*)\n-\t\t# Don't forget version if it is 3.2v4 or newer.\n-\t\t;;\n-\t# This refers to builds using the UEFI calling convention\n-\t# (which depends on the architecture) and PE file format.\n-\t# Note that this is both a different calling convention and\n-\t# different file format than that of GNU-EFI\n-\t# (x86_64-w64-mingw32).\n-\tuefi)\n-\t\t;;\n-\tnone)\n-\t\t;;\n-\tkernel* | msvc* )\n-\t\t# Restricted further below\n-\t\t;;\n-\t'')\n-\t\tif test x\"$obj\" = x\n-\t\tthen\n-\t\t\techo \"Invalid configuration '$1': Blank OS only allowed with explicit machine code file format\" 1>&2\n-\t\tfi\n-\t\t;;\n-\t*)\n-\t\techo \"Invalid configuration '$1': OS '$os' not recognized\" 1>&2\n-\t\texit 1\n-\t\t;;\n-esac\n-\n-case $obj in\n-\taout* | coff* | elf* | pe*)\n-\t\t;;\n-\t'')\n-\t\t# empty is fine\n-\t\t;;\n-\t*)\n-\t\techo \"Invalid configuration '$1': Machine code format '$obj' not recognized\" 1>&2\n-\t\texit 1\n-\t\t;;\n-esac\n-\n-# Here we handle the constraint that a (synthetic) cpu and os are\n-# valid only in combination with each other and nowhere else.\n-case $cpu-$os in\n-\t# The \"javascript-unknown-ghcjs\" triple is used by GHC; we\n-\t# accept it here in order to tolerate that, but reject any\n-\t# variations.\n-\tjavascript-ghcjs)\n-\t\t;;\n-\tjavascript-* | *-ghcjs)\n-\t\techo \"Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'\" 1>&2\n-\t\texit 1\n-\t\t;;\n-esac\n-\n-# As a final step for OS-related things, validate the OS-kernel combination\n-# (given a valid OS), if there is a kernel.\n-case $kernel-$os-$obj in\n-\tlinux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \\\n-\t\t    | linux-mlibc*- | linux-musl*- | linux-newlib*- \\\n-\t\t    | linux-relibc*- | linux-uclibc*- | linux-ohos*- )\n-\t\t;;\n-\tuclinux-uclibc*- | uclinux-gnu*- )\n-\t\t;;\n-\tmanagarm-mlibc*- | managarm-kernel*- )\n-\t\t;;\n-\twindows*-msvc*-)\n-\t\t;;\n-\t-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \\\n-\t\t    | -uclibc*- )\n-\t\t# These are just libc implementations, not actual OSes, and thus\n-\t\t# require a kernel.\n-\t\techo \"Invalid configuration '$1': libc '$os' needs explicit kernel.\" 1>&2\n-\t\texit 1\n-\t\t;;\n-\t-kernel*- )\n-\t\techo \"Invalid configuration '$1': '$os' needs explicit kernel.\" 1>&2\n-\t\texit 1\n-\t\t;;\n-\t*-kernel*- )\n-\t\techo \"Invalid configuration '$1': '$kernel' does not support '$os'.\" 1>&2\n-\t\texit 1\n-\t\t;;\n-\t*-msvc*- )\n-\t\techo \"Invalid configuration '$1': '$os' needs 'windows'.\" 1>&2\n-\t\texit 1\n-\t\t;;\n-\tkfreebsd*-gnu*- | knetbsd*-gnu*- | netbsd*-gnu*- | kopensolaris*-gnu*-)\n-\t\t;;\n-\tvxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)\n-\t\t;;\n-\tnto-qnx*-)\n-\t\t;;\n-\tos2-emx-)\n-\t\t;;\n-\trtmk-nova-)\n-\t\t;;\n-\t*-eabi*- | *-gnueabi*-)\n-\t\t;;\n-\tnone--*)\n-\t\t# None (no kernel, i.e. freestanding / bare metal),\n-\t\t# can be paired with an machine code file format\n-\t\t;;\n-\t-*-)\n-\t\t# Blank kernel with real OS is always fine.\n-\t\t;;\n-\t--*)\n-\t\t# Blank kernel and OS with real machine code file format is always fine.\n-\t\t;;\n-\t*-*-*)\n-\t\techo \"Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'.\" 1>&2\n-\t\texit 1\n-\t\t;;\n-esac\n-\n # Here we handle the case where we know the os, and the CPU type, but not the\n # manufacturer.  We pick the logical manufacturer.\n-case $vendor in\n-\tunknown)\n-\t\tcase $cpu-$os in\n-\t\t\t*-riscix*)\n+vendor=unknown\n+case $basic_machine in\n+\t*-unknown)\n+\t\tcase $os in\n+\t\t\t-riscix*)\n \t\t\t\tvendor=acorn\n \t\t\t\t;;\n-\t\t\t*-sunos* | *-solaris*)\n+\t\t\t-sunos*)\n \t\t\t\tvendor=sun\n \t\t\t\t;;\n-\t\t\t*-cnk* | *-aix*)\n+\t\t\t-cnk*|-aix*)\n \t\t\t\tvendor=ibm\n \t\t\t\t;;\n-\t\t\t*-beos*)\n+\t\t\t-beos*)\n \t\t\t\tvendor=be\n \t\t\t\t;;\n-\t\t\t*-hpux*)\n+\t\t\t-hpux*)\n \t\t\t\tvendor=hp\n \t\t\t\t;;\n-\t\t\t*-mpeix*)\n+\t\t\t-mpeix*)\n \t\t\t\tvendor=hp\n \t\t\t\t;;\n-\t\t\t*-hiux*)\n+\t\t\t-hiux*)\n \t\t\t\tvendor=hitachi\n \t\t\t\t;;\n-\t\t\t*-unos*)\n+\t\t\t-unos*)\n \t\t\t\tvendor=crds\n \t\t\t\t;;\n-\t\t\t*-dgux*)\n+\t\t\t-dgux*)\n \t\t\t\tvendor=dg\n \t\t\t\t;;\n-\t\t\t*-luna*)\n+\t\t\t-luna*)\n \t\t\t\tvendor=omron\n \t\t\t\t;;\n-\t\t\t*-genix*)\n+\t\t\t-genix*)\n \t\t\t\tvendor=ns\n \t\t\t\t;;\n-\t\t\t*-clix*)\n-\t\t\t\tvendor=intergraph\n-\t\t\t\t;;\n-\t\t\t*-mvs* | *-opened*)\n-\t\t\t\tvendor=ibm\n-\t\t\t\t;;\n-\t\t\t*-os400*)\n+\t\t\t-mvs* | -opened*)\n \t\t\t\tvendor=ibm\n \t\t\t\t;;\n-\t\t\ts390-* | s390x-*)\n+\t\t\t-os400*)\n \t\t\t\tvendor=ibm\n \t\t\t\t;;\n-\t\t\t*-ptx*)\n+\t\t\t-ptx*)\n \t\t\t\tvendor=sequent\n \t\t\t\t;;\n-\t\t\t*-tpf*)\n+\t\t\t-tpf*)\n \t\t\t\tvendor=ibm\n \t\t\t\t;;\n-\t\t\t*-vxsim* | *-vxworks* | *-windiss*)\n+\t\t\t-vxsim* | -vxworks* | -windiss*)\n \t\t\t\tvendor=wrs\n \t\t\t\t;;\n-\t\t\t*-aux*)\n+\t\t\t-aux*)\n \t\t\t\tvendor=apple\n \t\t\t\t;;\n-\t\t\t*-hms*)\n+\t\t\t-hms*)\n \t\t\t\tvendor=hitachi\n \t\t\t\t;;\n-\t\t\t*-mpw* | *-macos*)\n+\t\t\t-mpw* | -macos*)\n \t\t\t\tvendor=apple\n \t\t\t\t;;\n-\t\t\t*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)\n+\t\t\t-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)\n \t\t\t\tvendor=atari\n \t\t\t\t;;\n-\t\t\t*-vos*)\n+\t\t\t-vos*)\n \t\t\t\tvendor=stratus\n \t\t\t\t;;\n \t\tesac\n+\t\tbasic_machine=`echo $basic_machine | sed \"s/unknown/$vendor/\"`\n \t\t;;\n esac\n \n-echo \"$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}\"\n+echo $basic_machine$os\n exit\n \n # Local variables:\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"timestamp='\"\n # time-stamp-format: \"%:y-%02m-%02d\"\n # time-stamp-end: \"'\"\ndiff --git a/configure b/configure\nindex c67609c..39268ea 100755\n--- a/configure\n+++ b/configure\n@@ -1,10 +1,9 @@\n #! /bin/sh\n # Guess values for system-dependent variables and create Makefiles.\n-# Generated by GNU Autoconf 2.72 for libe-book 0.1.4.\n+# Generated by GNU Autoconf 2.69 for libe-book 0.1.3.\n #\n #\n-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,\n-# Inc.\n+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.\n #\n #\n # This configure script is free software; the Free Software Foundation\n@@ -15,65 +14,63 @@\n \n # Be more Bourne compatible\n DUALCASE=1; export DUALCASE # for MKS sh\n-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1\n-then :\n+if test -n \"${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :\n   emulate sh\n   NULLCMD=:\n   # Pre-4.2 versions of Zsh do word splitting on ${1+\"$@\"}, which\n   # is contrary to our usage.  Disable this feature.\n   alias -g '${1+\"$@\"}'='\"$@\"'\n   setopt NO_GLOB_SUBST\n-else case e in #(\n-  e) case `(set -o) 2>/dev/null` in #(\n+else\n+  case `(set -o) 2>/dev/null` in #(\n   *posix*) :\n     set -o posix ;; #(\n   *) :\n      ;;\n-esac ;;\n esac\n fi\n \n \n-\n-# Reset variables that may have inherited troublesome values from\n-# the environment.\n-\n-# IFS needs to be set, to space, tab, and newline, in precisely that order.\n-# (If _AS_PATH_WALK were called with IFS unset, it would have the\n-# side effect of setting IFS to empty, thus disabling word splitting.)\n-# Quoting is to prevent editors from complaining about space-tab.\n as_nl='\n '\n export as_nl\n-IFS=\" \"\"\t$as_nl\"\n-\n-PS1='$ '\n-PS2='> '\n-PS4='+ '\n-\n-# Ensure predictable behavior from utilities with locale-dependent output.\n-LC_ALL=C\n-export LC_ALL\n-LANGUAGE=C\n-export LANGUAGE\n-\n-# We cannot yet rely on \"unset\" to work, but we need these variables\n-# to be unset--not just set to an empty or harmless value--now, to\n-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct\n-# also avoids known problems related to \"unset\" and subshell syntax\n-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).\n-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH\n-do eval test \\${$as_var+y} \\\n-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :\n-done\n-\n-# Ensure that fds 0, 1, and 2 are open.\n-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi\n-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi\n-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi\n+# Printing a long string crashes Solaris 7 /usr/bin/printf.\n+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'\n+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo\n+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo\n+# Prefer a ksh shell builtin over an external printf program on Solaris,\n+# but without wasting forks for bash or zsh.\n+if test -z \"$BASH_VERSION$ZSH_VERSION\" \\\n+    && (test \"X`print -r -- $as_echo`\" = \"X$as_echo\") 2>/dev/null; then\n+  as_echo='print -r --'\n+  as_echo_n='print -rn --'\n+elif (test \"X`printf %s $as_echo`\" = \"X$as_echo\") 2>/dev/null; then\n+  as_echo='printf %s\\n'\n+  as_echo_n='printf %s'\n+else\n+  if test \"X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`\" = \"X-n $as_echo\"; then\n+    as_echo_body='eval /usr/ucb/echo -n \"$1$as_nl\"'\n+    as_echo_n='/usr/ucb/echo -n'\n+  else\n+    as_echo_body='eval expr \"X$1\" : \"X\\\\(.*\\\\)\"'\n+    as_echo_n_body='eval\n+      arg=$1;\n+      case $arg in #(\n+      *\"$as_nl\"*)\n+\texpr \"X$arg\" : \"X\\\\(.*\\\\)$as_nl\";\n+\targ=`expr \"X$arg\" : \".*$as_nl\\\\(.*\\\\)\"`;;\n+      esac;\n+      expr \"X$arg\" : \"X\\\\(.*\\\\)\" | tr -d \"$as_nl\"\n+    '\n+    export as_echo_n_body\n+    as_echo_n='sh -c $as_echo_n_body as_echo'\n+  fi\n+  export as_echo_body\n+  as_echo='sh -c $as_echo_body as_echo'\n+fi\n \n # The user is always right.\n-if ${PATH_SEPARATOR+false} :; then\n+if test \"${PATH_SEPARATOR+set}\" != set; then\n   PATH_SEPARATOR=:\n   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {\n     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||\n@@ -82,6 +79,13 @@ if ${PATH_SEPARATOR+false} :; then\n fi\n \n \n+# IFS\n+# We need space, tab and new line, in precisely that order.  Quoting is\n+# there to prevent editors from complaining about space-tab.\n+# (If _AS_PATH_WALK were called with IFS unset, it would disable word\n+# splitting by setting IFS to empty value.)\n+IFS=\" \"\"\t$as_nl\"\n+\n # Find who we are.  Look in the path if we contain no directory separator.\n as_myself=\n case $0 in #((\n@@ -90,27 +94,43 @@ case $0 in #((\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    test -r \"$as_dir$0\" && as_myself=$as_dir$0 && break\n+  test -z \"$as_dir\" && as_dir=.\n+    test -r \"$as_dir/$0\" && as_myself=$as_dir/$0 && break\n   done\n IFS=$as_save_IFS\n \n      ;;\n esac\n-# We did not find ourselves, most probably we were run as 'sh COMMAND'\n+# We did not find ourselves, most probably we were run as `sh COMMAND'\n # in which case we are not to be found in the path.\n if test \"x$as_myself\" = x; then\n   as_myself=$0\n fi\n if test ! -f \"$as_myself\"; then\n-  printf \"%s\\n\" \"$as_myself: error: cannot find myself; rerun with an absolute file name\" >&2\n+  $as_echo \"$as_myself: error: cannot find myself; rerun with an absolute file name\" >&2\n   exit 1\n fi\n \n+# Unset variables that we do not need and which cause bugs (e.g. in\n+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the \"|| exit 1\"\n+# suppresses any \"Segmentation fault\" message there.  '((' could\n+# trigger a bug in pdksh 5.2.14.\n+for as_var in BASH_ENV ENV MAIL MAILPATH\n+do eval test x\\${$as_var+set} = xset \\\n+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :\n+done\n+PS1='$ '\n+PS2='> '\n+PS4='+ '\n+\n+# NLS nuisances.\n+LC_ALL=C\n+export LC_ALL\n+LANGUAGE=C\n+export LANGUAGE\n+\n+# CDPATH.\n+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH\n \n # Use a proper internal environment variable to ensure we don't fall\n   # into an infinite loop, continuously re-executing ourselves.\n@@ -131,28 +151,26 @@ case $- in # ((((\n esac\n exec $CONFIG_SHELL $as_opts \"$as_myself\" ${1+\"$@\"}\n # Admittedly, this is quite paranoid, since all the known shells bail\n-# out after a failed 'exec'.\n-printf \"%s\\n\" \"$0: could not re-execute with $CONFIG_SHELL\" >&2\n-exit 255\n+# out after a failed `exec'.\n+$as_echo \"$0: could not re-execute with $CONFIG_SHELL\" >&2\n+as_fn_exit 255\n   fi\n   # We don't want this to propagate to other subprocesses.\n           { _as_can_reexec=; unset _as_can_reexec;}\n if test \"x$CONFIG_SHELL\" = x; then\n-  as_bourne_compatible=\"if test \\${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1\n-then :\n+  as_bourne_compatible=\"if test -n \\\"\\${ZSH_VERSION+set}\\\" && (emulate sh) >/dev/null 2>&1; then :\n   emulate sh\n   NULLCMD=:\n   # Pre-4.2 versions of Zsh do word splitting on \\${1+\\\"\\$@\\\"}, which\n   # is contrary to our usage.  Disable this feature.\n   alias -g '\\${1+\\\"\\$@\\\"}'='\\\"\\$@\\\"'\n   setopt NO_GLOB_SUBST\n-else case e in #(\n-  e) case \\`(set -o) 2>/dev/null\\` in #(\n+else\n+  case \\`(set -o) 2>/dev/null\\` in #(\n   *posix*) :\n     set -o posix ;; #(\n   *) :\n      ;;\n-esac ;;\n esac\n fi\n \"\n@@ -167,16 +185,12 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }\n as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }\n as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }\n as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }\n-if ( set x; as_fn_ret_success y && test x = \\\"\\$1\\\" )\n-then :\n+if ( set x; as_fn_ret_success y && test x = \\\"\\$1\\\" ); then :\n \n-else case e in #(\n-  e) exitcode=1; echo positional parameters were not saved. ;;\n-esac\n+else\n+  exitcode=1; echo positional parameters were not saved.\n fi\n test x\\$exitcode = x0 || exit 1\n-blah=\\$(echo \\$(echo blah))\n-test x\\\"\\$blah\\\" = xblah || exit 1\n test -x / || exit 1\"\n   as_suggested=\"  as_lineno_1=\";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested\" as_lineno_1a=\\$LINENO\n   as_lineno_2=\";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested\" as_lineno_2a=\\$LINENO\n@@ -191,39 +205,30 @@ test -x / || exit 1\"\n     test \\\"X\\`printf %s \\$ECHO\\`\\\" = \\\"X\\$ECHO\\\" \\\\\n       || test \\\"X\\`print -r -- \\$ECHO\\`\\\" = \\\"X\\$ECHO\\\" ) || exit 1\n test \\$(( 1 + 1 )) = 2 || exit 1\"\n-  if (eval \"$as_required\") 2>/dev/null\n-then :\n+  if (eval \"$as_required\") 2>/dev/null; then :\n   as_have_required=yes\n-else case e in #(\n-  e) as_have_required=no ;;\n-esac\n+else\n+  as_have_required=no\n fi\n-  if test x$as_have_required = xyes && (eval \"$as_suggested\") 2>/dev/null\n-then :\n+  if test x$as_have_required = xyes && (eval \"$as_suggested\") 2>/dev/null; then :\n \n-else case e in #(\n-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n+else\n+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n as_found=false\n for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n   as_found=:\n   case $as_dir in #(\n \t /*)\n \t   for as_base in sh bash ksh sh5; do\n \t     # Try only shells that exist, to save several forks.\n-\t     as_shell=$as_dir$as_base\n+\t     as_shell=$as_dir/$as_base\n \t     if { test -f \"$as_shell\" || test -f \"$as_shell.exe\"; } &&\n-\t\t    as_run=a \"$as_shell\" -c \"$as_bourne_compatible\"\"$as_required\" 2>/dev/null\n-then :\n+\t\t    { $as_echo \"$as_bourne_compatible\"\"$as_required\" | as_run=a \"$as_shell\"; } 2>/dev/null; then :\n   CONFIG_SHELL=$as_shell as_have_required=yes\n-\t\t   if as_run=a \"$as_shell\" -c \"$as_bourne_compatible\"\"$as_suggested\" 2>/dev/null\n-then :\n+\t\t   if { $as_echo \"$as_bourne_compatible\"\"$as_suggested\" | as_run=a \"$as_shell\"; } 2>/dev/null; then :\n   break 2\n fi\n fi\n@@ -231,22 +236,14 @@ fi\n        esac\n   as_found=false\n done\n-IFS=$as_save_IFS\n-if $as_found\n-then :\n-\n-else case e in #(\n-  e) if { test -f \"$SHELL\" || test -f \"$SHELL.exe\"; } &&\n-\t      as_run=a \"$SHELL\" -c \"$as_bourne_compatible\"\"$as_required\" 2>/dev/null\n-then :\n+$as_found || { if { test -f \"$SHELL\" || test -f \"$SHELL.exe\"; } &&\n+\t      { $as_echo \"$as_bourne_compatible\"\"$as_required\" | as_run=a \"$SHELL\"; } 2>/dev/null; then :\n   CONFIG_SHELL=$SHELL as_have_required=yes\n-fi ;;\n-esac\n-fi\n+fi; }\n+IFS=$as_save_IFS\n \n \n-      if test \"x$CONFIG_SHELL\" != x\n-then :\n+      if test \"x$CONFIG_SHELL\" != x; then :\n   export CONFIG_SHELL\n              # We cannot yet assume a decent shell, so we have to provide a\n # neutralization value for shells without unset; and this also\n@@ -263,27 +260,25 @@ case $- in # ((((\n esac\n exec $CONFIG_SHELL $as_opts \"$as_myself\" ${1+\"$@\"}\n # Admittedly, this is quite paranoid, since all the known shells bail\n-# out after a failed 'exec'.\n-printf \"%s\\n\" \"$0: could not re-execute with $CONFIG_SHELL\" >&2\n+# out after a failed `exec'.\n+$as_echo \"$0: could not re-execute with $CONFIG_SHELL\" >&2\n exit 255\n fi\n \n-    if test x$as_have_required = xno\n-then :\n-  printf \"%s\\n\" \"$0: This script requires a shell more modern than all\"\n-  printf \"%s\\n\" \"$0: the shells that I found on your system.\"\n-  if test ${ZSH_VERSION+y} ; then\n-    printf \"%s\\n\" \"$0: In particular, zsh $ZSH_VERSION has bugs and should\"\n-    printf \"%s\\n\" \"$0: be upgraded to zsh 4.3.4 or later.\"\n+    if test x$as_have_required = xno; then :\n+  $as_echo \"$0: This script requires a shell more modern than all\"\n+  $as_echo \"$0: the shells that I found on your system.\"\n+  if test x${ZSH_VERSION+set} = xset ; then\n+    $as_echo \"$0: In particular, zsh $ZSH_VERSION has bugs and should\"\n+    $as_echo \"$0: be upgraded to zsh 4.3.4 or later.\"\n   else\n-    printf \"%s\\n\" \"$0: Please tell bug-autoconf@gnu.org about your system,\n+    $as_echo \"$0: Please tell bug-autoconf@gnu.org about your system,\n $0: including any error possibly output before this\n $0: message. Then install a modern shell, or manually run\n $0: the script under such a shell if you do have one.\"\n   fi\n   exit 1\n-fi ;;\n-esac\n+fi\n fi\n fi\n SHELL=${CONFIG_SHELL-/bin/sh}\n@@ -304,7 +299,6 @@ as_fn_unset ()\n }\n as_unset=as_fn_unset\n \n-\n # as_fn_set_status STATUS\n # -----------------------\n # Set $? to STATUS, without forking.\n@@ -336,7 +330,7 @@ as_fn_mkdir_p ()\n     as_dirs=\n     while :; do\n       case $as_dir in #(\n-      *\\'*) as_qdir=`printf \"%s\\n\" \"$as_dir\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;; #'(\n+      *\\'*) as_qdir=`$as_echo \"$as_dir\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;; #'(\n       *) as_qdir=$as_dir;;\n       esac\n       as_dirs=\"'$as_qdir' $as_dirs\"\n@@ -345,7 +339,7 @@ $as_expr X\"$as_dir\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n \t X\"$as_dir\" : 'X\\(//\\)[^/]' \\| \\\n \t X\"$as_dir\" : 'X\\(//\\)$' \\| \\\n \t X\"$as_dir\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X\"$as_dir\" |\n+$as_echo X\"$as_dir\" |\n     sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -384,18 +378,16 @@ as_fn_executable_p ()\n # advantage of any shell optimizations that allow amortized linear growth over\n # repeated appends, instead of the typical quadratic growth present in naive\n # implementations.\n-if (eval \"as_var=1; as_var+=2; test x\\$as_var = x12\") 2>/dev/null\n-then :\n+if (eval \"as_var=1; as_var+=2; test x\\$as_var = x12\") 2>/dev/null; then :\n   eval 'as_fn_append ()\n   {\n     eval $1+=\\$2\n   }'\n-else case e in #(\n-  e) as_fn_append ()\n+else\n+  as_fn_append ()\n   {\n     eval $1=\\$$1\\$2\n-  } ;;\n-esac\n+  }\n fi # as_fn_append\n \n # as_fn_arith ARG...\n@@ -403,18 +395,16 @@ fi # as_fn_append\n # Perform arithmetic evaluation on the ARGs, and store the result in the\n # global $as_val. Take advantage of shells that can avoid forks. The arguments\n # must be portable across $(()) and expr.\n-if (eval \"test \\$(( 1 + 1 )) = 2\") 2>/dev/null\n-then :\n+if (eval \"test \\$(( 1 + 1 )) = 2\") 2>/dev/null; then :\n   eval 'as_fn_arith ()\n   {\n     as_val=$(( $* ))\n   }'\n-else case e in #(\n-  e) as_fn_arith ()\n+else\n+  as_fn_arith ()\n   {\n     as_val=`expr \"$@\" || test $? -eq 1`\n-  } ;;\n-esac\n+  }\n fi # as_fn_arith\n \n \n@@ -428,9 +418,9 @@ as_fn_error ()\n   as_status=$1; test $as_status -eq 0 && as_status=1\n   if test \"$4\"; then\n     as_lineno=${as_lineno-\"$3\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: $2\" >&$4\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: error: $2\" >&$4\n   fi\n-  printf \"%s\\n\" \"$as_me: error: $2\" >&2\n+  $as_echo \"$as_me: error: $2\" >&2\n   as_fn_exit $as_status\n } # as_fn_error\n \n@@ -457,7 +447,7 @@ as_me=`$as_basename -- \"$0\" ||\n $as_expr X/\"$0\" : '.*/\\([^/][^/]*\\)/*$' \\| \\\n \t X\"$0\" : 'X\\(//\\)$' \\| \\\n \t X\"$0\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X/\"$0\" |\n+$as_echo X/\"$0\" |\n     sed '/^.*\\/\\([^/][^/]*\\)\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -490,8 +480,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits\n     /[$]LINENO/=\n   ' <$as_myself |\n     sed '\n-      t clear\n-      :clear\n       s/[$]LINENO.*/&-/\n       t lineno\n       b\n@@ -503,7 +491,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits\n       s/-\\n.*//\n     ' >$as_me.lineno &&\n   chmod +x \"$as_me.lineno\" ||\n-    { printf \"%s\\n\" \"$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell\" >&2; as_fn_exit 1; }\n+    { $as_echo \"$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell\" >&2; as_fn_exit 1; }\n \n   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have\n   # already done that, so ensure we don't try to do so again and fall\n@@ -517,10 +505,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits\n   exit\n }\n \n-\n-# Determine whether it's possible to make 'echo' print without a newline.\n-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed\n-# for compatibility with existing Makefiles.\n ECHO_C= ECHO_N= ECHO_T=\n case `echo -n x` in #(((((\n -n*)\n@@ -534,12 +518,6 @@ case `echo -n x` in #(((((\n   ECHO_N='-n';;\n esac\n \n-# For backward compatibility with old third-party macros, we provide\n-# the shell variables $as_echo and $as_echo_n.  New code should use\n-# AS_ECHO([\"message\"]) and AS_ECHO_N([\"message\"]), respectively.\n-as_echo='printf %s\\n'\n-as_echo_n='printf %s'\n-\n rm -f conf$$ conf$$.exe conf$$.file\n if test -d conf$$.dir; then\n   rm -f conf$$.dir/conf$$.file\n@@ -551,9 +529,9 @@ if (echo >conf$$.file) 2>/dev/null; then\n   if ln -s conf$$.file conf$$ 2>/dev/null; then\n     as_ln_s='ln -s'\n     # ... but there are two gotchas:\n-    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.\n-    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.\n-    # In both cases, we have to default to 'cp -pR'.\n+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.\n+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.\n+    # In both cases, we have to default to `cp -pR'.\n     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||\n       as_ln_s='cp -pR'\n   elif ln conf$$.file conf$$ 2>/dev/null; then\n@@ -578,12 +556,10 @@ as_test_x='test -x'\n as_executable_p=as_fn_executable_p\n \n # Sed expression to map a string onto a valid CPP name.\n-as_sed_cpp=\"y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g\"\n-as_tr_cpp=\"eval sed '$as_sed_cpp'\" # deprecated\n+as_tr_cpp=\"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'\"\n \n # Sed expression to map a string onto a valid variable name.\n-as_sed_sh=\"y%*+%pp%;s%[^_$as_cr_alnum]%_%g\"\n-as_tr_sh=\"eval sed '$as_sed_sh'\" # deprecated\n+as_tr_sh=\"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'\"\n \n SHELL=${CONFIG_SHELL-/bin/sh}\n \n@@ -611,43 +587,47 @@ MAKEFLAGS=\n # Identity of this package.\n PACKAGE_NAME='libe-book'\n PACKAGE_TARNAME='libe-book'\n-PACKAGE_VERSION='0.1.4'\n-PACKAGE_STRING='libe-book 0.1.4'\n+PACKAGE_VERSION='0.1.3'\n+PACKAGE_STRING='libe-book 0.1.3'\n PACKAGE_BUGREPORT=''\n PACKAGE_URL=''\n \n # Factoring default headers for most tests.\n ac_includes_default=\"\\\n-#include <stddef.h>\n-#ifdef HAVE_STDIO_H\n-# include <stdio.h>\n+#include <stdio.h>\n+#ifdef HAVE_SYS_TYPES_H\n+# include <sys/types.h>\n+#endif\n+#ifdef HAVE_SYS_STAT_H\n+# include <sys/stat.h>\n #endif\n-#ifdef HAVE_STDLIB_H\n+#ifdef STDC_HEADERS\n # include <stdlib.h>\n+# include <stddef.h>\n+#else\n+# ifdef HAVE_STDLIB_H\n+#  include <stdlib.h>\n+# endif\n #endif\n #ifdef HAVE_STRING_H\n+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H\n+#  include <memory.h>\n+# endif\n # include <string.h>\n #endif\n+#ifdef HAVE_STRINGS_H\n+# include <strings.h>\n+#endif\n #ifdef HAVE_INTTYPES_H\n # include <inttypes.h>\n #endif\n #ifdef HAVE_STDINT_H\n # include <stdint.h>\n #endif\n-#ifdef HAVE_STRINGS_H\n-# include <strings.h>\n-#endif\n-#ifdef HAVE_SYS_TYPES_H\n-# include <sys/types.h>\n-#endif\n-#ifdef HAVE_SYS_STAT_H\n-# include <sys/stat.h>\n-#endif\n #ifdef HAVE_UNISTD_H\n # include <unistd.h>\n #endif\"\n \n-ac_header_c_list=\n ac_subst_vars='am__EXEEXT_FALSE\n am__EXEEXT_TRUE\n LTLIBOBJS\n@@ -721,7 +701,6 @@ NMEDIT\n DSYMUTIL\n MANIFEST_TOOL\n RANLIB\n-FILECMD\n NM\n ac_ct_DUMPBIN\n DUMPBIN\n@@ -757,6 +736,7 @@ am__nodep\n AMDEPBACKSLASH\n AMDEP_FALSE\n AMDEP_TRUE\n+am__quote\n am__include\n DEPDIR\n OBJEXT\n@@ -768,15 +748,10 @@ CFLAGS\n CC\n ac_ct_AR\n AR\n-am__xargs_n\n-am__rm_f_notfound\n AM_BACKSLASH\n AM_DEFAULT_VERBOSITY\n AM_DEFAULT_V\n AM_V\n-CSCOPE\n-ETAGS\n-CTAGS\n am__untar\n am__tar\n AMTAR\n@@ -819,7 +794,6 @@ infodir\n docdir\n oldincludedir\n includedir\n-runstatedir\n localstatedir\n sharedstatedir\n sysconfdir\n@@ -838,8 +812,7 @@ PACKAGE_VERSION\n PACKAGE_TARNAME\n PACKAGE_NAME\n PATH_SEPARATOR\n-SHELL\n-am__quote'\n+SHELL'\n ac_subst_files=''\n ac_user_opts='\n enable_option_checking\n@@ -847,11 +820,9 @@ enable_silent_rules\n enable_experimental\n enable_dependency_tracking\n enable_static\n-enable_pic\n with_pic\n enable_shared\n enable_fast_install\n-enable_aix_soname\n with_aix_soname\n with_gnu_ld\n with_sysroot\n@@ -943,7 +914,6 @@ datadir='${datarootdir}'\n sysconfdir='${prefix}/etc'\n sharedstatedir='${prefix}/com'\n localstatedir='${prefix}/var'\n-runstatedir='${localstatedir}/run'\n includedir='${prefix}/include'\n oldincludedir='/usr/include'\n docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'\n@@ -973,6 +943,8 @@ do\n   *)    ac_optarg=yes ;;\n   esac\n \n+  # Accept the important Cygnus configure options, so we can diagnose typos.\n+\n   case $ac_dashdash$ac_option in\n   --)\n     ac_dashdash=yes ;;\n@@ -1013,9 +985,9 @@ do\n     ac_useropt=`expr \"x$ac_option\" : 'x-*disable-\\(.*\\)'`\n     # Reject names that are not valid shell variable names.\n     expr \"x$ac_useropt\" : \".*[^-+._$as_cr_alnum]\" >/dev/null &&\n-      as_fn_error $? \"invalid feature name: '$ac_useropt'\"\n+      as_fn_error $? \"invalid feature name: $ac_useropt\"\n     ac_useropt_orig=$ac_useropt\n-    ac_useropt=`printf \"%s\\n\" \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n+    ac_useropt=`$as_echo \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n     case $ac_user_opts in\n       *\"\n \"enable_$ac_useropt\"\n@@ -1039,9 +1011,9 @@ do\n     ac_useropt=`expr \"x$ac_option\" : 'x-*enable-\\([^=]*\\)'`\n     # Reject names that are not valid shell variable names.\n     expr \"x$ac_useropt\" : \".*[^-+._$as_cr_alnum]\" >/dev/null &&\n-      as_fn_error $? \"invalid feature name: '$ac_useropt'\"\n+      as_fn_error $? \"invalid feature name: $ac_useropt\"\n     ac_useropt_orig=$ac_useropt\n-    ac_useropt=`printf \"%s\\n\" \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n+    ac_useropt=`$as_echo \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n     case $ac_user_opts in\n       *\"\n \"enable_$ac_useropt\"\n@@ -1194,15 +1166,6 @@ do\n   | -silent | --silent | --silen | --sile | --sil)\n     silent=yes ;;\n \n-  -runstatedir | --runstatedir | --runstatedi | --runstated \\\n-  | --runstate | --runstat | --runsta | --runst | --runs \\\n-  | --run | --ru | --r)\n-    ac_prev=runstatedir ;;\n-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \\\n-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \\\n-  | --run=* | --ru=* | --r=*)\n-    runstatedir=$ac_optarg ;;\n-\n   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)\n     ac_prev=sbindir ;;\n   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \\\n@@ -1252,9 +1215,9 @@ do\n     ac_useropt=`expr \"x$ac_option\" : 'x-*with-\\([^=]*\\)'`\n     # Reject names that are not valid shell variable names.\n     expr \"x$ac_useropt\" : \".*[^-+._$as_cr_alnum]\" >/dev/null &&\n-      as_fn_error $? \"invalid package name: '$ac_useropt'\"\n+      as_fn_error $? \"invalid package name: $ac_useropt\"\n     ac_useropt_orig=$ac_useropt\n-    ac_useropt=`printf \"%s\\n\" \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n+    ac_useropt=`$as_echo \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n     case $ac_user_opts in\n       *\"\n \"with_$ac_useropt\"\n@@ -1268,9 +1231,9 @@ do\n     ac_useropt=`expr \"x$ac_option\" : 'x-*without-\\(.*\\)'`\n     # Reject names that are not valid shell variable names.\n     expr \"x$ac_useropt\" : \".*[^-+._$as_cr_alnum]\" >/dev/null &&\n-      as_fn_error $? \"invalid package name: '$ac_useropt'\"\n+      as_fn_error $? \"invalid package name: $ac_useropt\"\n     ac_useropt_orig=$ac_useropt\n-    ac_useropt=`printf \"%s\\n\" \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n+    ac_useropt=`$as_echo \"$ac_useropt\" | sed 's/[-+.]/_/g'`\n     case $ac_user_opts in\n       *\"\n \"with_$ac_useropt\"\n@@ -1298,8 +1261,8 @@ do\n   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)\n     x_libraries=$ac_optarg ;;\n \n-  -*) as_fn_error $? \"unrecognized option: '$ac_option'\n-Try '$0 --help' for more information\"\n+  -*) as_fn_error $? \"unrecognized option: \\`$ac_option'\n+Try \\`$0 --help' for more information\"\n     ;;\n \n   *=*)\n@@ -1307,16 +1270,16 @@ Try '$0 --help' for more information\"\n     # Reject names that are not valid shell variable names.\n     case $ac_envvar in #(\n       '' | [0-9]* | *[!_$as_cr_alnum]* )\n-      as_fn_error $? \"invalid variable name: '$ac_envvar'\" ;;\n+      as_fn_error $? \"invalid variable name: \\`$ac_envvar'\" ;;\n     esac\n     eval $ac_envvar=\\$ac_optarg\n     export $ac_envvar ;;\n \n   *)\n     # FIXME: should be removed in autoconf 3.0.\n-    printf \"%s\\n\" \"$as_me: WARNING: you should use --build, --host, --target\" >&2\n+    $as_echo \"$as_me: WARNING: you should use --build, --host, --target\" >&2\n     expr \"x$ac_option\" : \".*[^-._$as_cr_alnum]\" >/dev/null &&\n-      printf \"%s\\n\" \"$as_me: WARNING: invalid host type: $ac_option\" >&2\n+      $as_echo \"$as_me: WARNING: invalid host type: $ac_option\" >&2\n     : \"${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}\"\n     ;;\n \n@@ -1332,7 +1295,7 @@ if test -n \"$ac_unrecognized_opts\"; then\n   case $enable_option_checking in\n     no) ;;\n     fatal) as_fn_error $? \"unrecognized options: $ac_unrecognized_opts\" ;;\n-    *)     printf \"%s\\n\" \"$as_me: WARNING: unrecognized options: $ac_unrecognized_opts\" >&2 ;;\n+    *)     $as_echo \"$as_me: WARNING: unrecognized options: $ac_unrecognized_opts\" >&2 ;;\n   esac\n fi\n \n@@ -1340,7 +1303,7 @@ fi\n for ac_var in\texec_prefix prefix bindir sbindir libexecdir datarootdir \\\n \t\tdatadir sysconfdir sharedstatedir localstatedir includedir \\\n \t\toldincludedir docdir infodir htmldir dvidir pdfdir psdir \\\n-\t\tlibdir localedir mandir runstatedir\n+\t\tlibdir localedir mandir\n do\n   eval ac_val=\\$$ac_var\n   # Remove trailing slashes.\n@@ -1357,7 +1320,7 @@ do\n   as_fn_error $? \"expected an absolute directory name for --$ac_var: $ac_val\"\n done\n \n-# There might be people who depend on the old broken behavior: '$host'\n+# There might be people who depend on the old broken behavior: `$host'\n # used to hold the argument of --host etc.\n # FIXME: To remove some day.\n build=$build_alias\n@@ -1396,7 +1359,7 @@ $as_expr X\"$as_myself\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n \t X\"$as_myself\" : 'X\\(//\\)[^/]' \\| \\\n \t X\"$as_myself\" : 'X\\(//\\)$' \\| \\\n \t X\"$as_myself\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X\"$as_myself\" |\n+$as_echo X\"$as_myself\" |\n     sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -1425,7 +1388,7 @@ if test ! -r \"$srcdir/$ac_unique_file\"; then\n   test \"$ac_srcdir_defaulted\" = yes && srcdir=\"$ac_confdir or ..\"\n   as_fn_error $? \"cannot find sources ($ac_unique_file) in $srcdir\"\n fi\n-ac_msg=\"sources are in $srcdir, but 'cd $srcdir' does not work\"\n+ac_msg=\"sources are in $srcdir, but \\`cd $srcdir' does not work\"\n ac_abs_confdir=`(\n \tcd \"$srcdir\" && test -r \"./$ac_unique_file\" || as_fn_error $? \"$ac_msg\"\n \tpwd)`\n@@ -1453,7 +1416,7 @@ if test \"$ac_init_help\" = \"long\"; then\n   # Omit some internal or obsolete options to make the list less imposing.\n   # This message is too long to be a string in the A/UX 3.1 sh.\n   cat <<_ACEOF\n-'configure' configures libe-book 0.1.4 to adapt to many kinds of systems.\n+\\`configure' configures libe-book 0.1.3 to adapt to many kinds of systems.\n \n Usage: $0 [OPTION]... [VAR=VALUE]...\n \n@@ -1467,11 +1430,11 @@ Configuration:\n       --help=short        display options specific to this package\n       --help=recursive    display the short help of all the included packages\n   -V, --version           display version information and exit\n-  -q, --quiet, --silent   do not print 'checking ...' messages\n+  -q, --quiet, --silent   do not print \\`checking ...' messages\n       --cache-file=FILE   cache test results in FILE [disabled]\n-  -C, --config-cache      alias for '--cache-file=config.cache'\n+  -C, --config-cache      alias for \\`--cache-file=config.cache'\n   -n, --no-create         do not create output files\n-      --srcdir=DIR        find the sources in DIR [configure dir or '..']\n+      --srcdir=DIR        find the sources in DIR [configure dir or \\`..']\n \n Installation directories:\n   --prefix=PREFIX         install architecture-independent files in PREFIX\n@@ -1479,10 +1442,10 @@ Installation directories:\n   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX\n                           [PREFIX]\n \n-By default, 'make install' will install all the files in\n-'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify\n-an installation prefix other than '$ac_default_prefix' using '--prefix',\n-for instance '--prefix=\\$HOME'.\n+By default, \\`make install' will install all the files in\n+\\`$ac_default_prefix/bin', \\`$ac_default_prefix/lib' etc.  You can specify\n+an installation prefix other than \\`$ac_default_prefix' using \\`--prefix',\n+for instance \\`--prefix=\\$HOME'.\n \n For better control, use the options below.\n \n@@ -1493,7 +1456,6 @@ Fine tuning of the installation directories:\n   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]\n   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]\n   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]\n-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]\n   --libdir=DIR            object code libraries [EPREFIX/lib]\n   --includedir=DIR        C header files [PREFIX/include]\n   --oldincludedir=DIR     C header files for non-gcc [/usr/include]\n@@ -1524,7 +1486,7 @@ fi\n \n if test -n \"$ac_init_help\"; then\n   case $ac_init_help in\n-     short | recursive ) echo \"Configuration of libe-book 0.1.4:\";;\n+     short | recursive ) echo \"Configuration of libe-book 0.1.3:\";;\n    esac\n   cat <<\\_ACEOF\n \n@@ -1541,14 +1503,9 @@ Optional Features:\n   --disable-dependency-tracking\n                           speeds up one-time build\n   --enable-static[=PKGS]  build static libraries [default=no]\n-  --enable-pic[=PKGS]     try to use only PIC/non-PIC objects [default=use\n-                          both]\n   --enable-shared[=PKGS]  build shared libraries [default=yes]\n   --enable-fast-install[=PKGS]\n                           optimize for fast installation [default=yes]\n-  --enable-aix-soname=aix|svr4|both\n-                          shared library versioning (aka \"SONAME\") variant to\n-                          provide on AIX, [default=aix].\n   --disable-libtool-lock  avoid locking (might break parallel builds)\n   --enable-werror         Treat all warnings as errors, usefull for\n                           development\n@@ -1562,6 +1519,11 @@ Optional Features:\n Optional Packages:\n   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]\n   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)\n+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use\n+                          both]\n+  --with-aix-soname=aix|svr4|both\n+                          shared library versioning (aka \"SONAME\") variant to\n+                          provide on AIX, [default=aix].\n   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]\n   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the\n                           compiler's sysroot if not specified).\n@@ -1623,7 +1585,7 @@ Some influential environment variables:\n   REVENGE_STREAM_LIBS\n               linker flags for REVENGE_STREAM, overriding pkg-config\n \n-Use these variables to override the choices made by 'configure' or to help\n+Use these variables to override the choices made by `configure' or to help\n it to find libraries and programs with nonstandard names/locations.\n \n Report bugs to the package provider.\n@@ -1642,9 +1604,9 @@ if test \"$ac_init_help\" = \"recursive\"; then\n case \"$ac_dir\" in\n .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;\n *)\n-  ac_dir_suffix=/`printf \"%s\\n\" \"$ac_dir\" | sed 's|^\\.[\\\\/]||'`\n+  ac_dir_suffix=/`$as_echo \"$ac_dir\" | sed 's|^\\.[\\\\/]||'`\n   # A \"..\" for each directory in $ac_dir_suffix.\n-  ac_top_builddir_sub=`printf \"%s\\n\" \"$ac_dir_suffix\" | sed 's|/[^\\\\/]*|/..|g;s|/||'`\n+  ac_top_builddir_sub=`$as_echo \"$ac_dir_suffix\" | sed 's|/[^\\\\/]*|/..|g;s|/||'`\n   case $ac_top_builddir_sub in\n   \"\") ac_top_builddir_sub=. ac_top_build_prefix= ;;\n   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;\n@@ -1672,8 +1634,7 @@ esac\n ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix\n \n     cd \"$ac_dir\" || { ac_status=$?; continue; }\n-    # Check for configure.gnu first; this name is used for a wrapper for\n-    # Metaconfig's \"Configure\" on case-insensitive file systems.\n+    # Check for guested configure.\n     if test -f \"$ac_srcdir/configure.gnu\"; then\n       echo &&\n       $SHELL \"$ac_srcdir/configure.gnu\" --help=recursive\n@@ -1681,7 +1642,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix\n       echo &&\n       $SHELL \"$ac_srcdir/configure\" --help=recursive\n     else\n-      printf \"%s\\n\" \"$as_me: WARNING: no configuration information is in $ac_dir\" >&2\n+      $as_echo \"$as_me: WARNING: no configuration information is in $ac_dir\" >&2\n     fi || ac_status=$?\n     cd \"$ac_pwd\" || { ac_status=$?; break; }\n   done\n@@ -1690,10 +1651,10 @@ fi\n test -n \"$ac_init_help\" && exit $ac_status\n if $ac_init_version; then\n   cat <<\\_ACEOF\n-libe-book configure 0.1.4\n-generated by GNU Autoconf 2.72\n+libe-book configure 0.1.3\n+generated by GNU Autoconf 2.69\n \n-Copyright (C) 2023 Free Software Foundation, Inc.\n+Copyright (C) 2012 Free Software Foundation, Inc.\n This configure script is free software; the Free Software Foundation\n gives unlimited permission to copy, distribute and modify it.\n _ACEOF\n@@ -1710,14 +1671,14 @@ fi\n ac_fn_c_try_compile ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  rm -f conftest.$ac_objext conftest.beam\n+  rm -f conftest.$ac_objext\n   if { { ac_try=\"$ac_compile\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_compile\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -1725,19 +1686,17 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n     mv -f conftest.er1 conftest.err\n   fi\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && {\n \t test -z \"$ac_c_werror_flag\" ||\n \t test ! -s conftest.err\n-       } && test -s conftest.$ac_objext\n-then :\n+       } && test -s conftest.$ac_objext; then :\n   ac_retval=0\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-\tac_retval=1 ;;\n-esac\n+\tac_retval=1\n fi\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n   as_fn_set_status $ac_retval\n@@ -1756,7 +1715,7 @@ case \"(($ac_try\" in\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_cpp conftest.$ac_ext\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -1764,19 +1723,17 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n     mv -f conftest.er1 conftest.err\n   fi\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } > conftest.i && {\n \t test -z \"$ac_c_preproc_warn_flag$ac_c_werror_flag\" ||\n \t test ! -s conftest.err\n-       }\n-then :\n+       }; then :\n   ac_retval=0\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-    ac_retval=1 ;;\n-esac\n+    ac_retval=1\n fi\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n   as_fn_set_status $ac_retval\n@@ -1789,14 +1746,14 @@ fi\n ac_fn_cxx_try_compile ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  rm -f conftest.$ac_objext conftest.beam\n+  rm -f conftest.$ac_objext\n   if { { ac_try=\"$ac_compile\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_compile\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -1804,19 +1761,17 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n     mv -f conftest.er1 conftest.err\n   fi\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && {\n \t test -z \"$ac_cxx_werror_flag\" ||\n \t test ! -s conftest.err\n-       } && test -s conftest.$ac_objext\n-then :\n+       } && test -s conftest.$ac_objext; then :\n   ac_retval=0\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-\tac_retval=1 ;;\n-esac\n+\tac_retval=1\n fi\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n   as_fn_set_status $ac_retval\n@@ -1829,14 +1784,14 @@ fi\n ac_fn_c_try_link ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext\n+  rm -f conftest.$ac_objext conftest$ac_exeext\n   if { { ac_try=\"$ac_link\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_link\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -1844,22 +1799,20 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n     mv -f conftest.er1 conftest.err\n   fi\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && {\n \t test -z \"$ac_c_werror_flag\" ||\n \t test ! -s conftest.err\n        } && test -s conftest$ac_exeext && {\n \t test \"$cross_compiling\" = yes ||\n \t test -x conftest$ac_exeext\n-       }\n-then :\n+       }; then :\n   ac_retval=0\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-\tac_retval=1 ;;\n-esac\n+\tac_retval=1\n fi\n   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information\n   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would\n@@ -1878,56 +1831,100 @@ fi\n ac_fn_c_check_header_compile ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $2\" >&5\n-printf %s \"checking for $2... \" >&6; }\n-if eval test \\${$3+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $2\" >&5\n+$as_echo_n \"checking for $2... \" >&6; }\n+if eval \\${$3+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n $4\n #include <$2>\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   eval \"$3=yes\"\n-else case e in #(\n-  e) eval \"$3=no\" ;;\n-esac\n+else\n+  eval \"$3=no\"\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n eval ac_res=\\$$3\n-\t       { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n-printf \"%s\\n\" \"$ac_res\" >&6; }\n+\t       { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n+$as_echo \"$ac_res\" >&6; }\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n \n } # ac_fn_c_check_header_compile\n \n+# ac_fn_c_try_run LINENO\n+# ----------------------\n+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes\n+# that executables *can* be run.\n+ac_fn_c_try_run ()\n+{\n+  as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n+  if { { ac_try=\"$ac_link\"\n+case \"(($ac_try\" in\n+  *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n+  *) ac_try_echo=$ac_try;;\n+esac\n+eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n+$as_echo \"$ac_try_echo\"; } >&5\n+  (eval \"$ac_link\") 2>&5\n+  ac_status=$?\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'\n+  { { case \"(($ac_try\" in\n+  *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n+  *) ac_try_echo=$ac_try;;\n+esac\n+eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n+$as_echo \"$ac_try_echo\"; } >&5\n+  (eval \"$ac_try\") 2>&5\n+  ac_status=$?\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  test $ac_status = 0; }; }; then :\n+  ac_retval=0\n+else\n+  $as_echo \"$as_me: program exited with status $ac_status\" >&5\n+       $as_echo \"$as_me: failed program was:\" >&5\n+sed 's/^/| /' conftest.$ac_ext >&5\n+\n+       ac_retval=$ac_status\n+fi\n+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo\n+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n+  as_fn_set_status $ac_retval\n+\n+} # ac_fn_c_try_run\n+\n # ac_fn_c_check_func LINENO FUNC VAR\n # ----------------------------------\n # Tests whether FUNC exists, setting the cache variable VAR accordingly\n ac_fn_c_check_func ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $2\" >&5\n-printf %s \"checking for $2... \" >&6; }\n-if eval test \\${$3+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $2\" >&5\n+$as_echo_n \"checking for $2... \" >&6; }\n+if eval \\${$3+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n /* Define $2 to an innocuous variant, in case <limits.h> declares $2.\n    For example, HP-UX 11i <limits.h> declares gettimeofday.  */\n #define $2 innocuous_$2\n \n /* System header to define __stub macros and hopefully few prototypes,\n-   which can conflict with char $2 (void); below.  */\n+    which can conflict with char $2 (); below.\n+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since\n+    <limits.h> exists even on freestanding compilers.  */\n+\n+#ifdef __STDC__\n+# include <limits.h>\n+#else\n+# include <assert.h>\n+#endif\n \n-#include <limits.h>\n #undef $2\n \n /* Override any GCC internal prototype to avoid an error.\n@@ -1936,7 +1933,7 @@ else case e in #(\n #ifdef __cplusplus\n extern \"C\"\n #endif\n-char $2 (void);\n+char $2 ();\n /* The GNU C library defines this for functions which it implements\n     to always fail with ENOSYS.  Some functions are actually named\n     something starting with __ and the normal name is an alias.  */\n@@ -1945,27 +1942,24 @@ choke me\n #endif\n \n int\n-main (void)\n+main ()\n {\n return $2 ();\n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   eval \"$3=yes\"\n-else case e in #(\n-  e) eval \"$3=no\" ;;\n-esac\n+else\n+  eval \"$3=no\"\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n-    conftest$ac_exeext conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext \\\n+    conftest$ac_exeext conftest.$ac_ext\n fi\n eval ac_res=\\$$3\n-\t       { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n-printf \"%s\\n\" \"$ac_res\" >&6; }\n+\t       { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n+$as_echo \"$ac_res\" >&6; }\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n \n } # ac_fn_c_check_func\n@@ -1982,7 +1976,7 @@ case \"(($ac_try\" in\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_cpp conftest.$ac_ext\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -1990,19 +1984,17 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n     mv -f conftest.er1 conftest.err\n   fi\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } > conftest.i && {\n \t test -z \"$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag\" ||\n \t test ! -s conftest.err\n-       }\n-then :\n+       }; then :\n   ac_retval=0\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-    ac_retval=1 ;;\n-esac\n+    ac_retval=1\n fi\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n   as_fn_set_status $ac_retval\n@@ -2015,14 +2007,14 @@ fi\n ac_fn_cxx_try_link ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext\n+  rm -f conftest.$ac_objext conftest$ac_exeext\n   if { { ac_try=\"$ac_link\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_link\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -2030,22 +2022,20 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n     mv -f conftest.er1 conftest.err\n   fi\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && {\n \t test -z \"$ac_cxx_werror_flag\" ||\n \t test ! -s conftest.err\n        } && test -s conftest$ac_exeext && {\n \t test \"$cross_compiling\" = yes ||\n \t test -x conftest$ac_exeext\n-       }\n-then :\n+       }; then :\n   ac_retval=0\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-\tac_retval=1 ;;\n-esac\n+\tac_retval=1\n fi\n   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information\n   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would\n@@ -2064,61 +2054,37 @@ fi\n ac_fn_cxx_check_header_compile ()\n {\n   as_lineno=${as_lineno-\"$1\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $2\" >&5\n-printf %s \"checking for $2... \" >&6; }\n-if eval test \\${$3+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $2\" >&5\n+$as_echo_n \"checking for $2... \" >&6; }\n+if eval \\${$3+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n $4\n #include <$2>\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   eval \"$3=yes\"\n-else case e in #(\n-  e) eval \"$3=no\" ;;\n-esac\n+else\n+  eval \"$3=no\"\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n eval ac_res=\\$$3\n-\t       { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n-printf \"%s\\n\" \"$ac_res\" >&6; }\n+\t       { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n+$as_echo \"$ac_res\" >&6; }\n   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno\n \n } # ac_fn_cxx_check_header_compile\n-ac_configure_args_raw=\n-for ac_arg\n-do\n-  case $ac_arg in\n-  *\\'*)\n-    ac_arg=`printf \"%s\\n\" \"$ac_arg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n-  esac\n-  as_fn_append ac_configure_args_raw \" '$ac_arg'\"\n-done\n-\n-case $ac_configure_args_raw in\n-  *$as_nl*)\n-    ac_safe_unquote= ;;\n-  *)\n-    ac_unsafe_z='|&;<>()$`\\\\\"*?[ ''\t' # This string ends in space, tab.\n-    ac_unsafe_a=\"$ac_unsafe_z#~\"\n-    ac_safe_unquote=\"s/ '\\\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\\\)'/ \\\\1/g\"\n-    ac_configure_args_raw=`      printf \"%s\\n\" \"$ac_configure_args_raw\" | sed \"$ac_safe_unquote\"`;;\n-esac\n-\n cat >config.log <<_ACEOF\n This file contains any messages produced by compilers while\n running configure, to aid debugging if configure makes a mistake.\n \n-It was created by libe-book $as_me 0.1.4, which was\n-generated by GNU Autoconf 2.72.  Invocation command line was\n+It was created by libe-book $as_me 0.1.3, which was\n+generated by GNU Autoconf 2.69.  Invocation command line was\n \n-  $ $0$ac_configure_args_raw\n+  $ $0 $@\n \n _ACEOF\n exec 5>>config.log\n@@ -2151,12 +2117,8 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    printf \"%s\\n\" \"PATH: $as_dir\"\n+  test -z \"$as_dir\" && as_dir=.\n+    $as_echo \"PATH: $as_dir\"\n   done\n IFS=$as_save_IFS\n \n@@ -2191,7 +2153,7 @@ do\n     | -silent | --silent | --silen | --sile | --sil)\n       continue ;;\n     *\\'*)\n-      ac_arg=`printf \"%s\\n\" \"$ac_arg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n+      ac_arg=`$as_echo \"$ac_arg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n     esac\n     case $ac_pass in\n     1) as_fn_append ac_configure_args0 \" '$ac_arg'\" ;;\n@@ -2226,13 +2188,11 @@ done\n # WARNING: Use '\\'' to represent an apostrophe within the trap.\n # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.\n trap 'exit_status=$?\n-  # Sanitize IFS.\n-  IFS=\" \"\"\t$as_nl\"\n   # Save into config.log some information that might help in debugging.\n   {\n     echo\n \n-    printf \"%s\\n\" \"## ---------------- ##\n+    $as_echo \"## ---------------- ##\n ## Cache variables. ##\n ## ---------------- ##\"\n     echo\n@@ -2243,8 +2203,8 @@ trap 'exit_status=$?\n     case $ac_val in #(\n     *${as_nl}*)\n       case $ac_var in #(\n-      *_cv_*) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;} ;;\n+      *_cv_*) { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline\" >&5\n+$as_echo \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;} ;;\n       esac\n       case $ac_var in #(\n       _ | IFS | as_nl) ;; #(\n@@ -2268,7 +2228,7 @@ printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;}\n )\n     echo\n \n-    printf \"%s\\n\" \"## ----------------- ##\n+    $as_echo \"## ----------------- ##\n ## Output variables. ##\n ## ----------------- ##\"\n     echo\n@@ -2276,14 +2236,14 @@ printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;}\n     do\n       eval ac_val=\\$$ac_var\n       case $ac_val in\n-      *\\'\\''*) ac_val=`printf \"%s\\n\" \"$ac_val\" | sed \"s/'\\''/'\\''\\\\\\\\\\\\\\\\'\\'''\\''/g\"`;;\n+      *\\'\\''*) ac_val=`$as_echo \"$ac_val\" | sed \"s/'\\''/'\\''\\\\\\\\\\\\\\\\'\\'''\\''/g\"`;;\n       esac\n-      printf \"%s\\n\" \"$ac_var='\\''$ac_val'\\''\"\n+      $as_echo \"$ac_var='\\''$ac_val'\\''\"\n     done | sort\n     echo\n \n     if test -n \"$ac_subst_files\"; then\n-      printf \"%s\\n\" \"## ------------------- ##\n+      $as_echo \"## ------------------- ##\n ## File substitutions. ##\n ## ------------------- ##\"\n       echo\n@@ -2291,15 +2251,15 @@ printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;}\n       do\n \teval ac_val=\\$$ac_var\n \tcase $ac_val in\n-\t*\\'\\''*) ac_val=`printf \"%s\\n\" \"$ac_val\" | sed \"s/'\\''/'\\''\\\\\\\\\\\\\\\\'\\'''\\''/g\"`;;\n+\t*\\'\\''*) ac_val=`$as_echo \"$ac_val\" | sed \"s/'\\''/'\\''\\\\\\\\\\\\\\\\'\\'''\\''/g\"`;;\n \tesac\n-\tprintf \"%s\\n\" \"$ac_var='\\''$ac_val'\\''\"\n+\t$as_echo \"$ac_var='\\''$ac_val'\\''\"\n       done | sort\n       echo\n     fi\n \n     if test -s confdefs.h; then\n-      printf \"%s\\n\" \"## ----------- ##\n+      $as_echo \"## ----------- ##\n ## confdefs.h. ##\n ## ----------- ##\"\n       echo\n@@ -2307,8 +2267,8 @@ printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;}\n       echo\n     fi\n     test \"$ac_signal\" != 0 &&\n-      printf \"%s\\n\" \"$as_me: caught signal $ac_signal\"\n-    printf \"%s\\n\" \"$as_me: exit $exit_status\"\n+      $as_echo \"$as_me: caught signal $ac_signal\"\n+    $as_echo \"$as_me: exit $exit_status\"\n   } >&5\n   rm -f core *.core core.conftest.* &&\n     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&\n@@ -2322,50 +2282,65 @@ ac_signal=0\n # confdefs.h avoids OS command line length limits that DEFS can exceed.\n rm -f -r conftest* confdefs.h\n \n-printf \"%s\\n\" \"/* confdefs.h */\" > confdefs.h\n+$as_echo \"/* confdefs.h */\" > confdefs.h\n \n # Predefined preprocessor variables.\n \n-printf \"%s\\n\" \"#define PACKAGE_NAME \\\"$PACKAGE_NAME\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE_NAME \"$PACKAGE_NAME\"\n+_ACEOF\n \n-printf \"%s\\n\" \"#define PACKAGE_TARNAME \\\"$PACKAGE_TARNAME\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"\n+_ACEOF\n \n-printf \"%s\\n\" \"#define PACKAGE_VERSION \\\"$PACKAGE_VERSION\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE_VERSION \"$PACKAGE_VERSION\"\n+_ACEOF\n \n-printf \"%s\\n\" \"#define PACKAGE_STRING \\\"$PACKAGE_STRING\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE_STRING \"$PACKAGE_STRING\"\n+_ACEOF\n \n-printf \"%s\\n\" \"#define PACKAGE_BUGREPORT \\\"$PACKAGE_BUGREPORT\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"\n+_ACEOF\n \n-printf \"%s\\n\" \"#define PACKAGE_URL \\\"$PACKAGE_URL\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE_URL \"$PACKAGE_URL\"\n+_ACEOF\n \n \n # Let the site file select an alternate cache file if it wants to.\n # Prefer an explicitly selected file to automatically selected ones.\n+ac_site_file1=NONE\n+ac_site_file2=NONE\n if test -n \"$CONFIG_SITE\"; then\n-  ac_site_files=\"$CONFIG_SITE\"\n+  # We do not want a PATH search for config.site.\n+  case $CONFIG_SITE in #((\n+    -*)  ac_site_file1=./$CONFIG_SITE;;\n+    */*) ac_site_file1=$CONFIG_SITE;;\n+    *)   ac_site_file1=./$CONFIG_SITE;;\n+  esac\n elif test \"x$prefix\" != xNONE; then\n-  ac_site_files=\"$prefix/share/config.site $prefix/etc/config.site\"\n+  ac_site_file1=$prefix/share/config.site\n+  ac_site_file2=$prefix/etc/config.site\n else\n-  ac_site_files=\"$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site\"\n+  ac_site_file1=$ac_default_prefix/share/config.site\n+  ac_site_file2=$ac_default_prefix/etc/config.site\n fi\n-\n-for ac_site_file in $ac_site_files\n+for ac_site_file in \"$ac_site_file1\" \"$ac_site_file2\"\n do\n-  case $ac_site_file in #(\n-  */*) :\n-     ;; #(\n-  *) :\n-    ac_site_file=./$ac_site_file ;;\n-esac\n-  if test -f \"$ac_site_file\" && test -r \"$ac_site_file\"; then\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file\" >&5\n-printf \"%s\\n\" \"$as_me: loading site script $ac_site_file\" >&6;}\n+  test \"x$ac_site_file\" = xNONE && continue\n+  if test /dev/null != \"$ac_site_file\" && test -r \"$ac_site_file\"; then\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file\" >&5\n+$as_echo \"$as_me: loading site script $ac_site_file\" >&6;}\n     sed 's/^/| /' \"$ac_site_file\" >&5\n     . \"$ac_site_file\" \\\n-      || { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+      || { { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"failed to load site script $ac_site_file\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n   fi\n done\n \n@@ -2373,745 +2348,122 @@ if test -r \"$cache_file\"; then\n   # Some versions of bash will fail to source /dev/null (special files\n   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.\n   if test /dev/null != \"$cache_file\" && test -f \"$cache_file\"; then\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: loading cache $cache_file\" >&5\n-printf \"%s\\n\" \"$as_me: loading cache $cache_file\" >&6;}\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: loading cache $cache_file\" >&5\n+$as_echo \"$as_me: loading cache $cache_file\" >&6;}\n     case $cache_file in\n       [\\\\/]* | ?:[\\\\/]* ) . \"$cache_file\";;\n       *)                      . \"./$cache_file\";;\n     esac\n   fi\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: creating cache $cache_file\" >&5\n-printf \"%s\\n\" \"$as_me: creating cache $cache_file\" >&6;}\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: creating cache $cache_file\" >&5\n+$as_echo \"$as_me: creating cache $cache_file\" >&6;}\n   >$cache_file\n fi\n \n-# Test code for whether the C compiler supports C89 (global declarations)\n-ac_c_conftest_c89_globals='\n-/* Does the compiler advertise C89 conformance?\n-   Do not test the value of __STDC__, because some compilers set it to 0\n-   while being otherwise adequately conformant. */\n-#if !defined __STDC__\n-# error \"Compiler does not advertise C89 conformance\"\n-#endif\n-\n-#include <stddef.h>\n-#include <stdarg.h>\n-struct stat;\n-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */\n-struct buf { int x; };\n-struct buf * (*rcsopen) (struct buf *, struct stat *, int);\n-static char *e (char **p, int i)\n-{\n-  return p[i];\n-}\n-static char *f (char * (*g) (char **, int), char **p, ...)\n-{\n-  char *s;\n-  va_list v;\n-  va_start (v,p);\n-  s = g (p, va_arg (v,int));\n-  va_end (v);\n-  return s;\n-}\n+# Check that the precious variables saved in the cache have kept the same\n+# value.\n+ac_cache_corrupted=false\n+for ac_var in $ac_precious_vars; do\n+  eval ac_old_set=\\$ac_cv_env_${ac_var}_set\n+  eval ac_new_set=\\$ac_env_${ac_var}_set\n+  eval ac_old_val=\\$ac_cv_env_${ac_var}_value\n+  eval ac_new_val=\\$ac_env_${ac_var}_value\n+  case $ac_old_set,$ac_new_set in\n+    set,)\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: error: \\`$ac_var' was set to \\`$ac_old_val' in the previous run\" >&5\n+$as_echo \"$as_me: error: \\`$ac_var' was set to \\`$ac_old_val' in the previous run\" >&2;}\n+      ac_cache_corrupted=: ;;\n+    ,set)\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: error: \\`$ac_var' was not set in the previous run\" >&5\n+$as_echo \"$as_me: error: \\`$ac_var' was not set in the previous run\" >&2;}\n+      ac_cache_corrupted=: ;;\n+    ,);;\n+    *)\n+      if test \"x$ac_old_val\" != \"x$ac_new_val\"; then\n+\t# differences in whitespace do not lead to failure.\n+\tac_old_val_w=`echo x $ac_old_val`\n+\tac_new_val_w=`echo x $ac_new_val`\n+\tif test \"$ac_old_val_w\" != \"$ac_new_val_w\"; then\n+\t  { $as_echo \"$as_me:${as_lineno-$LINENO}: error: \\`$ac_var' has changed since the previous run:\" >&5\n+$as_echo \"$as_me: error: \\`$ac_var' has changed since the previous run:\" >&2;}\n+\t  ac_cache_corrupted=:\n+\telse\n+\t  { $as_echo \"$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \\`$ac_var' since the previous run:\" >&5\n+$as_echo \"$as_me: warning: ignoring whitespace changes in \\`$ac_var' since the previous run:\" >&2;}\n+\t  eval $ac_var=\\$ac_old_val\n+\tfi\n+\t{ $as_echo \"$as_me:${as_lineno-$LINENO}:   former value:  \\`$ac_old_val'\" >&5\n+$as_echo \"$as_me:   former value:  \\`$ac_old_val'\" >&2;}\n+\t{ $as_echo \"$as_me:${as_lineno-$LINENO}:   current value: \\`$ac_new_val'\" >&5\n+$as_echo \"$as_me:   current value: \\`$ac_new_val'\" >&2;}\n+      fi;;\n+  esac\n+  # Pass precious variables to config.status.\n+  if test \"$ac_new_set\" = set; then\n+    case $ac_new_val in\n+    *\\'*) ac_arg=$ac_var=`$as_echo \"$ac_new_val\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n+    *) ac_arg=$ac_var=$ac_new_val ;;\n+    esac\n+    case \" $ac_configure_args \" in\n+      *\" '$ac_arg' \"*) ;; # Avoid dups.  Use of quotes ensures accuracy.\n+      *) as_fn_append ac_configure_args \" '$ac_arg'\" ;;\n+    esac\n+  fi\n+done\n+if $ac_cache_corrupted; then\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build\" >&5\n+$as_echo \"$as_me: error: changes in the environment can compromise the build\" >&2;}\n+  as_fn_error $? \"run \\`make distclean' and/or \\`rm $cache_file' and start over\" \"$LINENO\" 5\n+fi\n+## -------------------- ##\n+## Main body of script. ##\n+## -------------------- ##\n \n-/* C89 style stringification. */\n-#define noexpand_stringify(a) #a\n-const char *stringified = noexpand_stringify(arbitrary+token=sequence);\n-\n-/* C89 style token pasting.  Exercises some of the corner cases that\n-   e.g. old MSVC gets wrong, but not very hard. */\n-#define noexpand_concat(a,b) a##b\n-#define expand_concat(a,b) noexpand_concat(a,b)\n-extern int vA;\n-extern int vbee;\n-#define aye A\n-#define bee B\n-int *pvA = &expand_concat(v,aye);\n-int *pvbee = &noexpand_concat(v,bee);\n+ac_ext=c\n+ac_cpp='$CPP $CPPFLAGS'\n+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n+ac_compiler_gnu=$ac_cv_c_compiler_gnu\n \n-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has\n-   function prototypes and stuff, but not \\xHH hex character constants.\n-   These do not provoke an error unfortunately, instead are silently treated\n-   as an \"x\".  The following induces an error, until -std is added to get\n-   proper ANSI mode.  Curiously \\x00 != x always comes out true, for an\n-   array size at least.  It is necessary to write \\x00 == 0 to get something\n-   that is true only with -std.  */\n-int osf4_cc_array ['\\''\\x00'\\'' == 0 ? 1 : -1];\n \n-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters\n-   inside strings and character constants.  */\n-#define FOO(x) '\\''x'\\''\n-int xlc6_cc_array[FOO(a) == '\\''x'\\'' ? 1 : -1];\n \n-int test (int i, double x);\n-struct s1 {int (*f) (int a);};\n-struct s2 {int (*f) (double a);};\n-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),\n-               int, int);'\n+ac_config_headers=\"$ac_config_headers config.h\"\n \n-# Test code for whether the C compiler supports C89 (body of main).\n-ac_c_conftest_c89_main='\n-ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);\n-'\n+am__api_version='1.15'\n \n-# Test code for whether the C compiler supports C99 (global declarations)\n-ac_c_conftest_c99_globals='\n-/* Does the compiler advertise C99 conformance? */\n-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L\n-# error \"Compiler does not advertise C99 conformance\"\n-#endif\n+ac_aux_dir=\n+for ac_dir in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"; do\n+  if test -f \"$ac_dir/install-sh\"; then\n+    ac_aux_dir=$ac_dir\n+    ac_install_sh=\"$ac_aux_dir/install-sh -c\"\n+    break\n+  elif test -f \"$ac_dir/install.sh\"; then\n+    ac_aux_dir=$ac_dir\n+    ac_install_sh=\"$ac_aux_dir/install.sh -c\"\n+    break\n+  elif test -f \"$ac_dir/shtool\"; then\n+    ac_aux_dir=$ac_dir\n+    ac_install_sh=\"$ac_aux_dir/shtool install -c\"\n+    break\n+  fi\n+done\n+if test -z \"$ac_aux_dir\"; then\n+  as_fn_error $? \"cannot find install-sh, install.sh, or shtool in \\\"$srcdir\\\" \\\"$srcdir/..\\\" \\\"$srcdir/../..\\\"\" \"$LINENO\" 5\n+fi\n \n-// See if C++-style comments work.\n-\n-#include <stdbool.h>\n-extern int puts (const char *);\n-extern int printf (const char *, ...);\n-extern int dprintf (int, const char *, ...);\n-extern void *malloc (size_t);\n-extern void free (void *);\n-\n-// Check varargs macros.  These examples are taken from C99 6.10.3.5.\n-// dprintf is used instead of fprintf to avoid needing to declare\n-// FILE and stderr.\n-#define debug(...) dprintf (2, __VA_ARGS__)\n-#define showlist(...) puts (#__VA_ARGS__)\n-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))\n-static void\n-test_varargs_macros (void)\n-{\n-  int x = 1234;\n-  int y = 5678;\n-  debug (\"Flag\");\n-  debug (\"X = %d\\n\", x);\n-  showlist (The first, second, and third items.);\n-  report (x>y, \"x is %d but y is %d\", x, y);\n-}\n+# These three variables are undocumented and unsupported,\n+# and are intended to be withdrawn in a future Autoconf release.\n+# They can cause serious problems if a builder's source tree is in a directory\n+# whose full name contains unusual characters.\n+ac_config_guess=\"$SHELL $ac_aux_dir/config.guess\"  # Please don't use this var.\n+ac_config_sub=\"$SHELL $ac_aux_dir/config.sub\"  # Please don't use this var.\n+ac_configure=\"$SHELL $ac_aux_dir/configure\"  # Please don't use this var.\n \n-// Check long long types.\n-#define BIG64 18446744073709551615ull\n-#define BIG32 4294967295ul\n-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)\n-#if !BIG_OK\n-  #error \"your preprocessor is broken\"\n-#endif\n-#if BIG_OK\n-#else\n-  #error \"your preprocessor is broken\"\n-#endif\n-static long long int bignum = -9223372036854775807LL;\n-static unsigned long long int ubignum = BIG64;\n \n-struct incomplete_array\n-{\n-  int datasize;\n-  double data[];\n-};\n-\n-struct named_init {\n-  int number;\n-  const wchar_t *name;\n-  double average;\n-};\n-\n-typedef const char *ccp;\n-\n-static inline int\n-test_restrict (ccp restrict text)\n-{\n-  // Iterate through items via the restricted pointer.\n-  // Also check for declarations in for loops.\n-  for (unsigned int i = 0; *(text+i) != '\\''\\0'\\''; ++i)\n-    continue;\n-  return 0;\n-}\n-\n-// Check varargs and va_copy.\n-static bool\n-test_varargs (const char *format, ...)\n-{\n-  va_list args;\n-  va_start (args, format);\n-  va_list args_copy;\n-  va_copy (args_copy, args);\n-\n-  const char *str = \"\";\n-  int number = 0;\n-  float fnumber = 0;\n-\n-  while (*format)\n-    {\n-      switch (*format++)\n-\t{\n-\tcase '\\''s'\\'': // string\n-\t  str = va_arg (args_copy, const char *);\n-\t  break;\n-\tcase '\\''d'\\'': // int\n-\t  number = va_arg (args_copy, int);\n-\t  break;\n-\tcase '\\''f'\\'': // float\n-\t  fnumber = va_arg (args_copy, double);\n-\t  break;\n-\tdefault:\n-\t  break;\n-\t}\n-    }\n-  va_end (args_copy);\n-  va_end (args);\n-\n-  return *str && number && fnumber;\n-}\n-'\n-\n-# Test code for whether the C compiler supports C99 (body of main).\n-ac_c_conftest_c99_main='\n-  // Check bool.\n-  _Bool success = false;\n-  success |= (argc != 0);\n-\n-  // Check restrict.\n-  if (test_restrict (\"String literal\") == 0)\n-    success = true;\n-  char *restrict newvar = \"Another string\";\n-\n-  // Check varargs.\n-  success &= test_varargs (\"s, d'\\'' f .\", \"string\", 65, 34.234);\n-  test_varargs_macros ();\n-\n-  // Check flexible array members.\n-  struct incomplete_array *ia =\n-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));\n-  ia->datasize = 10;\n-  for (int i = 0; i < ia->datasize; ++i)\n-    ia->data[i] = i * 1.234;\n-  // Work around memory leak warnings.\n-  free (ia);\n-\n-  // Check named initializers.\n-  struct named_init ni = {\n-    .number = 34,\n-    .name = L\"Test wide string\",\n-    .average = 543.34343,\n-  };\n-\n-  ni.number = 58;\n-\n-  int dynamic_array[ni.number];\n-  dynamic_array[0] = argv[0][0];\n-  dynamic_array[ni.number - 1] = 543;\n-\n-  // work around unused variable warnings\n-  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\\''x'\\''\n-\t || dynamic_array[ni.number - 1] != 543);\n-'\n-\n-# Test code for whether the C compiler supports C11 (global declarations)\n-ac_c_conftest_c11_globals='\n-/* Does the compiler advertise C11 conformance? */\n-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L\n-# error \"Compiler does not advertise C11 conformance\"\n-#endif\n-\n-// Check _Alignas.\n-char _Alignas (double) aligned_as_double;\n-char _Alignas (0) no_special_alignment;\n-extern char aligned_as_int;\n-char _Alignas (0) _Alignas (int) aligned_as_int;\n-\n-// Check _Alignof.\n-enum\n-{\n-  int_alignment = _Alignof (int),\n-  int_array_alignment = _Alignof (int[100]),\n-  char_alignment = _Alignof (char)\n-};\n-_Static_assert (0 < -_Alignof (int), \"_Alignof is signed\");\n-\n-// Check _Noreturn.\n-int _Noreturn does_not_return (void) { for (;;) continue; }\n-\n-// Check _Static_assert.\n-struct test_static_assert\n-{\n-  int x;\n-  _Static_assert (sizeof (int) <= sizeof (long int),\n-                  \"_Static_assert does not work in struct\");\n-  long int y;\n-};\n-\n-// Check UTF-8 literals.\n-#define u8 syntax error!\n-char const utf8_literal[] = u8\"happens to be ASCII\" \"another string\";\n-\n-// Check duplicate typedefs.\n-typedef long *long_ptr;\n-typedef long int *long_ptr;\n-typedef long_ptr long_ptr;\n-\n-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.\n-struct anonymous\n-{\n-  union {\n-    struct { int i; int j; };\n-    struct { int k; long int l; } w;\n-  };\n-  int m;\n-} v1;\n-'\n-\n-# Test code for whether the C compiler supports C11 (body of main).\n-ac_c_conftest_c11_main='\n-  _Static_assert ((offsetof (struct anonymous, i)\n-\t\t   == offsetof (struct anonymous, w.k)),\n-\t\t  \"Anonymous union alignment botch\");\n-  v1.i = 2;\n-  v1.w.k = 5;\n-  ok |= v1.i != 5;\n-'\n-\n-# Test code for whether the C compiler supports C11 (complete).\n-ac_c_conftest_c11_program=\"${ac_c_conftest_c89_globals}\n-${ac_c_conftest_c99_globals}\n-${ac_c_conftest_c11_globals}\n-\n-int\n-main (int argc, char **argv)\n-{\n-  int ok = 0;\n-  ${ac_c_conftest_c89_main}\n-  ${ac_c_conftest_c99_main}\n-  ${ac_c_conftest_c11_main}\n-  return ok;\n-}\n-\"\n-\n-# Test code for whether the C compiler supports C99 (complete).\n-ac_c_conftest_c99_program=\"${ac_c_conftest_c89_globals}\n-${ac_c_conftest_c99_globals}\n-\n-int\n-main (int argc, char **argv)\n-{\n-  int ok = 0;\n-  ${ac_c_conftest_c89_main}\n-  ${ac_c_conftest_c99_main}\n-  return ok;\n-}\n-\"\n-\n-# Test code for whether the C compiler supports C89 (complete).\n-ac_c_conftest_c89_program=\"${ac_c_conftest_c89_globals}\n-\n-int\n-main (int argc, char **argv)\n-{\n-  int ok = 0;\n-  ${ac_c_conftest_c89_main}\n-  return ok;\n-}\n-\"\n-\n-# Test code for whether the C++ compiler supports C++98 (global declarations)\n-ac_cxx_conftest_cxx98_globals='\n-// Does the compiler advertise C++98 conformance?\n-#if !defined __cplusplus || __cplusplus < 199711L\n-# error \"Compiler does not advertise C++98 conformance\"\n-#endif\n-\n-// These inclusions are to reject old compilers that\n-// lack the unsuffixed header files.\n-#include <cstdlib>\n-#include <exception>\n-\n-// <cassert> and <cstring> are *not* freestanding headers in C++98.\n-extern void assert (int);\n-namespace std {\n-  extern int strcmp (const char *, const char *);\n-}\n-\n-// Namespaces, exceptions, and templates were all added after \"C++ 2.0\".\n-using std::exception;\n-using std::strcmp;\n-\n-namespace {\n-\n-void test_exception_syntax()\n-{\n-  try {\n-    throw \"test\";\n-  } catch (const char *s) {\n-    // Extra parentheses suppress a warning when building autoconf itself,\n-    // due to lint rules shared with more typical C programs.\n-    assert (!(strcmp) (s, \"test\"));\n-  }\n-}\n-\n-template <typename T> struct test_template\n-{\n-  T const val;\n-  explicit test_template(T t) : val(t) {}\n-  template <typename U> T add(U u) { return static_cast<T>(u) + val; }\n-};\n-\n-} // anonymous namespace\n-'\n-\n-# Test code for whether the C++ compiler supports C++98 (body of main)\n-ac_cxx_conftest_cxx98_main='\n-  assert (argc);\n-  assert (! argv[0]);\n-{\n-  test_exception_syntax ();\n-  test_template<double> tt (2.0);\n-  assert (tt.add (4) == 6.0);\n-  assert (true && !false);\n-}\n-'\n-\n-# Test code for whether the C++ compiler supports C++11 (global declarations)\n-ac_cxx_conftest_cxx11_globals='\n-// Does the compiler advertise C++ 2011 conformance?\n-#if !defined __cplusplus || __cplusplus < 201103L\n-# error \"Compiler does not advertise C++11 conformance\"\n-#endif\n-\n-namespace cxx11test\n-{\n-  constexpr int get_val() { return 20; }\n-\n-  struct testinit\n-  {\n-    int i;\n-    double d;\n-  };\n-\n-  class delegate\n-  {\n-  public:\n-    delegate(int n) : n(n) {}\n-    delegate(): delegate(2354) {}\n-\n-    virtual int getval() { return this->n; };\n-  protected:\n-    int n;\n-  };\n-\n-  class overridden : public delegate\n-  {\n-  public:\n-    overridden(int n): delegate(n) {}\n-    virtual int getval() override final { return this->n * 2; }\n-  };\n-\n-  class nocopy\n-  {\n-  public:\n-    nocopy(int i): i(i) {}\n-    nocopy() = default;\n-    nocopy(const nocopy&) = delete;\n-    nocopy & operator=(const nocopy&) = delete;\n-  private:\n-    int i;\n-  };\n-\n-  // for testing lambda expressions\n-  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)\n-  {\n-    return f(v);\n-  }\n-\n-  // for testing variadic templates and trailing return types\n-  template <typename V> auto sum(V first) -> V\n-  {\n-    return first;\n-  }\n-  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V\n-  {\n-    return first + sum(rest...);\n-  }\n-}\n-'\n-\n-# Test code for whether the C++ compiler supports C++11 (body of main)\n-ac_cxx_conftest_cxx11_main='\n-{\n-  // Test auto and decltype\n-  auto a1 = 6538;\n-  auto a2 = 48573953.4;\n-  auto a3 = \"String literal\";\n-\n-  int total = 0;\n-  for (auto i = a3; *i; ++i) { total += *i; }\n-\n-  decltype(a2) a4 = 34895.034;\n-}\n-{\n-  // Test constexpr\n-  short sa[cxx11test::get_val()] = { 0 };\n-}\n-{\n-  // Test initializer lists\n-  cxx11test::testinit il = { 4323, 435234.23544 };\n-}\n-{\n-  // Test range-based for\n-  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,\n-                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};\n-  for (auto &x : array) { x += 23; }\n-}\n-{\n-  // Test lambda expressions\n-  using cxx11test::eval;\n-  assert (eval ([](int x) { return x*2; }, 21) == 42);\n-  double d = 2.0;\n-  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);\n-  assert (d == 5.0);\n-  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);\n-  assert (d == 5.0);\n-}\n-{\n-  // Test use of variadic templates\n-  using cxx11test::sum;\n-  auto a = sum(1);\n-  auto b = sum(1, 2);\n-  auto c = sum(1.0, 2.0, 3.0);\n-}\n-{\n-  // Test constructor delegation\n-  cxx11test::delegate d1;\n-  cxx11test::delegate d2();\n-  cxx11test::delegate d3(45);\n-}\n-{\n-  // Test override and final\n-  cxx11test::overridden o1(55464);\n-}\n-{\n-  // Test nullptr\n-  char *c = nullptr;\n-}\n-{\n-  // Test template brackets\n-  test_template<::test_template<int>> v(test_template<int>(12));\n-}\n-{\n-  // Unicode literals\n-  char const *utf8 = u8\"UTF-8 string \\u2500\";\n-  char16_t const *utf16 = u\"UTF-8 string \\u2500\";\n-  char32_t const *utf32 = U\"UTF-32 string \\u2500\";\n-}\n-'\n-\n-# Test code for whether the C compiler supports C++11 (complete).\n-ac_cxx_conftest_cxx11_program=\"${ac_cxx_conftest_cxx98_globals}\n-${ac_cxx_conftest_cxx11_globals}\n-\n-int\n-main (int argc, char **argv)\n-{\n-  int ok = 0;\n-  ${ac_cxx_conftest_cxx98_main}\n-  ${ac_cxx_conftest_cxx11_main}\n-  return ok;\n-}\n-\"\n-\n-# Test code for whether the C compiler supports C++98 (complete).\n-ac_cxx_conftest_cxx98_program=\"${ac_cxx_conftest_cxx98_globals}\n-int\n-main (int argc, char **argv)\n-{\n-  int ok = 0;\n-  ${ac_cxx_conftest_cxx98_main}\n-  return ok;\n-}\n-\"\n-\n-as_fn_append ac_header_c_list \" stdio.h stdio_h HAVE_STDIO_H\"\n-as_fn_append ac_header_c_list \" stdlib.h stdlib_h HAVE_STDLIB_H\"\n-as_fn_append ac_header_c_list \" string.h string_h HAVE_STRING_H\"\n-as_fn_append ac_header_c_list \" inttypes.h inttypes_h HAVE_INTTYPES_H\"\n-as_fn_append ac_header_c_list \" stdint.h stdint_h HAVE_STDINT_H\"\n-as_fn_append ac_header_c_list \" strings.h strings_h HAVE_STRINGS_H\"\n-as_fn_append ac_header_c_list \" sys/stat.h sys_stat_h HAVE_SYS_STAT_H\"\n-as_fn_append ac_header_c_list \" sys/types.h sys_types_h HAVE_SYS_TYPES_H\"\n-as_fn_append ac_header_c_list \" unistd.h unistd_h HAVE_UNISTD_H\"\n-\n-# Auxiliary files required by this configure script.\n-ac_aux_files=\"config.guess config.sub ltmain.sh compile ar-lib missing install-sh\"\n-\n-# Locations in which to look for auxiliary files.\n-ac_aux_dir_candidates=\"${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../..\"\n-\n-# Search for a directory containing all of the required auxiliary files,\n-# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.\n-# If we don't find one directory that contains all the files we need,\n-# we report the set of missing files from the *first* directory in\n-# $ac_aux_dir_candidates and give up.\n-ac_missing_aux_files=\"\"\n-ac_first_candidate=:\n-printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files\" >&5\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-as_found=false\n-for as_dir in $ac_aux_dir_candidates\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-  as_found=:\n-\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:  trying $as_dir\" >&5\n-  ac_aux_dir_found=yes\n-  ac_install_sh=\n-  for ac_aux in $ac_aux_files\n-  do\n-    # As a special case, if \"install-sh\" is required, that requirement\n-    # can be satisfied by any of \"install-sh\", \"install.sh\", or \"shtool\",\n-    # and $ac_install_sh is set appropriately for whichever one is found.\n-    if test x\"$ac_aux\" = x\"install-sh\"\n-    then\n-      if test -f \"${as_dir}install-sh\"; then\n-        printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found\" >&5\n-        ac_install_sh=\"${as_dir}install-sh -c\"\n-      elif test -f \"${as_dir}install.sh\"; then\n-        printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found\" >&5\n-        ac_install_sh=\"${as_dir}install.sh -c\"\n-      elif test -f \"${as_dir}shtool\"; then\n-        printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found\" >&5\n-        ac_install_sh=\"${as_dir}shtool install -c\"\n-      else\n-        ac_aux_dir_found=no\n-        if $ac_first_candidate; then\n-          ac_missing_aux_files=\"${ac_missing_aux_files} install-sh\"\n-        else\n-          break\n-        fi\n-      fi\n-    else\n-      if test -f \"${as_dir}${ac_aux}\"; then\n-        printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found\" >&5\n-      else\n-        ac_aux_dir_found=no\n-        if $ac_first_candidate; then\n-          ac_missing_aux_files=\"${ac_missing_aux_files} ${ac_aux}\"\n-        else\n-          break\n-        fi\n-      fi\n-    fi\n-  done\n-  if test \"$ac_aux_dir_found\" = yes; then\n-    ac_aux_dir=\"$as_dir\"\n-    break\n-  fi\n-  ac_first_candidate=false\n-\n-  as_found=false\n-done\n-IFS=$as_save_IFS\n-if $as_found\n-then :\n-\n-else case e in #(\n-  e) as_fn_error $? \"cannot find required auxiliary files:$ac_missing_aux_files\" \"$LINENO\" 5 ;;\n-esac\n-fi\n-\n-\n-# These three variables are undocumented and unsupported,\n-# and are intended to be withdrawn in a future Autoconf release.\n-# They can cause serious problems if a builder's source tree is in a directory\n-# whose full name contains unusual characters.\n-if test -f \"${ac_aux_dir}config.guess\"; then\n-  ac_config_guess=\"$SHELL ${ac_aux_dir}config.guess\"\n-fi\n-if test -f \"${ac_aux_dir}config.sub\"; then\n-  ac_config_sub=\"$SHELL ${ac_aux_dir}config.sub\"\n-fi\n-if test -f \"$ac_aux_dir/configure\"; then\n-  ac_configure=\"$SHELL ${ac_aux_dir}configure\"\n-fi\n-\n-# Check that the precious variables saved in the cache have kept the same\n-# value.\n-ac_cache_corrupted=false\n-for ac_var in $ac_precious_vars; do\n-  eval ac_old_set=\\$ac_cv_env_${ac_var}_set\n-  eval ac_new_set=\\$ac_env_${ac_var}_set\n-  eval ac_old_val=\\$ac_cv_env_${ac_var}_value\n-  eval ac_new_val=\\$ac_env_${ac_var}_value\n-  case $ac_old_set,$ac_new_set in\n-    set,)\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run\" >&5\n-printf \"%s\\n\" \"$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run\" >&2;}\n-      ac_cache_corrupted=: ;;\n-    ,set)\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run\" >&5\n-printf \"%s\\n\" \"$as_me: error: '$ac_var' was not set in the previous run\" >&2;}\n-      ac_cache_corrupted=: ;;\n-    ,);;\n-    *)\n-      if test \"x$ac_old_val\" != \"x$ac_new_val\"; then\n-\t# differences in whitespace do not lead to failure.\n-\tac_old_val_w=`echo x $ac_old_val`\n-\tac_new_val_w=`echo x $ac_new_val`\n-\tif test \"$ac_old_val_w\" != \"$ac_new_val_w\"; then\n-\t  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:\" >&5\n-printf \"%s\\n\" \"$as_me: error: '$ac_var' has changed since the previous run:\" >&2;}\n-\t  ac_cache_corrupted=:\n-\telse\n-\t  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:\" >&5\n-printf \"%s\\n\" \"$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:\" >&2;}\n-\t  eval $ac_var=\\$ac_old_val\n-\tfi\n-\t{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'\" >&5\n-printf \"%s\\n\" \"$as_me:   former value:  '$ac_old_val'\" >&2;}\n-\t{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'\" >&5\n-printf \"%s\\n\" \"$as_me:   current value: '$ac_new_val'\" >&2;}\n-      fi;;\n-  esac\n-  # Pass precious variables to config.status.\n-  if test \"$ac_new_set\" = set; then\n-    case $ac_new_val in\n-    *\\'*) ac_arg=$ac_var=`printf \"%s\\n\" \"$ac_new_val\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n-    *) ac_arg=$ac_var=$ac_new_val ;;\n-    esac\n-    case \" $ac_configure_args \" in\n-      *\" '$ac_arg' \"*) ;; # Avoid dups.  Use of quotes ensures accuracy.\n-      *) as_fn_append ac_configure_args \" '$ac_arg'\" ;;\n-    esac\n-  fi\n-done\n-if $ac_cache_corrupted; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build\" >&5\n-printf \"%s\\n\" \"$as_me: error: changes in the environment can compromise the build\" >&2;}\n-  as_fn_error $? \"run '${MAKE-make} distclean' and/or 'rm $cache_file'\n-\t    and start over\" \"$LINENO\" 5\n-fi\n-## -------------------- ##\n-## Main body of script. ##\n-## -------------------- ##\n-\n-ac_ext=c\n-ac_cpp='$CPP $CPPFLAGS'\n-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n-ac_compiler_gnu=$ac_cv_c_compiler_gnu\n-\n-\n-\n-ac_config_headers=\"$ac_config_headers config.h\"\n-\n-am__api_version='1.17'\n-\n-\n-\n-  # Find a good install program.  We prefer a C program (faster),\n+# Find a good install program.  We prefer a C program (faster),\n # so one script is as good as another.  But avoid the broken or\n # incompatible versions:\n # SysV /etc/install, /usr/sbin/install\n@@ -3125,25 +2477,20 @@ am__api_version='1.17'\n # OS/2's system install, which has a completely different semantic\n # ./install, which can be erroneously created by make from ./install.sh.\n # Reject install programs that cannot install multiple files.\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install\" >&5\n-printf %s \"checking for a BSD-compatible install... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install\" >&5\n+$as_echo_n \"checking for a BSD-compatible install... \" >&6; }\n if test -z \"$INSTALL\"; then\n-if test ${ac_cv_path_install+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n+if ${ac_cv_path_install+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    # Account for fact that we put trailing slashes in our PATH walk.\n-case $as_dir in #((\n-  ./ | /[cC]/* | \\\n+  test -z \"$as_dir\" && as_dir=.\n+    # Account for people who put trailing slashes in PATH elements.\n+case $as_dir/ in #((\n+  ./ | .// | /[cC]/* | \\\n   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \\\n   ?:[\\\\/]os2[\\\\/]install[\\\\/]* | ?:[\\\\/]OS2[\\\\/]INSTALL[\\\\/]* | \\\n   /usr/ucb/* ) ;;\n@@ -3153,13 +2500,13 @@ case $as_dir in #((\n     # by default.\n     for ac_prog in ginstall scoinst install; do\n       for ac_exec_ext in '' $ac_executable_extensions; do\n-\tif as_fn_executable_p \"$as_dir$ac_prog$ac_exec_ext\"; then\n+\tif as_fn_executable_p \"$as_dir/$ac_prog$ac_exec_ext\"; then\n \t  if test $ac_prog = install &&\n-\t    grep dspmsg \"$as_dir$ac_prog$ac_exec_ext\" >/dev/null 2>&1; then\n+\t    grep dspmsg \"$as_dir/$ac_prog$ac_exec_ext\" >/dev/null 2>&1; then\n \t    # AIX install.  It has an incompatible calling convention.\n \t    :\n \t  elif test $ac_prog = install &&\n-\t    grep pwplus \"$as_dir$ac_prog$ac_exec_ext\" >/dev/null 2>&1; then\n+\t    grep pwplus \"$as_dir/$ac_prog$ac_exec_ext\" >/dev/null 2>&1; then\n \t    # program-specific install script used by HP pwplus--don't use.\n \t    :\n \t  else\n@@ -3167,12 +2514,12 @@ case $as_dir in #((\n \t    echo one > conftest.one\n \t    echo two > conftest.two\n \t    mkdir conftest.dir\n-\t    if \"$as_dir$ac_prog$ac_exec_ext\" -c conftest.one conftest.two \"`pwd`/conftest.dir/\" &&\n+\t    if \"$as_dir/$ac_prog$ac_exec_ext\" -c conftest.one conftest.two \"`pwd`/conftest.dir\" &&\n \t      test -s conftest.one && test -s conftest.two &&\n \t      test -s conftest.dir/conftest.one &&\n \t      test -s conftest.dir/conftest.two\n \t    then\n-\t      ac_cv_path_install=\"$as_dir$ac_prog$ac_exec_ext -c\"\n+\t      ac_cv_path_install=\"$as_dir/$ac_prog$ac_exec_ext -c\"\n \t      break 3\n \t    fi\n \t  fi\n@@ -3186,10 +2533,9 @@ esac\n IFS=$as_save_IFS\n \n rm -rf conftest.one conftest.two conftest.dir\n- ;;\n-esac\n+\n fi\n-  if test ${ac_cv_path_install+y}; then\n+  if test \"${ac_cv_path_install+set}\" = set; then\n     INSTALL=$ac_cv_path_install\n   else\n     # As a last resort, use the slow shell script.  Don't cache a\n@@ -3199,8 +2545,8 @@ fi\n     INSTALL=$ac_install_sh\n   fi\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $INSTALL\" >&5\n-printf \"%s\\n\" \"$INSTALL\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $INSTALL\" >&5\n+$as_echo \"$INSTALL\" >&6; }\n \n # Use test -z because SunOS4 sh mishandles braces in ${var-val}.\n # It thinks the first close brace ends the variable substitution.\n@@ -3210,167 +2556,8 @@ test -z \"$INSTALL_SCRIPT\" && INSTALL_SCRIPT='${INSTALL}'\n \n test -z \"$INSTALL_DATA\" && INSTALL_DATA='${INSTALL} -m 644'\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds\" >&5\n-printf %s \"checking whether sleep supports fractional seconds... \" >&6; }\n-if test ${am_cv_sleep_fractional_seconds+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if sleep 0.001 2>/dev/null\n-then :\n-  am_cv_sleep_fractional_seconds=yes\n-else case e in #(\n-  e) am_cv_sleep_fractional_seconds=no ;;\n-esac\n-fi\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds\" >&5\n-printf \"%s\\n\" \"$am_cv_sleep_fractional_seconds\" >&6; }\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution\" >&5\n-printf %s \"checking filesystem timestamp resolution... \" >&6; }\n-if test ${am_cv_filesystem_timestamp_resolution+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) # Default to the worst case.\n-am_cv_filesystem_timestamp_resolution=2\n-\n-# Only try to go finer than 1 sec if sleep can do it.\n-# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,\n-# - 1 sec is not much of a win compared to 2 sec, and\n-# - it takes 2 seconds to perform the test whether 1 sec works.\n-#\n-# Instead, just use the default 2s on platforms that have 1s resolution,\n-# accept the extra 1s delay when using $sleep in the Automake tests, in\n-# exchange for not incurring the 2s delay for running the test for all\n-# packages.\n-#\n-am_try_resolutions=\n-if test \"$am_cv_sleep_fractional_seconds\" = yes; then\n-  # Even a millisecond often causes a bunch of false positives,\n-  # so just try a hundredth of a second. The time saved between .001 and\n-  # .01 is not terribly consequential.\n-  am_try_resolutions=\"0.01 0.1 $am_try_resolutions\"\n-fi\n-\n-# In order to catch current-generation FAT out, we must *modify* files\n-# that already exist; the *creation* timestamp is finer.  Use names\n-# that make ls -t sort them differently when they have equal\n-# timestamps than when they have distinct timestamps, keeping\n-# in mind that ls -t prints the *newest* file first.\n-rm -f conftest.ts?\n-: > conftest.ts1\n-: > conftest.ts2\n-: > conftest.ts3\n-\n-# Make sure ls -t actually works.  Do 'set' in a subshell so we don't\n-# clobber the current shell's arguments. (Outer-level square brackets\n-# are removed by m4; they're present so that m4 does not expand\n-# <dollar><star>; be careful, easy to get confused.)\n-if (\n-     set X `ls -t conftest.ts[12]` &&\n-     {\n-       test \"$*\" != \"X conftest.ts1 conftest.ts2\" ||\n-       test \"$*\" != \"X conftest.ts2 conftest.ts1\";\n-     }\n-); then :; else\n-  # If neither matched, then we have a broken ls.  This can happen\n-  # if, for instance, CONFIG_SHELL is bash and it inherits a\n-  # broken ls alias from the environment.  This has actually\n-  # happened.  Such a system could not be considered \"sane\".\n-  printf \"%s\\n\" \"\"Bad output from ls -t: \\\"`ls -t conftest.ts[12]`\\\"\"\" >&5\n-  { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n-as_fn_error $? \"ls -t produces unexpected output.\n-Make sure there is not a broken ls alias in your environment.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n-fi\n-\n-for am_try_res in $am_try_resolutions; do\n-  # Any one fine-grained sleep might happen to cross the boundary\n-  # between two values of a coarser actual resolution, but if we do\n-  # two fine-grained sleeps in a row, at least one of them will fall\n-  # entirely within a coarse interval.\n-  echo alpha > conftest.ts1\n-  sleep $am_try_res\n-  echo beta > conftest.ts2\n-  sleep $am_try_res\n-  echo gamma > conftest.ts3\n-\n-  # We assume that 'ls -t' will make use of high-resolution\n-  # timestamps if the operating system supports them at all.\n-  if (set X `ls -t conftest.ts?` &&\n-      test \"$2\" = conftest.ts3 &&\n-      test \"$3\" = conftest.ts2 &&\n-      test \"$4\" = conftest.ts1); then\n-    #\n-    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,\n-    # because we don't need to test make.\n-    make_ok=true\n-    if test $am_try_res != 1; then\n-      # But if we've succeeded so far with a subsecond resolution, we\n-      # have one more thing to check: make. It can happen that\n-      # everything else supports the subsecond mtimes, but make doesn't;\n-      # notably on macOS, which ships make 3.81 from 2006 (the last one\n-      # released under GPLv2). https://bugs.gnu.org/68808\n-      #\n-      # We test $MAKE if it is defined in the environment, else \"make\".\n-      # It might get overridden later, but our hope is that in practice\n-      # it does not matter: it is the system \"make\" which is (by far)\n-      # the most likely to be broken, whereas if the user overrides it,\n-      # probably they did so with a better, or at least not worse, make.\n-      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html\n-      #\n-      # Create a Makefile (real tab character here):\n-      rm -f conftest.mk\n-      echo 'conftest.ts1: conftest.ts2' >conftest.mk\n-      echo '\ttouch conftest.ts2' >>conftest.mk\n-      #\n-      # Now, running\n-      #   touch conftest.ts1; touch conftest.ts2; make\n-      # should touch ts1 because ts2 is newer. This could happen by luck,\n-      # but most often, it will fail if make's support is insufficient. So\n-      # test for several consecutive successes.\n-      #\n-      # (We reuse conftest.ts[12] because we still want to modify existing\n-      # files, not create new ones, per above.)\n-      n=0\n-      make=${MAKE-make}\n-      until test $n -eq 3; do\n-        echo one > conftest.ts1\n-        sleep $am_try_res\n-        echo two > conftest.ts2 # ts2 should now be newer than ts1\n-        if $make -f conftest.mk | grep 'up to date' >/dev/null; then\n-          make_ok=false\n-          break # out of $n loop\n-        fi\n-        n=`expr $n + 1`\n-      done\n-    fi\n-    #\n-    if $make_ok; then\n-      # Everything we know to check worked out, so call this resolution good.\n-      am_cv_filesystem_timestamp_resolution=$am_try_res\n-      break # out of $am_try_res loop\n-    fi\n-    # Otherwise, we'll go on to check the next resolution.\n-  fi\n-done\n-rm -f conftest.ts?\n-# (end _am_filesystem_timestamp_resolution)\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution\" >&5\n-printf \"%s\\n\" \"$am_cv_filesystem_timestamp_resolution\" >&6; }\n-\n-# This check should not be cached, as it may vary across builds of\n-# different projects.\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether build environment is sane\" >&5\n-printf %s \"checking whether build environment is sane... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether build environment is sane\" >&5\n+$as_echo_n \"checking whether build environment is sane... \" >&6; }\n # Reject unsafe characters in $srcdir or the absolute working directory\n # name.  Accept space and tab only in the latter.\n am_lf='\n@@ -3389,45 +2576,49 @@ esac\n # symlink; some systems play weird games with the mod time of symlinks\n # (eg FreeBSD returns the mod time of the symlink's containing\n # directory).\n-am_build_env_is_sane=no\n-am_has_slept=no\n-rm -f conftest.file\n-for am_try in 1 2; do\n-  echo \"timestamp, slept: $am_has_slept\" > conftest.file\n-  if (\n-    set X `ls -Lt \"$srcdir/configure\" conftest.file 2> /dev/null`\n-    if test \"$*\" = \"X\"; then\n-      # -L didn't work.\n-      set X `ls -t \"$srcdir/configure\" conftest.file`\n-    fi\n-    test \"$2\" = conftest.file\n-  ); then\n-    am_build_env_is_sane=yes\n-    break\n-  fi\n-  # Just in case.\n-  sleep \"$am_cv_filesystem_timestamp_resolution\"\n-  am_has_slept=yes\n-done\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane\" >&5\n-printf \"%s\\n\" \"$am_build_env_is_sane\" >&6; }\n-if test \"$am_build_env_is_sane\" = no; then\n-  as_fn_error $? \"newly created file is older than distributed files!\n+if (\n+   am_has_slept=no\n+   for am_try in 1 2; do\n+     echo \"timestamp, slept: $am_has_slept\" > conftest.file\n+     set X `ls -Lt \"$srcdir/configure\" conftest.file 2> /dev/null`\n+     if test \"$*\" = \"X\"; then\n+\t# -L didn't work.\n+\tset X `ls -t \"$srcdir/configure\" conftest.file`\n+     fi\n+     if test \"$*\" != \"X $srcdir/configure conftest.file\" \\\n+\t&& test \"$*\" != \"X conftest.file $srcdir/configure\"; then\n+\n+\t# If neither matched, then we have a broken ls.  This can happen\n+\t# if, for instance, CONFIG_SHELL is bash and it inherits a\n+\t# broken ls alias from the environment.  This has actually\n+\t# happened.  Such a system could not be considered \"sane\".\n+\tas_fn_error $? \"ls -t appears to fail.  Make sure there is not a broken\n+  alias in your environment\" \"$LINENO\" 5\n+     fi\n+     if test \"$2\" = conftest.file || test $am_try -eq 2; then\n+       break\n+     fi\n+     # Just in case.\n+     sleep 1\n+     am_has_slept=yes\n+   done\n+   test \"$2\" = conftest.file\n+   )\n+then\n+   # Ok.\n+   :\n+else\n+   as_fn_error $? \"newly created file is older than distributed files!\n Check your system clock\" \"$LINENO\" 5\n fi\n-\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n # If we didn't sleep, we still need to ensure time stamps of config.status and\n # generated files are strictly newer.\n am_sleep_pid=\n-if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1\n-then :\n-\n-else case e in #(\n-  e)   ( sleep \"$am_cv_filesystem_timestamp_resolution\" ) &\n+if grep 'slept: no' conftest.file >/dev/null 2>&1; then\n+  ( sleep 1 ) &\n   am_sleep_pid=$!\n- ;;\n-esac\n fi\n \n rm -f conftest.file\n@@ -3438,25 +2629,28 @@ test \"$program_prefix\" != NONE &&\n test \"$program_suffix\" != NONE &&\n   program_transform_name=\"s&\\$&$program_suffix&;$program_transform_name\"\n # Double any \\ or $.\n-# By default was 's,x,x', remove it if useless.\n+# By default was `s,x,x', remove it if useless.\n ac_script='s/[\\\\$]/&&/g;s/;s,x,x,$//'\n-program_transform_name=`printf \"%s\\n\" \"$program_transform_name\" | sed \"$ac_script\"`\n-\n+program_transform_name=`$as_echo \"$program_transform_name\" | sed \"$ac_script\"`\n \n # Expand $ac_aux_dir to an absolute path.\n am_aux_dir=`cd \"$ac_aux_dir\" && pwd`\n \n-\n-  if test x\"${MISSING+set}\" != xset; then\n-  MISSING=\"\\${SHELL} '$am_aux_dir/missing'\"\n+if test x\"${MISSING+set}\" != xset; then\n+  case $am_aux_dir in\n+  *\\ * | *\\\t*)\n+    MISSING=\"\\${SHELL} \\\"$am_aux_dir/missing\\\"\" ;;\n+  *)\n+    MISSING=\"\\${SHELL} $am_aux_dir/missing\" ;;\n+  esac\n fi\n # Use eval to expand $SHELL\n if eval \"$MISSING --is-lightweight\"; then\n   am_missing_run=\"$MISSING \"\n else\n   am_missing_run=\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: 'missing' script is too old or missing\" >&2;}\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing\" >&5\n+$as_echo \"$as_me: WARNING: 'missing' script is too old or missing\" >&2;}\n fi\n \n if test x\"${install_sh+set}\" != xset; then\n@@ -3476,44 +2670,38 @@ if test \"$cross_compiling\" != no; then\n   if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}strip\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}strip; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_STRIP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$STRIP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_STRIP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$STRIP\"; then\n   ac_cv_prog_STRIP=\"$STRIP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_STRIP=\"${ac_tool_prefix}strip\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n STRIP=$ac_cv_prog_STRIP\n if test -n \"$STRIP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $STRIP\" >&5\n-printf \"%s\\n\" \"$STRIP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $STRIP\" >&5\n+$as_echo \"$STRIP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -3522,44 +2710,38 @@ if test -z \"$ac_cv_prog_STRIP\"; then\n   ac_ct_STRIP=$STRIP\n   # Extract the first word of \"strip\", so it can be a program name with args.\n set dummy strip; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_STRIP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_STRIP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_STRIP\"; then\n   ac_cv_prog_ac_ct_STRIP=\"$ac_ct_STRIP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_STRIP=\"strip\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP\n if test -n \"$ac_ct_STRIP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP\" >&5\n-printf \"%s\\n\" \"$ac_ct_STRIP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP\" >&5\n+$as_echo \"$ac_ct_STRIP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_STRIP\" = x; then\n@@ -3567,8 +2749,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     STRIP=$ac_ct_STRIP\n@@ -3580,110 +2762,98 @@ fi\n fi\n INSTALL_STRIP_PROGRAM=\"\\$(install_sh) -c -s\"\n \n-\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p\" >&5\n-printf %s \"checking for a race-free mkdir -p... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p\" >&5\n+$as_echo_n \"checking for a thread-safe mkdir -p... \" >&6; }\n if test -z \"$MKDIR_P\"; then\n-  if test ${ac_cv_path_mkdir+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n+  if ${ac_cv_path_mkdir+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_prog in mkdir gmkdir; do\n \t for ac_exec_ext in '' $ac_executable_extensions; do\n-\t   as_fn_executable_p \"$as_dir$ac_prog$ac_exec_ext\" || continue\n-\t   case `\"$as_dir$ac_prog$ac_exec_ext\" --version 2>&1` in #(\n-\t     'mkdir ('*'coreutils) '* | \\\n-\t     *'BusyBox '* | \\\n+\t   as_fn_executable_p \"$as_dir/$ac_prog$ac_exec_ext\" || continue\n+\t   case `\"$as_dir/$ac_prog$ac_exec_ext\" --version 2>&1` in #(\n+\t     'mkdir (GNU coreutils) '* | \\\n+\t     'mkdir (coreutils) '* | \\\n \t     'mkdir (fileutils) '4.1*)\n-\t       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext\n+\t       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext\n \t       break 3;;\n \t   esac\n \t done\n        done\n   done\n IFS=$as_save_IFS\n- ;;\n-esac\n+\n fi\n \n   test -d ./--version && rmdir ./--version\n-  if test ${ac_cv_path_mkdir+y}; then\n+  if test \"${ac_cv_path_mkdir+set}\" = set; then\n     MKDIR_P=\"$ac_cv_path_mkdir -p\"\n   else\n-    # As a last resort, use plain mkdir -p,\n-    # in the hope it doesn't have the bugs of ancient mkdir.\n-    MKDIR_P='mkdir -p'\n+    # As a last resort, use the slow shell script.  Don't cache a\n+    # value for MKDIR_P within a source directory, because that will\n+    # break other packages using the cache if that directory is\n+    # removed, or if the value is a relative name.\n+    MKDIR_P=\"$ac_install_sh -d\"\n   fi\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $MKDIR_P\" >&5\n-printf \"%s\\n\" \"$MKDIR_P\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $MKDIR_P\" >&5\n+$as_echo \"$MKDIR_P\" >&6; }\n \n for ac_prog in gawk mawk nawk awk\n do\n   # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_AWK+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$AWK\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_AWK+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$AWK\"; then\n   ac_cv_prog_AWK=\"$AWK\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_AWK=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n AWK=$ac_cv_prog_AWK\n if test -n \"$AWK\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $AWK\" >&5\n-printf \"%s\\n\" \"$AWK\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $AWK\" >&5\n+$as_echo \"$AWK\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n   test -n \"$AWK\" && break\n done\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \\$(MAKE)\" >&5\n-printf %s \"checking whether ${MAKE-make} sets \\$(MAKE)... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \\$(MAKE)\" >&5\n+$as_echo_n \"checking whether ${MAKE-make} sets \\$(MAKE)... \" >&6; }\n set x ${MAKE-make}\n-ac_make=`printf \"%s\\n\" \"$2\" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`\n-if eval test \\${ac_cv_prog_make_${ac_make}_set+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat >conftest.make <<\\_ACEOF\n+ac_make=`$as_echo \"$2\" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`\n+if eval \\${ac_cv_prog_make_${ac_make}_set+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat >conftest.make <<\\_ACEOF\n SHELL = /bin/sh\n all:\n \t@echo '@@@%%%=$(MAKE)=@@@%%%'\n@@ -3695,16 +2865,15 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in\n   *)\n     eval ac_cv_prog_make_${ac_make}_set=no;;\n esac\n-rm -f conftest.make ;;\n-esac\n+rm -f conftest.make\n fi\n if eval test \\$ac_cv_prog_make_${ac_make}_set = yes; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n   SET_MAKE=\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n   SET_MAKE=\"MAKE=${MAKE-make}\"\n fi\n \n@@ -3717,21 +2886,23 @@ else\n fi\n rmdir .tst 2>/dev/null\n \n-AM_DEFAULT_VERBOSITY=1\n # Check whether --enable-silent-rules was given.\n-if test ${enable_silent_rules+y}\n-then :\n+if test \"${enable_silent_rules+set}\" = set; then :\n   enableval=$enable_silent_rules;\n fi\n \n+case $enable_silent_rules in # (((\n+  yes) AM_DEFAULT_VERBOSITY=0;;\n+   no) AM_DEFAULT_VERBOSITY=1;;\n+    *) AM_DEFAULT_VERBOSITY=1;;\n+esac\n am_make=${MAKE-make}\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables\" >&5\n-printf %s \"checking whether $am_make supports nested variables... \" >&6; }\n-if test ${am_cv_make_support_nested_variables+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if printf \"%s\\n\" 'TRUE=$(BAR$(V))\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables\" >&5\n+$as_echo_n \"checking whether $am_make supports nested variables... \" >&6; }\n+if ${am_cv_make_support_nested_variables+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if $as_echo 'TRUE=$(BAR$(V))\n BAR0=false\n BAR1=true\n V=1\n@@ -3741,49 +2912,18 @@ am__doit:\n   am_cv_make_support_nested_variables=yes\n else\n   am_cv_make_support_nested_variables=no\n-fi ;;\n-esac\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables\" >&5\n-printf \"%s\\n\" \"$am_cv_make_support_nested_variables\" >&6; }\n-AM_BACKSLASH='\\'\n-\n-am__rm_f_notfound=\n-if (rm -f && rm -fr && rm -rf) 2>/dev/null\n-then :\n-\n-else case e in #(\n-  e) am__rm_f_notfound='\"\"' ;;\n-esac\n-fi\n-\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking xargs -n works\" >&5\n-printf %s \"checking xargs -n works... \" >&6; }\n-if test ${am_cv_xargs_n_works+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test \"`echo 1 2 3 | xargs -n2 echo`\" = \"1 2\n-3\"\n-then :\n-  am_cv_xargs_n_works=yes\n-else case e in #(\n-  e) am_cv_xargs_n_works=no ;;\n-esac\n-fi ;;\n-esac\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works\" >&5\n-printf \"%s\\n\" \"$am_cv_xargs_n_works\" >&6; }\n-if test \"$am_cv_xargs_n_works\" = yes\n-then :\n-  am__xargs_n='xargs -n'\n-else case e in #(\n-  e)   am__xargs_n='am__xargs_n () { shift; sed \"s/ /\\\\n/g\" | while read am__xargs_n_arg; do \"\" \"$am__xargs_n_arg\"; done; }'\n- ;;\n-esac\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables\" >&5\n+$as_echo \"$am_cv_make_support_nested_variables\" >&6; }\n+if test $am_cv_make_support_nested_variables = yes; then\n+    AM_V='$(V)'\n+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'\n+else\n+  AM_V=$AM_DEFAULT_VERBOSITY\n+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY\n fi\n+AM_BACKSLASH='\\'\n \n if test \"`cd $srcdir && pwd`\" != \"`pwd`\"; then\n   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output\n@@ -3807,13 +2947,17 @@ fi\n \n # Define the identity of the package.\n  PACKAGE='libe-book'\n- VERSION='0.1.4'\n+ VERSION='0.1.3'\n \n \n-printf \"%s\\n\" \"#define PACKAGE \\\"$PACKAGE\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define PACKAGE \"$PACKAGE\"\n+_ACEOF\n \n \n-printf \"%s\\n\" \"#define VERSION \\\"$VERSION\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define VERSION \"$VERSION\"\n+_ACEOF\n \n # Some tools Automake needs.\n \n@@ -3833,8 +2977,8 @@ MAKEINFO=${MAKEINFO-\"${am_missing_run}makeinfo\"}\n \n # For better backward compatibility.  To be removed once Automake 1.9.x\n # dies out for good.  For more background, see:\n-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>\n-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>\n+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>\n+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>\n mkdir_p='$(MKDIR_P)'\n \n # We need awk for the \"check\" target (and possibly the TAP driver).  The\n@@ -3853,27 +2997,88 @@ am__tar='$${TAR-tar} chof - \"$$tardir\"' am__untar='$${TAR-tar} xf -'\n \n \n \n-# Variables for tags utilities; see am/tags.am\n-if test -z \"$CTAGS\"; then\n-  CTAGS=ctags\n-fi\n \n-if test -z \"$ETAGS\"; then\n-  ETAGS=etags\n-fi\n+# POSIX will say in a future version that running \"rm -f\" with no argument\n+# is OK; and we want to be able to make that assumption in our Makefile\n+# recipes.  So use an aggressive probe to check that the usage we want is\n+# actually supported \"in the wild\" to an acceptable degree.\n+# See automake bug#10828.\n+# To make any issue more visible, cause the running configure to be aborted\n+# by default if the 'rm' program in use doesn't match our expectations; the\n+# user can still override this though.\n+if rm -f && rm -fr && rm -rf; then : OK; else\n+  cat >&2 <<'END'\n+Oops!\n \n-if test -z \"$CSCOPE\"; then\n-  CSCOPE=cscope\n-fi\n+Your 'rm' program seems unable to run without file operands specified\n+on the command line, even when the '-f' option is present.  This is contrary\n+to the behaviour of most rm programs out there, and not conforming with\n+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>\n \n+Please tell bug-automake@gnu.org about your system, including the value\n+of your $PATH and any error possibly output before this message.  This\n+can help us improve future automake versions.\n \n+END\n+  if test x\"$ACCEPT_INFERIOR_RM_PROGRAM\" = x\"yes\"; then\n+    echo 'Configuration will proceed anyway, since you have set the' >&2\n+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to \"yes\"' >&2\n+    echo >&2\n+  else\n+    cat >&2 <<'END'\n+Aborting the configuration process, to ensure you take notice of the issue.\n \n+You can download and install GNU coreutils to get an 'rm' implementation\n+that behaves properly: <http://www.gnu.org/software/coreutils/>.\n \n+If you want to complete the configuration process using your problematic\n+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM\n+to \"yes\", and re-run configure.\n \n+END\n+    as_fn_error $? \"Your 'rm' program is bad, sorry.\" \"$LINENO\" 5\n+  fi\n+fi\n \n+# Check whether --enable-silent-rules was given.\n+if test \"${enable_silent_rules+set}\" = set; then :\n+  enableval=$enable_silent_rules;\n+fi\n \n+case $enable_silent_rules in # (((\n+  yes) AM_DEFAULT_VERBOSITY=0;;\n+   no) AM_DEFAULT_VERBOSITY=1;;\n+    *) AM_DEFAULT_VERBOSITY=0;;\n+esac\n+am_make=${MAKE-make}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables\" >&5\n+$as_echo_n \"checking whether $am_make supports nested variables... \" >&6; }\n+if ${am_cv_make_support_nested_variables+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if $as_echo 'TRUE=$(BAR$(V))\n+BAR0=false\n+BAR1=true\n+V=1\n+am__doit:\n+\t@$(TRUE)\n+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then\n+  am_cv_make_support_nested_variables=yes\n+else\n+  am_cv_make_support_nested_variables=no\n+fi\n+fi\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables\" >&5\n+$as_echo \"$am_cv_make_support_nested_variables\" >&6; }\n+if test $am_cv_make_support_nested_variables = yes; then\n+    AM_V='$(V)'\n+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'\n+else\n+  AM_V=$AM_DEFAULT_VERBOSITY\n+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY\n+fi\n+AM_BACKSLASH='\\'\n \n-AM_DEFAULT_VERBOSITY=0\n ac_ext=cpp\n ac_cpp='$CXXCPP $CPPFLAGS'\n ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n@@ -3882,74 +3087,62 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n \n \n # Check whether --enable-experimental was given.\n-if test ${enable_experimental+y}\n-then :\n+if test \"${enable_experimental+set}\" = set; then :\n   enableval=$enable_experimental; enable_experimental=\"$enableval\"\n-else case e in #(\n-  e) enable_experimental=no ;;\n-esac\n+else\n+  enable_experimental=no\n fi\n \n \n # ===========================\n # Find required base packages\n # ===========================\n-\n-\n-\n-\n-\n-\n-\n-\n-\n DEPDIR=\"${am__leading_dot}deps\"\n \n ac_config_commands=\"$ac_config_commands depfiles\"\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive\" >&5\n-printf %s \"checking whether ${MAKE-make} supports the include directive... \" >&6; }\n-cat > confinc.mk << 'END'\n+\n+am_make=${MAKE-make}\n+cat > confinc << 'END'\n am__doit:\n-\t@echo this is the am__doit target >confinc.out\n+\t@echo this is the am__doit target\n .PHONY: am__doit\n END\n+# If we don't find an include directive, just comment out the code.\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make\" >&5\n+$as_echo_n \"checking for style of include used by $am_make... \" >&6; }\n am__include=\"#\"\n am__quote=\n-# BSD make does it like this.\n-echo '.include \"confinc.mk\" # ignored' > confmf.BSD\n-# Other make implementations (GNU, Solaris 10, AIX) do it like this.\n-echo 'include confinc.mk # ignored' > confmf.GNU\n-_am_result=no\n-for s in GNU BSD; do\n-  { echo \"$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out\" >&5\n-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5\n-   ac_status=$?\n-   echo \"$as_me:$LINENO: \\$? = $ac_status\" >&5\n-   (exit $ac_status); }\n-  case $?:`cat confinc.out 2>/dev/null` in #(\n-  '0:this is the am__doit target') :\n-    case $s in #(\n-  BSD) :\n-    am__include='.include' am__quote='\"' ;; #(\n-  *) :\n-    am__include='include' am__quote='' ;;\n-esac ;; #(\n-  *) :\n-     ;;\n+_am_result=none\n+# First try GNU make style include.\n+echo \"include confinc\" > confmf\n+# Ignore all kinds of additional output from 'make'.\n+case `$am_make -s -f confmf 2> /dev/null` in #(\n+*the\\ am__doit\\ target*)\n+  am__include=include\n+  am__quote=\n+  _am_result=GNU\n+  ;;\n esac\n-  if test \"$am__include\" != \"#\"; then\n-    _am_result=\"yes ($s style)\"\n-    break\n-  fi\n-done\n-rm -f confinc.* confmf.*\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: ${_am_result}\" >&5\n-printf \"%s\\n\" \"${_am_result}\" >&6; }\n+# Now try BSD make style include.\n+if test \"$am__include\" = \"#\"; then\n+   echo '.include \"confinc\"' > confmf\n+   case `$am_make -s -f confmf 2> /dev/null` in #(\n+   *the\\ am__doit\\ target*)\n+     am__include=.include\n+     am__quote=\"\\\"\"\n+     _am_result=BSD\n+     ;;\n+   esac\n+fi\n+\n+\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $_am_result\" >&5\n+$as_echo \"$_am_result\" >&6; }\n+rm -f confinc confmf\n \n # Check whether --enable-dependency-tracking was given.\n-if test ${enable_dependency_tracking+y}\n-then :\n+if test \"${enable_dependency_tracking+set}\" = set; then :\n   enableval=$enable_dependency_tracking;\n fi\n \n@@ -3975,44 +3168,38 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu\n if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}gcc\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}gcc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CC=\"${ac_tool_prefix}gcc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -4021,44 +3208,38 @@ if test -z \"$ac_cv_prog_CC\"; then\n   ac_ct_CC=$CC\n   # Extract the first word of \"gcc\", so it can be a program name with args.\n set dummy gcc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_CC\"; then\n   ac_cv_prog_ac_ct_CC=\"$ac_ct_CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_CC=\"gcc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_CC=$ac_cv_prog_ac_ct_CC\n if test -n \"$ac_ct_CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n-printf \"%s\\n\" \"$ac_ct_CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n+$as_echo \"$ac_ct_CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_CC\" = x; then\n@@ -4066,8 +3247,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     CC=$ac_ct_CC\n@@ -4080,44 +3261,38 @@ if test -z \"$CC\"; then\n           if test -n \"$ac_tool_prefix\"; then\n     # Extract the first word of \"${ac_tool_prefix}cc\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}cc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CC=\"${ac_tool_prefix}cc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -4126,13 +3301,12 @@ fi\n if test -z \"$CC\"; then\n   # Extract the first word of \"cc\", so it can be a program name with args.\n set dummy cc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n   ac_prog_rejected=no\n@@ -4140,19 +3314,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    if test \"$as_dir$ac_word$ac_exec_ext\" = \"/usr/ucb/cc\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    if test \"$as_dir/$ac_word$ac_exec_ext\" = \"/usr/ucb/cc\"; then\n        ac_prog_rejected=yes\n        continue\n      fi\n     ac_cv_prog_CC=\"cc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n@@ -4168,19 +3338,18 @@ if test $ac_prog_rejected = yes; then\n     # However, it has the same basename, so the bogon will be chosen\n     # first if we set CC to just the basename; use the full file name.\n     shift\n-    ac_cv_prog_CC=\"$as_dir$ac_word${1+' '}$@\"\n+    ac_cv_prog_CC=\"$as_dir/$ac_word${1+' '}$@\"\n   fi\n fi\n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -4191,44 +3360,38 @@ if test -z \"$CC\"; then\n   do\n     # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CC=\"$ac_tool_prefix$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -4241,44 +3404,38 @@ if test -z \"$CC\"; then\n do\n   # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_CC\"; then\n   ac_cv_prog_ac_ct_CC=\"$ac_ct_CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_CC=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_CC=$ac_cv_prog_ac_ct_CC\n if test -n \"$ac_ct_CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n-printf \"%s\\n\" \"$ac_ct_CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n+$as_echo \"$ac_ct_CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -4290,140 +3447,34 @@ done\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n-ac_tool_warned=yes ;;\n-esac\n-    CC=$ac_ct_CC\n-  fi\n-fi\n-\n-fi\n-if test -z \"$CC\"; then\n-  if test -n \"$ac_tool_prefix\"; then\n-  # Extract the first word of \"${ac_tool_prefix}clang\", so it can be a program name with args.\n-set dummy ${ac_tool_prefix}clang; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n-  ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_CC=\"${ac_tool_prefix}clang\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-fi ;;\n-esac\n-fi\n-CC=$ac_cv_prog_CC\n-if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-\n-fi\n-if test -z \"$ac_cv_prog_CC\"; then\n-  ac_ct_CC=$CC\n-  # Extract the first word of \"clang\", so it can be a program name with args.\n-set dummy clang; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CC\"; then\n-  ac_cv_prog_ac_ct_CC=\"$ac_ct_CC\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_ac_ct_CC=\"clang\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-fi ;;\n-esac\n-fi\n-ac_ct_CC=$ac_cv_prog_ac_ct_CC\n-if test -n \"$ac_ct_CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n-printf \"%s\\n\" \"$ac_ct_CC\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-  if test \"x$ac_ct_CC\" = x; then\n-    CC=\"\"\n-  else\n-    case $cross_compiling:$ac_tool_warned in\n-yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     CC=$ac_ct_CC\n   fi\n-else\n-  CC=\"$ac_cv_prog_CC\"\n fi\n \n fi\n \n \n-test -z \"$CC\" && { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+test -z \"$CC\" && { { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"no acceptable C compiler found in \\$PATH\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n \n # Provide some information about the compiler.\n-printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for C compiler version\" >&5\n+$as_echo \"$as_me:${as_lineno-$LINENO}: checking for C compiler version\" >&5\n set X $ac_compile\n ac_compiler=$2\n-for ac_option in --version -v -V -qversion -version; do\n+for ac_option in --version -v -V -qversion; do\n   { { ac_try=\"$ac_compiler $ac_option >&5\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_compiler $ac_option >&5\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -4433,7 +3484,7 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n   fi\n   rm -f conftest.er1 conftest.err\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n done\n \n@@ -4441,7 +3492,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n@@ -4453,9 +3504,9 @@ ac_clean_files=\"$ac_clean_files a.out a.out.dSYM a.exe b.out\"\n # Try to create an executable without -o first, disregard a.out.\n # It will help us diagnose broken compilers, and finding out an intuition\n # of exeext.\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the C compiler works\" >&5\n-printf %s \"checking whether the C compiler works... \" >&6; }\n-ac_link_default=`printf \"%s\\n\" \"$ac_link\" | sed 's/ -o *conftest[^ ]*//'`\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether the C compiler works\" >&5\n+$as_echo_n \"checking whether the C compiler works... \" >&6; }\n+ac_link_default=`$as_echo \"$ac_link\" | sed 's/ -o *conftest[^ ]*//'`\n \n # The possible output files:\n ac_files=\"a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*\"\n@@ -4476,14 +3527,13 @@ case \"(($ac_try\" in\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_link_default\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n-  test $ac_status = 0; }\n-then :\n-  # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.\n-# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  test $ac_status = 0; }; then :\n+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.\n+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'\n # in a Makefile.  We should not override ac_cv_exeext if it was cached,\n # so that the user can short-circuit this test for compilers unknown to\n # Autoconf.\n@@ -4498,12 +3548,12 @@ do\n \t# certainly right.\n \tbreak;;\n     *.* )\n-\tif test ${ac_cv_exeext+y} && test \"$ac_cv_exeext\" != no;\n+\tif test \"${ac_cv_exeext+set}\" = set && test \"$ac_cv_exeext\" != no;\n \tthen :; else\n \t   ac_cv_exeext=`expr \"$ac_file\" : '[^.]*\\(\\..*\\)'`\n \tfi\n \t# We set ac_cv_exeext here because the later test for it is not\n-\t# safe: cross compilers may not add the suffix if given an '-o'\n+\t# safe: cross compilers may not add the suffix if given an `-o'\n \t# argument, so we may need to know it at that point already.\n \t# Even if this section looks crufty: it has the advantage of\n \t# actually working.\n@@ -4514,52 +3564,48 @@ do\n done\n test \"$ac_cv_exeext\" = no && ac_cv_exeext=\n \n-else case e in #(\n-  e) ac_file='' ;;\n-esac\n+else\n+  ac_file=''\n fi\n-if test -z \"$ac_file\"\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+if test -z \"$ac_file\"; then :\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+$as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-{ { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error 77 \"C compiler cannot create executables\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; } ;;\n-esac\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name\" >&5\n-printf %s \"checking for C compiler default output file name... \" >&6; }\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_file\" >&5\n-printf \"%s\\n\" \"$ac_file\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name\" >&5\n+$as_echo_n \"checking for C compiler default output file name... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_file\" >&5\n+$as_echo \"$ac_file\" >&6; }\n ac_exeext=$ac_cv_exeext\n \n rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out\n ac_clean_files=$ac_clean_files_save\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for suffix of executables\" >&5\n-printf %s \"checking for suffix of executables... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for suffix of executables\" >&5\n+$as_echo_n \"checking for suffix of executables... \" >&6; }\n if { { ac_try=\"$ac_link\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_link\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n-  test $ac_status = 0; }\n-then :\n-  # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)\n-# catch 'conftest.exe'.  For instance with Cygwin, 'ls conftest' will\n-# work properly (i.e., refer to 'conftest.exe'), while it won't with\n-# 'rm'.\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  test $ac_status = 0; }; then :\n+  # If both `conftest.exe' and `conftest' are `present' (well, observable)\n+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will\n+# work properly (i.e., refer to `conftest.exe'), while it won't with\n+# `rm'.\n for ac_file in conftest.exe conftest conftest.*; do\n   test -f \"$ac_file\" || continue\n   case $ac_file in\n@@ -4569,16 +3615,15 @@ for ac_file in conftest.exe conftest conftest.*; do\n     * ) break;;\n   esac\n done\n-else case e in #(\n-  e) { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+else\n+  { { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"cannot compute suffix of executables: cannot compile and link\n-See 'config.log' for more details\" \"$LINENO\" 5; } ;;\n-esac\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n fi\n rm -f conftest conftest$ac_cv_exeext\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext\" >&5\n-printf \"%s\\n\" \"$ac_cv_exeext\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext\" >&5\n+$as_echo \"$ac_cv_exeext\" >&6; }\n \n rm -f conftest.$ac_ext\n EXEEXT=$ac_cv_exeext\n@@ -4587,11 +3632,9 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n #include <stdio.h>\n int\n-main (void)\n+main ()\n {\n FILE *f = fopen (\"conftest.out\", \"w\");\n- if (!f)\n-  return 1;\n  return ferror (f) || fclose (f) != 0;\n \n   ;\n@@ -4601,8 +3644,8 @@ _ACEOF\n ac_clean_files=\"$ac_clean_files conftest.out\"\n # Check that the compiler produces executables we can run.  If not, either\n # the compiler is broken, or we cross compile.\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling\" >&5\n-printf %s \"checking whether we are cross compiling... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling\" >&5\n+$as_echo_n \"checking whether we are cross compiling... \" >&6; }\n if test \"$cross_compiling\" != yes; then\n   { { ac_try=\"$ac_link\"\n case \"(($ac_try\" in\n@@ -4610,10 +3653,10 @@ case \"(($ac_try\" in\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_link\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n   if { ac_try='./conftest$ac_cv_exeext'\n   { { case \"(($ac_try\" in\n@@ -4621,41 +3664,39 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_try\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; }; then\n     cross_compiling=no\n   else\n     if test \"$cross_compiling\" = maybe; then\n \tcross_compiling=yes\n     else\n-\t{ { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n-as_fn_error 77 \"cannot run C compiled programs.\n-If you meant to cross compile, use '--host'.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n+as_fn_error $? \"cannot run C compiled programs.\n+If you meant to cross compile, use \\`--host'.\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n     fi\n   fi\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $cross_compiling\" >&5\n-printf \"%s\\n\" \"$cross_compiling\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $cross_compiling\" >&5\n+$as_echo \"$cross_compiling\" >&6; }\n \n-rm -f conftest.$ac_ext conftest$ac_cv_exeext \\\n-  conftest.o conftest.obj conftest.out\n+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out\n ac_clean_files=$ac_clean_files_save\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for suffix of object files\" >&5\n-printf %s \"checking for suffix of object files... \" >&6; }\n-if test ${ac_cv_objext+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for suffix of object files\" >&5\n+$as_echo_n \"checking for suffix of object files... \" >&6; }\n+if ${ac_cv_objext+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n@@ -4669,12 +3710,11 @@ case \"(($ac_try\" in\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_compile\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n-  test $ac_status = 0; }\n-then :\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  test $ac_status = 0; }; then :\n   for ac_file in conftest.o conftest.obj conftest.*; do\n   test -f \"$ac_file\" || continue;\n   case $ac_file in\n@@ -4683,34 +3723,31 @@ then :\n        break;;\n   esac\n done\n-else case e in #(\n-  e) printf \"%s\\n\" \"$as_me: failed program was:\" >&5\n+else\n+  $as_echo \"$as_me: failed program was:\" >&5\n sed 's/^/| /' conftest.$ac_ext >&5\n \n-{ { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"cannot compute suffix of object files: cannot compile\n-See 'config.log' for more details\" \"$LINENO\" 5; } ;;\n-esac\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n fi\n-rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;\n-esac\n+rm -f conftest.$ac_cv_objext conftest.$ac_ext\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext\" >&5\n-printf \"%s\\n\" \"$ac_cv_objext\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext\" >&5\n+$as_echo \"$ac_cv_objext\" >&6; }\n OBJEXT=$ac_cv_objext\n ac_objext=$OBJEXT\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C\" >&5\n-printf %s \"checking whether the compiler supports GNU C... \" >&6; }\n-if test ${ac_cv_c_compiler_gnu+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler\" >&5\n+$as_echo_n \"checking whether we are using the GNU C compiler... \" >&6; }\n+if ${ac_cv_c_compiler_gnu+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n #ifndef __GNUC__\n        choke me\n@@ -4720,36 +3757,30 @@ main (void)\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_compiler_gnu=yes\n-else case e in #(\n-  e) ac_compiler_gnu=no ;;\n-esac\n+else\n+  ac_compiler_gnu=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n ac_cv_c_compiler_gnu=$ac_compiler_gnu\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu\" >&5\n-printf \"%s\\n\" \"$ac_cv_c_compiler_gnu\" >&6; }\n-ac_compiler_gnu=$ac_cv_c_compiler_gnu\n \n+fi\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu\" >&5\n+$as_echo \"$ac_cv_c_compiler_gnu\" >&6; }\n if test $ac_compiler_gnu = yes; then\n   GCC=yes\n else\n   GCC=\n fi\n-ac_test_CFLAGS=${CFLAGS+y}\n+ac_test_CFLAGS=${CFLAGS+set}\n ac_save_CFLAGS=$CFLAGS\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g\" >&5\n-printf %s \"checking whether $CC accepts -g... \" >&6; }\n-if test ${ac_cv_prog_cc_g+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_save_c_werror_flag=$ac_c_werror_flag\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g\" >&5\n+$as_echo_n \"checking whether $CC accepts -g... \" >&6; }\n+if ${ac_cv_prog_cc_g+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_save_c_werror_flag=$ac_c_werror_flag\n    ac_c_werror_flag=yes\n    ac_cv_prog_cc_g=no\n    CFLAGS=\"-g\"\n@@ -4757,63 +3788,57 @@ else case e in #(\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cc_g=yes\n-else case e in #(\n-  e) CFLAGS=\"\"\n+else\n+  CFLAGS=\"\"\n       cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n \n-else case e in #(\n-  e) ac_c_werror_flag=$ac_save_c_werror_flag\n+else\n+  ac_c_werror_flag=$ac_save_c_werror_flag\n \t CFLAGS=\"-g\"\n \t cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cc_g=yes\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-   ac_c_werror_flag=$ac_save_c_werror_flag ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+   ac_c_werror_flag=$ac_save_c_werror_flag\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_g\" >&6; }\n-if test $ac_test_CFLAGS; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g\" >&5\n+$as_echo \"$ac_cv_prog_cc_g\" >&6; }\n+if test \"$ac_test_CFLAGS\" = set; then\n   CFLAGS=$ac_save_CFLAGS\n elif test $ac_cv_prog_cc_g = yes; then\n   if test \"$GCC\" = yes; then\n@@ -4828,153 +3853,94 @@ else\n     CFLAGS=\n   fi\n fi\n-ac_prog_cc_stdc=no\n-if test x$ac_prog_cc_stdc = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features\" >&5\n-printf %s \"checking for $CC option to enable C11 features... \" >&6; }\n-if test ${ac_cv_prog_cc_c11+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cc_c11=no\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89\" >&5\n+$as_echo_n \"checking for $CC option to accept ISO C89... \" >&6; }\n+if ${ac_cv_prog_cc_c89+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_cv_prog_cc_c89=no\n ac_save_CC=$CC\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n-$ac_c_conftest_c11_program\n-_ACEOF\n-for ac_arg in '' -std=gnu11\n-do\n-  CC=\"$ac_save_CC $ac_arg\"\n-  if ac_fn_c_try_compile \"$LINENO\"\n-then :\n-  ac_cv_prog_cc_c11=$ac_arg\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n-  test \"x$ac_cv_prog_cc_c11\" != \"xno\" && break\n-done\n-rm -f conftest.$ac_ext\n-CC=$ac_save_CC ;;\n-esac\n-fi\n+#include <stdarg.h>\n+#include <stdio.h>\n+struct stat;\n+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */\n+struct buf { int x; };\n+FILE * (*rcsopen) (struct buf *, struct stat *, int);\n+static char *e (p, i)\n+     char **p;\n+     int i;\n+{\n+  return p[i];\n+}\n+static char *f (char * (*g) (char **, int), char **p, ...)\n+{\n+  char *s;\n+  va_list v;\n+  va_start (v,p);\n+  s = g (p, va_arg (v,int));\n+  va_end (v);\n+  return s;\n+}\n \n-if test \"x$ac_cv_prog_cc_c11\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cc_c11\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_c11\" >&6; }\n-     CC=\"$CC $ac_cv_prog_cc_c11\" ;;\n-esac\n-fi\n-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11\n-  ac_prog_cc_stdc=c11 ;;\n-esac\n-fi\n-fi\n-if test x$ac_prog_cc_stdc = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features\" >&5\n-printf %s \"checking for $CC option to enable C99 features... \" >&6; }\n-if test ${ac_cv_prog_cc_c99+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cc_c99=no\n-ac_save_CC=$CC\n-cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-$ac_c_conftest_c99_program\n-_ACEOF\n-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=\n-do\n-  CC=\"$ac_save_CC $ac_arg\"\n-  if ac_fn_c_try_compile \"$LINENO\"\n-then :\n-  ac_cv_prog_cc_c99=$ac_arg\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n-  test \"x$ac_cv_prog_cc_c99\" != \"xno\" && break\n-done\n-rm -f conftest.$ac_ext\n-CC=$ac_save_CC ;;\n-esac\n-fi\n+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has\n+   function prototypes and stuff, but not '\\xHH' hex character constants.\n+   These don't provoke an error unfortunately, instead are silently treated\n+   as 'x'.  The following induces an error, until -std is added to get\n+   proper ANSI mode.  Curiously '\\x00'!='x' always comes out true, for an\n+   array size at least.  It's necessary to write '\\x00'==0 to get something\n+   that's true only with -std.  */\n+int osf4_cc_array ['\\x00' == 0 ? 1 : -1];\n \n-if test \"x$ac_cv_prog_cc_c99\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cc_c99\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_c99\" >&6; }\n-     CC=\"$CC $ac_cv_prog_cc_c99\" ;;\n-esac\n-fi\n-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99\n-  ac_prog_cc_stdc=c99 ;;\n-esac\n-fi\n-fi\n-if test x$ac_prog_cc_stdc = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features\" >&5\n-printf %s \"checking for $CC option to enable C89 features... \" >&6; }\n-if test ${ac_cv_prog_cc_c89+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cc_c89=no\n-ac_save_CC=$CC\n-cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-$ac_c_conftest_c89_program\n+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters\n+   inside strings and character constants.  */\n+#define FOO(x) 'x'\n+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];\n+\n+int test (int i, double x);\n+struct s1 {int (*f) (int a);};\n+struct s2 {int (*f) (double a);};\n+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);\n+int argc;\n+char **argv;\n+int\n+main ()\n+{\n+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];\n+  ;\n+  return 0;\n+}\n _ACEOF\n-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae \"-Aa -D_HPUX_SOURCE\" \"-Xc -D__EXTENSIONS__\"\n+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \\\n+\t-Ae \"-Aa -D_HPUX_SOURCE\" \"-Xc -D__EXTENSIONS__\"\n do\n   CC=\"$ac_save_CC $ac_arg\"\n-  if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+  if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cc_c89=$ac_arg\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n+rm -f core conftest.err conftest.$ac_objext\n   test \"x$ac_cv_prog_cc_c89\" != \"xno\" && break\n done\n rm -f conftest.$ac_ext\n-CC=$ac_save_CC ;;\n-esac\n-fi\n+CC=$ac_save_CC\n \n-if test \"x$ac_cv_prog_cc_c89\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cc_c89\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_c89\" >&6; }\n-     CC=\"$CC $ac_cv_prog_cc_c89\" ;;\n-esac\n fi\n-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89\n-  ac_prog_cc_stdc=c89 ;;\n+# AC_CACHE_VAL\n+case \"x$ac_cv_prog_cc_c89\" in\n+  x)\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n+$as_echo \"none needed\" >&6; } ;;\n+  xno)\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n+$as_echo \"unsupported\" >&6; } ;;\n+  *)\n+    CC=\"$CC $ac_cv_prog_cc_c89\"\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89\" >&5\n+$as_echo \"$ac_cv_prog_cc_c89\" >&6; } ;;\n esac\n-fi\n+if test \"x$ac_cv_prog_cc_c89\" != xno; then :\n+\n fi\n \n ac_ext=c\n@@ -4983,23 +3949,21 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_c_compiler_gnu\n \n-\n-  ac_ext=c\n+ac_ext=c\n ac_cpp='$CPP $CPPFLAGS'\n ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_c_compiler_gnu\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together\" >&5\n-printf %s \"checking whether $CC understands -c and -o together... \" >&6; }\n-if test ${am_cv_prog_cc_c_o+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together\" >&5\n+$as_echo_n \"checking whether $CC understands -c and -o together... \" >&6; }\n+if ${am_cv_prog_cc_c_o+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n@@ -5025,11 +3989,10 @@ _ACEOF\n     fi\n   done\n   rm -f core conftest*\n-  unset am_i ;;\n-esac\n+  unset am_i\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o\" >&5\n-printf \"%s\\n\" \"$am_cv_prog_cc_c_o\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o\" >&5\n+$as_echo \"$am_cv_prog_cc_c_o\" >&6; }\n if test \"$am_cv_prog_cc_c_o\" != yes; then\n    # Losing compiler, so override with the script.\n    # FIXME: It is wrong to rewrite CC.\n@@ -5047,13 +4010,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu\n \n depcc=\"$CC\"   am_compiler_list=\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc\" >&5\n-printf %s \"checking dependency style of $depcc... \" >&6; }\n-if test ${am_cv_CC_dependencies_compiler_type+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -z \"$AMDEP_TRUE\" && test -f \"$am_depcomp\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc\" >&5\n+$as_echo_n \"checking dependency style of $depcc... \" >&6; }\n+if ${am_cv_CC_dependencies_compiler_type+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -z \"$AMDEP_TRUE\" && test -f \"$am_depcomp\"; then\n   # We make a subdir and do the tests there.  Otherwise we can end up\n   # making bogus files that we don't know about and never remove.  For\n   # instance it was reported that on HP-UX the gcc test will end up\n@@ -5140,7 +4102,7 @@ else case e in #(\n       # icc doesn't choke on unknown options, it will just issue warnings\n       # or remarks (even with -Werror).  So we grep stderr for any message\n       # that says an option was ignored or not supported.\n-      # When given -MP, icc 7.0 and 7.1 complain thus:\n+      # When given -MP, icc 7.0 and 7.1 complain thusly:\n       #   icc: Command line warning: ignoring option '-M'; no argument required\n       # The diagnosis changed in icc 8.0:\n       #   icc: Command line remark: option '-MP' not supported\n@@ -5157,11 +4119,10 @@ else case e in #(\n else\n   am_cv_CC_dependencies_compiler_type=none\n fi\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type\" >&5\n-printf \"%s\\n\" \"$am_cv_CC_dependencies_compiler_type\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type\" >&5\n+$as_echo \"$am_cv_CC_dependencies_compiler_type\" >&6; }\n CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type\n \n  if\n@@ -5176,50 +4137,43 @@ fi\n \n \n \n-\n-  if test -n \"$ac_tool_prefix\"; then\n+if test -n \"$ac_tool_prefix\"; then\n   for ac_prog in ar lib \"link -lib\"\n   do\n     # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_AR+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$AR\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_AR+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$AR\"; then\n   ac_cv_prog_AR=\"$AR\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_AR=\"$ac_tool_prefix$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n AR=$ac_cv_prog_AR\n if test -n \"$AR\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $AR\" >&5\n-printf \"%s\\n\" \"$AR\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $AR\" >&5\n+$as_echo \"$AR\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5232,44 +4186,38 @@ if test -z \"$AR\"; then\n do\n   # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_AR+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_AR\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_AR+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_AR\"; then\n   ac_cv_prog_ac_ct_AR=\"$ac_ct_AR\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_AR=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_AR=$ac_cv_prog_ac_ct_AR\n if test -n \"$ac_ct_AR\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR\" >&5\n-printf \"%s\\n\" \"$ac_ct_AR\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR\" >&5\n+$as_echo \"$ac_ct_AR\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5281,8 +4229,8 @@ done\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     AR=$ac_ct_AR\n@@ -5290,15 +4238,13 @@ esac\n fi\n \n : ${AR=ar}\n-: ${ARFLAGS=cr}\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface\" >&5\n-printf %s \"checking the archiver ($AR) interface... \" >&6; }\n-if test ${am_cv_ar_interface+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_ext=c\n+\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface\" >&5\n+$as_echo_n \"checking the archiver ($AR) interface... \" >&6; }\n+if ${am_cv_ar_interface+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_ext=c\n ac_cpp='$CPP $CPPFLAGS'\n ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n@@ -5309,13 +4255,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu\n /* end confdefs.h.  */\n int some_variable = 0;\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n-  am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&5'\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'\n       { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$am_ar_try\\\"\"; } >&5\n   (eval $am_ar_try) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n       if test \"$ac_status\" -eq 0; then\n         am_cv_ar_interface=ar\n@@ -5324,7 +4269,7 @@ then :\n         { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$am_ar_try\\\"\"; } >&5\n   (eval $am_ar_try) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n         if test \"$ac_status\" -eq 0; then\n           am_cv_ar_interface=lib\n@@ -5335,17 +4280,16 @@ then :\n       rm -f conftest.lib libconftest.a\n \n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n    ac_ext=cpp\n ac_cpp='$CXXCPP $CPPFLAGS'\n ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface\" >&5\n-printf \"%s\\n\" \"$am_cv_ar_interface\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface\" >&5\n+$as_echo \"$am_cv_ar_interface\" >&6; }\n \n case $am_cv_ar_interface in\n ar)\n@@ -5372,44 +4316,38 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu\n if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}gcc\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}gcc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CC=\"${ac_tool_prefix}gcc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5418,44 +4356,38 @@ if test -z \"$ac_cv_prog_CC\"; then\n   ac_ct_CC=$CC\n   # Extract the first word of \"gcc\", so it can be a program name with args.\n set dummy gcc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_CC\"; then\n   ac_cv_prog_ac_ct_CC=\"$ac_ct_CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_CC=\"gcc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_CC=$ac_cv_prog_ac_ct_CC\n if test -n \"$ac_ct_CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n-printf \"%s\\n\" \"$ac_ct_CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n+$as_echo \"$ac_ct_CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_CC\" = x; then\n@@ -5463,8 +4395,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     CC=$ac_ct_CC\n@@ -5477,44 +4409,38 @@ if test -z \"$CC\"; then\n           if test -n \"$ac_tool_prefix\"; then\n     # Extract the first word of \"${ac_tool_prefix}cc\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}cc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CC=\"${ac_tool_prefix}cc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5523,13 +4449,12 @@ fi\n if test -z \"$CC\"; then\n   # Extract the first word of \"cc\", so it can be a program name with args.\n set dummy cc; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n   ac_prog_rejected=no\n@@ -5537,19 +4462,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    if test \"$as_dir$ac_word$ac_exec_ext\" = \"/usr/ucb/cc\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    if test \"$as_dir/$ac_word$ac_exec_ext\" = \"/usr/ucb/cc\"; then\n        ac_prog_rejected=yes\n        continue\n      fi\n     ac_cv_prog_CC=\"cc\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n@@ -5565,19 +4486,18 @@ if test $ac_prog_rejected = yes; then\n     # However, it has the same basename, so the bogon will be chosen\n     # first if we set CC to just the basename; use the full file name.\n     shift\n-    ac_cv_prog_CC=\"$as_dir$ac_word${1+' '}$@\"\n+    ac_cv_prog_CC=\"$as_dir/$ac_word${1+' '}$@\"\n   fi\n fi\n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5588,44 +4508,38 @@ if test -z \"$CC\"; then\n   do\n     # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CC\"; then\n   ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CC=\"$ac_tool_prefix$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CC=$ac_cv_prog_CC\n if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n+$as_echo \"$CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5638,44 +4552,38 @@ if test -z \"$CC\"; then\n do\n   # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CC\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_CC+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_CC\"; then\n   ac_cv_prog_ac_ct_CC=\"$ac_ct_CC\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_CC=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_CC=$ac_cv_prog_ac_ct_CC\n if test -n \"$ac_ct_CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n-printf \"%s\\n\" \"$ac_ct_CC\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n+$as_echo \"$ac_ct_CC\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -5687,140 +4595,34 @@ done\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n-ac_tool_warned=yes ;;\n-esac\n-    CC=$ac_ct_CC\n-  fi\n-fi\n-\n-fi\n-if test -z \"$CC\"; then\n-  if test -n \"$ac_tool_prefix\"; then\n-  # Extract the first word of \"${ac_tool_prefix}clang\", so it can be a program name with args.\n-set dummy ${ac_tool_prefix}clang; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CC\"; then\n-  ac_cv_prog_CC=\"$CC\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_CC=\"${ac_tool_prefix}clang\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-fi ;;\n-esac\n-fi\n-CC=$ac_cv_prog_CC\n-if test -n \"$CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CC\" >&5\n-printf \"%s\\n\" \"$CC\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-\n-fi\n-if test -z \"$ac_cv_prog_CC\"; then\n-  ac_ct_CC=$CC\n-  # Extract the first word of \"clang\", so it can be a program name with args.\n-set dummy clang; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CC+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CC\"; then\n-  ac_cv_prog_ac_ct_CC=\"$ac_ct_CC\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_ac_ct_CC=\"clang\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-fi ;;\n-esac\n-fi\n-ac_ct_CC=$ac_cv_prog_ac_ct_CC\n-if test -n \"$ac_ct_CC\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC\" >&5\n-printf \"%s\\n\" \"$ac_ct_CC\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-  if test \"x$ac_ct_CC\" = x; then\n-    CC=\"\"\n-  else\n-    case $cross_compiling:$ac_tool_warned in\n-yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     CC=$ac_ct_CC\n   fi\n-else\n-  CC=\"$ac_cv_prog_CC\"\n fi\n \n fi\n \n \n-test -z \"$CC\" && { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+test -z \"$CC\" && { { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"no acceptable C compiler found in \\$PATH\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n \n # Provide some information about the compiler.\n-printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for C compiler version\" >&5\n+$as_echo \"$as_me:${as_lineno-$LINENO}: checking for C compiler version\" >&5\n set X $ac_compile\n ac_compiler=$2\n-for ac_option in --version -v -V -qversion -version; do\n+for ac_option in --version -v -V -qversion; do\n   { { ac_try=\"$ac_compiler $ac_option >&5\"\n case \"(($ac_try\" in\n   *\\\"* | *\\`* | *\\\\*) ac_try_echo=\\$ac_try;;\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_compiler $ac_option >&5\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -5830,21 +4632,20 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n   fi\n   rm -f conftest.er1 conftest.err\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n done\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C\" >&5\n-printf %s \"checking whether the compiler supports GNU C... \" >&6; }\n-if test ${ac_cv_c_compiler_gnu+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler\" >&5\n+$as_echo_n \"checking whether we are using the GNU C compiler... \" >&6; }\n+if ${ac_cv_c_compiler_gnu+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n #ifndef __GNUC__\n        choke me\n@@ -5854,36 +4655,30 @@ main (void)\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_compiler_gnu=yes\n-else case e in #(\n-  e) ac_compiler_gnu=no ;;\n-esac\n+else\n+  ac_compiler_gnu=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n ac_cv_c_compiler_gnu=$ac_compiler_gnu\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu\" >&5\n-printf \"%s\\n\" \"$ac_cv_c_compiler_gnu\" >&6; }\n-ac_compiler_gnu=$ac_cv_c_compiler_gnu\n \n+fi\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu\" >&5\n+$as_echo \"$ac_cv_c_compiler_gnu\" >&6; }\n if test $ac_compiler_gnu = yes; then\n   GCC=yes\n else\n   GCC=\n fi\n-ac_test_CFLAGS=${CFLAGS+y}\n+ac_test_CFLAGS=${CFLAGS+set}\n ac_save_CFLAGS=$CFLAGS\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g\" >&5\n-printf %s \"checking whether $CC accepts -g... \" >&6; }\n-if test ${ac_cv_prog_cc_g+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_save_c_werror_flag=$ac_c_werror_flag\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g\" >&5\n+$as_echo_n \"checking whether $CC accepts -g... \" >&6; }\n+if ${ac_cv_prog_cc_g+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_save_c_werror_flag=$ac_c_werror_flag\n    ac_c_werror_flag=yes\n    ac_cv_prog_cc_g=no\n    CFLAGS=\"-g\"\n@@ -5891,63 +4686,57 @@ else case e in #(\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cc_g=yes\n-else case e in #(\n-  e) CFLAGS=\"\"\n+else\n+  CFLAGS=\"\"\n       cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n \n-else case e in #(\n-  e) ac_c_werror_flag=$ac_save_c_werror_flag\n+else\n+  ac_c_werror_flag=$ac_save_c_werror_flag\n \t CFLAGS=\"-g\"\n \t cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cc_g=yes\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-   ac_c_werror_flag=$ac_save_c_werror_flag ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+   ac_c_werror_flag=$ac_save_c_werror_flag\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_g\" >&6; }\n-if test $ac_test_CFLAGS; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g\" >&5\n+$as_echo \"$ac_cv_prog_cc_g\" >&6; }\n+if test \"$ac_test_CFLAGS\" = set; then\n   CFLAGS=$ac_save_CFLAGS\n elif test $ac_cv_prog_cc_g = yes; then\n   if test \"$GCC\" = yes; then\n@@ -5962,153 +4751,94 @@ else\n     CFLAGS=\n   fi\n fi\n-ac_prog_cc_stdc=no\n-if test x$ac_prog_cc_stdc = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features\" >&5\n-printf %s \"checking for $CC option to enable C11 features... \" >&6; }\n-if test ${ac_cv_prog_cc_c11+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cc_c11=no\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89\" >&5\n+$as_echo_n \"checking for $CC option to accept ISO C89... \" >&6; }\n+if ${ac_cv_prog_cc_c89+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_cv_prog_cc_c89=no\n ac_save_CC=$CC\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n-$ac_c_conftest_c11_program\n-_ACEOF\n-for ac_arg in '' -std=gnu11\n-do\n-  CC=\"$ac_save_CC $ac_arg\"\n-  if ac_fn_c_try_compile \"$LINENO\"\n-then :\n-  ac_cv_prog_cc_c11=$ac_arg\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n-  test \"x$ac_cv_prog_cc_c11\" != \"xno\" && break\n-done\n-rm -f conftest.$ac_ext\n-CC=$ac_save_CC ;;\n-esac\n-fi\n+#include <stdarg.h>\n+#include <stdio.h>\n+struct stat;\n+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */\n+struct buf { int x; };\n+FILE * (*rcsopen) (struct buf *, struct stat *, int);\n+static char *e (p, i)\n+     char **p;\n+     int i;\n+{\n+  return p[i];\n+}\n+static char *f (char * (*g) (char **, int), char **p, ...)\n+{\n+  char *s;\n+  va_list v;\n+  va_start (v,p);\n+  s = g (p, va_arg (v,int));\n+  va_end (v);\n+  return s;\n+}\n \n-if test \"x$ac_cv_prog_cc_c11\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cc_c11\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_c11\" >&6; }\n-     CC=\"$CC $ac_cv_prog_cc_c11\" ;;\n-esac\n-fi\n-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11\n-  ac_prog_cc_stdc=c11 ;;\n-esac\n-fi\n-fi\n-if test x$ac_prog_cc_stdc = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features\" >&5\n-printf %s \"checking for $CC option to enable C99 features... \" >&6; }\n-if test ${ac_cv_prog_cc_c99+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cc_c99=no\n-ac_save_CC=$CC\n-cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-$ac_c_conftest_c99_program\n-_ACEOF\n-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=\n-do\n-  CC=\"$ac_save_CC $ac_arg\"\n-  if ac_fn_c_try_compile \"$LINENO\"\n-then :\n-  ac_cv_prog_cc_c99=$ac_arg\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n-  test \"x$ac_cv_prog_cc_c99\" != \"xno\" && break\n-done\n-rm -f conftest.$ac_ext\n-CC=$ac_save_CC ;;\n-esac\n-fi\n+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has\n+   function prototypes and stuff, but not '\\xHH' hex character constants.\n+   These don't provoke an error unfortunately, instead are silently treated\n+   as 'x'.  The following induces an error, until -std is added to get\n+   proper ANSI mode.  Curiously '\\x00'!='x' always comes out true, for an\n+   array size at least.  It's necessary to write '\\x00'==0 to get something\n+   that's true only with -std.  */\n+int osf4_cc_array ['\\x00' == 0 ? 1 : -1];\n \n-if test \"x$ac_cv_prog_cc_c99\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cc_c99\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_c99\" >&6; }\n-     CC=\"$CC $ac_cv_prog_cc_c99\" ;;\n-esac\n-fi\n-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99\n-  ac_prog_cc_stdc=c99 ;;\n-esac\n-fi\n-fi\n-if test x$ac_prog_cc_stdc = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features\" >&5\n-printf %s \"checking for $CC option to enable C89 features... \" >&6; }\n-if test ${ac_cv_prog_cc_c89+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cc_c89=no\n-ac_save_CC=$CC\n-cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-$ac_c_conftest_c89_program\n+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters\n+   inside strings and character constants.  */\n+#define FOO(x) 'x'\n+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];\n+\n+int test (int i, double x);\n+struct s1 {int (*f) (int a);};\n+struct s2 {int (*f) (double a);};\n+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);\n+int argc;\n+char **argv;\n+int\n+main ()\n+{\n+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];\n+  ;\n+  return 0;\n+}\n _ACEOF\n-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae \"-Aa -D_HPUX_SOURCE\" \"-Xc -D__EXTENSIONS__\"\n+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \\\n+\t-Ae \"-Aa -D_HPUX_SOURCE\" \"-Xc -D__EXTENSIONS__\"\n do\n   CC=\"$ac_save_CC $ac_arg\"\n-  if ac_fn_c_try_compile \"$LINENO\"\n-then :\n+  if ac_fn_c_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cc_c89=$ac_arg\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n+rm -f core conftest.err conftest.$ac_objext\n   test \"x$ac_cv_prog_cc_c89\" != \"xno\" && break\n done\n rm -f conftest.$ac_ext\n-CC=$ac_save_CC ;;\n-esac\n-fi\n+CC=$ac_save_CC\n \n-if test \"x$ac_cv_prog_cc_c89\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cc_c89\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cc_c89\" >&6; }\n-     CC=\"$CC $ac_cv_prog_cc_c89\" ;;\n-esac\n fi\n-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89\n-  ac_prog_cc_stdc=c89 ;;\n+# AC_CACHE_VAL\n+case \"x$ac_cv_prog_cc_c89\" in\n+  x)\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n+$as_echo \"none needed\" >&6; } ;;\n+  xno)\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n+$as_echo \"unsupported\" >&6; } ;;\n+  *)\n+    CC=\"$CC $ac_cv_prog_cc_c89\"\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89\" >&5\n+$as_echo \"$ac_cv_prog_cc_c89\" >&6; } ;;\n esac\n-fi\n+if test \"x$ac_cv_prog_cc_c89\" != xno; then :\n+\n fi\n \n ac_ext=cpp\n@@ -6117,23 +4847,21 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n \n-\n-  ac_ext=c\n+ac_ext=c\n ac_cpp='$CPP $CPPFLAGS'\n ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_c_compiler_gnu\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together\" >&5\n-printf %s \"checking whether $CC understands -c and -o together... \" >&6; }\n-if test ${am_cv_prog_cc_c_o+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together\" >&5\n+$as_echo_n \"checking whether $CC understands -c and -o together... \" >&6; }\n+if ${am_cv_prog_cc_c_o+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n@@ -6159,11 +4887,10 @@ _ACEOF\n     fi\n   done\n   rm -f core conftest*\n-  unset am_i ;;\n-esac\n+  unset am_i\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o\" >&5\n-printf \"%s\\n\" \"$am_cv_prog_cc_c_o\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o\" >&5\n+$as_echo \"$am_cv_prog_cc_c_o\" >&6; }\n if test \"$am_cv_prog_cc_c_o\" != yes; then\n    # Losing compiler, so override with the script.\n    # FIXME: It is wrong to rewrite CC.\n@@ -6181,13 +4908,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n \n depcc=\"$CC\"   am_compiler_list=\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc\" >&5\n-printf %s \"checking dependency style of $depcc... \" >&6; }\n-if test ${am_cv_CC_dependencies_compiler_type+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -z \"$AMDEP_TRUE\" && test -f \"$am_depcomp\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc\" >&5\n+$as_echo_n \"checking dependency style of $depcc... \" >&6; }\n+if ${am_cv_CC_dependencies_compiler_type+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -z \"$AMDEP_TRUE\" && test -f \"$am_depcomp\"; then\n   # We make a subdir and do the tests there.  Otherwise we can end up\n   # making bogus files that we don't know about and never remove.  For\n   # instance it was reported that on HP-UX the gcc test will end up\n@@ -6274,7 +5000,7 @@ else case e in #(\n       # icc doesn't choke on unknown options, it will just issue warnings\n       # or remarks (even with -Werror).  So we grep stderr for any message\n       # that says an option was ignored or not supported.\n-      # When given -MP, icc 7.0 and 7.1 complain thus:\n+      # When given -MP, icc 7.0 and 7.1 complain thusly:\n       #   icc: Command line warning: ignoring option '-M'; no argument required\n       # The diagnosis changed in icc 8.0:\n       #   icc: Command line remark: option '-MP' not supported\n@@ -6291,11 +5017,10 @@ else case e in #(\n else\n   am_cv_CC_dependencies_compiler_type=none\n fi\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type\" >&5\n-printf \"%s\\n\" \"$am_cv_CC_dependencies_compiler_type\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type\" >&5\n+$as_echo \"$am_cv_CC_dependencies_compiler_type\" >&6; }\n CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type\n \n  if\n@@ -6314,39 +5039,42 @@ ac_cpp='$CPP $CPPFLAGS'\n ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_c_compiler_gnu\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor\" >&5\n-printf %s \"checking how to run the C preprocessor... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor\" >&5\n+$as_echo_n \"checking how to run the C preprocessor... \" >&6; }\n # On Suns, sometimes $CPP names a directory.\n if test -n \"$CPP\" && test -d \"$CPP\"; then\n   CPP=\n fi\n if test -z \"$CPP\"; then\n-  if test ${ac_cv_prog_CPP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)     # Double quotes because $CC needs to be expanded\n-    for CPP in \"$CC -E\" \"$CC -E -traditional-cpp\" cpp /lib/cpp\n+  if ${ac_cv_prog_CPP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+      # Double quotes because CPP needs to be expanded\n+    for CPP in \"$CC -E\" \"$CC -E -traditional-cpp\" \"/lib/cpp\"\n     do\n       ac_preproc_ok=false\n for ac_c_preproc_warn_flag in '' yes\n do\n   # Use a header file that comes with gcc, so configuring glibc\n   # with a fresh cross-compiler works.\n+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since\n+  # <limits.h> exists even on freestanding compilers.\n   # On the NeXT, cc -E runs the code through the compiler's parser,\n   # not just through cpp. \"Syntax error\" is here to catch this case.\n   cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n-#include <limits.h>\n+#ifdef __STDC__\n+# include <limits.h>\n+#else\n+# include <assert.h>\n+#endif\n \t\t     Syntax error\n _ACEOF\n-if ac_fn_c_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_c_try_cpp \"$LINENO\"; then :\n \n-else case e in #(\n-  e) # Broken: fails on valid input.\n-continue ;;\n-esac\n+else\n+  # Broken: fails on valid input.\n+continue\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n@@ -6356,56 +5084,56 @@ rm -f conftest.err conftest.i conftest.$ac_ext\n /* end confdefs.h.  */\n #include <ac_nonexistent.h>\n _ACEOF\n-if ac_fn_c_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_c_try_cpp \"$LINENO\"; then :\n   # Broken: success on invalid input.\n continue\n-else case e in #(\n-  e) # Passes both tests.\n+else\n+  # Passes both tests.\n ac_preproc_ok=:\n-break ;;\n-esac\n+break\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n done\n-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n rm -f conftest.i conftest.err conftest.$ac_ext\n-if $ac_preproc_ok\n-then :\n+if $ac_preproc_ok; then :\n   break\n fi\n \n     done\n     ac_cv_prog_CPP=$CPP\n-   ;;\n-esac\n+\n fi\n   CPP=$ac_cv_prog_CPP\n else\n   ac_cv_prog_CPP=$CPP\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CPP\" >&5\n-printf \"%s\\n\" \"$CPP\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CPP\" >&5\n+$as_echo \"$CPP\" >&6; }\n ac_preproc_ok=false\n for ac_c_preproc_warn_flag in '' yes\n do\n   # Use a header file that comes with gcc, so configuring glibc\n   # with a fresh cross-compiler works.\n+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since\n+  # <limits.h> exists even on freestanding compilers.\n   # On the NeXT, cc -E runs the code through the compiler's parser,\n   # not just through cpp. \"Syntax error\" is here to catch this case.\n   cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n-#include <limits.h>\n+#ifdef __STDC__\n+# include <limits.h>\n+#else\n+# include <assert.h>\n+#endif\n \t\t     Syntax error\n _ACEOF\n-if ac_fn_c_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_c_try_cpp \"$LINENO\"; then :\n \n-else case e in #(\n-  e) # Broken: fails on valid input.\n-continue ;;\n-esac\n+else\n+  # Broken: fails on valid input.\n+continue\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n@@ -6415,30 +5143,26 @@ rm -f conftest.err conftest.i conftest.$ac_ext\n /* end confdefs.h.  */\n #include <ac_nonexistent.h>\n _ACEOF\n-if ac_fn_c_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_c_try_cpp \"$LINENO\"; then :\n   # Broken: success on invalid input.\n continue\n-else case e in #(\n-  e) # Passes both tests.\n+else\n+  # Passes both tests.\n ac_preproc_ok=:\n-break ;;\n-esac\n+break\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n done\n-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n rm -f conftest.i conftest.err conftest.$ac_ext\n-if $ac_preproc_ok\n-then :\n+if $ac_preproc_ok; then :\n \n-else case e in #(\n-  e) { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+else\n+  { { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"C preprocessor \\\"$CPP\\\" fails sanity check\n-See 'config.log' for more details\" \"$LINENO\" 5; } ;;\n-esac\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n fi\n \n ac_ext=cpp\n@@ -6447,12 +5171,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n \n-\n-\n-\n-\n-\n-\n ac_ext=cpp\n ac_cpp='$CXXCPP $CPPFLAGS'\n ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n@@ -6463,48 +5181,42 @@ if test -z \"$CXX\"; then\n     CXX=$CCC\n   else\n     if test -n \"$ac_tool_prefix\"; then\n-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++\n+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC\n   do\n     # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$CXX\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$CXX\"; then\n   ac_cv_prog_CXX=\"$CXX\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_CXX=\"$ac_tool_prefix$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n CXX=$ac_cv_prog_CXX\n if test -n \"$CXX\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CXX\" >&5\n-printf \"%s\\n\" \"$CXX\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CXX\" >&5\n+$as_echo \"$CXX\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -6513,48 +5225,42 @@ fi\n fi\n if test -z \"$CXX\"; then\n   ac_ct_CXX=$CXX\n-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++\n+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC\n do\n   # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_CXX\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_CXX\"; then\n   ac_cv_prog_ac_ct_CXX=\"$ac_ct_CXX\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_CXX=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_CXX=$ac_cv_prog_ac_ct_CXX\n if test -n \"$ac_ct_CXX\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX\" >&5\n-printf \"%s\\n\" \"$ac_ct_CXX\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX\" >&5\n+$as_echo \"$ac_ct_CXX\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -6566,8 +5272,8 @@ done\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     CXX=$ac_ct_CXX\n@@ -6577,7 +5283,7 @@ fi\n   fi\n fi\n # Provide some information about the compiler.\n-printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for C++ compiler version\" >&5\n+$as_echo \"$as_me:${as_lineno-$LINENO}: checking for C++ compiler version\" >&5\n set X $ac_compile\n ac_compiler=$2\n for ac_option in --version -v -V -qversion; do\n@@ -6587,7 +5293,7 @@ case \"(($ac_try\" in\n   *) ac_try_echo=$ac_try;;\n esac\n eval ac_try_echo=\"\\\"\\$as_me:${as_lineno-$LINENO}: $ac_try_echo\\\"\"\n-printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n+$as_echo \"$ac_try_echo\"; } >&5\n   (eval \"$ac_compiler $ac_option >&5\") 2>conftest.err\n   ac_status=$?\n   if test -s conftest.err; then\n@@ -6597,21 +5303,20 @@ printf \"%s\\n\" \"$ac_try_echo\"; } >&5\n     cat conftest.er1 >&5\n   fi\n   rm -f conftest.er1 conftest.err\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n done\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++\" >&5\n-printf %s \"checking whether the compiler supports GNU C++... \" >&6; }\n-if test ${ac_cv_cxx_compiler_gnu+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler\" >&5\n+$as_echo_n \"checking whether we are using the GNU C++ compiler... \" >&6; }\n+if ${ac_cv_cxx_compiler_gnu+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n #ifndef __GNUC__\n        choke me\n@@ -6621,36 +5326,30 @@ main (void)\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   ac_compiler_gnu=yes\n-else case e in #(\n-  e) ac_compiler_gnu=no ;;\n-esac\n+else\n+  ac_compiler_gnu=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n ac_cv_cxx_compiler_gnu=$ac_compiler_gnu\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu\" >&5\n-printf \"%s\\n\" \"$ac_cv_cxx_compiler_gnu\" >&6; }\n-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n \n+fi\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu\" >&5\n+$as_echo \"$ac_cv_cxx_compiler_gnu\" >&6; }\n if test $ac_compiler_gnu = yes; then\n   GXX=yes\n else\n   GXX=\n fi\n-ac_test_CXXFLAGS=${CXXFLAGS+y}\n+ac_test_CXXFLAGS=${CXXFLAGS+set}\n ac_save_CXXFLAGS=$CXXFLAGS\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g\" >&5\n-printf %s \"checking whether $CXX accepts -g... \" >&6; }\n-if test ${ac_cv_prog_cxx_g+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g\" >&5\n+$as_echo_n \"checking whether $CXX accepts -g... \" >&6; }\n+if ${ac_cv_prog_cxx_g+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag\n    ac_cxx_werror_flag=yes\n    ac_cv_prog_cxx_g=no\n    CXXFLAGS=\"-g\"\n@@ -6658,63 +5357,57 @@ else case e in #(\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cxx_g=yes\n-else case e in #(\n-  e) CXXFLAGS=\"\"\n+else\n+  CXXFLAGS=\"\"\n       cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n \n-else case e in #(\n-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag\n+else\n+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag\n \t CXXFLAGS=\"-g\"\n \t cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   ac_cv_prog_cxx_g=yes\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cxx_g\" >&6; }\n-if test $ac_test_CXXFLAGS; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g\" >&5\n+$as_echo \"$ac_cv_prog_cxx_g\" >&6; }\n+if test \"$ac_test_CXXFLAGS\" = set; then\n   CXXFLAGS=$ac_save_CXXFLAGS\n elif test $ac_cv_prog_cxx_g = yes; then\n   if test \"$GXX\" = yes; then\n@@ -6729,106 +5422,6 @@ else\n     CXXFLAGS=\n   fi\n fi\n-ac_prog_cxx_stdcxx=no\n-if test x$ac_prog_cxx_stdcxx = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features\" >&5\n-printf %s \"checking for $CXX option to enable C++11 features... \" >&6; }\n-if test ${ac_cv_prog_cxx_cxx11+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cxx_cxx11=no\n-ac_save_CXX=$CXX\n-cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-$ac_cxx_conftest_cxx11_program\n-_ACEOF\n-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA\n-do\n-  CXX=\"$ac_save_CXX $ac_arg\"\n-  if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n-  ac_cv_prog_cxx_cxx11=$ac_arg\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n-  test \"x$ac_cv_prog_cxx_cxx11\" != \"xno\" && break\n-done\n-rm -f conftest.$ac_ext\n-CXX=$ac_save_CXX ;;\n-esac\n-fi\n-\n-if test \"x$ac_cv_prog_cxx_cxx11\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cxx_cxx11\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cxx_cxx11\" >&6; }\n-     CXX=\"$CXX $ac_cv_prog_cxx_cxx11\" ;;\n-esac\n-fi\n-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11\n-  ac_prog_cxx_stdcxx=cxx11 ;;\n-esac\n-fi\n-fi\n-if test x$ac_prog_cxx_stdcxx = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features\" >&5\n-printf %s \"checking for $CXX option to enable C++98 features... \" >&6; }\n-if test ${ac_cv_prog_cxx_cxx98+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_cv_prog_cxx_cxx98=no\n-ac_save_CXX=$CXX\n-cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-$ac_cxx_conftest_cxx98_program\n-_ACEOF\n-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA\n-do\n-  CXX=\"$ac_save_CXX $ac_arg\"\n-  if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n-  ac_cv_prog_cxx_cxx98=$ac_arg\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam\n-  test \"x$ac_cv_prog_cxx_cxx98\" != \"xno\" && break\n-done\n-rm -f conftest.$ac_ext\n-CXX=$ac_save_CXX ;;\n-esac\n-fi\n-\n-if test \"x$ac_cv_prog_cxx_cxx98\" = xno\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: unsupported\" >&5\n-printf \"%s\\n\" \"unsupported\" >&6; }\n-else case e in #(\n-  e) if test \"x$ac_cv_prog_cxx_cxx98\" = x\n-then :\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none needed\" >&5\n-printf \"%s\\n\" \"none needed\" >&6; }\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98\" >&5\n-printf \"%s\\n\" \"$ac_cv_prog_cxx_cxx98\" >&6; }\n-     CXX=\"$CXX $ac_cv_prog_cxx_cxx98\" ;;\n-esac\n-fi\n-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98\n-  ac_prog_cxx_stdcxx=cxx98 ;;\n-esac\n-fi\n-fi\n-\n ac_ext=cpp\n ac_cpp='$CXXCPP $CPPFLAGS'\n ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n@@ -6837,13 +5430,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n \n depcc=\"$CXX\"  am_compiler_list=\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc\" >&5\n-printf %s \"checking dependency style of $depcc... \" >&6; }\n-if test ${am_cv_CXX_dependencies_compiler_type+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -z \"$AMDEP_TRUE\" && test -f \"$am_depcomp\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc\" >&5\n+$as_echo_n \"checking dependency style of $depcc... \" >&6; }\n+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -z \"$AMDEP_TRUE\" && test -f \"$am_depcomp\"; then\n   # We make a subdir and do the tests there.  Otherwise we can end up\n   # making bogus files that we don't know about and never remove.  For\n   # instance it was reported that on HP-UX the gcc test will end up\n@@ -6930,7 +5522,7 @@ else case e in #(\n       # icc doesn't choke on unknown options, it will just issue warnings\n       # or remarks (even with -Werror).  So we grep stderr for any message\n       # that says an option was ignored or not supported.\n-      # When given -MP, icc 7.0 and 7.1 complain thus:\n+      # When given -MP, icc 7.0 and 7.1 complain thusly:\n       #   icc: Command line warning: ignoring option '-M'; no argument required\n       # The diagnosis changed in icc 8.0:\n       #   icc: Command line remark: option '-MP' not supported\n@@ -6947,11 +5539,10 @@ else case e in #(\n else\n   am_cv_CXX_dependencies_compiler_type=none\n fi\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type\" >&5\n-printf \"%s\\n\" \"$am_cv_CXX_dependencies_compiler_type\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type\" >&5\n+$as_echo \"$am_cv_CXX_dependencies_compiler_type\" >&6; }\n CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type\n \n  if\n@@ -6966,26 +5557,25 @@ fi\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether ln -s works\" >&5\n-printf %s \"checking whether ln -s works... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether ln -s works\" >&5\n+$as_echo_n \"checking whether ln -s works... \" >&6; }\n LN_S=$as_ln_s\n if test \"$LN_S\" = \"ln -s\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no, using $LN_S\" >&5\n-printf \"%s\\n\" \"no, using $LN_S\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no, using $LN_S\" >&5\n+$as_echo \"no, using $LN_S\" >&6; }\n fi\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \\$(MAKE)\" >&5\n-printf %s \"checking whether ${MAKE-make} sets \\$(MAKE)... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \\$(MAKE)\" >&5\n+$as_echo_n \"checking whether ${MAKE-make} sets \\$(MAKE)... \" >&6; }\n set x ${MAKE-make}\n-ac_make=`printf \"%s\\n\" \"$2\" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`\n-if eval test \\${ac_cv_prog_make_${ac_make}_set+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat >conftest.make <<\\_ACEOF\n+ac_make=`$as_echo \"$2\" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`\n+if eval \\${ac_cv_prog_make_${ac_make}_set+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat >conftest.make <<\\_ACEOF\n SHELL = /bin/sh\n all:\n \t@echo '@@@%%%=$(MAKE)=@@@%%%'\n@@ -6997,30 +5587,28 @@ case `${MAKE-make} -f conftest.make 2>/dev/null` in\n   *)\n     eval ac_cv_prog_make_${ac_make}_set=no;;\n esac\n-rm -f conftest.make ;;\n-esac\n+rm -f conftest.make\n fi\n if eval test \\$ac_cv_prog_make_${ac_make}_set = yes; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n   SET_MAKE=\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n   SET_MAKE=\"MAKE=${MAKE-make}\"\n fi\n \n case `pwd` in\n   *\\ * | *\\\t*)\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \\`pwd\\`\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: Libtool does not cope well with whitespace in \\`pwd\\`\" >&2;} ;;\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \\`pwd\\`\" >&5\n+$as_echo \"$as_me: WARNING: Libtool does not cope well with whitespace in \\`pwd\\`\" >&2;} ;;\n esac\n \n \n \n-macro_version='2.5.4'\n-macro_revision='2.5.4'\n-\n+macro_version='2.4.6'\n+macro_revision='2.4.6'\n \n \n \n@@ -7036,30 +5624,26 @@ macro_revision='2.5.4'\n \n ltmain=$ac_aux_dir/ltmain.sh\n \n+# Make sure we can run config.sub.\n+$SHELL \"$ac_aux_dir/config.sub\" sun4 >/dev/null 2>&1 ||\n+  as_fn_error $? \"cannot run $SHELL $ac_aux_dir/config.sub\" \"$LINENO\" 5\n \n-\n-  # Make sure we can run config.sub.\n-$SHELL \"${ac_aux_dir}config.sub\" sun4 >/dev/null 2>&1 ||\n-  as_fn_error $? \"cannot run $SHELL ${ac_aux_dir}config.sub\" \"$LINENO\" 5\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking build system type\" >&5\n-printf %s \"checking build system type... \" >&6; }\n-if test ${ac_cv_build+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_build_alias=$build_alias\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking build system type\" >&5\n+$as_echo_n \"checking build system type... \" >&6; }\n+if ${ac_cv_build+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_build_alias=$build_alias\n test \"x$ac_build_alias\" = x &&\n-  ac_build_alias=`$SHELL \"${ac_aux_dir}config.guess\"`\n+  ac_build_alias=`$SHELL \"$ac_aux_dir/config.guess\"`\n test \"x$ac_build_alias\" = x &&\n   as_fn_error $? \"cannot guess build type; you must specify one\" \"$LINENO\" 5\n-ac_cv_build=`$SHELL \"${ac_aux_dir}config.sub\" $ac_build_alias` ||\n-  as_fn_error $? \"$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed\" \"$LINENO\" 5\n- ;;\n-esac\n+ac_cv_build=`$SHELL \"$ac_aux_dir/config.sub\" $ac_build_alias` ||\n+  as_fn_error $? \"$SHELL $ac_aux_dir/config.sub $ac_build_alias failed\" \"$LINENO\" 5\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_build\" >&5\n-printf \"%s\\n\" \"$ac_cv_build\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_build\" >&5\n+$as_echo \"$ac_cv_build\" >&6; }\n case $ac_cv_build in\n *-*-*) ;;\n *) as_fn_error $? \"invalid value of canonical build\" \"$LINENO\" 5;;\n@@ -7078,23 +5662,21 @@ IFS=$ac_save_IFS\n case $build_os in *\\ *) build_os=`echo \"$build_os\" | sed 's/ /-/g'`;; esac\n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking host system type\" >&5\n-printf %s \"checking host system type... \" >&6; }\n-if test ${ac_cv_host+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test \"x$host_alias\" = x; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking host system type\" >&5\n+$as_echo_n \"checking host system type... \" >&6; }\n+if ${ac_cv_host+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test \"x$host_alias\" = x; then\n   ac_cv_host=$ac_cv_build\n else\n-  ac_cv_host=`$SHELL \"${ac_aux_dir}config.sub\" $host_alias` ||\n-    as_fn_error $? \"$SHELL ${ac_aux_dir}config.sub $host_alias failed\" \"$LINENO\" 5\n+  ac_cv_host=`$SHELL \"$ac_aux_dir/config.sub\" $host_alias` ||\n+    as_fn_error $? \"$SHELL $ac_aux_dir/config.sub $host_alias failed\" \"$LINENO\" 5\n fi\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_host\" >&5\n-printf \"%s\\n\" \"$ac_cv_host\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_host\" >&5\n+$as_echo \"$ac_cv_host\" >&6; }\n case $ac_cv_host in\n *-*-*) ;;\n *) as_fn_error $? \"invalid value of canonical host\" \"$LINENO\" 5;;\n@@ -7134,8 +5716,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\n ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO\n ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to print strings\" >&5\n-printf %s \"checking how to print strings... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to print strings\" >&5\n+$as_echo_n \"checking how to print strings... \" >&6; }\n # Test print first, because it will be a builtin if present.\n if test \"X`( print -r -- -n ) 2>/dev/null`\" = X-n && \\\n    test \"X`print -r -- $ECHO 2>/dev/null`\" = \"X$ECHO\"; then\n@@ -7161,12 +5743,12 @@ func_echo_all ()\n }\n \n case $ECHO in\n-  printf*) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: printf\" >&5\n-printf \"%s\\n\" \"printf\" >&6; } ;;\n-  print*) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: print -r\" >&5\n-printf \"%s\\n\" \"print -r\" >&6; } ;;\n-  *) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: cat\" >&5\n-printf \"%s\\n\" \"cat\" >&6; } ;;\n+  printf*) { $as_echo \"$as_me:${as_lineno-$LINENO}: result: printf\" >&5\n+$as_echo \"printf\" >&6; } ;;\n+  print*) { $as_echo \"$as_me:${as_lineno-$LINENO}: result: print -r\" >&5\n+$as_echo \"print -r\" >&6; } ;;\n+  *) { $as_echo \"$as_me:${as_lineno-$LINENO}: result: cat\" >&5\n+$as_echo \"cat\" >&6; } ;;\n esac\n \n \n@@ -7182,13 +5764,12 @@ esac\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output\" >&5\n-printf %s \"checking for a sed that does not truncate output... \" >&6; }\n-if test ${ac_cv_path_SED+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output\" >&5\n+$as_echo_n \"checking for a sed that does not truncate output... \" >&6; }\n+if ${ac_cv_path_SED+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/\n      for ac_i in 1 2 3 4 5 6 7; do\n        ac_script=\"$ac_script$as_nl$ac_script\"\n      done\n@@ -7201,31 +5782,25 @@ else case e in #(\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_prog in sed gsed\n-   do\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_prog in sed gsed; do\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-      ac_path_SED=\"$as_dir$ac_prog$ac_exec_ext\"\n+      ac_path_SED=\"$as_dir/$ac_prog$ac_exec_ext\"\n       as_fn_executable_p \"$ac_path_SED\" || continue\n # Check for GNU ac_path_SED and select it if it is found.\n   # Check for GNU $ac_path_SED\n-case `\"$ac_path_SED\" --version 2>&1` in #(\n+case `\"$ac_path_SED\" --version 2>&1` in\n *GNU*)\n   ac_cv_path_SED=\"$ac_path_SED\" ac_path_SED_found=:;;\n-#(\n *)\n   ac_count=0\n-  printf %s 0123456789 >\"conftest.in\"\n+  $as_echo_n 0123456789 >\"conftest.in\"\n   while :\n   do\n     cat \"conftest.in\" \"conftest.in\" >\"conftest.tmp\"\n     mv \"conftest.tmp\" \"conftest.in\"\n     cp \"conftest.in\" \"conftest.nl\"\n-    printf \"%s\\n\" '' >> \"conftest.nl\"\n+    $as_echo '' >> \"conftest.nl\"\n     \"$ac_path_SED\" -f conftest.sed < \"conftest.nl\" >\"conftest.out\" 2>/dev/null || break\n     diff \"conftest.out\" \"conftest.nl\" >/dev/null 2>&1 || break\n     as_fn_arith $ac_count + 1 && ac_count=$as_val\n@@ -7251,11 +5826,10 @@ IFS=$as_save_IFS\n else\n   ac_cv_path_SED=$SED\n fi\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED\" >&5\n-printf \"%s\\n\" \"$ac_cv_path_SED\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED\" >&5\n+$as_echo \"$ac_cv_path_SED\" >&6; }\n  SED=\"$ac_cv_path_SED\"\n   rm -f conftest.sed\n \n@@ -7272,44 +5846,37 @@ Xsed=\"$SED -e 1s/^X//\"\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e\" >&5\n-printf %s \"checking for grep that handles long lines and -e... \" >&6; }\n-if test ${ac_cv_path_GREP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -z \"$GREP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e\" >&5\n+$as_echo_n \"checking for grep that handles long lines and -e... \" >&6; }\n+if ${ac_cv_path_GREP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -z \"$GREP\"; then\n   ac_path_GREP_found=false\n   # Loop through the user's path and test for each of PROGNAME-LIST\n   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_prog in grep ggrep\n-   do\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_prog in grep ggrep; do\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-      ac_path_GREP=\"$as_dir$ac_prog$ac_exec_ext\"\n+      ac_path_GREP=\"$as_dir/$ac_prog$ac_exec_ext\"\n       as_fn_executable_p \"$ac_path_GREP\" || continue\n # Check for GNU ac_path_GREP and select it if it is found.\n   # Check for GNU $ac_path_GREP\n-case `\"$ac_path_GREP\" --version 2>&1` in #(\n+case `\"$ac_path_GREP\" --version 2>&1` in\n *GNU*)\n   ac_cv_path_GREP=\"$ac_path_GREP\" ac_path_GREP_found=:;;\n-#(\n *)\n   ac_count=0\n-  printf %s 0123456789 >\"conftest.in\"\n+  $as_echo_n 0123456789 >\"conftest.in\"\n   while :\n   do\n     cat \"conftest.in\" \"conftest.in\" >\"conftest.tmp\"\n     mv \"conftest.tmp\" \"conftest.in\"\n     cp \"conftest.in\" \"conftest.nl\"\n-    printf \"%s\\n\" 'GREP' >> \"conftest.nl\"\n+    $as_echo 'GREP' >> \"conftest.nl\"\n     \"$ac_path_GREP\" -e 'GREP$' -e '-(cannot match)-' < \"conftest.nl\" >\"conftest.out\" 2>/dev/null || break\n     diff \"conftest.out\" \"conftest.nl\" >/dev/null 2>&1 || break\n     as_fn_arith $ac_count + 1 && ac_count=$as_val\n@@ -7335,21 +5902,19 @@ IFS=$as_save_IFS\n else\n   ac_cv_path_GREP=$GREP\n fi\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP\" >&5\n-printf \"%s\\n\" \"$ac_cv_path_GREP\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP\" >&5\n+$as_echo \"$ac_cv_path_GREP\" >&6; }\n  GREP=\"$ac_cv_path_GREP\"\n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for egrep\" >&5\n-printf %s \"checking for egrep... \" >&6; }\n-if test ${ac_cv_path_EGREP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for egrep\" >&5\n+$as_echo_n \"checking for egrep... \" >&6; }\n+if ${ac_cv_path_EGREP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1\n    then ac_cv_path_EGREP=\"$GREP -E\"\n    else\n      if test -z \"$EGREP\"; then\n@@ -7359,31 +5924,25 @@ else case e in #(\n for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_prog in egrep\n-   do\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_prog in egrep; do\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-      ac_path_EGREP=\"$as_dir$ac_prog$ac_exec_ext\"\n+      ac_path_EGREP=\"$as_dir/$ac_prog$ac_exec_ext\"\n       as_fn_executable_p \"$ac_path_EGREP\" || continue\n # Check for GNU ac_path_EGREP and select it if it is found.\n   # Check for GNU $ac_path_EGREP\n-case `\"$ac_path_EGREP\" --version 2>&1` in #(\n+case `\"$ac_path_EGREP\" --version 2>&1` in\n *GNU*)\n   ac_cv_path_EGREP=\"$ac_path_EGREP\" ac_path_EGREP_found=:;;\n-#(\n *)\n   ac_count=0\n-  printf %s 0123456789 >\"conftest.in\"\n+  $as_echo_n 0123456789 >\"conftest.in\"\n   while :\n   do\n     cat \"conftest.in\" \"conftest.in\" >\"conftest.tmp\"\n     mv \"conftest.tmp\" \"conftest.in\"\n     cp \"conftest.in\" \"conftest.nl\"\n-    printf \"%s\\n\" 'EGREP' >> \"conftest.nl\"\n+    $as_echo 'EGREP' >> \"conftest.nl\"\n     \"$ac_path_EGREP\" 'EGREP$' < \"conftest.nl\" >\"conftest.out\" 2>/dev/null || break\n     diff \"conftest.out\" \"conftest.nl\" >/dev/null 2>&1 || break\n     as_fn_arith $ac_count + 1 && ac_count=$as_val\n@@ -7410,23 +5969,19 @@ else\n   ac_cv_path_EGREP=$EGREP\n fi\n \n-   fi ;;\n-esac\n+   fi\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP\" >&5\n-printf \"%s\\n\" \"$ac_cv_path_EGREP\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP\" >&5\n+$as_echo \"$ac_cv_path_EGREP\" >&6; }\n  EGREP=\"$ac_cv_path_EGREP\"\n \n-         EGREP_TRADITIONAL=$EGREP\n- ac_cv_path_EGREP_TRADITIONAL=$EGREP\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for fgrep\" >&5\n-printf %s \"checking for fgrep... \" >&6; }\n-if test ${ac_cv_path_FGREP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for fgrep\" >&5\n+$as_echo_n \"checking for fgrep... \" >&6; }\n+if ${ac_cv_path_FGREP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1\n    then ac_cv_path_FGREP=\"$GREP -F\"\n    else\n      if test -z \"$FGREP\"; then\n@@ -7436,31 +5991,25 @@ else case e in #(\n for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_prog in fgrep\n-   do\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_prog in fgrep; do\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-      ac_path_FGREP=\"$as_dir$ac_prog$ac_exec_ext\"\n+      ac_path_FGREP=\"$as_dir/$ac_prog$ac_exec_ext\"\n       as_fn_executable_p \"$ac_path_FGREP\" || continue\n # Check for GNU ac_path_FGREP and select it if it is found.\n   # Check for GNU $ac_path_FGREP\n-case `\"$ac_path_FGREP\" --version 2>&1` in #(\n+case `\"$ac_path_FGREP\" --version 2>&1` in\n *GNU*)\n   ac_cv_path_FGREP=\"$ac_path_FGREP\" ac_path_FGREP_found=:;;\n-#(\n *)\n   ac_count=0\n-  printf %s 0123456789 >\"conftest.in\"\n+  $as_echo_n 0123456789 >\"conftest.in\"\n   while :\n   do\n     cat \"conftest.in\" \"conftest.in\" >\"conftest.tmp\"\n     mv \"conftest.tmp\" \"conftest.in\"\n     cp \"conftest.in\" \"conftest.nl\"\n-    printf \"%s\\n\" 'FGREP' >> \"conftest.nl\"\n+    $as_echo 'FGREP' >> \"conftest.nl\"\n     \"$ac_path_FGREP\" FGREP < \"conftest.nl\" >\"conftest.out\" 2>/dev/null || break\n     diff \"conftest.out\" \"conftest.nl\" >/dev/null 2>&1 || break\n     as_fn_arith $ac_count + 1 && ac_count=$as_val\n@@ -7487,11 +6036,10 @@ else\n   ac_cv_path_FGREP=$FGREP\n fi\n \n-   fi ;;\n-esac\n+   fi\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP\" >&5\n-printf \"%s\\n\" \"$ac_cv_path_FGREP\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP\" >&5\n+$as_echo \"$ac_cv_path_FGREP\" >&6; }\n  FGREP=\"$ac_cv_path_FGREP\"\n \n \n@@ -7516,21 +6064,19 @@ test -z \"$GREP\" && GREP=grep\n \n \n # Check whether --with-gnu-ld was given.\n-if test ${with_gnu_ld+y}\n-then :\n+if test \"${with_gnu_ld+set}\" = set; then :\n   withval=$with_gnu_ld; test no = \"$withval\" || with_gnu_ld=yes\n-else case e in #(\n-  e) with_gnu_ld=no ;;\n-esac\n+else\n+  with_gnu_ld=no\n fi\n \n ac_prog=ld\n if test yes = \"$GCC\"; then\n   # Check if gcc -print-prog-name=ld gives a path.\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for ld used by $CC\" >&5\n-printf %s \"checking for ld used by $CC... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for ld used by $CC\" >&5\n+$as_echo_n \"checking for ld used by $CC... \" >&6; }\n   case $host in\n-  *-*-mingw* | *-*-windows*)\n+  *-*-mingw*)\n     # gcc leaves a trailing carriage return, which upsets mingw\n     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\\015'` ;;\n   *)\n@@ -7557,17 +6103,16 @@ printf %s \"checking for ld used by $CC... \" >&6; }\n     ;;\n   esac\n elif test yes = \"$with_gnu_ld\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for GNU ld\" >&5\n-printf %s \"checking for GNU ld... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for GNU ld\" >&5\n+$as_echo_n \"checking for GNU ld... \" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for non-GNU ld\" >&5\n-printf %s \"checking for non-GNU ld... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for non-GNU ld\" >&5\n+$as_echo_n \"checking for non-GNU ld... \" >&6; }\n fi\n-if test ${lt_cv_path_LD+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -z \"$LD\"; then\n+if ${lt_cv_path_LD+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -z \"$LD\"; then\n   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR\n   for ac_dir in $PATH; do\n     IFS=$lt_save_ifs\n@@ -7590,26 +6135,24 @@ else case e in #(\n   IFS=$lt_save_ifs\n else\n   lt_cv_path_LD=$LD # Let the user override the test with a path.\n-fi ;;\n-esac\n+fi\n fi\n \n LD=$lt_cv_path_LD\n if test -n \"$LD\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $LD\" >&5\n-printf \"%s\\n\" \"$LD\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $LD\" >&5\n+$as_echo \"$LD\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n test -z \"$LD\" && as_fn_error $? \"no acceptable ld found in \\$PATH\" \"$LINENO\" 5\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld\" >&5\n-printf %s \"checking if the linker ($LD) is GNU ld... \" >&6; }\n-if test ${lt_cv_prog_gnu_ld+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld\" >&5\n+$as_echo_n \"checking if the linker ($LD) is GNU ld... \" >&6; }\n+if ${lt_cv_prog_gnu_ld+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  # I'd rather use --version here, but apparently some GNU lds only accept -v.\n case `$LD -v 2>&1 </dev/null` in\n *GNU* | *'with BFD'*)\n   lt_cv_prog_gnu_ld=yes\n@@ -7617,11 +6160,10 @@ case `$LD -v 2>&1 </dev/null` in\n *)\n   lt_cv_prog_gnu_ld=no\n   ;;\n-esac ;;\n esac\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_gnu_ld\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld\" >&5\n+$as_echo \"$lt_cv_prog_gnu_ld\" >&6; }\n with_gnu_ld=$lt_cv_prog_gnu_ld\n \n \n@@ -7632,13 +6174,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)\" >&5\n-printf %s \"checking for BSD- or MS-compatible name lister (nm)... \" >&6; }\n-if test ${lt_cv_path_NM+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$NM\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)\" >&5\n+$as_echo_n \"checking for BSD- or MS-compatible name lister (nm)... \" >&6; }\n+if ${lt_cv_path_NM+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$NM\"; then\n   # Let the user override the test.\n   lt_cv_path_NM=$NM\n else\n@@ -7659,16 +6200,16 @@ else\n \t# Tru64's nm complains that /dev/null is an invalid object file\n \t# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty\n \tcase $build_os in\n-\tmingw* | windows*) lt_bad_file=conftest.nm/nofile ;;\n+\tmingw*) lt_bad_file=conftest.nm/nofile ;;\n \t*) lt_bad_file=/dev/null ;;\n \tesac\n-\tcase `\"$tmp_nm\" -B $lt_bad_file 2>&1 | $SED '1q'` in\n+\tcase `\"$tmp_nm\" -B $lt_bad_file 2>&1 | sed '1q'` in\n \t*$lt_bad_file* | *'Invalid file or object type'*)\n \t  lt_cv_path_NM=\"$tmp_nm -B\"\n \t  break 2\n \t  ;;\n \t*)\n-\t  case `\"$tmp_nm\" -p /dev/null 2>&1 | $SED '1q'` in\n+\t  case `\"$tmp_nm\" -p /dev/null 2>&1 | sed '1q'` in\n \t  */dev/null*)\n \t    lt_cv_path_NM=\"$tmp_nm -p\"\n \t    break 2\n@@ -7685,11 +6226,10 @@ else\n     IFS=$lt_save_ifs\n   done\n   : ${lt_cv_path_NM=no}\n-fi ;;\n-esac\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM\" >&5\n-printf \"%s\\n\" \"$lt_cv_path_NM\" >&6; }\n+fi\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM\" >&5\n+$as_echo \"$lt_cv_path_NM\" >&6; }\n if test no != \"$lt_cv_path_NM\"; then\n   NM=$lt_cv_path_NM\n else\n@@ -7702,44 +6242,38 @@ else\n   do\n     # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_DUMPBIN+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$DUMPBIN\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_DUMPBIN+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$DUMPBIN\"; then\n   ac_cv_prog_DUMPBIN=\"$DUMPBIN\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_DUMPBIN=\"$ac_tool_prefix$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n DUMPBIN=$ac_cv_prog_DUMPBIN\n if test -n \"$DUMPBIN\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $DUMPBIN\" >&5\n-printf \"%s\\n\" \"$DUMPBIN\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $DUMPBIN\" >&5\n+$as_echo \"$DUMPBIN\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -7752,44 +6286,38 @@ if test -z \"$DUMPBIN\"; then\n do\n   # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_DUMPBIN+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_DUMPBIN\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_DUMPBIN\"; then\n   ac_cv_prog_ac_ct_DUMPBIN=\"$ac_ct_DUMPBIN\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_DUMPBIN=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN\n if test -n \"$ac_ct_DUMPBIN\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN\" >&5\n-printf \"%s\\n\" \"$ac_ct_DUMPBIN\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN\" >&5\n+$as_echo \"$ac_ct_DUMPBIN\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -7801,15 +6329,15 @@ done\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     DUMPBIN=$ac_ct_DUMPBIN\n   fi\n fi\n \n-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in\n+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in\n     *COFF*)\n       DUMPBIN=\"$DUMPBIN -symbols -headers\"\n       ;;\n@@ -7830,13 +6358,12 @@ test -z \"$NM\" && NM=nm\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface\" >&5\n-printf %s \"checking the name lister ($NM) interface... \" >&6; }\n-if test ${lt_cv_nm_interface+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_nm_interface=\"BSD nm\"\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface\" >&5\n+$as_echo_n \"checking the name lister ($NM) interface... \" >&6; }\n+if ${lt_cv_nm_interface+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_nm_interface=\"BSD nm\"\n   echo \"int some_variable = 0;\" > conftest.$ac_ext\n   (eval echo \"\\\"\\$as_me:$LINENO: $ac_compile\\\"\" >&5)\n   (eval \"$ac_compile\" 2>conftest.err)\n@@ -7849,20 +6376,18 @@ else case e in #(\n   if $GREP 'External.*some_variable' conftest.out > /dev/null; then\n     lt_cv_nm_interface=\"MS dumpbin\"\n   fi\n-  rm -f conftest* ;;\n-esac\n+  rm -f conftest*\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface\" >&5\n-printf \"%s\\n\" \"$lt_cv_nm_interface\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface\" >&5\n+$as_echo \"$lt_cv_nm_interface\" >&6; }\n \n # find the maximum length of command line arguments\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments\" >&5\n-printf %s \"checking the maximum length of command line arguments... \" >&6; }\n-if test ${lt_cv_sys_max_cmd_len+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)   i=0\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments\" >&5\n+$as_echo_n \"checking the maximum length of command line arguments... \" >&6; }\n+if ${lt_cv_sys_max_cmd_len+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+    i=0\n   teststring=ABCD\n \n   case $build_os in\n@@ -7874,14 +6399,14 @@ else case e in #(\n     lt_cv_sys_max_cmd_len=12288;    # 12K is about right\n     ;;\n \n-  gnu* | ironclad*)\n-    # Under GNU Hurd and Ironclad, this test is not required because there\n-    # is no limit to the length of command line arguments.\n+  gnu*)\n+    # Under GNU Hurd, this test is not required because there is\n+    # no limit to the length of command line arguments.\n     # Libtool will interpret -1 as no limit whatsoever\n     lt_cv_sys_max_cmd_len=-1;\n     ;;\n \n-  cygwin* | mingw* | windows* | cegcc*)\n+  cygwin* | mingw* | cegcc*)\n     # On Win9x/ME, this test blows up -- it succeeds, but takes\n     # about 5 minutes as the teststring grows exponentially.\n     # Worse, since 9x/ME are not pre-emptively multitasking,\n@@ -7903,7 +6428,7 @@ else case e in #(\n     lt_cv_sys_max_cmd_len=8192;\n     ;;\n \n-  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)\n+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)\n     # This has been around since 386BSD, at least.  Likely further.\n     if test -x /sbin/sysctl; then\n       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`\n@@ -7946,7 +6471,7 @@ else case e in #(\n   sysv5* | sco5v6* | sysv4.2uw2*)\n     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`\n     if test -n \"$kargmax\"; then\n-      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[\t ]//'`\n+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[\t ]//'`\n     else\n       lt_cv_sys_max_cmd_len=32768\n     fi\n@@ -7984,16 +6509,15 @@ else case e in #(\n     fi\n     ;;\n   esac\n- ;;\n-esac\n+\n fi\n \n if test -n \"$lt_cv_sys_max_cmd_len\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len\" >&5\n-printf \"%s\\n\" \"$lt_cv_sys_max_cmd_len\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len\" >&5\n+$as_echo \"$lt_cv_sys_max_cmd_len\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: none\" >&5\n-printf \"%s\\n\" \"none\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: none\" >&5\n+$as_echo \"none\" >&6; }\n fi\n max_cmd_len=$lt_cv_sys_max_cmd_len\n \n@@ -8037,16 +6561,15 @@ esac\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format\" >&5\n-printf %s \"checking how to convert $build file names to $host format... \" >&6; }\n-if test ${lt_cv_to_host_file_cmd+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $host in\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format\" >&5\n+$as_echo_n \"checking how to convert $build file names to $host format... \" >&6; }\n+if ${lt_cv_to_host_file_cmd+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $host in\n   *-*-mingw* )\n     case $build in\n-      *-*-mingw* | *-*-windows* ) # actually msys\n+      *-*-mingw* ) # actually msys\n         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32\n         ;;\n       *-*-cygwin* )\n@@ -8059,7 +6582,7 @@ else case e in #(\n     ;;\n   *-*-cygwin* )\n     case $build in\n-      *-*-mingw* | *-*-windows* ) # actually msys\n+      *-*-mingw* ) # actually msys\n         lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin\n         ;;\n       *-*-cygwin* )\n@@ -8074,58 +6597,53 @@ else case e in #(\n     lt_cv_to_host_file_cmd=func_convert_file_noop\n     ;;\n esac\n- ;;\n-esac\n+\n fi\n \n to_host_file_cmd=$lt_cv_to_host_file_cmd\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd\" >&5\n-printf \"%s\\n\" \"$lt_cv_to_host_file_cmd\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd\" >&5\n+$as_echo \"$lt_cv_to_host_file_cmd\" >&6; }\n \n \n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format\" >&5\n-printf %s \"checking how to convert $build file names to toolchain format... \" >&6; }\n-if test ${lt_cv_to_tool_file_cmd+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) #assume ordinary cross tools, or native build.\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format\" >&5\n+$as_echo_n \"checking how to convert $build file names to toolchain format... \" >&6; }\n+if ${lt_cv_to_tool_file_cmd+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  #assume ordinary cross tools, or native build.\n lt_cv_to_tool_file_cmd=func_convert_file_noop\n case $host in\n-  *-*-mingw* | *-*-windows* )\n+  *-*-mingw* )\n     case $build in\n-      *-*-mingw* | *-*-windows* ) # actually msys\n+      *-*-mingw* ) # actually msys\n         lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32\n         ;;\n     esac\n     ;;\n esac\n- ;;\n-esac\n+\n fi\n \n to_tool_file_cmd=$lt_cv_to_tool_file_cmd\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd\" >&5\n-printf \"%s\\n\" \"$lt_cv_to_tool_file_cmd\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd\" >&5\n+$as_echo \"$lt_cv_to_tool_file_cmd\" >&6; }\n \n \n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files\" >&5\n-printf %s \"checking for $LD option to reload object files... \" >&6; }\n-if test ${lt_cv_ld_reload_flag+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_ld_reload_flag='-r' ;;\n-esac\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files\" >&5\n+$as_echo_n \"checking for $LD option to reload object files... \" >&6; }\n+if ${lt_cv_ld_reload_flag+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_ld_reload_flag='-r'\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag\" >&5\n-printf \"%s\\n\" \"$lt_cv_ld_reload_flag\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag\" >&5\n+$as_echo \"$lt_cv_ld_reload_flag\" >&6; }\n reload_flag=$lt_cv_ld_reload_flag\n case $reload_flag in\n \"\" | \" \"*) ;;\n@@ -8133,7 +6651,7 @@ case $reload_flag in\n esac\n reload_cmds='$LD$reload_flag -o $output$reload_objs'\n case $host_os in\n-  cygwin* | mingw* | windows* | pw32* | cegcc*)\n+  cygwin* | mingw* | pw32* | cegcc*)\n     if test yes != \"$GCC\"; then\n       reload_cmds=false\n     fi\n@@ -8155,97 +6673,41 @@ esac\n \n \n \n-# Extract the first word of \"file\", so it can be a program name with args.\n-set dummy file; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_FILECMD+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$FILECMD\"; then\n-  ac_cv_prog_FILECMD=\"$FILECMD\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_FILECMD=\"file\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-  test -z \"$ac_cv_prog_FILECMD\" && ac_cv_prog_FILECMD=\":\"\n-fi ;;\n-esac\n-fi\n-FILECMD=$ac_cv_prog_FILECMD\n-if test -n \"$FILECMD\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $FILECMD\" >&5\n-printf \"%s\\n\" \"$FILECMD\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-\n-\n-\n-\n-\n-\n-\n if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}objdump\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}objdump; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_OBJDUMP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$OBJDUMP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_OBJDUMP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$OBJDUMP\"; then\n   ac_cv_prog_OBJDUMP=\"$OBJDUMP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_OBJDUMP=\"${ac_tool_prefix}objdump\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n OBJDUMP=$ac_cv_prog_OBJDUMP\n if test -n \"$OBJDUMP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $OBJDUMP\" >&5\n-printf \"%s\\n\" \"$OBJDUMP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $OBJDUMP\" >&5\n+$as_echo \"$OBJDUMP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -8254,44 +6716,38 @@ if test -z \"$ac_cv_prog_OBJDUMP\"; then\n   ac_ct_OBJDUMP=$OBJDUMP\n   # Extract the first word of \"objdump\", so it can be a program name with args.\n set dummy objdump; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_OBJDUMP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_OBJDUMP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_OBJDUMP\"; then\n   ac_cv_prog_ac_ct_OBJDUMP=\"$ac_ct_OBJDUMP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_OBJDUMP=\"objdump\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP\n if test -n \"$ac_ct_OBJDUMP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP\" >&5\n-printf \"%s\\n\" \"$ac_ct_OBJDUMP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP\" >&5\n+$as_echo \"$ac_ct_OBJDUMP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_OBJDUMP\" = x; then\n@@ -8299,8 +6755,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     OBJDUMP=$ac_ct_OBJDUMP\n@@ -8316,13 +6772,12 @@ test -z \"$OBJDUMP\" && OBJDUMP=objdump\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries\" >&5\n-printf %s \"checking how to recognize dependent libraries... \" >&6; }\n-if test ${lt_cv_deplibs_check_method+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_file_magic_cmd='$MAGIC_CMD'\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries\" >&5\n+$as_echo_n \"checking how to recognize dependent libraries... \" >&6; }\n+if ${lt_cv_deplibs_check_method+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_file_magic_cmd='$MAGIC_CMD'\n lt_cv_file_magic_test_file=\n lt_cv_deplibs_check_method='unknown'\n # Need to set the preceding variable on all platforms that support\n@@ -8330,6 +6785,7 @@ lt_cv_deplibs_check_method='unknown'\n # 'none' -- dependencies not supported.\n # 'unknown' -- same as none, but documents that we really don't know.\n # 'pass_all' -- all dependencies passed with no checks.\n+# 'test_compile' -- check by making test program.\n # 'file_magic [[regex]]' -- check by looking for files in library path\n # that responds to the $file_magic_cmd with a given extended regex.\n # If you have 'file' or equivalent on your system and you're not sure\n@@ -8346,7 +6802,7 @@ beos*)\n \n bsdi[45]*)\n   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'\n-  lt_cv_file_magic_cmd='$FILECMD -L'\n+  lt_cv_file_magic_cmd='/usr/bin/file -L'\n   lt_cv_file_magic_test_file=/shlib/libc.so\n   ;;\n \n@@ -8356,7 +6812,7 @@ cygwin*)\n   lt_cv_file_magic_cmd='func_win32_libid'\n   ;;\n \n-mingw* | windows* | pw32*)\n+mingw* | pw32*)\n   # Base MSYS/MinGW do not provide the 'file' command needed by\n   # func_win32_libid shell function, so use a weaker test based on 'objdump',\n   # unless we find 'file', for example because we are cross-compiling.\n@@ -8365,7 +6821,7 @@ mingw* | windows* | pw32*)\n     lt_cv_file_magic_cmd='func_win32_libid'\n   else\n     # Keep this pattern in sync with the one in func_win32_libid.\n-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'\n+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'\n     lt_cv_file_magic_cmd='$OBJDUMP -f'\n   fi\n   ;;\n@@ -8380,14 +6836,14 @@ darwin* | rhapsody*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-freebsd* | dragonfly* | midnightbsd*)\n+freebsd* | dragonfly*)\n   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then\n     case $host_cpu in\n     i*86 )\n       # Not sure whether the presence of OpenBSD here was a mistake.\n       # Let's accept both of them until this is cleared up.\n       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'\n-      lt_cv_file_magic_cmd=$FILECMD\n+      lt_cv_file_magic_cmd=/usr/bin/file\n       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`\n       ;;\n     esac\n@@ -8401,7 +6857,7 @@ haiku*)\n   ;;\n \n hpux10.20* | hpux11*)\n-  lt_cv_file_magic_cmd=$FILECMD\n+  lt_cv_file_magic_cmd=/usr/bin/file\n   case $host_cpu in\n   ia64*)\n     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'\n@@ -8438,11 +6894,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-*-mlibc)\n-  lt_cv_deplibs_check_method=pass_all\n-  ;;\n-\n-netbsd* | netbsdelf*-gnu)\n+netbsd*)\n   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then\n     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\\.so\\.[0-9]+\\.[0-9]+|_pic\\.a)$'\n   else\n@@ -8452,7 +6904,7 @@ netbsd* | netbsdelf*-gnu)\n \n newos6*)\n   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'\n-  lt_cv_file_magic_cmd=$FILECMD\n+  lt_cv_file_magic_cmd=/usr/bin/file\n   lt_cv_file_magic_test_file=/usr/lib/libnls.so\n   ;;\n \n@@ -8460,7 +6912,7 @@ newos6*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-openbsd*)\n+openbsd* | bitrig*)\n   if test -z \"`echo __ELF__ | $CC -E - | $GREP __ELF__`\"; then\n     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\\.so\\.[0-9]+\\.[0-9]+|\\.so|_pic\\.a)$'\n   else\n@@ -8476,10 +6928,6 @@ rdos*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-serenity*)\n-  lt_cv_deplibs_check_method=pass_all\n-  ;;\n-\n solaris*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n@@ -8522,17 +6970,16 @@ os2*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n esac\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method\" >&5\n-printf \"%s\\n\" \"$lt_cv_deplibs_check_method\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method\" >&5\n+$as_echo \"$lt_cv_deplibs_check_method\" >&6; }\n \n file_magic_glob=\n want_nocaseglob=no\n if test \"$build\" = \"$host\"; then\n   case $host_os in\n-  mingw* | windows* | pw32*)\n+  mingw* | pw32*)\n     if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then\n       want_nocaseglob=yes\n     else\n@@ -8570,44 +7017,38 @@ test -z \"$deplibs_check_method\" && deplibs_check_method=unknown\n if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}dlltool\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}dlltool; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_DLLTOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$DLLTOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_DLLTOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$DLLTOOL\"; then\n   ac_cv_prog_DLLTOOL=\"$DLLTOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_DLLTOOL=\"${ac_tool_prefix}dlltool\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n DLLTOOL=$ac_cv_prog_DLLTOOL\n if test -n \"$DLLTOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $DLLTOOL\" >&5\n-printf \"%s\\n\" \"$DLLTOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $DLLTOOL\" >&5\n+$as_echo \"$DLLTOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -8616,44 +7057,38 @@ if test -z \"$ac_cv_prog_DLLTOOL\"; then\n   ac_ct_DLLTOOL=$DLLTOOL\n   # Extract the first word of \"dlltool\", so it can be a program name with args.\n set dummy dlltool; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_DLLTOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_DLLTOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_DLLTOOL\"; then\n   ac_cv_prog_ac_ct_DLLTOOL=\"$ac_ct_DLLTOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_DLLTOOL=\"dlltool\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL\n if test -n \"$ac_ct_DLLTOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL\" >&5\n-printf \"%s\\n\" \"$ac_ct_DLLTOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL\" >&5\n+$as_echo \"$ac_ct_DLLTOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_DLLTOOL\" = x; then\n@@ -8661,8 +7096,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     DLLTOOL=$ac_ct_DLLTOOL\n@@ -8679,16 +7114,15 @@ test -z \"$DLLTOOL\" && DLLTOOL=dlltool\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries\" >&5\n-printf %s \"checking how to associate runtime and link libraries... \" >&6; }\n-if test ${lt_cv_sharedlib_from_linklib_cmd+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_sharedlib_from_linklib_cmd='unknown'\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries\" >&5\n+$as_echo_n \"checking how to associate runtime and link libraries... \" >&6; }\n+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_sharedlib_from_linklib_cmd='unknown'\n \n case $host_os in\n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   # two different shell functions defined in ltmain.sh;\n   # decide which one to use based on capabilities of $DLLTOOL\n   case `$DLLTOOL --help 2>&1` in\n@@ -8705,11 +7139,10 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n   lt_cv_sharedlib_from_linklib_cmd=$ECHO\n   ;;\n esac\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd\" >&5\n-printf \"%s\\n\" \"$lt_cv_sharedlib_from_linklib_cmd\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd\" >&5\n+$as_echo \"$lt_cv_sharedlib_from_linklib_cmd\" >&6; }\n sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd\n test -z \"$sharedlib_from_linklib_cmd\" && sharedlib_from_linklib_cmd=$ECHO\n \n@@ -8721,202 +7154,86 @@ test -z \"$sharedlib_from_linklib_cmd\" && sharedlib_from_linklib_cmd=$ECHO\n \n \n if test -n \"$ac_tool_prefix\"; then\n-  # Extract the first word of \"${ac_tool_prefix}ranlib\", so it can be a program name with args.\n-set dummy ${ac_tool_prefix}ranlib; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_RANLIB+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$RANLIB\"; then\n-  ac_cv_prog_RANLIB=\"$RANLIB\" # Let the user override the test.\n+  for ac_prog in ar\n+  do\n+    # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n+set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_AR+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$AR\"; then\n+  ac_cv_prog_AR=\"$AR\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_RANLIB=\"${ac_tool_prefix}ranlib\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_prog_AR=\"$ac_tool_prefix$ac_prog\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n fi\n-RANLIB=$ac_cv_prog_RANLIB\n-if test -n \"$RANLIB\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $RANLIB\" >&5\n-printf \"%s\\n\" \"$RANLIB\" >&6; }\n+fi\n+AR=$ac_cv_prog_AR\n+if test -n \"$AR\"; then\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $AR\" >&5\n+$as_echo \"$AR\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n+    test -n \"$AR\" && break\n+  done\n fi\n-if test -z \"$ac_cv_prog_RANLIB\"; then\n-  ac_ct_RANLIB=$RANLIB\n-  # Extract the first word of \"ranlib\", so it can be a program name with args.\n-set dummy ranlib; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_RANLIB+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_RANLIB\"; then\n-  ac_cv_prog_ac_ct_RANLIB=\"$ac_ct_RANLIB\" # Let the user override the test.\n+if test -z \"$AR\"; then\n+  ac_ct_AR=$AR\n+  for ac_prog in ar\n+do\n+  # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n+set dummy $ac_prog; ac_word=$2\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_AR+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_AR\"; then\n+  ac_cv_prog_ac_ct_AR=\"$ac_ct_AR\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_ac_ct_RANLIB=\"ranlib\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_prog_ac_ct_AR=\"$ac_prog\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n fi\n-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB\n-if test -n \"$ac_ct_RANLIB\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB\" >&5\n-printf \"%s\\n\" \"$ac_ct_RANLIB\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-  if test \"x$ac_ct_RANLIB\" = x; then\n-    RANLIB=\":\"\n-  else\n-    case $cross_compiling:$ac_tool_warned in\n-yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n-ac_tool_warned=yes ;;\n-esac\n-    RANLIB=$ac_ct_RANLIB\n-  fi\n-else\n-  RANLIB=\"$ac_cv_prog_RANLIB\"\n-fi\n-\n-if test -n \"$ac_tool_prefix\"; then\n-  for ac_prog in ar\n-  do\n-    # Extract the first word of \"$ac_tool_prefix$ac_prog\", so it can be a program name with args.\n-set dummy $ac_tool_prefix$ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_AR+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$AR\"; then\n-  ac_cv_prog_AR=\"$AR\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_AR=\"$ac_tool_prefix$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-fi ;;\n-esac\n-fi\n-AR=$ac_cv_prog_AR\n-if test -n \"$AR\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $AR\" >&5\n-printf \"%s\\n\" \"$AR\" >&6; }\n-else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-fi\n-\n-\n-    test -n \"$AR\" && break\n-  done\n-fi\n-if test -z \"$AR\"; then\n-  ac_ct_AR=$AR\n-  for ac_prog in ar\n-do\n-  # Extract the first word of \"$ac_prog\", so it can be a program name with args.\n-set dummy $ac_prog; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_AR+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_AR\"; then\n-  ac_cv_prog_ac_ct_AR=\"$ac_ct_AR\" # Let the user override the test.\n-else\n-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n-for as_dir in $PATH\n-do\n-  IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_prog_ac_ct_AR=\"$ac_prog\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n-    break 2\n-  fi\n-done\n-  done\n-IFS=$as_save_IFS\n-\n-fi ;;\n-esac\n fi\n ac_ct_AR=$ac_cv_prog_ac_ct_AR\n if test -n \"$ac_ct_AR\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR\" >&5\n-printf \"%s\\n\" \"$ac_ct_AR\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR\" >&5\n+$as_echo \"$ac_ct_AR\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -8928,8 +7245,8 @@ done\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     AR=$ac_ct_AR\n@@ -8937,60 +7254,42 @@ esac\n fi\n \n : ${AR=ar}\n+: ${AR_FLAGS=cru}\n \n \n \n \n \n \n-# Use ARFLAGS variable as AR's operation code to sync the variable naming with\n-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have\n-# higher priority because that's what people were doing historically (setting\n-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS\n-# variable obsoleted/removed.\n-\n-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}\n-lt_ar_flags=$AR_FLAGS\n-\n-\n-\n-\n \n \n-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override\n-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.\n \n \n \n-\n-\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support\" >&5\n-printf %s \"checking for archiver @FILE support... \" >&6; }\n-if test ${lt_cv_ar_at_file+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_ar_at_file=no\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support\" >&5\n+$as_echo_n \"checking for archiver @FILE support... \" >&6; }\n+if ${lt_cv_ar_at_file+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_ar_at_file=no\n    cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   echo conftest.$ac_objext > conftest.lst\n       lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'\n       { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$lt_ar_try\\\"\"; } >&5\n   (eval $lt_ar_try) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n       if test 0 -eq \"$ac_status\"; then\n \t# Ensure the archiver fails upon bogus file names.\n@@ -8998,7 +7297,7 @@ then :\n \t{ { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$lt_ar_try\\\"\"; } >&5\n   (eval $lt_ar_try) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n \tif test 0 -ne \"$ac_status\"; then\n           lt_cv_ar_at_file=@\n@@ -9007,12 +7306,11 @@ then :\n       rm -f conftest.* libconftest.a\n \n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-   ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file\" >&5\n-printf \"%s\\n\" \"$lt_cv_ar_at_file\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file\" >&5\n+$as_echo \"$lt_cv_ar_at_file\" >&6; }\n \n if test no = \"$lt_cv_ar_at_file\"; then\n   archiver_list_spec=\n@@ -9029,44 +7327,38 @@ fi\n if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}strip\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}strip; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_STRIP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$STRIP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_STRIP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$STRIP\"; then\n   ac_cv_prog_STRIP=\"$STRIP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_STRIP=\"${ac_tool_prefix}strip\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n STRIP=$ac_cv_prog_STRIP\n if test -n \"$STRIP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $STRIP\" >&5\n-printf \"%s\\n\" \"$STRIP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $STRIP\" >&5\n+$as_echo \"$STRIP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -9075,44 +7367,38 @@ if test -z \"$ac_cv_prog_STRIP\"; then\n   ac_ct_STRIP=$STRIP\n   # Extract the first word of \"strip\", so it can be a program name with args.\n set dummy strip; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_STRIP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_STRIP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_STRIP\"; then\n   ac_cv_prog_ac_ct_STRIP=\"$ac_ct_STRIP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_STRIP=\"strip\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP\n if test -n \"$ac_ct_STRIP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP\" >&5\n-printf \"%s\\n\" \"$ac_ct_STRIP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP\" >&5\n+$as_echo \"$ac_ct_STRIP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_STRIP\" = x; then\n@@ -9120,8 +7406,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     STRIP=$ac_ct_STRIP\n@@ -9137,6 +7423,97 @@ test -z \"$STRIP\" && STRIP=:\n \n \n \n+if test -n \"$ac_tool_prefix\"; then\n+  # Extract the first word of \"${ac_tool_prefix}ranlib\", so it can be a program name with args.\n+set dummy ${ac_tool_prefix}ranlib; ac_word=$2\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_RANLIB+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$RANLIB\"; then\n+  ac_cv_prog_RANLIB=\"$RANLIB\" # Let the user override the test.\n+else\n+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n+for as_dir in $PATH\n+do\n+  IFS=$as_save_IFS\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_exec_ext in '' $ac_executable_extensions; do\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_prog_RANLIB=\"${ac_tool_prefix}ranlib\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n+    break 2\n+  fi\n+done\n+  done\n+IFS=$as_save_IFS\n+\n+fi\n+fi\n+RANLIB=$ac_cv_prog_RANLIB\n+if test -n \"$RANLIB\"; then\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $RANLIB\" >&5\n+$as_echo \"$RANLIB\" >&6; }\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+fi\n+\n+\n+fi\n+if test -z \"$ac_cv_prog_RANLIB\"; then\n+  ac_ct_RANLIB=$RANLIB\n+  # Extract the first word of \"ranlib\", so it can be a program name with args.\n+set dummy ranlib; ac_word=$2\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_RANLIB\"; then\n+  ac_cv_prog_ac_ct_RANLIB=\"$ac_ct_RANLIB\" # Let the user override the test.\n+else\n+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n+for as_dir in $PATH\n+do\n+  IFS=$as_save_IFS\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_exec_ext in '' $ac_executable_extensions; do\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_prog_ac_ct_RANLIB=\"ranlib\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n+    break 2\n+  fi\n+done\n+  done\n+IFS=$as_save_IFS\n+\n+fi\n+fi\n+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB\n+if test -n \"$ac_ct_RANLIB\"; then\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB\" >&5\n+$as_echo \"$ac_ct_RANLIB\" >&6; }\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+fi\n+\n+  if test \"x$ac_ct_RANLIB\" = x; then\n+    RANLIB=\":\"\n+  else\n+    case $cross_compiling:$ac_tool_warned in\n+yes:)\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+ac_tool_warned=yes ;;\n+esac\n+    RANLIB=$ac_ct_RANLIB\n+  fi\n+else\n+  RANLIB=\"$ac_cv_prog_RANLIB\"\n+fi\n \n test -z \"$RANLIB\" && RANLIB=:\n \n@@ -9151,8 +7528,15 @@ old_postinstall_cmds='chmod 644 $oldlib'\n old_postuninstall_cmds=\n \n if test -n \"$RANLIB\"; then\n+  case $host_os in\n+  bitrig* | openbsd*)\n+    old_postinstall_cmds=\"$old_postinstall_cmds~\\$RANLIB -t \\$tool_oldlib\"\n+    ;;\n+  *)\n+    old_postinstall_cmds=\"$old_postinstall_cmds~\\$RANLIB \\$tool_oldlib\"\n+    ;;\n+  esac\n   old_archive_cmds=\"$old_archive_cmds~\\$RANLIB \\$tool_oldlib\"\n-  old_postinstall_cmds=\"$old_postinstall_cmds~\\$RANLIB \\$tool_oldlib\"\n fi\n \n case $host_os in\n@@ -9211,13 +7595,12 @@ compiler=$CC\n \n \n # Check for command to grab the raw symbol name followed by C symbol from nm.\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object\" >&5\n-printf %s \"checking command to parse $NM output from $compiler object... \" >&6; }\n-if test ${lt_cv_sys_global_symbol_pipe+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object\" >&5\n+$as_echo_n \"checking command to parse $NM output from $compiler object... \" >&6; }\n+if ${lt_cv_sys_global_symbol_pipe+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+\n # These are sane defaults that work on at least a few old systems.\n # [They come from Ultrix.  What could be older than Ultrix?!! ;)]\n \n@@ -9232,7 +7615,7 @@ case $host_os in\n aix*)\n   symcode='[BCDT]'\n   ;;\n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   symcode='[ABCDGISTW]'\n   ;;\n hpux*)\n@@ -9247,7 +7630,7 @@ osf*)\n   symcode='[BCDEGQRST]'\n   ;;\n solaris*)\n-  symcode='[BCDRT]'\n+  symcode='[BDRT]'\n   ;;\n sco3.2v5*)\n   symcode='[DT]'\n@@ -9271,7 +7654,7 @@ esac\n \n if test \"$lt_cv_nm_interface\" = \"MS dumpbin\"; then\n   # Gets list of data symbols to import.\n-  lt_cv_sys_global_symbol_to_import=\"$SED -n -e 's/^I .* \\(.*\\)$/\\1/p'\"\n+  lt_cv_sys_global_symbol_to_import=\"sed -n -e 's/^I .* \\(.*\\)$/\\1/p'\"\n   # Adjust the below global symbol transforms to fixup imported variables.\n   lt_cdecl_hook=\" -e 's/^I .* \\(.*\\)$/extern __declspec(dllimport) char \\1;/p'\"\n   lt_c_name_hook=\" -e 's/^I .* \\(.*\\)$/  {\\\"\\1\\\", (void *) 0},/p'\"\n@@ -9289,20 +7672,20 @@ fi\n # Transform an extracted symbol line into a proper C declaration.\n # Some systems (esp. on ia64) link data and code symbols differently,\n # so use this general approach.\n-lt_cv_sys_global_symbol_to_cdecl=\"$SED -n\"\\\n+lt_cv_sys_global_symbol_to_cdecl=\"sed -n\"\\\n $lt_cdecl_hook\\\n \" -e 's/^T .* \\(.*\\)$/extern int \\1();/p'\"\\\n \" -e 's/^$symcode$symcode* .* \\(.*\\)$/extern char \\1;/p'\"\n \n # Transform an extracted symbol line into symbol name and symbol address\n-lt_cv_sys_global_symbol_to_c_name_address=\"$SED -n\"\\\n+lt_cv_sys_global_symbol_to_c_name_address=\"sed -n\"\\\n $lt_c_name_hook\\\n \" -e 's/^: \\(.*\\) .*$/  {\\\"\\1\\\", (void *) 0},/p'\"\\\n \" -e 's/^$symcode$symcode* .* \\(.*\\)$/  {\\\"\\1\\\", (void *) \\&\\1},/p'\"\n \n # Transform an extracted symbol line into symbol name with lib prefix and\n # symbol address.\n-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix=\"$SED -n\"\\\n+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix=\"sed -n\"\\\n $lt_c_name_lib_hook\\\n \" -e 's/^: \\(.*\\) .*$/  {\\\"\\1\\\", (void *) 0},/p'\"\\\n \" -e 's/^$symcode$symcode* .* \\(lib.*\\)$/  {\\\"\\1\\\", (void *) \\&\\1},/p'\"\\\n@@ -9311,7 +7694,7 @@ $lt_c_name_lib_hook\\\n # Handle CRLF in mingw tool chain\n opt_cr=\n case $build_os in\n-mingw* | windows*)\n+mingw*)\n   opt_cr=`$ECHO 'x\\{0,1\\}' | tr x '\\015'` # option cr in regexp\n   ;;\n esac\n@@ -9326,7 +7709,7 @@ for ac_symprfx in \"\" \"_\"; do\n   if test \"$lt_cv_nm_interface\" = \"MS dumpbin\"; then\n     # Fake it for dumpbin and say T for any non-static function,\n     # D for any global variable and I for any imported variable.\n-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,\n+    # Also find C++ and __fastcall symbols from MSVC++,\n     # which start with @ or ?.\n     lt_cv_sys_global_symbol_pipe=\"$AWK '\"\\\n \"     {last_section=section; section=\\$ 3};\"\\\n@@ -9344,9 +7727,9 @@ for ac_symprfx in \"\" \"_\"; do\n \"     s[1]~prfx {split(s[1],t,\\\"@\\\"); print f,t[1],substr(t[1],length(prfx))}\"\\\n \"     ' prfx=^$ac_symprfx\"\n   else\n-    lt_cv_sys_global_symbol_pipe=\"$SED -n -e 's/^.*[\t ]\\($symcode$symcode*\\)[\t ][\t ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'\"\n+    lt_cv_sys_global_symbol_pipe=\"sed -n -e 's/^.*[\t ]\\($symcode$symcode*\\)[\t ][\t ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'\"\n   fi\n-  lt_cv_sys_global_symbol_pipe=\"$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'\"\n+  lt_cv_sys_global_symbol_pipe=\"$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'\"\n \n   # Check to see that the pipe works correctly.\n   pipe_works=no\n@@ -9362,18 +7745,21 @@ void nm_test_func(void){}\n #ifdef __cplusplus\n }\n #endif\n-int main(void){nm_test_var='a';nm_test_func();return(0);}\n+int main(){nm_test_var='a';nm_test_func();return(0);}\n _LT_EOF\n \n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n     # Now try to grab the symbols.\n     nlist=conftest.nm\n-    $ECHO \"$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist\" >&5\n-    if eval \"$NM\" conftest.$ac_objext \\| \"$lt_cv_sys_global_symbol_pipe\" \\> $nlist 2>&5 && test -s \"$nlist\"; then\n+    if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$NM conftest.$ac_objext \\| \"$lt_cv_sys_global_symbol_pipe\" \\> $nlist\\\"\"; } >&5\n+  (eval $NM conftest.$ac_objext \\| \"$lt_cv_sys_global_symbol_pipe\" \\> $nlist) 2>&5\n+  ac_status=$?\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  test $ac_status = 0; } && test -s \"$nlist\"; then\n       # Try sorting and uniquifying the output.\n       if sort \"$nlist\" | uniq > \"$nlist\"T; then\n \tmv -f \"$nlist\"T \"$nlist\"\n@@ -9441,7 +7827,7 @@ _LT_EOF\n \t  if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_link\\\"\"; } >&5\n   (eval $ac_link) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && test -s conftest$ac_exeext; then\n \t    pipe_works=yes\n \t  fi\n@@ -9469,19 +7855,18 @@ _LT_EOF\n     lt_cv_sys_global_symbol_pipe=\n   fi\n done\n- ;;\n-esac\n+\n fi\n \n if test -z \"$lt_cv_sys_global_symbol_pipe\"; then\n   lt_cv_sys_global_symbol_to_cdecl=\n fi\n if test -z \"$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: failed\" >&5\n-printf \"%s\\n\" \"failed\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: failed\" >&5\n+$as_echo \"failed\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: ok\" >&5\n-printf \"%s\\n\" \"ok\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: ok\" >&5\n+$as_echo \"ok\" >&6; }\n fi\n \n # Response file support.\n@@ -9527,16 +7912,14 @@ fi\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for sysroot\" >&5\n-printf %s \"checking for sysroot... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for sysroot\" >&5\n+$as_echo_n \"checking for sysroot... \" >&6; }\n \n # Check whether --with-sysroot was given.\n-if test ${with_sysroot+y}\n-then :\n+if test \"${with_sysroot+set}\" = set; then :\n   withval=$with_sysroot;\n-else case e in #(\n-  e) with_sysroot=no ;;\n-esac\n+else\n+  with_sysroot=no\n fi\n \n \n@@ -9544,37 +7927,34 @@ lt_sysroot=\n case $with_sysroot in #(\n  yes)\n    if test yes = \"$GCC\"; then\n-     # Trim trailing / since we'll always append absolute paths and we want\n-     # to avoid //, if only for less confusing output for the user.\n-     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\\+$::'`\n+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`\n    fi\n    ;; #(\n  /*)\n-   lt_sysroot=`echo \"$with_sysroot\" | $SED -e \"$sed_quote_subst\"`\n+   lt_sysroot=`echo \"$with_sysroot\" | sed -e \"$sed_quote_subst\"`\n    ;; #(\n  no|'')\n    ;; #(\n  *)\n-   { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $with_sysroot\" >&5\n-printf \"%s\\n\" \"$with_sysroot\" >&6; }\n+   { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $with_sysroot\" >&5\n+$as_echo \"$with_sysroot\" >&6; }\n    as_fn_error $? \"The sysroot must be an absolute path.\" \"$LINENO\" 5\n    ;;\n esac\n \n- { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}\" >&5\n-printf \"%s\\n\" \"${lt_sysroot:-no}\" >&6; }\n+ { $as_echo \"$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}\" >&5\n+$as_echo \"${lt_sysroot:-no}\" >&6; }\n \n \n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for a working dd\" >&5\n-printf %s \"checking for a working dd... \" >&6; }\n-if test ${ac_cv_path_lt_DD+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) printf 0123456789abcdef0123456789abcdef >conftest.i\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for a working dd\" >&5\n+$as_echo_n \"checking for a working dd... \" >&6; }\n+if ${ac_cv_path_lt_DD+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  printf 0123456789abcdef0123456789abcdef >conftest.i\n cat conftest.i conftest.i >conftest2.i\n : ${lt_DD:=$DD}\n if test -z \"$lt_DD\"; then\n@@ -9584,15 +7964,10 @@ if test -z \"$lt_DD\"; then\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    for ac_prog in dd\n-   do\n+  test -z \"$as_dir\" && as_dir=.\n+    for ac_prog in dd; do\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-      ac_path_lt_DD=\"$as_dir$ac_prog$ac_exec_ext\"\n+      ac_path_lt_DD=\"$as_dir/$ac_prog$ac_exec_ext\"\n       as_fn_executable_p \"$ac_path_lt_DD\" || continue\n if \"$ac_path_lt_DD\" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then\n   cmp -s conftest.i conftest.out \\\n@@ -9610,20 +7985,18 @@ else\n   ac_cv_path_lt_DD=$lt_DD\n fi\n \n-rm -f conftest.i conftest2.i conftest.out ;;\n-esac\n+rm -f conftest.i conftest2.i conftest.out\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD\" >&5\n-printf \"%s\\n\" \"$ac_cv_path_lt_DD\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD\" >&5\n+$as_echo \"$ac_cv_path_lt_DD\" >&6; }\n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes\" >&5\n-printf %s \"checking how to truncate binary pipes... \" >&6; }\n-if test ${lt_cv_truncate_bin+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) printf 0123456789abcdef0123456789abcdef >conftest.i\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes\" >&5\n+$as_echo_n \"checking how to truncate binary pipes... \" >&6; }\n+if ${lt_cv_truncate_bin+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  printf 0123456789abcdef0123456789abcdef >conftest.i\n cat conftest.i conftest.i >conftest2.i\n lt_cv_truncate_bin=\n if \"$ac_cv_path_lt_DD\" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then\n@@ -9631,11 +8004,10 @@ if \"$ac_cv_path_lt_DD\" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; the\n   && lt_cv_truncate_bin=\"$ac_cv_path_lt_DD bs=4096 count=1\"\n fi\n rm -f conftest.i conftest2.i conftest.out\n-test -z \"$lt_cv_truncate_bin\" && lt_cv_truncate_bin=\"$SED -e 4q\" ;;\n-esac\n+test -z \"$lt_cv_truncate_bin\" && lt_cv_truncate_bin=\"$SED -e 4q\"\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin\" >&5\n-printf \"%s\\n\" \"$lt_cv_truncate_bin\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin\" >&5\n+$as_echo \"$lt_cv_truncate_bin\" >&6; }\n \n \n \n@@ -9658,8 +8030,7 @@ func_cc_basename ()\n }\n \n # Check whether --enable-libtool-lock was given.\n-if test ${enable_libtool_lock+y}\n-then :\n+if test \"${enable_libtool_lock+set}\" = set; then :\n   enableval=$enable_libtool_lock;\n fi\n \n@@ -9675,9 +8046,9 @@ ia64-*-hpux*)\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *ELF-32*)\n \tHPUX_IA64_MODE=32\n \t;;\n@@ -9695,10 +8066,10 @@ ia64-*-hpux*)\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n     if test yes = \"$lt_cv_prog_gnu_ld\"; then\n-      case `$FILECMD conftest.$ac_objext` in\n+      case `/usr/bin/file conftest.$ac_objext` in\n \t*32-bit*)\n \t  LD=\"${LD-ld} -melf32bsmip\"\n \t  ;;\n@@ -9710,7 +8081,7 @@ ia64-*-hpux*)\n \t;;\n       esac\n     else\n-      case `$FILECMD conftest.$ac_objext` in\n+      case `/usr/bin/file conftest.$ac_objext` in\n \t*32-bit*)\n \t  LD=\"${LD-ld} -32\"\n \t  ;;\n@@ -9733,10 +8104,10 @@ mips64*-*linux*)\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n     emul=elf\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *32-bit*)\n \temul=\"${emul}32\"\n \t;;\n@@ -9744,7 +8115,7 @@ mips64*-*linux*)\n \temul=\"${emul}64\"\n \t;;\n     esac\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *MSB*)\n \temul=\"${emul}btsmip\"\n \t;;\n@@ -9752,7 +8123,7 @@ mips64*-*linux*)\n \temul=\"${emul}ltsmip\"\n \t;;\n     esac\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *N32*)\n \temul=\"${emul}n32\"\n \t;;\n@@ -9763,7 +8134,7 @@ mips64*-*linux*)\n   ;;\n \n x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \\\n-s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)\n   # Find out what ABI is being produced by ac_compile, and set linker\n   # options accordingly.  Note that the listed cases only cover the\n   # situations where additional linker options are needed (such as when\n@@ -9774,16 +8145,16 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n-    case `$FILECMD conftest.o` in\n+    case `/usr/bin/file conftest.o` in\n       *32-bit*)\n \tcase $host in\n \t  x86_64-*kfreebsd*-gnu)\n \t    LD=\"${LD-ld} -m elf_i386_fbsd\"\n \t    ;;\n-\t  x86_64-*linux*|x86_64-gnu*)\n-\t    case `$FILECMD conftest.o` in\n+\t  x86_64-*linux*)\n+\t    case `/usr/bin/file conftest.o` in\n \t      *x86-64*)\n \t\tLD=\"${LD-ld} -m elf32_x86_64\"\n \t\t;;\n@@ -9811,7 +8182,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n \t  x86_64-*kfreebsd*-gnu)\n \t    LD=\"${LD-ld} -m elf_x86_64_fbsd\"\n \t    ;;\n-\t  x86_64-*linux*|x86_64-gnu*)\n+\t  x86_64-*linux*)\n \t    LD=\"${LD-ld} -m elf_x86_64\"\n \t    ;;\n \t  powerpcle-*linux*)\n@@ -9837,13 +8208,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n   # On SCO OpenServer 5, we need -belf to get full-featured binaries.\n   SAVE_CFLAGS=$CFLAGS\n   CFLAGS=\"$CFLAGS -belf\"\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf\" >&5\n-printf %s \"checking whether the C compiler needs -belf... \" >&6; }\n-if test ${lt_cv_cc_needs_belf+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_ext=c\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf\" >&5\n+$as_echo_n \"checking whether the C compiler needs -belf... \" >&6; }\n+if ${lt_cv_cc_needs_belf+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_ext=c\n ac_cpp='$CPP $CPPFLAGS'\n ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n@@ -9853,32 +8223,29 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   lt_cv_cc_needs_belf=yes\n-else case e in #(\n-  e) lt_cv_cc_needs_belf=no ;;\n-esac\n+else\n+  lt_cv_cc_needs_belf=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n      ac_ext=c\n ac_cpp='$CPP $CPPFLAGS'\n ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_c_compiler_gnu\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf\" >&5\n-printf \"%s\\n\" \"$lt_cv_cc_needs_belf\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf\" >&5\n+$as_echo \"$lt_cv_cc_needs_belf\" >&6; }\n   if test yes != \"$lt_cv_cc_needs_belf\"; then\n     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf\n     CFLAGS=$SAVE_CFLAGS\n@@ -9891,9 +8258,9 @@ printf \"%s\\n\" \"$lt_cv_cc_needs_belf\" >&6; }\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n-    case `$FILECMD conftest.o` in\n+    case `/usr/bin/file conftest.o` in\n     *64-bit*)\n       case $lt_cv_prog_gnu_ld in\n       yes*)\n@@ -9928,44 +8295,38 @@ need_locks=$enable_libtool_lock\n if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}mt\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}mt; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_MANIFEST_TOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$MANIFEST_TOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$MANIFEST_TOOL\"; then\n   ac_cv_prog_MANIFEST_TOOL=\"$MANIFEST_TOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_MANIFEST_TOOL=\"${ac_tool_prefix}mt\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL\n if test -n \"$MANIFEST_TOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL\" >&5\n-printf \"%s\\n\" \"$MANIFEST_TOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL\" >&5\n+$as_echo \"$MANIFEST_TOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -9974,44 +8335,38 @@ if test -z \"$ac_cv_prog_MANIFEST_TOOL\"; then\n   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL\n   # Extract the first word of \"mt\", so it can be a program name with args.\n set dummy mt; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_MANIFEST_TOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_MANIFEST_TOOL\"; then\n   ac_cv_prog_ac_ct_MANIFEST_TOOL=\"$ac_ct_MANIFEST_TOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_MANIFEST_TOOL=\"mt\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL\n if test -n \"$ac_ct_MANIFEST_TOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL\" >&5\n-printf \"%s\\n\" \"$ac_ct_MANIFEST_TOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL\" >&5\n+$as_echo \"$ac_ct_MANIFEST_TOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_MANIFEST_TOOL\" = x; then\n@@ -10019,8 +8374,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL\n@@ -10030,25 +8385,23 @@ else\n fi\n \n test -z \"$MANIFEST_TOOL\" && MANIFEST_TOOL=mt\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool\" >&5\n-printf %s \"checking if $MANIFEST_TOOL is a manifest tool... \" >&6; }\n-if test ${lt_cv_path_manifest_tool+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_path_manifest_tool=no\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool\" >&5\n+$as_echo_n \"checking if $MANIFEST_TOOL is a manifest tool... \" >&6; }\n+if ${lt_cv_path_mainfest_tool+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_path_mainfest_tool=no\n   echo \"$as_me:$LINENO: $MANIFEST_TOOL '-?'\" >&5\n   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out\n   cat conftest.err >&5\n   if $GREP 'Manifest Tool' conftest.out > /dev/null; then\n-    lt_cv_path_manifest_tool=yes\n+    lt_cv_path_mainfest_tool=yes\n   fi\n-  rm -f conftest* ;;\n-esac\n+  rm -f conftest*\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool\" >&5\n-printf \"%s\\n\" \"$lt_cv_path_manifest_tool\" >&6; }\n-if test yes != \"$lt_cv_path_manifest_tool\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool\" >&5\n+$as_echo \"$lt_cv_path_mainfest_tool\" >&6; }\n+if test yes != \"$lt_cv_path_mainfest_tool\"; then\n   MANIFEST_TOOL=:\n fi\n \n@@ -10062,44 +8415,38 @@ fi\n     if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}dsymutil\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}dsymutil; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_DSYMUTIL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$DSYMUTIL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_DSYMUTIL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$DSYMUTIL\"; then\n   ac_cv_prog_DSYMUTIL=\"$DSYMUTIL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_DSYMUTIL=\"${ac_tool_prefix}dsymutil\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n DSYMUTIL=$ac_cv_prog_DSYMUTIL\n if test -n \"$DSYMUTIL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL\" >&5\n-printf \"%s\\n\" \"$DSYMUTIL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL\" >&5\n+$as_echo \"$DSYMUTIL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -10108,44 +8455,38 @@ if test -z \"$ac_cv_prog_DSYMUTIL\"; then\n   ac_ct_DSYMUTIL=$DSYMUTIL\n   # Extract the first word of \"dsymutil\", so it can be a program name with args.\n set dummy dsymutil; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_DSYMUTIL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_DSYMUTIL\"; then\n   ac_cv_prog_ac_ct_DSYMUTIL=\"$ac_ct_DSYMUTIL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_DSYMUTIL=\"dsymutil\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL\n if test -n \"$ac_ct_DSYMUTIL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL\" >&5\n-printf \"%s\\n\" \"$ac_ct_DSYMUTIL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL\" >&5\n+$as_echo \"$ac_ct_DSYMUTIL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_DSYMUTIL\" = x; then\n@@ -10153,8 +8494,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     DSYMUTIL=$ac_ct_DSYMUTIL\n@@ -10166,44 +8507,38 @@ fi\n     if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}nmedit\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}nmedit; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_NMEDIT+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$NMEDIT\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_NMEDIT+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$NMEDIT\"; then\n   ac_cv_prog_NMEDIT=\"$NMEDIT\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_NMEDIT=\"${ac_tool_prefix}nmedit\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n NMEDIT=$ac_cv_prog_NMEDIT\n if test -n \"$NMEDIT\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $NMEDIT\" >&5\n-printf \"%s\\n\" \"$NMEDIT\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $NMEDIT\" >&5\n+$as_echo \"$NMEDIT\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -10212,44 +8547,38 @@ if test -z \"$ac_cv_prog_NMEDIT\"; then\n   ac_ct_NMEDIT=$NMEDIT\n   # Extract the first word of \"nmedit\", so it can be a program name with args.\n set dummy nmedit; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_NMEDIT+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_NMEDIT\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_NMEDIT\"; then\n   ac_cv_prog_ac_ct_NMEDIT=\"$ac_ct_NMEDIT\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_NMEDIT=\"nmedit\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT\n if test -n \"$ac_ct_NMEDIT\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT\" >&5\n-printf \"%s\\n\" \"$ac_ct_NMEDIT\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT\" >&5\n+$as_echo \"$ac_ct_NMEDIT\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_NMEDIT\" = x; then\n@@ -10257,8 +8586,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     NMEDIT=$ac_ct_NMEDIT\n@@ -10270,44 +8599,38 @@ fi\n     if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}lipo\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}lipo; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_LIPO+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$LIPO\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_LIPO+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$LIPO\"; then\n   ac_cv_prog_LIPO=\"$LIPO\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_LIPO=\"${ac_tool_prefix}lipo\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n LIPO=$ac_cv_prog_LIPO\n if test -n \"$LIPO\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $LIPO\" >&5\n-printf \"%s\\n\" \"$LIPO\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $LIPO\" >&5\n+$as_echo \"$LIPO\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -10316,44 +8639,38 @@ if test -z \"$ac_cv_prog_LIPO\"; then\n   ac_ct_LIPO=$LIPO\n   # Extract the first word of \"lipo\", so it can be a program name with args.\n set dummy lipo; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_LIPO+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_LIPO\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_LIPO\"; then\n   ac_cv_prog_ac_ct_LIPO=\"$ac_ct_LIPO\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_LIPO=\"lipo\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO\n if test -n \"$ac_ct_LIPO\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO\" >&5\n-printf \"%s\\n\" \"$ac_ct_LIPO\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO\" >&5\n+$as_echo \"$ac_ct_LIPO\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_LIPO\" = x; then\n@@ -10361,8 +8678,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     LIPO=$ac_ct_LIPO\n@@ -10374,44 +8691,38 @@ fi\n     if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}otool\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}otool; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_OTOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$OTOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_OTOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$OTOOL\"; then\n   ac_cv_prog_OTOOL=\"$OTOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_OTOOL=\"${ac_tool_prefix}otool\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n OTOOL=$ac_cv_prog_OTOOL\n if test -n \"$OTOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $OTOOL\" >&5\n-printf \"%s\\n\" \"$OTOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $OTOOL\" >&5\n+$as_echo \"$OTOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -10420,44 +8731,38 @@ if test -z \"$ac_cv_prog_OTOOL\"; then\n   ac_ct_OTOOL=$OTOOL\n   # Extract the first word of \"otool\", so it can be a program name with args.\n set dummy otool; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_OTOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_OTOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_OTOOL\"; then\n   ac_cv_prog_ac_ct_OTOOL=\"$ac_ct_OTOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_OTOOL=\"otool\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL\n if test -n \"$ac_ct_OTOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL\" >&5\n-printf \"%s\\n\" \"$ac_ct_OTOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL\" >&5\n+$as_echo \"$ac_ct_OTOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_OTOOL\" = x; then\n@@ -10465,8 +8770,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     OTOOL=$ac_ct_OTOOL\n@@ -10478,44 +8783,38 @@ fi\n     if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}otool64\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}otool64; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_OTOOL64+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$OTOOL64\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_OTOOL64+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$OTOOL64\"; then\n   ac_cv_prog_OTOOL64=\"$OTOOL64\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_OTOOL64=\"${ac_tool_prefix}otool64\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n OTOOL64=$ac_cv_prog_OTOOL64\n if test -n \"$OTOOL64\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $OTOOL64\" >&5\n-printf \"%s\\n\" \"$OTOOL64\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $OTOOL64\" >&5\n+$as_echo \"$OTOOL64\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -10524,44 +8823,38 @@ if test -z \"$ac_cv_prog_OTOOL64\"; then\n   ac_ct_OTOOL64=$OTOOL64\n   # Extract the first word of \"otool64\", so it can be a program name with args.\n set dummy otool64; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_OTOOL64+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_OTOOL64\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_OTOOL64\"; then\n   ac_cv_prog_ac_ct_OTOOL64=\"$ac_ct_OTOOL64\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_OTOOL64=\"otool64\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64\n if test -n \"$ac_ct_OTOOL64\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64\" >&5\n-printf \"%s\\n\" \"$ac_ct_OTOOL64\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64\" >&5\n+$as_echo \"$ac_ct_OTOOL64\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_OTOOL64\" = x; then\n@@ -10569,8 +8862,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     OTOOL64=$ac_ct_OTOOL64\n@@ -10605,13 +8898,12 @@ fi\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag\" >&5\n-printf %s \"checking for -single_module linker flag... \" >&6; }\n-if test ${lt_cv_apple_cc_single_mod+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_apple_cc_single_mod=no\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag\" >&5\n+$as_echo_n \"checking for -single_module linker flag... \" >&6; }\n+if ${lt_cv_apple_cc_single_mod+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_apple_cc_single_mod=no\n       if test -z \"$LT_MULTI_MODULE\"; then\n \t# By default we will add the -single_module flag. You can override\n \t# by either setting the environment variable LT_MULTI_MODULE\n@@ -10637,58 +8929,17 @@ else case e in #(\n \tfi\n \trm -rf libconftest.dylib*\n \trm -f conftest.*\n-      fi ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod\" >&5\n-printf \"%s\\n\" \"$lt_cv_apple_cc_single_mod\" >&6; }\n-\n-    # Feature test to disable chained fixups since it is not\n-    # compatible with '-undefined dynamic_lookup'\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag\" >&5\n-printf %s \"checking for -no_fixup_chains linker flag... \" >&6; }\n-if test ${lt_cv_support_no_fixup_chains+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)  save_LDFLAGS=$LDFLAGS\n-        LDFLAGS=\"$LDFLAGS -Wl,-no_fixup_chains\"\n-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-\n-int\n-main (void)\n-{\n-\n-  ;\n-  return 0;\n-}\n-_ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n-  lt_cv_support_no_fixup_chains=yes\n-else case e in #(\n-  e) lt_cv_support_no_fixup_chains=no\n-         ;;\n-esac\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n-    conftest$ac_exeext conftest.$ac_ext\n-        LDFLAGS=$save_LDFLAGS\n-\n-     ;;\n-esac\n+      fi\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains\" >&5\n-printf \"%s\\n\" \"$lt_cv_support_no_fixup_chains\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod\" >&5\n+$as_echo \"$lt_cv_apple_cc_single_mod\" >&6; }\n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag\" >&5\n-printf %s \"checking for -exported_symbols_list linker flag... \" >&6; }\n-if test ${lt_cv_ld_exported_symbols_list+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_ld_exported_symbols_list=no\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag\" >&5\n+$as_echo_n \"checking for -exported_symbols_list linker flag... \" >&6; }\n+if ${lt_cv_ld_exported_symbols_list+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_ld_exported_symbols_list=no\n       save_LDFLAGS=$LDFLAGS\n       echo \"_main\" > conftest.sym\n       LDFLAGS=\"$LDFLAGS -Wl,-exported_symbols_list,conftest.sym\"\n@@ -10696,47 +8947,43 @@ else case e in #(\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   lt_cv_ld_exported_symbols_list=yes\n-else case e in #(\n-  e) lt_cv_ld_exported_symbols_list=no ;;\n-esac\n+else\n+  lt_cv_ld_exported_symbols_list=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n \tLDFLAGS=$save_LDFLAGS\n-     ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list\" >&5\n-printf \"%s\\n\" \"$lt_cv_ld_exported_symbols_list\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list\" >&5\n+$as_echo \"$lt_cv_ld_exported_symbols_list\" >&6; }\n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag\" >&5\n-printf %s \"checking for -force_load linker flag... \" >&6; }\n-if test ${lt_cv_ld_force_load+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_ld_force_load=no\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag\" >&5\n+$as_echo_n \"checking for -force_load linker flag... \" >&6; }\n+if ${lt_cv_ld_force_load+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_ld_force_load=no\n       cat > conftest.c << _LT_EOF\n int forced_loaded() { return 2;}\n _LT_EOF\n       echo \"$LTCC $LTCFLAGS -c -o conftest.o conftest.c\" >&5\n       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5\n-      echo \"$AR $AR_FLAGS libconftest.a conftest.o\" >&5\n-      $AR $AR_FLAGS libconftest.a conftest.o 2>&5\n+      echo \"$AR cru libconftest.a conftest.o\" >&5\n+      $AR cru libconftest.a conftest.o 2>&5\n       echo \"$RANLIB libconftest.a\" >&5\n       $RANLIB libconftest.a 2>&5\n       cat > conftest.c << _LT_EOF\n-int main(void) { return 0;}\n+int main() { return 0;}\n _LT_EOF\n       echo \"$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a\" >&5\n       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err\n@@ -10750,47 +8997,32 @@ _LT_EOF\n       fi\n         rm -f conftest.err libconftest.a conftest conftest.c\n         rm -rf conftest.dSYM\n-     ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load\" >&5\n-printf \"%s\\n\" \"$lt_cv_ld_force_load\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load\" >&5\n+$as_echo \"$lt_cv_ld_force_load\" >&6; }\n     case $host_os in\n     rhapsody* | darwin1.[012])\n       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;\n     darwin1.*)\n       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;\n-    darwin*)\n-      case $MACOSX_DEPLOYMENT_TARGET,$host in\n-        10.[012],*|,*powerpc*-darwin[5-8]*)\n-          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;\n-        *)\n-          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'\n-          if test yes = \"$lt_cv_support_no_fixup_chains\"; then\n-            as_fn_append _lt_dar_allow_undefined ' $wl-no_fixup_chains'\n-          fi\n-        ;;\n+    darwin*) # darwin 5.x on\n+      # if running on 10.5 or later, the deployment target defaults\n+      # to the OS version, if on x86, and 10.4, the deployment\n+      # target defaults to 10.4. Don't you love it?\n+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in\n+\t10.0,*86*-darwin8*|10.0,*-darwin[91]*)\n+\t  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;\n+\t10.[012][,.]*)\n+\t  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;\n+\t10.*)\n+\t  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;\n       esac\n     ;;\n   esac\n     if test yes = \"$lt_cv_apple_cc_single_mod\"; then\n       _lt_dar_single_mod='$single_module'\n     fi\n-    _lt_dar_needs_single_mod=no\n-    case $host_os in\n-    rhapsody* | darwin1.*)\n-      _lt_dar_needs_single_mod=yes ;;\n-    darwin*)\n-      # When targeting Mac OS X 10.4 (darwin 8) or later,\n-      # -single_module is the default and -multi_module is unsupported.\n-      # The toolchain on macOS 10.14 (darwin 18) and later cannot\n-      # target any OS version that needs -single_module.\n-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in\n-      10.0,*-darwin[567].*|10.[0-3],*-darwin[5-9].*|10.[0-3],*-darwin1[0-7].*)\n-        _lt_dar_needs_single_mod=yes ;;\n-      esac\n-    ;;\n-    esac\n     if test yes = \"$lt_cv_ld_exported_symbols_list\"; then\n       _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'\n     else\n@@ -10839,43 +9071,149 @@ func_munge_path_list ()\n     esac\n }\n \n-ac_header= ac_cache=\n-for ac_item in $ac_header_c_list\n-do\n-  if test $ac_cache; then\n-    ac_fn_c_check_header_compile \"$LINENO\" $ac_header ac_cv_header_$ac_cache \"$ac_includes_default\"\n-    if eval test \\\"x\\$ac_cv_header_$ac_cache\\\" = xyes; then\n-      printf \"%s\\n\" \"#define $ac_item 1\" >> confdefs.h\n-    fi\n-    ac_header= ac_cache=\n-  elif test $ac_header; then\n-    ac_cache=$ac_item\n-  else\n-    ac_header=$ac_item\n-  fi\n-done\n \n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for ANSI C header files\" >&5\n+$as_echo_n \"checking for ANSI C header files... \" >&6; }\n+if ${ac_cv_header_stdc+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+/* end confdefs.h.  */\n+#include <stdlib.h>\n+#include <stdarg.h>\n+#include <string.h>\n+#include <float.h>\n+\n+int\n+main ()\n+{\n+\n+  ;\n+  return 0;\n+}\n+_ACEOF\n+if ac_fn_c_try_compile \"$LINENO\"; then :\n+  ac_cv_header_stdc=yes\n+else\n+  ac_cv_header_stdc=no\n+fi\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+\n+if test $ac_cv_header_stdc = yes; then\n+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+/* end confdefs.h.  */\n+#include <string.h>\n+\n+_ACEOF\n+if (eval \"$ac_cpp conftest.$ac_ext\") 2>&5 |\n+  $EGREP \"memchr\" >/dev/null 2>&1; then :\n+\n+else\n+  ac_cv_header_stdc=no\n+fi\n+rm -f conftest*\n+\n+fi\n+\n+if test $ac_cv_header_stdc = yes; then\n+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+/* end confdefs.h.  */\n+#include <stdlib.h>\n+\n+_ACEOF\n+if (eval \"$ac_cpp conftest.$ac_ext\") 2>&5 |\n+  $EGREP \"free\" >/dev/null 2>&1; then :\n+\n+else\n+  ac_cv_header_stdc=no\n+fi\n+rm -f conftest*\n \n+fi\n \n+if test $ac_cv_header_stdc = yes; then\n+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.\n+  if test \"$cross_compiling\" = yes; then :\n+  :\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+/* end confdefs.h.  */\n+#include <ctype.h>\n+#include <stdlib.h>\n+#if ((' ' & 0x0FF) == 0x020)\n+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')\n+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))\n+#else\n+# define ISLOWER(c) \\\n+\t\t   (('a' <= (c) && (c) <= 'i') \\\n+\t\t     || ('j' <= (c) && (c) <= 'r') \\\n+\t\t     || ('s' <= (c) && (c) <= 'z'))\n+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))\n+#endif\n \n+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))\n+int\n+main ()\n+{\n+  int i;\n+  for (i = 0; i < 256; i++)\n+    if (XOR (islower (i), ISLOWER (i))\n+\t|| toupper (i) != TOUPPER (i))\n+      return 2;\n+  return 0;\n+}\n+_ACEOF\n+if ac_fn_c_try_run \"$LINENO\"; then :\n \n+else\n+  ac_cv_header_stdc=no\n+fi\n+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \\\n+  conftest.$ac_objext conftest.beam conftest.$ac_ext\n+fi\n \n+fi\n+fi\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc\" >&5\n+$as_echo \"$ac_cv_header_stdc\" >&6; }\n+if test $ac_cv_header_stdc = yes; then\n \n+$as_echo \"#define STDC_HEADERS 1\" >>confdefs.h\n \n-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes\n-then :\n+fi\n \n-printf \"%s\\n\" \"#define STDC_HEADERS 1\" >>confdefs.h\n+# On IRIX 5.3, sys/types and inttypes.h are conflicting.\n+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \\\n+\t\t  inttypes.h stdint.h unistd.h\n+do :\n+  as_ac_Header=`$as_echo \"ac_cv_header_$ac_header\" | $as_tr_sh`\n+ac_fn_c_check_header_compile \"$LINENO\" \"$ac_header\" \"$as_ac_Header\" \"$ac_includes_default\n+\"\n+if eval test \\\"x\\$\"$as_ac_Header\"\\\" = x\"yes\"; then :\n+  cat >>confdefs.h <<_ACEOF\n+#define `$as_echo \"HAVE_$ac_header\" | $as_tr_cpp` 1\n+_ACEOF\n \n fi\n-ac_fn_c_check_header_compile \"$LINENO\" \"dlfcn.h\" \"ac_cv_header_dlfcn_h\" \"$ac_includes_default\n+\n+done\n+\n+\n+for ac_header in dlfcn.h\n+do :\n+  ac_fn_c_check_header_compile \"$LINENO\" \"dlfcn.h\" \"ac_cv_header_dlfcn_h\" \"$ac_includes_default\n \"\n-if test \"x$ac_cv_header_dlfcn_h\" = xyes\n-then :\n-  printf \"%s\\n\" \"#define HAVE_DLFCN_H 1\" >>confdefs.h\n+if test \"x$ac_cv_header_dlfcn_h\" = xyes; then :\n+  cat >>confdefs.h <<_ACEOF\n+#define HAVE_DLFCN_H 1\n+_ACEOF\n \n fi\n \n+done\n+\n \n \n func_stripname_cnf ()\n@@ -10894,48 +9232,42 @@ func_stripname_cnf ()\n enable_win32_dll=yes\n \n case $host in\n-*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)\n+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)\n   if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}as\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}as; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_AS+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$AS\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_AS+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$AS\"; then\n   ac_cv_prog_AS=\"$AS\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_AS=\"${ac_tool_prefix}as\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n AS=$ac_cv_prog_AS\n if test -n \"$AS\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $AS\" >&5\n-printf \"%s\\n\" \"$AS\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $AS\" >&5\n+$as_echo \"$AS\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -10944,44 +9276,38 @@ if test -z \"$ac_cv_prog_AS\"; then\n   ac_ct_AS=$AS\n   # Extract the first word of \"as\", so it can be a program name with args.\n set dummy as; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_AS+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_AS\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_AS+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_AS\"; then\n   ac_cv_prog_ac_ct_AS=\"$ac_ct_AS\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_AS=\"as\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_AS=$ac_cv_prog_ac_ct_AS\n if test -n \"$ac_ct_AS\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS\" >&5\n-printf \"%s\\n\" \"$ac_ct_AS\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS\" >&5\n+$as_echo \"$ac_ct_AS\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_AS\" = x; then\n@@ -10989,8 +9315,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     AS=$ac_ct_AS\n@@ -11002,44 +9328,38 @@ fi\n   if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}dlltool\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}dlltool; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_DLLTOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$DLLTOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_DLLTOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$DLLTOOL\"; then\n   ac_cv_prog_DLLTOOL=\"$DLLTOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_DLLTOOL=\"${ac_tool_prefix}dlltool\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n DLLTOOL=$ac_cv_prog_DLLTOOL\n if test -n \"$DLLTOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $DLLTOOL\" >&5\n-printf \"%s\\n\" \"$DLLTOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $DLLTOOL\" >&5\n+$as_echo \"$DLLTOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -11048,44 +9368,38 @@ if test -z \"$ac_cv_prog_DLLTOOL\"; then\n   ac_ct_DLLTOOL=$DLLTOOL\n   # Extract the first word of \"dlltool\", so it can be a program name with args.\n set dummy dlltool; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_DLLTOOL+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_DLLTOOL\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_DLLTOOL\"; then\n   ac_cv_prog_ac_ct_DLLTOOL=\"$ac_ct_DLLTOOL\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_DLLTOOL=\"dlltool\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL\n if test -n \"$ac_ct_DLLTOOL\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL\" >&5\n-printf \"%s\\n\" \"$ac_ct_DLLTOOL\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL\" >&5\n+$as_echo \"$ac_ct_DLLTOOL\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_DLLTOOL\" = x; then\n@@ -11093,8 +9407,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     DLLTOOL=$ac_ct_DLLTOOL\n@@ -11106,44 +9420,38 @@ fi\n   if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}objdump\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}objdump; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_OBJDUMP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$OBJDUMP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_OBJDUMP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$OBJDUMP\"; then\n   ac_cv_prog_OBJDUMP=\"$OBJDUMP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_OBJDUMP=\"${ac_tool_prefix}objdump\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n OBJDUMP=$ac_cv_prog_OBJDUMP\n if test -n \"$OBJDUMP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $OBJDUMP\" >&5\n-printf \"%s\\n\" \"$OBJDUMP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $OBJDUMP\" >&5\n+$as_echo \"$OBJDUMP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -11152,44 +9460,38 @@ if test -z \"$ac_cv_prog_OBJDUMP\"; then\n   ac_ct_OBJDUMP=$OBJDUMP\n   # Extract the first word of \"objdump\", so it can be a program name with args.\n set dummy objdump; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_OBJDUMP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_OBJDUMP\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_OBJDUMP\"; then\n   ac_cv_prog_ac_ct_OBJDUMP=\"$ac_ct_OBJDUMP\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_OBJDUMP=\"objdump\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP\n if test -n \"$ac_ct_OBJDUMP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP\" >&5\n-printf \"%s\\n\" \"$ac_ct_OBJDUMP\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP\" >&5\n+$as_echo \"$ac_ct_OBJDUMP\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_OBJDUMP\" = x; then\n@@ -11197,8 +9499,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     OBJDUMP=$ac_ct_OBJDUMP\n@@ -11228,8 +9530,7 @@ test -z \"$OBJDUMP\" && OBJDUMP=objdump\n \n \n # Check whether --enable-static was given.\n-if test ${enable_static+y}\n-then :\n+if test \"${enable_static+set}\" = set; then :\n   enableval=$enable_static; p=${PACKAGE-default}\n     case $enableval in\n     yes) enable_static=yes ;;\n@@ -11247,9 +9548,8 @@ then :\n       IFS=$lt_save_ifs\n       ;;\n     esac\n-else case e in #(\n-  e) enable_static=no ;;\n-esac\n+else\n+  enable_static=no\n fi\n \n \n@@ -11258,52 +9558,27 @@ fi\n \n \n \n-# Check whether --enable-pic was given.\n-if test ${enable_pic+y}\n-then :\n-  enableval=$enable_pic; lt_p=${PACKAGE-default}\n-     case $enableval in\n-     yes|no) pic_mode=$enableval ;;\n-     *)\n-       pic_mode=default\n-       # Look at the argument we got.  We use all the common list separators.\n-       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,\n-       for lt_pkg in $enableval; do\n-\t IFS=$lt_save_ifs\n-\t if test \"X$lt_pkg\" = \"X$lt_p\"; then\n-\t   pic_mode=yes\n-\t fi\n-       done\n-       IFS=$lt_save_ifs\n-       ;;\n-     esac\n-else case e in #(\n-  e)           # Check whether --with-pic was given.\n-if test ${with_pic+y}\n-then :\n-  withval=$with_pic; lt_p=${PACKAGE-default}\n-\t case $withval in\n-\t yes|no) pic_mode=$withval ;;\n-\t *)\n-\t   pic_mode=default\n-\t   # Look at the argument we got.  We use all the common list separators.\n-\t   lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,\n-\t   for lt_pkg in $withval; do\n-\t     IFS=$lt_save_ifs\n-\t     if test \"X$lt_pkg\" = \"X$lt_p\"; then\n-\t       pic_mode=yes\n-\t     fi\n-\t   done\n-\t   IFS=$lt_save_ifs\n-\t   ;;\n-\t esac\n-else case e in #(\n-  e) pic_mode=yes ;;\n-esac\n-fi\n \n-     ;;\n-esac\n+# Check whether --with-pic was given.\n+if test \"${with_pic+set}\" = set; then :\n+  withval=$with_pic; lt_p=${PACKAGE-default}\n+    case $withval in\n+    yes|no) pic_mode=$withval ;;\n+    *)\n+      pic_mode=default\n+      # Look at the argument we got.  We use all the common list separators.\n+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,\n+      for lt_pkg in $withval; do\n+\tIFS=$lt_save_ifs\n+\tif test \"X$lt_pkg\" = \"X$lt_p\"; then\n+\t  pic_mode=yes\n+\tfi\n+      done\n+      IFS=$lt_save_ifs\n+      ;;\n+    esac\n+else\n+  pic_mode=yes\n fi\n \n \n@@ -11319,8 +9594,7 @@ fi\n \n \n             # Check whether --enable-shared was given.\n-if test ${enable_shared+y}\n-then :\n+if test \"${enable_shared+set}\" = set; then :\n   enableval=$enable_shared; p=${PACKAGE-default}\n     case $enableval in\n     yes) enable_shared=yes ;;\n@@ -11338,9 +9612,8 @@ then :\n       IFS=$lt_save_ifs\n       ;;\n     esac\n-else case e in #(\n-  e) enable_shared=yes ;;\n-esac\n+else\n+  enable_shared=yes\n fi\n \n \n@@ -11354,8 +9627,7 @@ fi\n \n \n   # Check whether --enable-fast-install was given.\n-if test ${enable_fast_install+y}\n-then :\n+if test \"${enable_fast_install+set}\" = set; then :\n   enableval=$enable_fast_install; p=${PACKAGE-default}\n     case $enableval in\n     yes) enable_fast_install=yes ;;\n@@ -11373,9 +9645,8 @@ then :\n       IFS=$lt_save_ifs\n       ;;\n     esac\n-else case e in #(\n-  e) enable_fast_install=yes ;;\n-esac\n+else\n+  enable_fast_install=yes\n fi\n \n \n@@ -11388,50 +9659,31 @@ fi\n   shared_archive_member_spec=\n case $host,$enable_shared in\n power*-*-aix[5-9]*,yes)\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide\" >&5\n-printf %s \"checking which variant of shared library versioning to provide... \" >&6; }\n-  # Check whether --enable-aix-soname was given.\n-if test ${enable_aix_soname+y}\n-then :\n-  enableval=$enable_aix_soname; case $enableval in\n-     aix|svr4|both)\n-       ;;\n-     *)\n-       as_fn_error $? \"Unknown argument to --enable-aix-soname\" \"$LINENO\" 5\n-       ;;\n-     esac\n-     lt_cv_with_aix_soname=$enable_aix_soname\n-else case e in #(\n-  e) # Check whether --with-aix-soname was given.\n-if test ${with_aix_soname+y}\n-then :\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide\" >&5\n+$as_echo_n \"checking which variant of shared library versioning to provide... \" >&6; }\n+\n+# Check whether --with-aix-soname was given.\n+if test \"${with_aix_soname+set}\" = set; then :\n   withval=$with_aix_soname; case $withval in\n-         aix|svr4|both)\n-           ;;\n-         *)\n-           as_fn_error $? \"Unknown argument to --with-aix-soname\" \"$LINENO\" 5\n-           ;;\n-         esac\n-         lt_cv_with_aix_soname=$with_aix_soname\n-else case e in #(\n-  e) if test ${lt_cv_with_aix_soname+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_with_aix_soname=aix ;;\n-esac\n-fi\n- ;;\n-esac\n+    aix|svr4|both)\n+      ;;\n+    *)\n+      as_fn_error $? \"Unknown argument to --with-aix-soname\" \"$LINENO\" 5\n+      ;;\n+    esac\n+    lt_cv_with_aix_soname=$with_aix_soname\n+else\n+  if ${lt_cv_with_aix_soname+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_with_aix_soname=aix\n fi\n \n-     enable_aix_soname=$lt_cv_with_aix_soname ;;\n-esac\n+    with_aix_soname=$lt_cv_with_aix_soname\n fi\n \n-  with_aix_soname=$enable_aix_soname\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $with_aix_soname\" >&5\n-printf \"%s\\n\" \"$with_aix_soname\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $with_aix_soname\" >&5\n+$as_echo \"$with_aix_soname\" >&6; }\n   if test aix != \"$with_aix_soname\"; then\n     # For the AIX way of multilib, we name the shared archive member\n     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',\n@@ -11513,13 +9765,12 @@ if test -n \"${ZSH_VERSION+set}\"; then\n    setopt NO_GLOB_SUBST\n fi\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for objdir\" >&5\n-printf %s \"checking for objdir... \" >&6; }\n-if test ${lt_cv_objdir+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) rm -f .libs 2>/dev/null\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for objdir\" >&5\n+$as_echo_n \"checking for objdir... \" >&6; }\n+if ${lt_cv_objdir+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  rm -f .libs 2>/dev/null\n mkdir .libs 2>/dev/null\n if test -d .libs; then\n   lt_cv_objdir=.libs\n@@ -11527,18 +9778,19 @@ else\n   # MS-DOS does not allow filenames that begin with a dot.\n   lt_cv_objdir=_libs\n fi\n-rmdir .libs 2>/dev/null ;;\n-esac\n+rmdir .libs 2>/dev/null\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir\" >&5\n-printf \"%s\\n\" \"$lt_cv_objdir\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir\" >&5\n+$as_echo \"$lt_cv_objdir\" >&6; }\n objdir=$lt_cv_objdir\n \n \n \n \n \n-printf \"%s\\n\" \"#define LT_OBJDIR \\\"$lt_cv_objdir/\\\"\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define LT_OBJDIR \"$lt_cv_objdir/\"\n+_ACEOF\n \n \n \n@@ -11559,8 +9811,8 @@ esac\n ofile=libtool\n can_build_shared=yes\n \n-# All known linkers require a '.a' archive for static linking (except MSVC and\n-# ICC, which need '.lib').\n+# All known linkers require a '.a' archive for static linking (except MSVC,\n+# which needs '.lib').\n libext=a\n \n with_gnu_ld=$lt_cv_prog_gnu_ld\n@@ -11584,13 +9836,12 @@ test -z \"$MAGIC_CMD\" && MAGIC_CMD=file\n case $deplibs_check_method in\n file_magic*)\n   if test \"$file_magic_cmd\" = '$MAGIC_CMD'; then\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file\" >&5\n-printf %s \"checking for ${ac_tool_prefix}file... \" >&6; }\n-if test ${lt_cv_path_MAGIC_CMD+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $MAGIC_CMD in\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file\" >&5\n+$as_echo_n \"checking for ${ac_tool_prefix}file... \" >&6; }\n+if ${lt_cv_path_MAGIC_CMD+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $MAGIC_CMD in\n [\\\\/*] |  ?:[\\\\/]*)\n   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.\n   ;;\n@@ -11633,17 +9884,16 @@ _LT_EOF\n   IFS=$lt_save_ifs\n   MAGIC_CMD=$lt_save_MAGIC_CMD\n   ;;\n-esac ;;\n esac\n fi\n \n MAGIC_CMD=$lt_cv_path_MAGIC_CMD\n if test -n \"$MAGIC_CMD\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD\" >&5\n-printf \"%s\\n\" \"$MAGIC_CMD\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD\" >&5\n+$as_echo \"$MAGIC_CMD\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -11652,13 +9902,12 @@ fi\n \n if test -z \"$lt_cv_path_MAGIC_CMD\"; then\n   if test -n \"$ac_tool_prefix\"; then\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for file\" >&5\n-printf %s \"checking for file... \" >&6; }\n-if test ${lt_cv_path_MAGIC_CMD+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $MAGIC_CMD in\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for file\" >&5\n+$as_echo_n \"checking for file... \" >&6; }\n+if ${lt_cv_path_MAGIC_CMD+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $MAGIC_CMD in\n [\\\\/*] |  ?:[\\\\/]*)\n   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.\n   ;;\n@@ -11701,17 +9950,16 @@ _LT_EOF\n   IFS=$lt_save_ifs\n   MAGIC_CMD=$lt_save_MAGIC_CMD\n   ;;\n-esac ;;\n esac\n fi\n \n MAGIC_CMD=$lt_cv_path_MAGIC_CMD\n if test -n \"$MAGIC_CMD\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD\" >&5\n-printf \"%s\\n\" \"$MAGIC_CMD\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD\" >&5\n+$as_echo \"$MAGIC_CMD\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -11745,7 +9993,7 @@ objext=$objext\n lt_simple_compile_test_code=\"int some_variable = 0;\"\n \n # Code to be used in simple link tests\n-lt_simple_link_test_code='int main(void){return(0);}'\n+lt_simple_link_test_code='int main(){return(0);}'\n \n \n \n@@ -11796,13 +10044,12 @@ if test yes = \"$GCC\"; then\n     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;\n   esac\n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions\" >&5\n-printf %s \"checking if $compiler supports -fno-rtti -fno-exceptions... \" >&6; }\n-if test ${lt_cv_prog_compiler_rtti_exceptions+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_rtti_exceptions=no\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions\" >&5\n+$as_echo_n \"checking if $compiler supports -fno-rtti -fno-exceptions... \" >&6; }\n+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_rtti_exceptions=no\n    ac_outfile=conftest.$ac_objext\n    echo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n    lt_compiler_flag=\"-fno-rtti -fno-exceptions\"  ## exclude from sc_useless_quotes_in_assignment\n@@ -11830,11 +10077,10 @@ else case e in #(\n      fi\n    fi\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_rtti_exceptions\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions\" >&5\n+$as_echo \"$lt_cv_prog_compiler_rtti_exceptions\" >&6; }\n \n if test yes = \"$lt_cv_prog_compiler_rtti_exceptions\"; then\n     lt_prog_compiler_no_builtin_flag=\"$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions\"\n@@ -11887,7 +10133,7 @@ lt_prog_compiler_static=\n       # PIC is the default for these OSes.\n       ;;\n \n-    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)\n+    mingw* | cygwin* | pw32* | os2* | cegcc*)\n       # This hack is so that the source file can tell whether it is being\n       # built for inclusion in a dll (and should export symbols for example).\n       # Although the cygwin gcc ignores -fPIC, still need this for old-style\n@@ -11990,7 +10236,7 @@ lt_prog_compiler_static=\n       esac\n       ;;\n \n-    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)\n+    mingw* | cygwin* | pw32* | os2* | cegcc*)\n       # This hack is so that the source file can tell whether it is being\n       # built for inclusion in a dll (and should export symbols for example).\n       lt_prog_compiler_pic='-DDLL_EXPORT'\n@@ -12031,12 +10277,6 @@ lt_prog_compiler_static=\n \tlt_prog_compiler_pic='-KPIC'\n \tlt_prog_compiler_static='-static'\n         ;;\n-      *flang* | ftn | f18* | f95*)\n-        # Flang compiler.\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-fPIC'\n-\tlt_prog_compiler_static='-static'\n-        ;;\n       # icc used to be incompatible with GCC.\n       # ICC 10 doesn't accept -KPIC any more.\n       icc* | ifort*)\n@@ -12081,7 +10321,7 @@ lt_prog_compiler_static=\n \tlt_prog_compiler_static='-qstaticlink'\n \t;;\n       *)\n-\tcase `$CC -V 2>&1 | $SED 5q` in\n+\tcase `$CC -V 2>&1 | sed 5q` in\n \t*Sun\\ Ceres\\ Fortran* | *Sun*Fortran*\\ [1-7].* | *Sun*Fortran*\\ 8.[0-3]*)\n \t  # Sun Fortran 8.3 passes all unrecognized flags to the linker\n \t  lt_prog_compiler_pic='-KPIC'\n@@ -12119,12 +10359,6 @@ lt_prog_compiler_static=\n       lt_prog_compiler_static='-Bstatic'\n       ;;\n \n-    *-mlibc)\n-      lt_prog_compiler_wl='-Wl,'\n-      lt_prog_compiler_pic='-fPIC'\n-      lt_prog_compiler_static='-static'\n-      ;;\n-\n     *nto* | *qnx*)\n       # QNX uses GNU C++, but need to define -shared option too, otherwise\n       # it will coredump.\n@@ -12141,9 +10375,6 @@ lt_prog_compiler_static=\n       lt_prog_compiler_static='-non_shared'\n       ;;\n \n-    serenity*)\n-      ;;\n-\n     solaris*)\n       lt_prog_compiler_pic='-KPIC'\n       lt_prog_compiler_static='-Bstatic'\n@@ -12206,30 +10437,27 @@ case $host_os in\n     ;;\n esac\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC\" >&5\n-printf %s \"checking for $compiler option to produce PIC... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;\n-esac\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC\" >&5\n+$as_echo_n \"checking for $compiler option to produce PIC... \" >&6; }\n+if ${lt_cv_prog_compiler_pic+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic\" >&5\n+$as_echo \"$lt_cv_prog_compiler_pic\" >&6; }\n lt_prog_compiler_pic=$lt_cv_prog_compiler_pic\n \n #\n # Check to make sure the PIC flag actually works.\n #\n if test -n \"$lt_prog_compiler_pic\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works\" >&5\n-printf %s \"checking if $compiler PIC flag $lt_prog_compiler_pic works... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic_works+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic_works=no\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works\" >&5\n+$as_echo_n \"checking if $compiler PIC flag $lt_prog_compiler_pic works... \" >&6; }\n+if ${lt_cv_prog_compiler_pic_works+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_pic_works=no\n    ac_outfile=conftest.$ac_objext\n    echo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n    lt_compiler_flag=\"$lt_prog_compiler_pic -DPIC\"  ## exclude from sc_useless_quotes_in_assignment\n@@ -12257,11 +10485,10 @@ else case e in #(\n      fi\n    fi\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic_works\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works\" >&5\n+$as_echo \"$lt_cv_prog_compiler_pic_works\" >&6; }\n \n if test yes = \"$lt_cv_prog_compiler_pic_works\"; then\n     case $lt_prog_compiler_pic in\n@@ -12289,13 +10516,12 @@ fi\n # Check to make sure the static flag actually works.\n #\n wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\\\"$lt_prog_compiler_static\\\"\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works\" >&5\n-printf %s \"checking if $compiler static flag $lt_tmp_static_flag works... \" >&6; }\n-if test ${lt_cv_prog_compiler_static_works+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_static_works=no\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works\" >&5\n+$as_echo_n \"checking if $compiler static flag $lt_tmp_static_flag works... \" >&6; }\n+if ${lt_cv_prog_compiler_static_works+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_static_works=no\n    save_LDFLAGS=$LDFLAGS\n    LDFLAGS=\"$LDFLAGS $lt_tmp_static_flag\"\n    echo \"$lt_simple_link_test_code\" > conftest.$ac_ext\n@@ -12316,11 +10542,10 @@ else case e in #(\n    fi\n    $RM -r conftest*\n    LDFLAGS=$save_LDFLAGS\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_static_works\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works\" >&5\n+$as_echo \"$lt_cv_prog_compiler_static_works\" >&6; }\n \n if test yes = \"$lt_cv_prog_compiler_static_works\"; then\n     :\n@@ -12334,13 +10559,12 @@ fi\n \n \n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n-printf %s \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n-if test ${lt_cv_prog_compiler_c_o+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_c_o=no\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n+$as_echo_n \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n+if ${lt_cv_prog_compiler_c_o+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_c_o=no\n    $RM -r conftest 2>/dev/null\n    mkdir conftest\n    cd conftest\n@@ -12380,24 +10604,22 @@ else case e in #(\n    cd ..\n    $RM -r conftest\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_c_o\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o\" >&5\n+$as_echo \"$lt_cv_prog_compiler_c_o\" >&6; }\n \n \n \n \n \n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n-printf %s \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n-if test ${lt_cv_prog_compiler_c_o+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_c_o=no\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n+$as_echo_n \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n+if ${lt_cv_prog_compiler_c_o+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_c_o=no\n    $RM -r conftest 2>/dev/null\n    mkdir conftest\n    cd conftest\n@@ -12437,11 +10659,10 @@ else case e in #(\n    cd ..\n    $RM -r conftest\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_c_o\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o\" >&5\n+$as_echo \"$lt_cv_prog_compiler_c_o\" >&6; }\n \n \n \n@@ -12449,19 +10670,19 @@ printf \"%s\\n\" \"$lt_cv_prog_compiler_c_o\" >&6; }\n hard_links=nottested\n if test no = \"$lt_cv_prog_compiler_c_o\" && test no != \"$need_locks\"; then\n   # do not overwrite the value of need_locks provided by the user\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links\" >&5\n-printf %s \"checking if we can lock with hard links... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links\" >&5\n+$as_echo_n \"checking if we can lock with hard links... \" >&6; }\n   hard_links=yes\n   $RM conftest*\n   ln conftest.a conftest.b 2>/dev/null && hard_links=no\n   touch conftest.a\n   ln conftest.a conftest.b 2>&5 || hard_links=no\n   ln conftest.a conftest.b 2>/dev/null && hard_links=no\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $hard_links\" >&5\n-printf \"%s\\n\" \"$hard_links\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $hard_links\" >&5\n+$as_echo \"$hard_links\" >&6; }\n   if test no = \"$hard_links\"; then\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&2;}\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&5\n+$as_echo \"$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&2;}\n     need_locks=warn\n   fi\n else\n@@ -12473,8 +10694,8 @@ fi\n \n \n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries\" >&5\n-printf %s \"checking whether the $compiler linker ($LD) supports shared libraries... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries\" >&5\n+$as_echo_n \"checking whether the $compiler linker ($LD) supports shared libraries... \" >&6; }\n \n   runpath_var=\n   allow_undefined_flag=\n@@ -12517,18 +10738,21 @@ printf %s \"checking whether the $compiler linker ($LD) supports shared libraries\n   extract_expsyms_cmds=\n \n   case $host_os in\n-  cygwin* | mingw* | windows* | pw32* | cegcc*)\n-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time\n+  cygwin* | mingw* | pw32* | cegcc*)\n+    # FIXME: the MSVC++ port hasn't been tested in a loooong time\n     # When not using gcc, we currently assume that we are using\n-    # Microsoft Visual C++ or Intel C++ Compiler.\n+    # Microsoft Visual C++.\n     if test yes != \"$GCC\"; then\n       with_gnu_ld=no\n     fi\n     ;;\n   interix*)\n-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)\n+    # we just hope/assume this is gcc and not c89 (= MSVC++)\n     with_gnu_ld=yes\n     ;;\n+  openbsd* | bitrig*)\n+    with_gnu_ld=no\n+    ;;\n   esac\n \n   ld_shlibs=yes\n@@ -12575,7 +10799,7 @@ printf %s \"checking whether the $compiler linker ($LD) supports shared libraries\n       whole_archive_flag_spec=\n     fi\n     supports_anon_versioning=no\n-    case `$LD -v | $SED -e 's/([^)]\\+)\\s\\+//' 2>&1` in\n+    case `$LD -v | $SED -e 's/(^)\\+)\\s\\+//' 2>&1` in\n       *GNU\\ gold*) supports_anon_versioning=yes ;;\n       *\\ [01].* | *\\ 2.[0-9].* | *\\ 2.10.*) ;; # catch versions < 2.11\n       *\\ 2.11.93.0.2\\ *) supports_anon_versioning=yes ;; # RH7.3 ...\n@@ -12629,7 +10853,7 @@ _LT_EOF\n       fi\n       ;;\n \n-    cygwin* | mingw* | windows* | pw32* | cegcc*)\n+    cygwin* | mingw* | pw32* | cegcc*)\n       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,\n       # as there is no search path for DLLs.\n       hardcode_libdir_flag_spec='-L$libdir'\n@@ -12639,7 +10863,6 @@ _LT_EOF\n       enable_shared_with_static_runtimes=yes\n       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\\''/^[BCDGRS][ ]/s/.*[ ]\\([^ ]*\\)/\\1 DATA/;s/^.*[ ]__nm__\\([^ ]*\\)[ ][^ ]*/\\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\\'' | sort | uniq > $export_symbols'\n       exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'\n-      file_list_spec='@'\n \n       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then\n         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'\n@@ -12659,7 +10882,7 @@ _LT_EOF\n \n     haiku*)\n       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n-      link_all_deplibs=no\n+      link_all_deplibs=yes\n       ;;\n \n     os2*)\n@@ -12686,9 +10909,8 @@ _LT_EOF\n \tcat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~\n \t$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~\n \temximp -o $lib $output_objdir/$libname.def'\n-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n       enable_shared_with_static_runtimes=yes\n-      file_list_spec='@'\n       ;;\n \n     interix[3-9]*)\n@@ -12703,7 +10925,7 @@ _LT_EOF\n       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link\n       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.\n       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \\* 262144 + 1342177280` -o $lib'\n-      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'\n+      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'\n       ;;\n \n     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)\n@@ -12746,7 +10968,7 @@ _LT_EOF\n \t  compiler_needs_object=yes\n \t  ;;\n \tesac\n-\tcase `$CC -V 2>&1 | $SED 5q` in\n+\tcase `$CC -V 2>&1 | sed 5q` in\n \t*Sun\\ C*)\t\t\t# Sun C 5.9\n \t  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'\n \t  compiler_needs_object=yes\n@@ -12758,14 +10980,13 @@ _LT_EOF\n \n         if test yes = \"$supports_anon_versioning\"; then\n           archive_expsym_cmds='echo \"{ global:\" > $output_objdir/$libname.ver~\n-            cat $export_symbols | $SED -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n+            cat $export_symbols | sed -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n             echo \"local: *; };\" >> $output_objdir/$libname.ver~\n             $CC '\"$tmp_sharedflag\"\"$tmp_addflag\"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'\n         fi\n \n \tcase $cc_basename in\n \ttcc*)\n-\t  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'\n \t  export_dynamic_flag_spec='-rdynamic'\n \t  ;;\n \txlf* | bgf* | bgxlf* | mpixlf*)\n@@ -12775,7 +10996,7 @@ _LT_EOF\n \t  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'\n \t  if test yes = \"$supports_anon_versioning\"; then\n \t    archive_expsym_cmds='echo \"{ global:\" > $output_objdir/$libname.ver~\n-              cat $export_symbols | $SED -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n+              cat $export_symbols | sed -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n               echo \"local: *; };\" >> $output_objdir/$libname.ver~\n               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'\n \t  fi\n@@ -12786,12 +11007,7 @@ _LT_EOF\n       fi\n       ;;\n \n-    *-mlibc)\n-\tarchive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n-\tarchive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'\n-      ;;\n-\n-    netbsd* | netbsdelf*-gnu)\n+    netbsd*)\n       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then\n \tarchive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'\n \twlarc=\n@@ -12912,7 +11128,7 @@ _LT_EOF\n \tif $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then\n \t  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'\n \telse\n-\t  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 == \"L\") || (\\$ 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'\n+\t  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'\n \tfi\n \taix_use_runtimelinking=no\n \n@@ -13034,23 +11250,21 @@ _LT_EOF\n         if test set = \"${lt_cv_aix_libpath+set}\"; then\n   aix_libpath=$lt_cv_aix_libpath\n else\n-  if test ${lt_cv_aix_libpath_+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  if ${lt_cv_aix_libpath_+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n \n   lt_aix_libpath_sed='\n       /Import File Strings/,/^$/ {\n@@ -13065,13 +11279,12 @@ then :\n     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e \"$lt_aix_libpath_sed\"`\n   fi\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n   if test -z \"$lt_cv_aix_libpath_\"; then\n     lt_cv_aix_libpath_=/usr/lib:/lib\n   fi\n-   ;;\n-esac\n+\n fi\n \n   aix_libpath=$lt_cv_aix_libpath_\n@@ -13090,23 +11303,21 @@ fi\n \t if test set = \"${lt_cv_aix_libpath+set}\"; then\n   aix_libpath=$lt_cv_aix_libpath\n else\n-  if test ${lt_cv_aix_libpath_+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  if ${lt_cv_aix_libpath_+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n \n   lt_aix_libpath_sed='\n       /Import File Strings/,/^$/ {\n@@ -13121,13 +11332,12 @@ then :\n     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e \"$lt_aix_libpath_sed\"`\n   fi\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n   if test -z \"$lt_cv_aix_libpath_\"; then\n     lt_cv_aix_libpath_=/usr/lib:/lib\n   fi\n-   ;;\n-esac\n+\n fi\n \n   aix_libpath=$lt_cv_aix_libpath_\n@@ -13183,14 +11393,14 @@ fi\n       export_dynamic_flag_spec=-rdynamic\n       ;;\n \n-    cygwin* | mingw* | windows* | pw32* | cegcc*)\n+    cygwin* | mingw* | pw32* | cegcc*)\n       # When not using gcc, we currently assume that we are using\n-      # Microsoft Visual C++ or Intel C++ Compiler.\n+      # Microsoft Visual C++.\n       # hardcode_libdir_flag_spec is actually meaningless, as there is\n       # no search path for DLLs.\n       case $cc_basename in\n-      cl* | icl*)\n-\t# Native MSVC or ICC\n+      cl*)\n+\t# Native MSVC\n \thardcode_libdir_flag_spec=' '\n \tallow_undefined_flag=unsupported\n \talways_export_symbols=yes\n@@ -13200,14 +11410,14 @@ fi\n \t# Tell ltmain to make .dll files, not .so files.\n \tshrext_cmds=.dll\n \t# FIXME: Setting linknames here is a bad hack.\n-\tarchive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~linknames='\n+\tarchive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~linknames='\n \tarchive_expsym_cmds='if   test DEF = \"`$SED -n     -e '\\''s/^[\t ]*//'\\''     -e '\\''/^\\(;.*\\)*$/d'\\''     -e '\\''s/^\\(EXPORTS\\|LIBRARY\\)\\([\t ].*\\)*$/DEF/p'\\''     -e q     $export_symbols`\" ; then\n             cp \"$export_symbols\" \"$output_objdir/$soname.def\";\n             echo \"$tool_output_objdir$soname.def\" > \"$output_objdir/$soname.exp\";\n           else\n             $SED -e '\\''s/^/-link -EXPORT:/'\\'' < $export_symbols > $output_objdir/$soname.exp;\n           fi~\n-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs \"@$tool_output_objdir$soname.exp\" -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~\n+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs \"@$tool_output_objdir$soname.exp\" -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~\n           linknames='\n \t# The linker will not automatically build a static lib if we build a DLL.\n \t# _LT_TAGVAR(old_archive_from_new_cmds, )='true'\n@@ -13231,7 +11441,7 @@ fi\n           fi'\n \t;;\n       *)\n-\t# Assume MSVC and ICC wrapper\n+\t# Assume MSVC wrapper\n \thardcode_libdir_flag_spec=' '\n \tallow_undefined_flag=unsupported\n \t# Tell ltmain to make .lib files, not .a files.\n@@ -13272,8 +11482,8 @@ fi\n     output_verbose_link_cmd=func_echo_all\n     archive_cmds=\"\\$CC -dynamiclib \\$allow_undefined_flag -o \\$lib \\$libobjs \\$deplibs \\$compiler_flags -install_name \\$rpath/\\$soname \\$verstring $_lt_dar_single_mod$_lt_dsymutil\"\n     module_cmds=\"\\$CC \\$allow_undefined_flag -o \\$lib -bundle \\$libobjs \\$deplibs \\$compiler_flags$_lt_dsymutil\"\n-    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\"\n-    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\"\n+    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\"\n+    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\"\n \n   else\n   ld_shlibs=no\n@@ -13307,7 +11517,7 @@ fi\n       ;;\n \n     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.\n-    freebsd* | dragonfly* | midnightbsd*)\n+    freebsd* | dragonfly*)\n       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'\n       hardcode_libdir_flag_spec='-R$libdir'\n       hardcode_direct=yes\n@@ -13373,13 +11583,12 @@ fi\n \n \t  # Older versions of the 11.00 compiler do not understand -b yet\n \t  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)\n-\t  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $CC understands -b\" >&5\n-printf %s \"checking if $CC understands -b... \" >&6; }\n-if test ${lt_cv_prog_compiler__b+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler__b=no\n+\t  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $CC understands -b\" >&5\n+$as_echo_n \"checking if $CC understands -b... \" >&6; }\n+if ${lt_cv_prog_compiler__b+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler__b=no\n    save_LDFLAGS=$LDFLAGS\n    LDFLAGS=\"$LDFLAGS -b\"\n    echo \"$lt_simple_link_test_code\" > conftest.$ac_ext\n@@ -13400,11 +11609,10 @@ else case e in #(\n    fi\n    $RM -r conftest*\n    LDFLAGS=$save_LDFLAGS\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler__b\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b\" >&5\n+$as_echo \"$lt_cv_prog_compiler__b\" >&6; }\n \n if test yes = \"$lt_cv_prog_compiler__b\"; then\n     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'\n@@ -13444,32 +11652,28 @@ fi\n \t# work, assume that -exports_file does not work either and\n \t# implicitly export all symbols.\n \t# This should be the same for all languages, so no per-tag cache variable.\n-\t{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol\" >&5\n-printf %s \"checking whether the $host_os linker accepts -exported_symbol... \" >&6; }\n-if test ${lt_cv_irix_exported_symbol+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) save_LDFLAGS=$LDFLAGS\n+\t{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol\" >&5\n+$as_echo_n \"checking whether the $host_os linker accepts -exported_symbol... \" >&6; }\n+if ${lt_cv_irix_exported_symbol+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  save_LDFLAGS=$LDFLAGS\n \t   LDFLAGS=\"$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null\"\n \t   cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n int foo (void) { return 0; }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   lt_cv_irix_exported_symbol=yes\n-else case e in #(\n-  e) lt_cv_irix_exported_symbol=no ;;\n-esac\n+else\n+  lt_cv_irix_exported_symbol=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-           LDFLAGS=$save_LDFLAGS ;;\n-esac\n+           LDFLAGS=$save_LDFLAGS\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol\" >&5\n-printf \"%s\\n\" \"$lt_cv_irix_exported_symbol\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol\" >&5\n+$as_echo \"$lt_cv_irix_exported_symbol\" >&6; }\n \tif test yes = \"$lt_cv_irix_exported_symbol\"; then\n           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'\n \tfi\n@@ -13490,15 +11694,11 @@ printf \"%s\\n\" \"$lt_cv_irix_exported_symbol\" >&6; }\n \t# Fabrice Bellard et al's Tiny C Compiler\n \tld_shlibs=yes\n \tarchive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'\n-\thardcode_libdir_flag_spec='$wl-rpath $wl$libdir'\n \t;;\n       esac\n       ;;\n \n-    *-mlibc)\n-      ;;\n-\n-    netbsd* | netbsdelf*-gnu)\n+    netbsd*)\n       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then\n \tarchive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out\n       else\n@@ -13520,7 +11720,7 @@ printf \"%s\\n\" \"$lt_cv_irix_exported_symbol\" >&6; }\n     *nto* | *qnx*)\n       ;;\n \n-    openbsd*)\n+    openbsd* | bitrig*)\n       if test -f /usr/libexec/ld.so; then\n \thardcode_direct=yes\n \thardcode_shlibpath_var=no\n@@ -13563,9 +11763,8 @@ printf \"%s\\n\" \"$lt_cv_irix_exported_symbol\" >&6; }\n \tcat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~\n \t$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~\n \temximp -o $lib $output_objdir/$libname.def'\n-      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n       enable_shared_with_static_runtimes=yes\n-      file_list_spec='@'\n       ;;\n \n     osf3*)\n@@ -13599,9 +11798,6 @@ printf \"%s\\n\" \"$lt_cv_irix_exported_symbol\" >&6; }\n       hardcode_libdir_separator=:\n       ;;\n \n-    serenity*)\n-      ;;\n-\n     solaris*)\n       no_undefined_flag=' -z defs'\n       if test yes = \"$GCC\"; then\n@@ -13757,8 +11953,8 @@ printf \"%s\\n\" \"$lt_cv_irix_exported_symbol\" >&6; }\n     fi\n   fi\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ld_shlibs\" >&5\n-printf \"%s\\n\" \"$ld_shlibs\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ld_shlibs\" >&5\n+$as_echo \"$ld_shlibs\" >&6; }\n test no = \"$ld_shlibs\" && can_build_shared=no\n \n with_gnu_ld=$with_gnu_ld\n@@ -13794,19 +11990,18 @@ x|xyes)\n       # Test whether the compiler implicitly links with -lc since on some\n       # systems, -lgcc has to come before -lc. If gcc already passes -lc\n       # to ld, don't add -lc before -lgcc.\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in\" >&5\n-printf %s \"checking whether -lc should be explicitly linked in... \" >&6; }\n-if test ${lt_cv_archive_cmds_need_lc+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) $RM conftest*\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in\" >&5\n+$as_echo_n \"checking whether -lc should be explicitly linked in... \" >&6; }\n+if ${lt_cv_archive_cmds_need_lc+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  $RM conftest*\n \techo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n \n \tif { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } 2>conftest.err; then\n \t  soname=conftest\n \t  lib=conftest\n@@ -13824,7 +12019,7 @@ else case e in #(\n \t  if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$archive_cmds 2\\>\\&1 \\| $GREP \\\" -lc \\\" \\>/dev/null 2\\>\\&1\\\"\"; } >&5\n   (eval $archive_cmds 2\\>\\&1 \\| $GREP \\\" -lc \\\" \\>/dev/null 2\\>\\&1) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n \t  then\n \t    lt_cv_archive_cmds_need_lc=no\n@@ -13836,11 +12031,10 @@ else case e in #(\n \t  cat conftest.err 1>&5\n \tfi\n \t$RM conftest*\n-\t ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc\" >&5\n-printf \"%s\\n\" \"$lt_cv_archive_cmds_need_lc\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc\" >&5\n+$as_echo \"$lt_cv_archive_cmds_need_lc\" >&6; }\n       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc\n       ;;\n     esac\n@@ -13999,8 +12193,8 @@ esac\n \n \n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics\" >&5\n-printf %s \"checking dynamic linker characteristics... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics\" >&5\n+$as_echo_n \"checking dynamic linker characteristics... \" >&6; }\n \n if test yes = \"$GCC\"; then\n   case $host_os in\n@@ -14008,7 +12202,7 @@ if test yes = \"$GCC\"; then\n     *) lt_awk_arg='/^libraries:/' ;;\n   esac\n   case $host_os in\n-    mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\\([A-Za-z]:\\)|\\1|g' ;;\n+    mingw* | cegcc*) lt_sed_strip_eq='s|=\\([A-Za-z]:\\)|\\1|g' ;;\n     *) lt_sed_strip_eq='s|=/|/|g' ;;\n   esac\n   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e \"s/^libraries://\" -e $lt_sed_strip_eq`\n@@ -14066,7 +12260,7 @@ BEGIN {RS = \" \"; FS = \"/|\\n\";} {\n   # AWK program above erroneously prepends '/' to C:/dos/paths\n   # for these hosts.\n   case $host_os in\n-    mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO \"$lt_search_path_spec\" |\\\n+    mingw* | cegcc*) lt_search_path_spec=`$ECHO \"$lt_search_path_spec\" |\\\n       $SED 's|/\\([A-Za-z]:\\)|\\1|g'` ;;\n   esac\n   sys_lib_search_path_spec=`$ECHO \"$lt_search_path_spec\" | $lt_NL2SP`\n@@ -14140,7 +12334,7 @@ aix[4-9]*)\n     # Unfortunately, runtime linking may impact performance, so we do\n     # not want this to be the default eventually. Also, we use the\n     # versioned .so libs for executables only if there is the -brtl\n-    # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.\n+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.\n     # To allow for filename-based versioning support, we need to create\n     # libNAME.so.V as an archive file, containing:\n     # *) an Import File, referring to the versioned filename of the\n@@ -14234,7 +12428,7 @@ bsdi[45]*)\n   # libtool to hard-code these into programs\n   ;;\n \n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   version_type=windows\n   shrext_cmds=.dll\n   need_version=no\n@@ -14245,29 +12439,15 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     # gcc\n     library_names_spec='$libname.dll.a'\n     # DLL is installed to $(libdir)/../bin by postinstall_cmds\n-    # If user builds GCC with multilib enabled,\n-    # it should just install on $(libdir)\n-    # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.\n-    if test xyes = x\"$multilib\"; then\n-      postinstall_cmds='base_file=`basename \\$file`~\n-        dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n-        dldir=$destdir/`dirname \\$dlpath`~\n-        $install_prog $dir/$dlname $destdir/$dlname~\n-        chmod a+x $destdir/$dlname~\n-        if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n-          eval '\\''$striplib $destdir/$dlname'\\'' || exit \\$?;\n-        fi'\n-    else\n-      postinstall_cmds='base_file=`basename \\$file`~\n-        dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n-        dldir=$destdir/`dirname \\$dlpath`~\n-        test -d \\$dldir || mkdir -p \\$dldir~\n-        $install_prog $dir/$dlname \\$dldir/$dlname~\n-        chmod a+x \\$dldir/$dlname~\n-        if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n-          eval '\\''$striplib \\$dldir/$dlname'\\'' || exit \\$?;\n-        fi'\n-    fi\n+    postinstall_cmds='base_file=`basename \\$file`~\n+      dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n+      dldir=$destdir/`dirname \\$dlpath`~\n+      test -d \\$dldir || mkdir -p \\$dldir~\n+      $install_prog $dir/$dlname \\$dldir/$dlname~\n+      chmod a+x \\$dldir/$dlname~\n+      if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n+        eval '\\''$striplib \\$dldir/$dlname'\\'' || exit \\$?;\n+      fi'\n     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\\''. $file; echo \\$dlname'\\''`~\n       dlpath=$dir/\\$dldll~\n        $RM \\$dlpath'\n@@ -14276,30 +12456,30 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     case $host_os in\n     cygwin*)\n       # Cygwin DLLs use 'cyg' prefix rather than 'lib'\n-      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n \n       sys_lib_search_path_spec=\"$sys_lib_search_path_spec /usr/lib/w32api\"\n       ;;\n-    mingw* | windows* | cegcc*)\n+    mingw* | cegcc*)\n       # MinGW DLLs use traditional 'lib' prefix\n       soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n       ;;\n     pw32*)\n       # pw32 DLLs use 'pw' prefix rather than 'lib'\n-      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n       ;;\n     esac\n     dynamic_linker='Win32 ld.exe'\n     ;;\n \n-  *,cl* | *,icl*)\n-    # Native MSVC or ICC\n+  *,cl*)\n+    # Native MSVC\n     libname_spec='$name'\n     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n     library_names_spec='$libname.dll.lib'\n \n     case $build_os in\n-    mingw* | windows*)\n+    mingw*)\n       sys_lib_search_path_spec=\n       lt_save_ifs=$IFS\n       IFS=';'\n@@ -14312,7 +12492,7 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n       done\n       IFS=$lt_save_ifs\n       # Convert to MSYS style.\n-      sys_lib_search_path_spec=`$ECHO \"$sys_lib_search_path_spec\" | $SED -e 's|\\\\\\\\|/|g' -e 's| \\\\([a-zA-Z]\\\\):| /\\\\1|g' -e 's|^ ||'`\n+      sys_lib_search_path_spec=`$ECHO \"$sys_lib_search_path_spec\" | sed -e 's|\\\\\\\\|/|g' -e 's| \\\\([a-zA-Z]\\\\):| /\\\\1|g' -e 's|^ ||'`\n       ;;\n     cygwin*)\n       # Convert to unix form, then to dos form, then back to unix form\n@@ -14349,7 +12529,7 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     ;;\n \n   *)\n-    # Assume MSVC and ICC wrapper\n+    # Assume MSVC wrapper\n     library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'\n     dynamic_linker='Win32 ld.exe'\n     ;;\n@@ -14382,7 +12562,7 @@ dgux*)\n   shlibpath_var=LD_LIBRARY_PATH\n   ;;\n \n-freebsd* | dragonfly* | midnightbsd*)\n+freebsd* | dragonfly*)\n   # DragonFly does not have aout.  When/if they implement a new\n   # versioning mechanism, adjust this.\n   if test -x /usr/bin/objformat; then\n@@ -14406,28 +12586,7 @@ freebsd* | dragonfly* | midnightbsd*)\n       need_version=yes\n       ;;\n   esac\n-  case $host_cpu in\n-    powerpc64)\n-      # On FreeBSD bi-arch platforms, a different variable is used for 32-bit\n-      # binaries.  See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.\n-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-int test_pointer_size[sizeof (void *) - 5];\n-\n-_ACEOF\n-if ac_fn_c_try_compile \"$LINENO\"\n-then :\n   shlibpath_var=LD_LIBRARY_PATH\n-else case e in #(\n-  e) shlibpath_var=LD_32_LIBRARY_PATH ;;\n-esac\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-      ;;\n-    *)\n-      shlibpath_var=LD_LIBRARY_PATH\n-      ;;\n-  esac\n   case $host_os in\n   freebsd2.*)\n     shlibpath_overrides_runpath=yes\n@@ -14457,9 +12616,8 @@ haiku*)\n   soname_spec='$libname$release$shared_ext$major'\n   shlibpath_var=LIBRARY_PATH\n   shlibpath_overrides_runpath=no\n-  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'\n-  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'\n-  hardcode_into_libs=no\n+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'\n+  hardcode_into_libs=yes\n   ;;\n \n hpux9* | hpux10* | hpux11*)\n@@ -14569,7 +12727,7 @@ linux*android*)\n   version_type=none # Android doesn't support versioned libraries.\n   need_lib_prefix=no\n   need_version=no\n-  library_names_spec='$libname$release$shared_ext $libname$shared_ext'\n+  library_names_spec='$libname$release$shared_ext'\n   soname_spec='$libname$release$shared_ext'\n   finish_cmds=\n   shlibpath_var=LD_LIBRARY_PATH\n@@ -14581,9 +12739,8 @@ linux*android*)\n   hardcode_into_libs=yes\n \n   dynamic_linker='Android linker'\n-  # -rpath works at least for libraries that are not overridden by\n-  # libraries installed in system locations.\n-  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'\n+  # Don't embed -rpath directories since the linker doesn't support them.\n+  hardcode_libdir_flag_spec='-L$libdir'\n   ;;\n \n # This must be glibc/ELF.\n@@ -14598,11 +12755,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n   shlibpath_overrides_runpath=no\n \n   # Some binutils ld are patched to set DT_RUNPATH\n-  if test ${lt_cv_shlibpath_overrides_runpath+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_shlibpath_overrides_runpath=no\n+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_shlibpath_overrides_runpath=no\n     save_LDFLAGS=$LDFLAGS\n     save_libdir=$libdir\n     eval \"libdir=/foo; wl=\\\"$lt_prog_compiler_wl\\\"; \\\n@@ -14611,26 +12767,23 @@ else case e in #(\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep \"RUNPATH.*$libdir\" >/dev/null\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep \"RUNPATH.*$libdir\" >/dev/null; then :\n   lt_cv_shlibpath_overrides_runpath=yes\n fi\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n     LDFLAGS=$save_LDFLAGS\n     libdir=$save_libdir\n-     ;;\n-esac\n+\n fi\n \n   shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath\n@@ -14643,7 +12796,7 @@ fi\n   # Add ABI-specific directories to the system library path.\n   sys_lib_dlsearch_path_spec=\"/lib64 /usr/lib64 /lib /usr/lib\"\n \n-  # Ideally, we could use ldconfig to report *all* directories which are\n+  # Ideally, we could use ldconfig to report *all* directores which are\n   # searched for libraries, however this is still not possible.  Aside from not\n   # being certain /sbin/ldconfig is available, command\n   # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,\n@@ -14663,18 +12816,6 @@ fi\n   dynamic_linker='GNU/Linux ld.so'\n   ;;\n \n-netbsdelf*-gnu)\n-  version_type=linux\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  dynamic_linker='NetBSD ld.elf_so'\n-  ;;\n-\n netbsd*)\n   version_type=sunos\n   need_lib_prefix=no\n@@ -14693,19 +12834,7 @@ netbsd*)\n   hardcode_into_libs=yes\n   ;;\n \n-*-mlibc)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  dynamic_linker='mlibc ld.so'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  ;;\n-\n-newsos6)\n+newsos6)\n   version_type=linux # correct to gnu/linux during the next big refactor\n   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n   shlibpath_var=LD_LIBRARY_PATH\n@@ -14724,7 +12853,7 @@ newsos6)\n   dynamic_linker='ldqnx.so'\n   ;;\n \n-openbsd*)\n+openbsd* | bitrig*)\n   version_type=sunos\n   sys_lib_dlsearch_path_spec=/usr/lib\n   need_lib_prefix=no\n@@ -14784,17 +12913,6 @@ rdos*)\n   dynamic_linker=no\n   ;;\n \n-serenity*)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  dynamic_linker='SerenityOS LibELF'\n-  ;;\n-\n solaris*)\n   version_type=linux # correct to gnu/linux during the next big refactor\n   need_lib_prefix=no\n@@ -14892,525 +13010,44 @@ uts4*)\n   shlibpath_var=LD_LIBRARY_PATH\n   ;;\n \n-emscripten*)\n-  version_type=none\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext'\n-  soname_spec='$libname$release$shared_ext'\n-  finish_cmds=\n-  dynamic_linker=\"Emscripten linker\"\n-  lt_prog_compiler_wl=\n-lt_prog_compiler_pic=\n-lt_prog_compiler_static=\n+*)\n+  dynamic_linker=no\n+  ;;\n+esac\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $dynamic_linker\" >&5\n+$as_echo \"$dynamic_linker\" >&6; }\n+test no = \"$dynamic_linker\" && can_build_shared=no\n \n+variables_saved_for_relink=\"PATH $shlibpath_var $runpath_var\"\n+if test yes = \"$GCC\"; then\n+  variables_saved_for_relink=\"$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH\"\n+fi\n \n-  if test yes = \"$GCC\"; then\n-    lt_prog_compiler_wl='-Wl,'\n-    lt_prog_compiler_static='-static'\n+if test set = \"${lt_cv_sys_lib_search_path_spec+set}\"; then\n+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec\n+fi\n \n-    case $host_os in\n-      aix*)\n-      # All AIX code is PIC.\n-      if test ia64 = \"$host_cpu\"; then\n-\t# AIX 5 now supports IA64 processor\n-\tlt_prog_compiler_static='-Bstatic'\n-      fi\n-      lt_prog_compiler_pic='-fPIC'\n-      ;;\n+if test set = \"${lt_cv_sys_lib_dlsearch_path_spec+set}\"; then\n+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec\n+fi\n \n-    amigaos*)\n-      case $host_cpu in\n-      powerpc)\n-            # see comment about AmigaOS4 .so support\n-            lt_prog_compiler_pic='-fPIC'\n-        ;;\n-      m68k)\n-            # FIXME: we need at least 68020 code to build shared libraries, but\n-            # adding the '-m68020' flag to GCC prevents building anything better,\n-            # like '-m68040'.\n-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'\n-        ;;\n-      esac\n-      ;;\n+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...\n+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec\n \n-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)\n-      # PIC is the default for these OSes.\n-      ;;\n+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code\n+func_munge_path_list sys_lib_dlsearch_path_spec \"$LT_SYS_LIBRARY_PATH\"\n \n-    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)\n-      # This hack is so that the source file can tell whether it is being\n-      # built for inclusion in a dll (and should export symbols for example).\n-      # Although the cygwin gcc ignores -fPIC, still need this for old-style\n-      # (--disable-auto-import) libraries\n-      lt_prog_compiler_pic='-DDLL_EXPORT'\n-      case $host_os in\n-      os2*)\n-\tlt_prog_compiler_static='$wl-static'\n-\t;;\n-      esac\n-      ;;\n+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool\n+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH\n \n-    darwin* | rhapsody*)\n-      # PIC is the default on this platform\n-      # Common symbols not allowed in MH_DYLIB files\n-      lt_prog_compiler_pic='-fno-common'\n-      ;;\n \n-    haiku*)\n-      # PIC is the default for Haiku.\n-      # The \"-static\" flag exists, but is broken.\n-      lt_prog_compiler_static=\n-      ;;\n \n-    hpux*)\n-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit\n-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag\n-      # sets the default TLS model and affects inlining.\n-      case $host_cpu in\n-      hppa*64*)\n-\t# +Z the default\n-\t;;\n-      *)\n-\tlt_prog_compiler_pic='-fPIC'\n-\t;;\n-      esac\n-      ;;\n \n-    interix[3-9]*)\n-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.\n-      # Instead, we relocate shared libraries at runtime.\n-      ;;\n \n-    msdosdjgpp*)\n-      # Just because we use GCC doesn't mean we suddenly get shared libraries\n-      # on systems that don't support them.\n-      lt_prog_compiler_can_build_shared=no\n-      enable_shared=no\n-      ;;\n \n-    *nto* | *qnx*)\n-      # QNX uses GNU C++, but need to define -shared option too, otherwise\n-      # it will coredump.\n-      lt_prog_compiler_pic='-fPIC -shared'\n-      ;;\n \n-    sysv4*MP*)\n-      if test -d /usr/nec; then\n-\tlt_prog_compiler_pic=-Kconform_pic\n-      fi\n-      ;;\n \n-    *)\n-      lt_prog_compiler_pic='-fPIC'\n-      ;;\n-    esac\n \n-    case $cc_basename in\n-    nvcc*) # Cuda Compiler Driver 2.2\n-      lt_prog_compiler_wl='-Xlinker '\n-      if test -n \"$lt_prog_compiler_pic\"; then\n-        lt_prog_compiler_pic=\"-Xcompiler $lt_prog_compiler_pic\"\n-      fi\n-      ;;\n-    esac\n-  else\n-    # PORTME Check for flag to pass linker flags through the system compiler.\n-    case $host_os in\n-    aix*)\n-      lt_prog_compiler_wl='-Wl,'\n-      if test ia64 = \"$host_cpu\"; then\n-\t# AIX 5 now supports IA64 processor\n-\tlt_prog_compiler_static='-Bstatic'\n-      else\n-\tlt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'\n-      fi\n-      ;;\n-\n-    darwin* | rhapsody*)\n-      # PIC is the default on this platform\n-      # Common symbols not allowed in MH_DYLIB files\n-      lt_prog_compiler_pic='-fno-common'\n-      case $cc_basename in\n-      nagfor*)\n-        # NAG Fortran compiler\n-        lt_prog_compiler_wl='-Wl,-Wl,,'\n-        lt_prog_compiler_pic='-PIC'\n-        lt_prog_compiler_static='-Bstatic'\n-        ;;\n-      esac\n-      ;;\n-\n-    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)\n-      # This hack is so that the source file can tell whether it is being\n-      # built for inclusion in a dll (and should export symbols for example).\n-      lt_prog_compiler_pic='-DDLL_EXPORT'\n-      case $host_os in\n-      os2*)\n-\tlt_prog_compiler_static='$wl-static'\n-\t;;\n-      esac\n-      ;;\n-\n-    hpux9* | hpux10* | hpux11*)\n-      lt_prog_compiler_wl='-Wl,'\n-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but\n-      # not for PA HP-UX.\n-      case $host_cpu in\n-      hppa*64*|ia64*)\n-\t# +Z the default\n-\t;;\n-      *)\n-\tlt_prog_compiler_pic='+Z'\n-\t;;\n-      esac\n-      # Is there a better lt_prog_compiler_static that works with the bundled CC?\n-      lt_prog_compiler_static='$wl-a ${wl}archive'\n-      ;;\n-\n-    irix5* | irix6* | nonstopux*)\n-      lt_prog_compiler_wl='-Wl,'\n-      # PIC (with -KPIC) is the default.\n-      lt_prog_compiler_static='-non_shared'\n-      ;;\n-\n-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n-      case $cc_basename in\n-      # old Intel for x86_64, which still supported -KPIC.\n-      ecc*)\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-KPIC'\n-\tlt_prog_compiler_static='-static'\n-        ;;\n-      *flang* | ftn | f18* | f95*)\n-        # Flang compiler.\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-fPIC'\n-\tlt_prog_compiler_static='-static'\n-        ;;\n-      # icc used to be incompatible with GCC.\n-      # ICC 10 doesn't accept -KPIC any more.\n-      icc* | ifort*)\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-fPIC'\n-\tlt_prog_compiler_static='-static'\n-        ;;\n-      # Lahey Fortran 8.1.\n-      lf95*)\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='--shared'\n-\tlt_prog_compiler_static='--static'\n-\t;;\n-      nagfor*)\n-\t# NAG Fortran compiler\n-\tlt_prog_compiler_wl='-Wl,-Wl,,'\n-\tlt_prog_compiler_pic='-PIC'\n-\tlt_prog_compiler_static='-Bstatic'\n-\t;;\n-      tcc*)\n-\t# Fabrice Bellard et al's Tiny C Compiler\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-fPIC'\n-\tlt_prog_compiler_static='-static'\n-\t;;\n-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)\n-        # Portland Group compilers (*not* the Pentium gcc compiler,\n-\t# which looks to be a dead project)\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-fpic'\n-\tlt_prog_compiler_static='-Bstatic'\n-        ;;\n-      ccc*)\n-        lt_prog_compiler_wl='-Wl,'\n-        # All Alpha code is PIC.\n-        lt_prog_compiler_static='-non_shared'\n-        ;;\n-      xl* | bgxl* | bgf* | mpixl*)\n-\t# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene\n-\tlt_prog_compiler_wl='-Wl,'\n-\tlt_prog_compiler_pic='-qpic'\n-\tlt_prog_compiler_static='-qstaticlink'\n-\t;;\n-      *)\n-\tcase `$CC -V 2>&1 | $SED 5q` in\n-\t*Sun\\ Ceres\\ Fortran* | *Sun*Fortran*\\ [1-7].* | *Sun*Fortran*\\ 8.[0-3]*)\n-\t  # Sun Fortran 8.3 passes all unrecognized flags to the linker\n-\t  lt_prog_compiler_pic='-KPIC'\n-\t  lt_prog_compiler_static='-Bstatic'\n-\t  lt_prog_compiler_wl=''\n-\t  ;;\n-\t*Sun\\ F* | *Sun*Fortran*)\n-\t  lt_prog_compiler_pic='-KPIC'\n-\t  lt_prog_compiler_static='-Bstatic'\n-\t  lt_prog_compiler_wl='-Qoption ld '\n-\t  ;;\n-\t*Sun\\ C*)\n-\t  # Sun C 5.9\n-\t  lt_prog_compiler_pic='-KPIC'\n-\t  lt_prog_compiler_static='-Bstatic'\n-\t  lt_prog_compiler_wl='-Wl,'\n-\t  ;;\n-        *Intel*\\ [CF]*Compiler*)\n-\t  lt_prog_compiler_wl='-Wl,'\n-\t  lt_prog_compiler_pic='-fPIC'\n-\t  lt_prog_compiler_static='-static'\n-\t  ;;\n-\t*Portland\\ Group*)\n-\t  lt_prog_compiler_wl='-Wl,'\n-\t  lt_prog_compiler_pic='-fpic'\n-\t  lt_prog_compiler_static='-Bstatic'\n-\t  ;;\n-\tesac\n-\t;;\n-      esac\n-      ;;\n-\n-    newsos6)\n-      lt_prog_compiler_pic='-KPIC'\n-      lt_prog_compiler_static='-Bstatic'\n-      ;;\n-\n-    *-mlibc)\n-      lt_prog_compiler_wl='-Wl,'\n-      lt_prog_compiler_pic='-fPIC'\n-      lt_prog_compiler_static='-static'\n-      ;;\n-\n-    *nto* | *qnx*)\n-      # QNX uses GNU C++, but need to define -shared option too, otherwise\n-      # it will coredump.\n-      lt_prog_compiler_pic='-fPIC -shared'\n-      ;;\n-\n-    osf3* | osf4* | osf5*)\n-      lt_prog_compiler_wl='-Wl,'\n-      # All OSF/1 code is PIC.\n-      lt_prog_compiler_static='-non_shared'\n-      ;;\n-\n-    rdos*)\n-      lt_prog_compiler_static='-non_shared'\n-      ;;\n-\n-    serenity*)\n-      ;;\n-\n-    solaris*)\n-      lt_prog_compiler_pic='-KPIC'\n-      lt_prog_compiler_static='-Bstatic'\n-      case $cc_basename in\n-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)\n-\tlt_prog_compiler_wl='-Qoption ld ';;\n-      *)\n-\tlt_prog_compiler_wl='-Wl,';;\n-      esac\n-      ;;\n-\n-    sunos4*)\n-      lt_prog_compiler_wl='-Qoption ld '\n-      lt_prog_compiler_pic='-PIC'\n-      lt_prog_compiler_static='-Bstatic'\n-      ;;\n-\n-    sysv4 | sysv4.2uw2* | sysv4.3*)\n-      lt_prog_compiler_wl='-Wl,'\n-      lt_prog_compiler_pic='-KPIC'\n-      lt_prog_compiler_static='-Bstatic'\n-      ;;\n-\n-    sysv4*MP*)\n-      if test -d /usr/nec; then\n-\tlt_prog_compiler_pic='-Kconform_pic'\n-\tlt_prog_compiler_static='-Bstatic'\n-      fi\n-      ;;\n-\n-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)\n-      lt_prog_compiler_wl='-Wl,'\n-      lt_prog_compiler_pic='-KPIC'\n-      lt_prog_compiler_static='-Bstatic'\n-      ;;\n-\n-    unicos*)\n-      lt_prog_compiler_wl='-Wl,'\n-      lt_prog_compiler_can_build_shared=no\n-      ;;\n-\n-    uts4*)\n-      lt_prog_compiler_pic='-pic'\n-      lt_prog_compiler_static='-Bstatic'\n-      ;;\n-\n-    *)\n-      lt_prog_compiler_can_build_shared=no\n-      ;;\n-    esac\n-  fi\n-\n-case $host_os in\n-  # For platforms that do not support PIC, -DPIC is meaningless:\n-  *djgpp*)\n-    lt_prog_compiler_pic=\n-    ;;\n-  *)\n-    lt_prog_compiler_pic=\"$lt_prog_compiler_pic -DPIC\"\n-    ;;\n-esac\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC\" >&5\n-printf %s \"checking for $compiler option to produce PIC... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic\" >&6; }\n-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic\n-\n-#\n-# Check to make sure the PIC flag actually works.\n-#\n-if test -n \"$lt_prog_compiler_pic\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works\" >&5\n-printf %s \"checking if $compiler PIC flag $lt_prog_compiler_pic works... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic_works+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic_works=no\n-   ac_outfile=conftest.$ac_objext\n-   echo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n-   lt_compiler_flag=\"$lt_prog_compiler_pic -DPIC\"  ## exclude from sc_useless_quotes_in_assignment\n-   # Insert the option either (1) after the last *FLAGS variable, or\n-   # (2) before a word containing \"conftest.\", or (3) at the end.\n-   # Note that $ac_compile itself does not contain backslashes and begins\n-   # with a dollar sign (not a hyphen), so the echo should work correctly.\n-   # The option is referenced via a variable to avoid confusing sed.\n-   lt_compile=`echo \"$ac_compile\" | $SED \\\n-   -e 's:.*FLAGS}\\{0,1\\} :&$lt_compiler_flag :; t' \\\n-   -e 's: [^ ]*conftest\\.: $lt_compiler_flag&:; t' \\\n-   -e 's:$: $lt_compiler_flag:'`\n-   (eval echo \"\\\"\\$as_me:$LINENO: $lt_compile\\\"\" >&5)\n-   (eval \"$lt_compile\" 2>conftest.err)\n-   ac_status=$?\n-   cat conftest.err >&5\n-   echo \"$as_me:$LINENO: \\$? = $ac_status\" >&5\n-   if (exit $ac_status) && test -s \"$ac_outfile\"; then\n-     # The compiler can only warn and ignore the option if not recognized\n-     # So say no if there are warnings other than the usual output.\n-     $ECHO \"$_lt_compiler_boilerplate\" | $SED '/^$/d' >conftest.exp\n-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2\n-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then\n-       lt_cv_prog_compiler_pic_works=yes\n-     fi\n-   fi\n-   $RM conftest*\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic_works\" >&6; }\n-\n-if test yes = \"$lt_cv_prog_compiler_pic_works\"; then\n-    case $lt_prog_compiler_pic in\n-     \"\" | \" \"*) ;;\n-     *) lt_prog_compiler_pic=\" $lt_prog_compiler_pic\" ;;\n-     esac\n-else\n-    lt_prog_compiler_pic=\n-     lt_prog_compiler_can_build_shared=no\n-fi\n-\n-fi\n-\n-\n-\n-\n-\n-#\n-# Check to make sure the static flag actually works.\n-#\n-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\\\"$lt_prog_compiler_static\\\"\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works\" >&5\n-printf %s \"checking if $compiler static flag $lt_tmp_static_flag works... \" >&6; }\n-if test ${lt_cv_prog_compiler_static_works+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_static_works=no\n-   save_LDFLAGS=$LDFLAGS\n-   LDFLAGS=\"$LDFLAGS $lt_tmp_static_flag\"\n-   echo \"$lt_simple_link_test_code\" > conftest.$ac_ext\n-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then\n-     # The linker can only warn and ignore the option if not recognized\n-     # So say no if there are warnings\n-     if test -s conftest.err; then\n-       # Append any errors to the config.log.\n-       cat conftest.err 1>&5\n-       $ECHO \"$_lt_linker_boilerplate\" | $SED '/^$/d' > conftest.exp\n-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2\n-       if diff conftest.exp conftest.er2 >/dev/null; then\n-         lt_cv_prog_compiler_static_works=yes\n-       fi\n-     else\n-       lt_cv_prog_compiler_static_works=yes\n-     fi\n-   fi\n-   $RM -r conftest*\n-   LDFLAGS=$save_LDFLAGS\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_static_works\" >&6; }\n-\n-if test yes = \"$lt_cv_prog_compiler_static_works\"; then\n-    :\n-else\n-    lt_prog_compiler_static=\n-fi\n-\n-\n-\n-='-fPIC'\n-  archive_cmds='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'\n-  archive_expsym_cmds='$SED \"s|^|_|\" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'\n-  archive_cmds_need_lc=no\n-  no_undefined_flag=\n-  ;;\n-\n-*)\n-  dynamic_linker=no\n-  ;;\n-esac\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $dynamic_linker\" >&5\n-printf \"%s\\n\" \"$dynamic_linker\" >&6; }\n-test no = \"$dynamic_linker\" && can_build_shared=no\n-\n-variables_saved_for_relink=\"PATH $shlibpath_var $runpath_var\"\n-if test yes = \"$GCC\"; then\n-  variables_saved_for_relink=\"$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH\"\n-fi\n-\n-if test set = \"${lt_cv_sys_lib_search_path_spec+set}\"; then\n-  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec\n-fi\n-\n-if test set = \"${lt_cv_sys_lib_dlsearch_path_spec+set}\"; then\n-  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec\n-fi\n-\n-# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...\n-configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec\n-\n-# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code\n-func_munge_path_list sys_lib_dlsearch_path_spec \"$LT_SYS_LIBRARY_PATH\"\n-\n-# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool\n-configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH\n \n \n \n@@ -15499,17 +13136,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH\n \n \n \n-\n-\n-\n-\n-\n-\n-\n-\n-\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs\" >&5\n-printf %s \"checking how to hardcode library paths into programs... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs\" >&5\n+$as_echo_n \"checking how to hardcode library paths into programs... \" >&6; }\n hardcode_action=\n if test -n \"$hardcode_libdir_flag_spec\" ||\n    test -n \"$runpath_var\" ||\n@@ -15533,8 +13161,8 @@ else\n   # directories.\n   hardcode_action=unsupported\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $hardcode_action\" >&5\n-printf \"%s\\n\" \"$hardcode_action\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $hardcode_action\" >&5\n+$as_echo \"$hardcode_action\" >&6; }\n \n if test relink = \"$hardcode_action\" ||\n    test yes = \"$inherit_rpath\"; then\n@@ -15566,7 +13194,7 @@ else\n     lt_cv_dlopen_self=yes\n     ;;\n \n-  mingw* | windows* | pw32* | cegcc*)\n+  mingw* | pw32* | cegcc*)\n     lt_cv_dlopen=LoadLibrary\n     lt_cv_dlopen_libs=\n     ;;\n@@ -15578,59 +13206,50 @@ else\n \n   darwin*)\n     # if libdl is installed we need to link against it\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl\" >&5\n-printf %s \"checking for dlopen in -ldl... \" >&6; }\n-if test ${ac_cv_lib_dl_dlopen+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_check_lib_save_LIBS=$LIBS\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl\" >&5\n+$as_echo_n \"checking for dlopen in -ldl... \" >&6; }\n+if ${ac_cv_lib_dl_dlopen+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_check_lib_save_LIBS=$LIBS\n LIBS=\"-ldl  $LIBS\"\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n /* Override any GCC internal prototype to avoid an error.\n    Use char because int might match the return type of a GCC\n-   builtin and then its argument prototype would still apply.\n-   The 'extern \"C\"' is for builds by C++ compilers;\n-   although this is not generally supported in C code supporting it here\n-   has little cost and some practical benefit (sr 110532).  */\n+   builtin and then its argument prototype would still apply.  */\n #ifdef __cplusplus\n extern \"C\"\n #endif\n-char dlopen (void);\n+char dlopen ();\n int\n-main (void)\n+main ()\n {\n return dlopen ();\n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   ac_cv_lib_dl_dlopen=yes\n-else case e in #(\n-  e) ac_cv_lib_dl_dlopen=no ;;\n-esac\n+else\n+  ac_cv_lib_dl_dlopen=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-LIBS=$ac_check_lib_save_LIBS ;;\n-esac\n+LIBS=$ac_check_lib_save_LIBS\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen\" >&5\n-printf \"%s\\n\" \"$ac_cv_lib_dl_dlopen\" >&6; }\n-if test \"x$ac_cv_lib_dl_dlopen\" = xyes\n-then :\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen\" >&5\n+$as_echo \"$ac_cv_lib_dl_dlopen\" >&6; }\n+if test \"x$ac_cv_lib_dl_dlopen\" = xyes; then :\n   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl\n-else case e in #(\n-  e)\n+else\n+\n     lt_cv_dlopen=dyld\n     lt_cv_dlopen_libs=\n     lt_cv_dlopen_self=yes\n-     ;;\n-esac\n+\n fi\n \n     ;;\n@@ -15645,222 +13264,183 @@ fi\n \n   *)\n     ac_fn_c_check_func \"$LINENO\" \"shl_load\" \"ac_cv_func_shl_load\"\n-if test \"x$ac_cv_func_shl_load\" = xyes\n-then :\n+if test \"x$ac_cv_func_shl_load\" = xyes; then :\n   lt_cv_dlopen=shl_load\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld\" >&5\n-printf %s \"checking for shl_load in -ldld... \" >&6; }\n-if test ${ac_cv_lib_dld_shl_load+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_check_lib_save_LIBS=$LIBS\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld\" >&5\n+$as_echo_n \"checking for shl_load in -ldld... \" >&6; }\n+if ${ac_cv_lib_dld_shl_load+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_check_lib_save_LIBS=$LIBS\n LIBS=\"-ldld  $LIBS\"\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n /* Override any GCC internal prototype to avoid an error.\n    Use char because int might match the return type of a GCC\n-   builtin and then its argument prototype would still apply.\n-   The 'extern \"C\"' is for builds by C++ compilers;\n-   although this is not generally supported in C code supporting it here\n-   has little cost and some practical benefit (sr 110532).  */\n+   builtin and then its argument prototype would still apply.  */\n #ifdef __cplusplus\n extern \"C\"\n #endif\n-char shl_load (void);\n+char shl_load ();\n int\n-main (void)\n+main ()\n {\n return shl_load ();\n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   ac_cv_lib_dld_shl_load=yes\n-else case e in #(\n-  e) ac_cv_lib_dld_shl_load=no ;;\n-esac\n+else\n+  ac_cv_lib_dld_shl_load=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-LIBS=$ac_check_lib_save_LIBS ;;\n-esac\n+LIBS=$ac_check_lib_save_LIBS\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load\" >&5\n-printf \"%s\\n\" \"$ac_cv_lib_dld_shl_load\" >&6; }\n-if test \"x$ac_cv_lib_dld_shl_load\" = xyes\n-then :\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load\" >&5\n+$as_echo \"$ac_cv_lib_dld_shl_load\" >&6; }\n+if test \"x$ac_cv_lib_dld_shl_load\" = xyes; then :\n   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld\n-else case e in #(\n-  e) ac_fn_c_check_func \"$LINENO\" \"dlopen\" \"ac_cv_func_dlopen\"\n-if test \"x$ac_cv_func_dlopen\" = xyes\n-then :\n+else\n+  ac_fn_c_check_func \"$LINENO\" \"dlopen\" \"ac_cv_func_dlopen\"\n+if test \"x$ac_cv_func_dlopen\" = xyes; then :\n   lt_cv_dlopen=dlopen\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl\" >&5\n-printf %s \"checking for dlopen in -ldl... \" >&6; }\n-if test ${ac_cv_lib_dl_dlopen+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_check_lib_save_LIBS=$LIBS\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl\" >&5\n+$as_echo_n \"checking for dlopen in -ldl... \" >&6; }\n+if ${ac_cv_lib_dl_dlopen+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_check_lib_save_LIBS=$LIBS\n LIBS=\"-ldl  $LIBS\"\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n /* Override any GCC internal prototype to avoid an error.\n    Use char because int might match the return type of a GCC\n-   builtin and then its argument prototype would still apply.\n-   The 'extern \"C\"' is for builds by C++ compilers;\n-   although this is not generally supported in C code supporting it here\n-   has little cost and some practical benefit (sr 110532).  */\n+   builtin and then its argument prototype would still apply.  */\n #ifdef __cplusplus\n extern \"C\"\n #endif\n-char dlopen (void);\n+char dlopen ();\n int\n-main (void)\n+main ()\n {\n return dlopen ();\n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   ac_cv_lib_dl_dlopen=yes\n-else case e in #(\n-  e) ac_cv_lib_dl_dlopen=no ;;\n-esac\n+else\n+  ac_cv_lib_dl_dlopen=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-LIBS=$ac_check_lib_save_LIBS ;;\n-esac\n+LIBS=$ac_check_lib_save_LIBS\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen\" >&5\n-printf \"%s\\n\" \"$ac_cv_lib_dl_dlopen\" >&6; }\n-if test \"x$ac_cv_lib_dl_dlopen\" = xyes\n-then :\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen\" >&5\n+$as_echo \"$ac_cv_lib_dl_dlopen\" >&6; }\n+if test \"x$ac_cv_lib_dl_dlopen\" = xyes; then :\n   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld\" >&5\n-printf %s \"checking for dlopen in -lsvld... \" >&6; }\n-if test ${ac_cv_lib_svld_dlopen+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_check_lib_save_LIBS=$LIBS\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld\" >&5\n+$as_echo_n \"checking for dlopen in -lsvld... \" >&6; }\n+if ${ac_cv_lib_svld_dlopen+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_check_lib_save_LIBS=$LIBS\n LIBS=\"-lsvld  $LIBS\"\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n /* Override any GCC internal prototype to avoid an error.\n    Use char because int might match the return type of a GCC\n-   builtin and then its argument prototype would still apply.\n-   The 'extern \"C\"' is for builds by C++ compilers;\n-   although this is not generally supported in C code supporting it here\n-   has little cost and some practical benefit (sr 110532).  */\n+   builtin and then its argument prototype would still apply.  */\n #ifdef __cplusplus\n extern \"C\"\n #endif\n-char dlopen (void);\n+char dlopen ();\n int\n-main (void)\n+main ()\n {\n return dlopen ();\n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   ac_cv_lib_svld_dlopen=yes\n-else case e in #(\n-  e) ac_cv_lib_svld_dlopen=no ;;\n-esac\n+else\n+  ac_cv_lib_svld_dlopen=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-LIBS=$ac_check_lib_save_LIBS ;;\n-esac\n+LIBS=$ac_check_lib_save_LIBS\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen\" >&5\n-printf \"%s\\n\" \"$ac_cv_lib_svld_dlopen\" >&6; }\n-if test \"x$ac_cv_lib_svld_dlopen\" = xyes\n-then :\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen\" >&5\n+$as_echo \"$ac_cv_lib_svld_dlopen\" >&6; }\n+if test \"x$ac_cv_lib_svld_dlopen\" = xyes; then :\n   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld\n-else case e in #(\n-  e) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld\" >&5\n-printf %s \"checking for dld_link in -ldld... \" >&6; }\n-if test ${ac_cv_lib_dld_dld_link+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_check_lib_save_LIBS=$LIBS\n+else\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld\" >&5\n+$as_echo_n \"checking for dld_link in -ldld... \" >&6; }\n+if ${ac_cv_lib_dld_dld_link+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_check_lib_save_LIBS=$LIBS\n LIBS=\"-ldld  $LIBS\"\n cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n /* Override any GCC internal prototype to avoid an error.\n    Use char because int might match the return type of a GCC\n-   builtin and then its argument prototype would still apply.\n-   The 'extern \"C\"' is for builds by C++ compilers;\n-   although this is not generally supported in C code supporting it here\n-   has little cost and some practical benefit (sr 110532).  */\n+   builtin and then its argument prototype would still apply.  */\n #ifdef __cplusplus\n extern \"C\"\n #endif\n-char dld_link (void);\n+char dld_link ();\n int\n-main (void)\n+main ()\n {\n return dld_link ();\n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_c_try_link \"$LINENO\"\n-then :\n+if ac_fn_c_try_link \"$LINENO\"; then :\n   ac_cv_lib_dld_dld_link=yes\n-else case e in #(\n-  e) ac_cv_lib_dld_dld_link=no ;;\n-esac\n+else\n+  ac_cv_lib_dld_dld_link=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-LIBS=$ac_check_lib_save_LIBS ;;\n-esac\n+LIBS=$ac_check_lib_save_LIBS\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link\" >&5\n-printf \"%s\\n\" \"$ac_cv_lib_dld_dld_link\" >&6; }\n-if test \"x$ac_cv_lib_dld_dld_link\" = xyes\n-then :\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link\" >&5\n+$as_echo \"$ac_cv_lib_dld_dld_link\" >&6; }\n+if test \"x$ac_cv_lib_dld_dld_link\" = xyes; then :\n   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld\n fi\n \n-\t       ;;\n-esac\n+\n fi\n \n-\t     ;;\n-esac\n+\n fi\n \n-\t   ;;\n-esac\n+\n fi\n \n-\t ;;\n-esac\n+\n fi\n \n-       ;;\n-esac\n+\n fi\n \n     ;;\n@@ -15883,13 +13463,12 @@ fi\n     save_LIBS=$LIBS\n     LIBS=\"$lt_cv_dlopen_libs $LIBS\"\n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself\" >&5\n-printf %s \"checking whether a program can dlopen itself... \" >&6; }\n-if test ${lt_cv_dlopen_self+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) \t  if test yes = \"$cross_compiling\"; then :\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself\" >&5\n+$as_echo_n \"checking whether a program can dlopen itself... \" >&6; }\n+if ${lt_cv_dlopen_self+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  \t  if test yes = \"$cross_compiling\"; then :\n   lt_cv_dlopen_self=cross\n else\n   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2\n@@ -15939,11 +13518,11 @@ else\n /* When -fvisibility=hidden is used, assume the code has been annotated\n    correspondingly for the symbols needed.  */\n #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))\n-int fnord (void) __attribute__((visibility(\"default\")));\n+int fnord () __attribute__((visibility(\"default\")));\n #endif\n \n-int fnord (void) { return 42; }\n-int main (void)\n+int fnord () { return 42; }\n+int main ()\n {\n   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);\n   int status = $lt_dlunknown;\n@@ -15967,7 +13546,7 @@ _LT_EOF\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_link\\\"\"; } >&5\n   (eval $ac_link) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && test -s \"conftest$ac_exeext\" 2>/dev/null; then\n     (./conftest; exit; ) >&5 2>/dev/null\n     lt_status=$?\n@@ -15983,21 +13562,19 @@ _LT_EOF\n fi\n rm -fr conftest*\n \n-     ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self\" >&5\n-printf \"%s\\n\" \"$lt_cv_dlopen_self\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self\" >&5\n+$as_echo \"$lt_cv_dlopen_self\" >&6; }\n \n     if test yes = \"$lt_cv_dlopen_self\"; then\n       wl=$lt_prog_compiler_wl eval LDFLAGS=\\\"\\$LDFLAGS $lt_prog_compiler_static\\\"\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself\" >&5\n-printf %s \"checking whether a statically linked program can dlopen itself... \" >&6; }\n-if test ${lt_cv_dlopen_self_static+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) \t  if test yes = \"$cross_compiling\"; then :\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself\" >&5\n+$as_echo_n \"checking whether a statically linked program can dlopen itself... \" >&6; }\n+if ${lt_cv_dlopen_self_static+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  \t  if test yes = \"$cross_compiling\"; then :\n   lt_cv_dlopen_self_static=cross\n else\n   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2\n@@ -16047,11 +13624,11 @@ else\n /* When -fvisibility=hidden is used, assume the code has been annotated\n    correspondingly for the symbols needed.  */\n #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))\n-int fnord (void) __attribute__((visibility(\"default\")));\n+int fnord () __attribute__((visibility(\"default\")));\n #endif\n \n-int fnord (void) { return 42; }\n-int main (void)\n+int fnord () { return 42; }\n+int main ()\n {\n   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);\n   int status = $lt_dlunknown;\n@@ -16075,7 +13652,7 @@ _LT_EOF\n   if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_link\\\"\"; } >&5\n   (eval $ac_link) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } && test -s \"conftest$ac_exeext\" 2>/dev/null; then\n     (./conftest; exit; ) >&5 2>/dev/null\n     lt_status=$?\n@@ -16091,11 +13668,10 @@ _LT_EOF\n fi\n rm -fr conftest*\n \n-       ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static\" >&5\n-printf \"%s\\n\" \"$lt_cv_dlopen_self_static\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static\" >&5\n+$as_echo \"$lt_cv_dlopen_self_static\" >&6; }\n     fi\n \n     CPPFLAGS=$save_CPPFLAGS\n@@ -16133,43 +13709,32 @@ fi\n \n striplib=\n old_striplib=\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible\" >&5\n-printf %s \"checking whether stripping libraries is possible... \" >&6; }\n-if test -z \"$STRIP\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-else\n-  if $STRIP -V 2>&1 | $GREP \"GNU strip\" >/dev/null; then\n-    old_striplib=\"$STRIP --strip-debug\"\n-    striplib=\"$STRIP --strip-unneeded\"\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n-  else\n-    case $host_os in\n-    darwin*)\n-      # FIXME - insert some real tests, host_os isn't really good enough\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible\" >&5\n+$as_echo_n \"checking whether stripping libraries is possible... \" >&6; }\n+if test -n \"$STRIP\" && $STRIP -V 2>&1 | $GREP \"GNU strip\" >/dev/null; then\n+  test -z \"$old_striplib\" && old_striplib=\"$STRIP --strip-debug\"\n+  test -z \"$striplib\" && striplib=\"$STRIP --strip-unneeded\"\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n+else\n+# FIXME - insert some real tests, host_os isn't really good enough\n+  case $host_os in\n+  darwin*)\n+    if test -n \"$STRIP\"; then\n       striplib=\"$STRIP -x\"\n       old_striplib=\"$STRIP -S\"\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n-      ;;\n-    freebsd*)\n-      if $STRIP -V 2>&1 | $GREP \"elftoolchain\" >/dev/null; then\n-        old_striplib=\"$STRIP --strip-debug\"\n-        striplib=\"$STRIP --strip-unneeded\"\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n-      else\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-      fi\n-      ;;\n-    *)\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-      ;;\n-    esac\n-  fi\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n+    else\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+    fi\n+    ;;\n+  *)\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+    ;;\n+  esac\n fi\n \n \n@@ -16184,13 +13749,13 @@ fi\n \n \n   # Report what library types will actually be built\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries\" >&5\n-printf %s \"checking if libtool supports shared libraries... \" >&6; }\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $can_build_shared\" >&5\n-printf \"%s\\n\" \"$can_build_shared\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries\" >&5\n+$as_echo_n \"checking if libtool supports shared libraries... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $can_build_shared\" >&5\n+$as_echo \"$can_build_shared\" >&6; }\n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries\" >&5\n-printf %s \"checking whether to build shared libraries... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries\" >&5\n+$as_echo_n \"checking whether to build shared libraries... \" >&6; }\n   test no = \"$can_build_shared\" && enable_shared=no\n \n   # On AIX, shared libraries and static libraries use the same namespace, and\n@@ -16214,15 +13779,15 @@ printf %s \"checking whether to build shared libraries... \" >&6; }\n     fi\n     ;;\n   esac\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $enable_shared\" >&5\n-printf \"%s\\n\" \"$enable_shared\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $enable_shared\" >&5\n+$as_echo \"$enable_shared\" >&6; }\n \n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether to build static libraries\" >&5\n-printf %s \"checking whether to build static libraries... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether to build static libraries\" >&5\n+$as_echo_n \"checking whether to build static libraries... \" >&6; }\n   # Make sure either enable_shared or enable_static is yes.\n   test yes = \"$enable_shared\" || enable_static=yes\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $enable_static\" >&5\n-printf \"%s\\n\" \"$enable_static\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $enable_static\" >&5\n+$as_echo \"$enable_static\" >&6; }\n \n \n \n@@ -16244,35 +13809,38 @@ ac_cpp='$CXXCPP $CPPFLAGS'\n ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor\" >&5\n-printf %s \"checking how to run the C++ preprocessor... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor\" >&5\n+$as_echo_n \"checking how to run the C++ preprocessor... \" >&6; }\n if test -z \"$CXXCPP\"; then\n-  if test ${ac_cv_prog_CXXCPP+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)     # Double quotes because $CXX needs to be expanded\n-    for CXXCPP in \"$CXX -E\" cpp /lib/cpp\n+  if ${ac_cv_prog_CXXCPP+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+      # Double quotes because CXXCPP needs to be expanded\n+    for CXXCPP in \"$CXX -E\" \"/lib/cpp\"\n     do\n       ac_preproc_ok=false\n for ac_cxx_preproc_warn_flag in '' yes\n do\n   # Use a header file that comes with gcc, so configuring glibc\n   # with a fresh cross-compiler works.\n+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since\n+  # <limits.h> exists even on freestanding compilers.\n   # On the NeXT, cc -E runs the code through the compiler's parser,\n   # not just through cpp. \"Syntax error\" is here to catch this case.\n   cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n-#include <limits.h>\n+#ifdef __STDC__\n+# include <limits.h>\n+#else\n+# include <assert.h>\n+#endif\n \t\t     Syntax error\n _ACEOF\n-if ac_fn_cxx_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_cpp \"$LINENO\"; then :\n \n-else case e in #(\n-  e) # Broken: fails on valid input.\n-continue ;;\n-esac\n+else\n+  # Broken: fails on valid input.\n+continue\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n@@ -16282,56 +13850,56 @@ rm -f conftest.err conftest.i conftest.$ac_ext\n /* end confdefs.h.  */\n #include <ac_nonexistent.h>\n _ACEOF\n-if ac_fn_cxx_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_cpp \"$LINENO\"; then :\n   # Broken: success on invalid input.\n continue\n-else case e in #(\n-  e) # Passes both tests.\n+else\n+  # Passes both tests.\n ac_preproc_ok=:\n-break ;;\n-esac\n+break\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n done\n-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n rm -f conftest.i conftest.err conftest.$ac_ext\n-if $ac_preproc_ok\n-then :\n+if $ac_preproc_ok; then :\n   break\n fi\n \n     done\n     ac_cv_prog_CXXCPP=$CXXCPP\n-   ;;\n-esac\n+\n fi\n   CXXCPP=$ac_cv_prog_CXXCPP\n else\n   ac_cv_prog_CXXCPP=$CXXCPP\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $CXXCPP\" >&5\n-printf \"%s\\n\" \"$CXXCPP\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $CXXCPP\" >&5\n+$as_echo \"$CXXCPP\" >&6; }\n ac_preproc_ok=false\n for ac_cxx_preproc_warn_flag in '' yes\n do\n   # Use a header file that comes with gcc, so configuring glibc\n   # with a fresh cross-compiler works.\n+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since\n+  # <limits.h> exists even on freestanding compilers.\n   # On the NeXT, cc -E runs the code through the compiler's parser,\n   # not just through cpp. \"Syntax error\" is here to catch this case.\n   cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n-#include <limits.h>\n+#ifdef __STDC__\n+# include <limits.h>\n+#else\n+# include <assert.h>\n+#endif\n \t\t     Syntax error\n _ACEOF\n-if ac_fn_cxx_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_cpp \"$LINENO\"; then :\n \n-else case e in #(\n-  e) # Broken: fails on valid input.\n-continue ;;\n-esac\n+else\n+  # Broken: fails on valid input.\n+continue\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n@@ -16341,30 +13909,26 @@ rm -f conftest.err conftest.i conftest.$ac_ext\n /* end confdefs.h.  */\n #include <ac_nonexistent.h>\n _ACEOF\n-if ac_fn_cxx_try_cpp \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_cpp \"$LINENO\"; then :\n   # Broken: success on invalid input.\n continue\n-else case e in #(\n-  e) # Passes both tests.\n+else\n+  # Passes both tests.\n ac_preproc_ok=:\n-break ;;\n-esac\n+break\n fi\n rm -f conftest.err conftest.i conftest.$ac_ext\n \n done\n-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.\n rm -f conftest.i conftest.err conftest.$ac_ext\n-if $ac_preproc_ok\n-then :\n+if $ac_preproc_ok; then :\n \n-else case e in #(\n-  e) { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+else\n+  { { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"C++ preprocessor \\\"$CXXCPP\\\" fails sanity check\n-See 'config.log' for more details\" \"$LINENO\" 5; } ;;\n-esac\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n fi\n \n ac_ext=cpp\n@@ -16498,21 +14062,19 @@ cc_basename=$func_cc_basename_result\n \n \n # Check whether --with-gnu-ld was given.\n-if test ${with_gnu_ld+y}\n-then :\n+if test \"${with_gnu_ld+set}\" = set; then :\n   withval=$with_gnu_ld; test no = \"$withval\" || with_gnu_ld=yes\n-else case e in #(\n-  e) with_gnu_ld=no ;;\n-esac\n+else\n+  with_gnu_ld=no\n fi\n \n ac_prog=ld\n if test yes = \"$GCC\"; then\n   # Check if gcc -print-prog-name=ld gives a path.\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for ld used by $CC\" >&5\n-printf %s \"checking for ld used by $CC... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for ld used by $CC\" >&5\n+$as_echo_n \"checking for ld used by $CC... \" >&6; }\n   case $host in\n-  *-*-mingw* | *-*-windows*)\n+  *-*-mingw*)\n     # gcc leaves a trailing carriage return, which upsets mingw\n     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\\015'` ;;\n   *)\n@@ -16539,17 +14101,16 @@ printf %s \"checking for ld used by $CC... \" >&6; }\n     ;;\n   esac\n elif test yes = \"$with_gnu_ld\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for GNU ld\" >&5\n-printf %s \"checking for GNU ld... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for GNU ld\" >&5\n+$as_echo_n \"checking for GNU ld... \" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for non-GNU ld\" >&5\n-printf %s \"checking for non-GNU ld... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for non-GNU ld\" >&5\n+$as_echo_n \"checking for non-GNU ld... \" >&6; }\n fi\n-if test ${lt_cv_path_LD+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -z \"$LD\"; then\n+if ${lt_cv_path_LD+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -z \"$LD\"; then\n   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR\n   for ac_dir in $PATH; do\n     IFS=$lt_save_ifs\n@@ -16572,26 +14133,24 @@ else case e in #(\n   IFS=$lt_save_ifs\n else\n   lt_cv_path_LD=$LD # Let the user override the test with a path.\n-fi ;;\n-esac\n+fi\n fi\n \n LD=$lt_cv_path_LD\n if test -n \"$LD\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $LD\" >&5\n-printf \"%s\\n\" \"$LD\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $LD\" >&5\n+$as_echo \"$LD\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n test -z \"$LD\" && as_fn_error $? \"no acceptable ld found in \\$PATH\" \"$LINENO\" 5\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld\" >&5\n-printf %s \"checking if the linker ($LD) is GNU ld... \" >&6; }\n-if test ${lt_cv_prog_gnu_ld+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld\" >&5\n+$as_echo_n \"checking if the linker ($LD) is GNU ld... \" >&6; }\n+if ${lt_cv_prog_gnu_ld+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  # I'd rather use --version here, but apparently some GNU lds only accept -v.\n case `$LD -v 2>&1 </dev/null` in\n *GNU* | *'with BFD'*)\n   lt_cv_prog_gnu_ld=yes\n@@ -16599,11 +14158,10 @@ case `$LD -v 2>&1 </dev/null` in\n *)\n   lt_cv_prog_gnu_ld=no\n   ;;\n-esac ;;\n esac\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_gnu_ld\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld\" >&5\n+$as_echo \"$lt_cv_prog_gnu_ld\" >&6; }\n with_gnu_ld=$lt_cv_prog_gnu_ld\n \n \n@@ -16627,7 +14185,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld\n         wlarc='$wl'\n \n         # ancient GNU ld didn't support --whole-archive et. al.\n-        if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then\n+        if eval \"`$CC -print-prog-name=ld` --help 2>&1\" |\n+\t  $GREP 'no-whole-archive' > /dev/null; then\n           whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'\n         else\n           whole_archive_flag_spec_CXX=\n@@ -16647,7 +14206,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld\n       # Commands to make compiler produce verbose output that lists\n       # what \"hidden\" libraries, object files and flags are used when\n       # linking a shared library.\n-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [-]L\"'\n+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \n     else\n       GXX=no\n@@ -16656,8 +14215,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld\n     fi\n \n     # PORTME: fill in a description of your system's C++ link characteristics\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries\" >&5\n-printf %s \"checking whether the $compiler linker ($LD) supports shared libraries... \" >&6; }\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries\" >&5\n+$as_echo_n \"checking whether the $compiler linker ($LD) supports shared libraries... \" >&6; }\n     ld_shlibs_CXX=yes\n     case $host_os in\n       aix3*)\n@@ -16795,23 +14354,21 @@ printf %s \"checking whether the $compiler linker ($LD) supports shared libraries\n           if test set = \"${lt_cv_aix_libpath+set}\"; then\n   aix_libpath=$lt_cv_aix_libpath\n else\n-  if test ${lt_cv_aix_libpath__CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  if ${lt_cv_aix_libpath__CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_link \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_link \"$LINENO\"; then :\n \n   lt_aix_libpath_sed='\n       /Import File Strings/,/^$/ {\n@@ -16826,13 +14383,12 @@ then :\n     lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e \"$lt_aix_libpath_sed\"`\n   fi\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n   if test -z \"$lt_cv_aix_libpath__CXX\"; then\n     lt_cv_aix_libpath__CXX=/usr/lib:/lib\n   fi\n-   ;;\n-esac\n+\n fi\n \n   aix_libpath=$lt_cv_aix_libpath__CXX\n@@ -16852,23 +14408,21 @@ fi\n \t    if test set = \"${lt_cv_aix_libpath+set}\"; then\n   aix_libpath=$lt_cv_aix_libpath\n else\n-  if test ${lt_cv_aix_libpath__CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  if ${lt_cv_aix_libpath__CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_link \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_link \"$LINENO\"; then :\n \n   lt_aix_libpath_sed='\n       /Import File Strings/,/^$/ {\n@@ -16883,13 +14437,12 @@ then :\n     lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e \"$lt_aix_libpath_sed\"`\n   fi\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n   if test -z \"$lt_cv_aix_libpath__CXX\"; then\n     lt_cv_aix_libpath__CXX=/usr/lib:/lib\n   fi\n-   ;;\n-esac\n+\n fi\n \n   aix_libpath=$lt_cv_aix_libpath__CXX\n@@ -16947,10 +14500,10 @@ fi\n         esac\n         ;;\n \n-      cygwin* | mingw* | windows* | pw32* | cegcc*)\n+      cygwin* | mingw* | pw32* | cegcc*)\n \tcase $GXX,$cc_basename in\n-\t,cl* | no,cl* | ,icl* | no,icl*)\n-\t  # Native MSVC or ICC\n+\t,cl* | no,cl*)\n+\t  # Native MSVC\n \t  # hardcode_libdir_flag_spec is actually meaningless, as there is\n \t  # no search path for DLLs.\n \t  hardcode_libdir_flag_spec_CXX=' '\n@@ -17000,7 +14553,6 @@ fi\n \t  allow_undefined_flag_CXX=unsupported\n \t  always_export_symbols_CXX=no\n \t  enable_shared_with_static_runtimes_CXX=yes\n-\t  file_list_spec_CXX='@'\n \n \t  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then\n \t    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'\n@@ -17042,11 +14594,11 @@ fi\n     output_verbose_link_cmd=func_echo_all\n     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\"\n     module_cmds_CXX=\"\\$CC \\$allow_undefined_flag -o \\$lib -bundle \\$libobjs \\$deplibs \\$compiler_flags$_lt_dsymutil\"\n-    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\"\n-    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\"\n-       if test yes = \"$_lt_dar_needs_single_mod\" -a yes != \"$lt_cv_apple_cc_single_mod\"; then\n+    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\"\n+    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\"\n+       if test yes != \"$lt_cv_apple_cc_single_mod\"; then\n       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\"\n-      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\"\n+      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\"\n     fi\n \n   else\n@@ -17079,9 +14631,8 @@ fi\n \t  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~\n \t  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~\n \t  emximp -o $lib $output_objdir/$libname.def'\n-\told_archive_from_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n+\told_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n \tenable_shared_with_static_runtimes_CXX=yes\n-\tfile_list_spec_CXX='@'\n \t;;\n \n       dgux*)\n@@ -17112,7 +14663,7 @@ fi\n         archive_cmds_need_lc_CXX=no\n         ;;\n \n-      freebsd* | dragonfly* | midnightbsd*)\n+      freebsd* | dragonfly*)\n         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF\n         # conventions\n         ld_shlibs_CXX=yes\n@@ -17120,7 +14671,7 @@ fi\n \n       haiku*)\n         archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n-        link_all_deplibs_CXX=no\n+        link_all_deplibs_CXX=yes\n         ;;\n \n       hpux9*)\n@@ -17147,7 +14698,7 @@ fi\n             # explicitly linking system object files so we need to strip them\n             # from the output so that they don't get included in the library\n             # dependencies.\n-            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\"'\n+            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\"'\n             ;;\n           *)\n             if test yes = \"$GXX\"; then\n@@ -17212,7 +14763,7 @@ fi\n \t    # explicitly linking system object files so we need to strip them\n \t    # from the output so that they don't get included in the library\n \t    # dependencies.\n-\t    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\"'\n+\t    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\"'\n \t    ;;\n           *)\n \t    if test yes = \"$GXX\"; then\n@@ -17249,7 +14800,7 @@ fi\n \t# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link\n \t# time.  Moving up from 0x10000000 also allows more sbrk(2) space.\n \tarchive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \\* 262144 + 1342177280` -o $lib'\n-\tarchive_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'\n+\tarchive_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'\n \t;;\n       irix5* | irix6*)\n         case $cc_basename in\n@@ -17389,13 +14940,13 @@ fi\n \t    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n \t    if test yes = \"$supports_anon_versioning\"; then\n \t      archive_expsym_cmds_CXX='echo \"{ global:\" > $output_objdir/$libname.ver~\n-                cat $export_symbols | $SED -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n+                cat $export_symbols | sed -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n                 echo \"local: *; };\" >> $output_objdir/$libname.ver~\n                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'\n \t    fi\n \t    ;;\n \t  *)\n-\t    case `$CC -V 2>&1 | $SED 5q` in\n+\t    case `$CC -V 2>&1 | sed 5q` in\n \t    *Sun\\ C*)\n \t      # Sun C++ 5.9\n \t      no_undefined_flag_CXX=' -zdefs'\n@@ -17444,10 +14995,6 @@ fi\n \tesac\n \t;;\n \n-      *-mlibc)\n-        ld_shlibs_CXX=yes\n-\t;;\n-\n       netbsd*)\n         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then\n \t  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'\n@@ -17464,7 +15011,7 @@ fi\n         ld_shlibs_CXX=yes\n \t;;\n \n-      openbsd*)\n+      openbsd* | bitrig*)\n \tif test -f /usr/libexec/ld.so; then\n \t  hardcode_direct_CXX=yes\n \t  hardcode_shlibpath_var_CXX=no\n@@ -17555,7 +15102,7 @@ fi\n \t      # Commands to make compiler produce verbose output that lists\n \t      # what \"hidden\" libraries, object files and flags are used when\n \t      # linking a shared library.\n-\t      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [-]L\"'\n+\t      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \n \t    else\n \t      # FIXME: insert proper C++ library support\n@@ -17570,9 +15117,6 @@ fi\n         ld_shlibs_CXX=no\n         ;;\n \n-      serenity*)\n-        ;;\n-\n       sunos4*)\n         case $cc_basename in\n           CC*)\n@@ -17642,7 +15186,7 @@ fi\n \t        # Commands to make compiler produce verbose output that lists\n \t        # what \"hidden\" libraries, object files and flags are used when\n \t        # linking a shared library.\n-\t        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [-]L\"'\n+\t        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \t      else\n \t        # g++ 2.7 appears to require '-G' NOT '-shared' on this\n \t        # platform.\n@@ -17653,7 +15197,7 @@ fi\n \t        # Commands to make compiler produce verbose output that lists\n \t        # what \"hidden\" libraries, object files and flags are used when\n \t        # linking a shared library.\n-\t        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [-]L\"'\n+\t        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \t      fi\n \n \t      hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'\n@@ -17744,8 +15288,8 @@ fi\n         ;;\n     esac\n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX\" >&5\n-printf \"%s\\n\" \"$ld_shlibs_CXX\" >&6; }\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX\" >&5\n+$as_echo \"$ld_shlibs_CXX\" >&6; }\n     test no = \"$ld_shlibs_CXX\" && can_build_shared=no\n \n     GCC_CXX=$GXX\n@@ -17783,7 +15327,7 @@ esac\n if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   # Parse the compiler output and extract the necessary\n   # objects, libraries and library flags.\n@@ -17796,11 +15340,10 @@ if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n     case $prev$p in\n \n     -L* | -R* | -l*)\n-       # Some compilers place space between \"-{L,R,l}\" and the path.\n+       # Some compilers place space between \"-{L,R}\" and the path.\n        # Remove the space.\n-       if test x-L = x\"$p\" ||\n-          test x-R = x\"$p\" ||\n-          test x-l = x\"$p\"; then\n+       if test x-L = \"$p\" ||\n+          test x-R = \"$p\"; then\n \t prev=$p\n \t continue\n        fi\n@@ -17967,7 +15510,7 @@ lt_prog_compiler_static_CXX=\n     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)\n       # PIC is the default for these OSes.\n       ;;\n-    mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)\n+    mingw* | cygwin* | os2* | pw32* | cegcc*)\n       # This hack is so that the source file can tell whether it is being\n       # built for inclusion in a dll (and should export symbols for example).\n       # Although the cygwin gcc ignores -fPIC, still need this for old-style\n@@ -18042,7 +15585,7 @@ lt_prog_compiler_static_CXX=\n \t  ;;\n \tesac\n \t;;\n-      mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)\n+      mingw* | cygwin* | os2* | pw32* | cegcc*)\n \t# This hack is so that the source file can tell whether it is being\n \t# built for inclusion in a dll (and should export symbols for example).\n \tlt_prog_compiler_pic_CXX='-DDLL_EXPORT'\n@@ -18060,7 +15603,7 @@ lt_prog_compiler_static_CXX=\n \t    ;;\n \tesac\n \t;;\n-      freebsd* | dragonfly* | midnightbsd*)\n+      freebsd* | dragonfly*)\n \t# FreeBSD uses GNU C++\n \t;;\n       hpux9* | hpux10* | hpux11*)\n@@ -18143,7 +15686,7 @@ lt_prog_compiler_static_CXX=\n \t    lt_prog_compiler_static_CXX='-qstaticlink'\n \t    ;;\n \t  *)\n-\t    case `$CC -V 2>&1 | $SED 5q` in\n+\t    case `$CC -V 2>&1 | sed 5q` in\n \t    *Sun\\ C*)\n \t      # Sun C++ 5.9\n \t      lt_prog_compiler_pic_CXX='-KPIC'\n@@ -18167,9 +15710,7 @@ lt_prog_compiler_static_CXX=\n \t    ;;\n \tesac\n \t;;\n-      netbsd* | netbsdelf*-gnu)\n-\t;;\n-      *-mlibc)\n+      netbsd*)\n \t;;\n       *qnx* | *nto*)\n         # QNX uses GNU C++, but need to define -shared option too, otherwise\n@@ -18199,8 +15740,6 @@ lt_prog_compiler_static_CXX=\n \t;;\n       psos*)\n \t;;\n-      serenity*)\n-        ;;\n       solaris*)\n \tcase $cc_basename in\n \t  CC* | sunCC*)\n@@ -18269,30 +15808,27 @@ case $host_os in\n     ;;\n esac\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC\" >&5\n-printf %s \"checking for $compiler option to produce PIC... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;;\n-esac\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC\" >&5\n+$as_echo_n \"checking for $compiler option to produce PIC... \" >&6; }\n+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX\" >&5\n+$as_echo \"$lt_cv_prog_compiler_pic_CXX\" >&6; }\n lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX\n \n #\n # Check to make sure the PIC flag actually works.\n #\n if test -n \"$lt_prog_compiler_pic_CXX\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works\" >&5\n-printf %s \"checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic_works_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic_works_CXX=no\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works\" >&5\n+$as_echo_n \"checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... \" >&6; }\n+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_pic_works_CXX=no\n    ac_outfile=conftest.$ac_objext\n    echo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n    lt_compiler_flag=\"$lt_prog_compiler_pic_CXX -DPIC\"  ## exclude from sc_useless_quotes_in_assignment\n@@ -18320,11 +15856,10 @@ else case e in #(\n      fi\n    fi\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic_works_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX\" >&5\n+$as_echo \"$lt_cv_prog_compiler_pic_works_CXX\" >&6; }\n \n if test yes = \"$lt_cv_prog_compiler_pic_works_CXX\"; then\n     case $lt_prog_compiler_pic_CXX in\n@@ -18346,13 +15881,12 @@ fi\n # Check to make sure the static flag actually works.\n #\n wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\\\"$lt_prog_compiler_static_CXX\\\"\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works\" >&5\n-printf %s \"checking if $compiler static flag $lt_tmp_static_flag works... \" >&6; }\n-if test ${lt_cv_prog_compiler_static_works_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_static_works_CXX=no\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works\" >&5\n+$as_echo_n \"checking if $compiler static flag $lt_tmp_static_flag works... \" >&6; }\n+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_static_works_CXX=no\n    save_LDFLAGS=$LDFLAGS\n    LDFLAGS=\"$LDFLAGS $lt_tmp_static_flag\"\n    echo \"$lt_simple_link_test_code\" > conftest.$ac_ext\n@@ -18373,11 +15907,10 @@ else case e in #(\n    fi\n    $RM -r conftest*\n    LDFLAGS=$save_LDFLAGS\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_static_works_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX\" >&5\n+$as_echo \"$lt_cv_prog_compiler_static_works_CXX\" >&6; }\n \n if test yes = \"$lt_cv_prog_compiler_static_works_CXX\"; then\n     :\n@@ -18388,13 +15921,12 @@ fi\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n-printf %s \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n-if test ${lt_cv_prog_compiler_c_o_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_c_o_CXX=no\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n+$as_echo_n \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_c_o_CXX=no\n    $RM -r conftest 2>/dev/null\n    mkdir conftest\n    cd conftest\n@@ -18434,21 +15966,19 @@ else case e in #(\n    cd ..\n    $RM -r conftest\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_c_o_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX\" >&5\n+$as_echo \"$lt_cv_prog_compiler_c_o_CXX\" >&6; }\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n-printf %s \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n-if test ${lt_cv_prog_compiler_c_o_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_c_o_CXX=no\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext\" >&5\n+$as_echo_n \"checking if $compiler supports -c -o file.$ac_objext... \" >&6; }\n+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_prog_compiler_c_o_CXX=no\n    $RM -r conftest 2>/dev/null\n    mkdir conftest\n    cd conftest\n@@ -18488,11 +16018,10 @@ else case e in #(\n    cd ..\n    $RM -r conftest\n    $RM conftest*\n- ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_c_o_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX\" >&5\n+$as_echo \"$lt_cv_prog_compiler_c_o_CXX\" >&6; }\n \n \n \n@@ -18500,19 +16029,19 @@ printf \"%s\\n\" \"$lt_cv_prog_compiler_c_o_CXX\" >&6; }\n hard_links=nottested\n if test no = \"$lt_cv_prog_compiler_c_o_CXX\" && test no != \"$need_locks\"; then\n   # do not overwrite the value of need_locks provided by the user\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links\" >&5\n-printf %s \"checking if we can lock with hard links... \" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links\" >&5\n+$as_echo_n \"checking if we can lock with hard links... \" >&6; }\n   hard_links=yes\n   $RM conftest*\n   ln conftest.a conftest.b 2>/dev/null && hard_links=no\n   touch conftest.a\n   ln conftest.a conftest.b 2>&5 || hard_links=no\n   ln conftest.a conftest.b 2>/dev/null && hard_links=no\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $hard_links\" >&5\n-printf \"%s\\n\" \"$hard_links\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $hard_links\" >&5\n+$as_echo \"$hard_links\" >&6; }\n   if test no = \"$hard_links\"; then\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&2;}\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&5\n+$as_echo \"$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe\" >&2;}\n     need_locks=warn\n   fi\n else\n@@ -18521,8 +16050,8 @@ fi\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries\" >&5\n-printf %s \"checking whether the $compiler linker ($LD) supports shared libraries... \" >&6; }\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries\" >&5\n+$as_echo_n \"checking whether the $compiler linker ($LD) supports shared libraries... \" >&6; }\n \n   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\\''s/.* //'\\'' | sort | uniq > $export_symbols'\n   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'\n@@ -18539,15 +16068,15 @@ printf %s \"checking whether the $compiler linker ($LD) supports shared libraries\n     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then\n       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'\n     else\n-      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 == \"L\") || (\\$ 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'\n+      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'\n     fi\n     ;;\n   pw32*)\n     export_symbols_cmds_CXX=$ltdll_cmds\n     ;;\n-  cygwin* | mingw* | windows* | cegcc*)\n+  cygwin* | mingw* | cegcc*)\n     case $cc_basename in\n-    cl* | icl*)\n+    cl*)\n       exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'\n       ;;\n     *)\n@@ -18561,8 +16090,8 @@ printf %s \"checking whether the $compiler linker ($LD) supports shared libraries\n     ;;\n   esac\n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX\" >&5\n-printf \"%s\\n\" \"$ld_shlibs_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX\" >&5\n+$as_echo \"$ld_shlibs_CXX\" >&6; }\n test no = \"$ld_shlibs_CXX\" && can_build_shared=no\n \n with_gnu_ld_CXX=$with_gnu_ld\n@@ -18589,19 +16118,18 @@ x|xyes)\n       # Test whether the compiler implicitly links with -lc since on some\n       # systems, -lgcc has to come before -lc. If gcc already passes -lc\n       # to ld, don't add -lc before -lgcc.\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in\" >&5\n-printf %s \"checking whether -lc should be explicitly linked in... \" >&6; }\n-if test ${lt_cv_archive_cmds_need_lc_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) $RM conftest*\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in\" >&5\n+$as_echo_n \"checking whether -lc should be explicitly linked in... \" >&6; }\n+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  $RM conftest*\n \techo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n \n \tif { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$ac_compile\\\"\"; } >&5\n   (eval $ac_compile) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; } 2>conftest.err; then\n \t  soname=conftest\n \t  lib=conftest\n@@ -18619,7 +16147,7 @@ else case e in #(\n \t  if { { eval echo \"\\\"\\$as_me\\\":${as_lineno-$LINENO}: \\\"$archive_cmds_CXX 2\\>\\&1 \\| $GREP \\\" -lc \\\" \\>/dev/null 2\\>\\&1\\\"\"; } >&5\n   (eval $archive_cmds_CXX 2\\>\\&1 \\| $GREP \\\" -lc \\\" \\>/dev/null 2\\>\\&1) 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }\n \t  then\n \t    lt_cv_archive_cmds_need_lc_CXX=no\n@@ -18631,11 +16159,10 @@ else case e in #(\n \t  cat conftest.err 1>&5\n \tfi\n \t$RM conftest*\n-\t ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_archive_cmds_need_lc_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX\" >&5\n+$as_echo \"$lt_cv_archive_cmds_need_lc_CXX\" >&6; }\n       archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX\n       ;;\n     esac\n@@ -18704,8 +16231,8 @@ esac\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics\" >&5\n-printf %s \"checking dynamic linker characteristics... \" >&6; }\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics\" >&5\n+$as_echo_n \"checking dynamic linker characteristics... \" >&6; }\n \n library_names_spec=\n libname_spec='lib$name'\n@@ -18774,7 +16301,7 @@ aix[4-9]*)\n     # Unfortunately, runtime linking may impact performance, so we do\n     # not want this to be the default eventually. Also, we use the\n     # versioned .so libs for executables only if there is the -brtl\n-    # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.\n+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.\n     # To allow for filename-based versioning support, we need to create\n     # libNAME.so.V as an archive file, containing:\n     # *) an Import File, referring to the versioned filename of the\n@@ -18868,7 +16395,7 @@ bsdi[45]*)\n   # libtool to hard-code these into programs\n   ;;\n \n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   version_type=windows\n   shrext_cmds=.dll\n   need_version=no\n@@ -18879,29 +16406,15 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     # gcc\n     library_names_spec='$libname.dll.a'\n     # DLL is installed to $(libdir)/../bin by postinstall_cmds\n-    # If user builds GCC with multilib enabled,\n-    # it should just install on $(libdir)\n-    # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.\n-    if test xyes = x\"$multilib\"; then\n-      postinstall_cmds='base_file=`basename \\$file`~\n-        dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n-        dldir=$destdir/`dirname \\$dlpath`~\n-        $install_prog $dir/$dlname $destdir/$dlname~\n-        chmod a+x $destdir/$dlname~\n-        if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n-          eval '\\''$striplib $destdir/$dlname'\\'' || exit \\$?;\n-        fi'\n-    else\n-      postinstall_cmds='base_file=`basename \\$file`~\n-        dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n-        dldir=$destdir/`dirname \\$dlpath`~\n-        test -d \\$dldir || mkdir -p \\$dldir~\n-        $install_prog $dir/$dlname \\$dldir/$dlname~\n-        chmod a+x \\$dldir/$dlname~\n-        if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n-          eval '\\''$striplib \\$dldir/$dlname'\\'' || exit \\$?;\n-        fi'\n-    fi\n+    postinstall_cmds='base_file=`basename \\$file`~\n+      dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n+      dldir=$destdir/`dirname \\$dlpath`~\n+      test -d \\$dldir || mkdir -p \\$dldir~\n+      $install_prog $dir/$dlname \\$dldir/$dlname~\n+      chmod a+x \\$dldir/$dlname~\n+      if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n+        eval '\\''$striplib \\$dldir/$dlname'\\'' || exit \\$?;\n+      fi'\n     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\\''. $file; echo \\$dlname'\\''`~\n       dlpath=$dir/\\$dldll~\n        $RM \\$dlpath'\n@@ -18910,29 +16423,29 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     case $host_os in\n     cygwin*)\n       # Cygwin DLLs use 'cyg' prefix rather than 'lib'\n-      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n \n       ;;\n-    mingw* | windows* | cegcc*)\n+    mingw* | cegcc*)\n       # MinGW DLLs use traditional 'lib' prefix\n       soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n       ;;\n     pw32*)\n       # pw32 DLLs use 'pw' prefix rather than 'lib'\n-      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n       ;;\n     esac\n     dynamic_linker='Win32 ld.exe'\n     ;;\n \n-  *,cl* | *,icl*)\n-    # Native MSVC or ICC\n+  *,cl*)\n+    # Native MSVC\n     libname_spec='$name'\n     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'\n     library_names_spec='$libname.dll.lib'\n \n     case $build_os in\n-    mingw* | windows*)\n+    mingw*)\n       sys_lib_search_path_spec=\n       lt_save_ifs=$IFS\n       IFS=';'\n@@ -18945,7 +16458,7 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n       done\n       IFS=$lt_save_ifs\n       # Convert to MSYS style.\n-      sys_lib_search_path_spec=`$ECHO \"$sys_lib_search_path_spec\" | $SED -e 's|\\\\\\\\|/|g' -e 's| \\\\([a-zA-Z]\\\\):| /\\\\1|g' -e 's|^ ||'`\n+      sys_lib_search_path_spec=`$ECHO \"$sys_lib_search_path_spec\" | sed -e 's|\\\\\\\\|/|g' -e 's| \\\\([a-zA-Z]\\\\):| /\\\\1|g' -e 's|^ ||'`\n       ;;\n     cygwin*)\n       # Convert to unix form, then to dos form, then back to unix form\n@@ -18982,7 +16495,7 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     ;;\n \n   *)\n-    # Assume MSVC and ICC wrapper\n+    # Assume MSVC wrapper\n     library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'\n     dynamic_linker='Win32 ld.exe'\n     ;;\n@@ -19014,7 +16527,7 @@ dgux*)\n   shlibpath_var=LD_LIBRARY_PATH\n   ;;\n \n-freebsd* | dragonfly* | midnightbsd*)\n+freebsd* | dragonfly*)\n   # DragonFly does not have aout.  When/if they implement a new\n   # versioning mechanism, adjust this.\n   if test -x /usr/bin/objformat; then\n@@ -19038,28 +16551,7 @@ freebsd* | dragonfly* | midnightbsd*)\n       need_version=yes\n       ;;\n   esac\n-  case $host_cpu in\n-    powerpc64)\n-      # On FreeBSD bi-arch platforms, a different variable is used for 32-bit\n-      # binaries.  See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.\n-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n-/* end confdefs.h.  */\n-int test_pointer_size[sizeof (void *) - 5];\n-\n-_ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n   shlibpath_var=LD_LIBRARY_PATH\n-else case e in #(\n-  e) shlibpath_var=LD_32_LIBRARY_PATH ;;\n-esac\n-fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-      ;;\n-    *)\n-      shlibpath_var=LD_LIBRARY_PATH\n-      ;;\n-  esac\n   case $host_os in\n   freebsd2.*)\n     shlibpath_overrides_runpath=yes\n@@ -19089,9 +16581,8 @@ haiku*)\n   soname_spec='$libname$release$shared_ext$major'\n   shlibpath_var=LIBRARY_PATH\n   shlibpath_overrides_runpath=no\n-  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'\n-  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'\n-  hardcode_into_libs=no\n+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'\n+  hardcode_into_libs=yes\n   ;;\n \n hpux9* | hpux10* | hpux11*)\n@@ -19201,7 +16692,7 @@ linux*android*)\n   version_type=none # Android doesn't support versioned libraries.\n   need_lib_prefix=no\n   need_version=no\n-  library_names_spec='$libname$release$shared_ext $libname$shared_ext'\n+  library_names_spec='$libname$release$shared_ext'\n   soname_spec='$libname$release$shared_ext'\n   finish_cmds=\n   shlibpath_var=LD_LIBRARY_PATH\n@@ -19213,9 +16704,8 @@ linux*android*)\n   hardcode_into_libs=yes\n \n   dynamic_linker='Android linker'\n-  # -rpath works at least for libraries that are not overridden by\n-  # libraries installed in system locations.\n-  hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'\n+  # Don't embed -rpath directories since the linker doesn't support them.\n+  hardcode_libdir_flag_spec_CXX='-L$libdir'\n   ;;\n \n # This must be glibc/ELF.\n@@ -19230,11 +16720,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n   shlibpath_overrides_runpath=no\n \n   # Some binutils ld are patched to set DT_RUNPATH\n-  if test ${lt_cv_shlibpath_overrides_runpath+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_shlibpath_overrides_runpath=no\n+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  lt_cv_shlibpath_overrides_runpath=no\n     save_LDFLAGS=$LDFLAGS\n     save_libdir=$libdir\n     eval \"libdir=/foo; wl=\\\"$lt_prog_compiler_wl_CXX\\\"; \\\n@@ -19243,26 +16732,23 @@ else case e in #(\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_link \"$LINENO\"\n-then :\n-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep \"RUNPATH.*$libdir\" >/dev/null\n-then :\n+if ac_fn_cxx_try_link \"$LINENO\"; then :\n+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep \"RUNPATH.*$libdir\" >/dev/null; then :\n   lt_cv_shlibpath_overrides_runpath=yes\n fi\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n     LDFLAGS=$save_LDFLAGS\n     libdir=$save_libdir\n-     ;;\n-esac\n+\n fi\n \n   shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath\n@@ -19275,7 +16761,7 @@ fi\n   # Add ABI-specific directories to the system library path.\n   sys_lib_dlsearch_path_spec=\"/lib64 /usr/lib64 /lib /usr/lib\"\n \n-  # Ideally, we could use ldconfig to report *all* directories which are\n+  # Ideally, we could use ldconfig to report *all* directores which are\n   # searched for libraries, however this is still not possible.  Aside from not\n   # being certain /sbin/ldconfig is available, command\n   # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,\n@@ -19295,18 +16781,6 @@ fi\n   dynamic_linker='GNU/Linux ld.so'\n   ;;\n \n-netbsdelf*-gnu)\n-  version_type=linux\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  dynamic_linker='NetBSD ld.elf_so'\n-  ;;\n-\n netbsd*)\n   version_type=sunos\n   need_lib_prefix=no\n@@ -19325,18 +16799,6 @@ netbsd*)\n   hardcode_into_libs=yes\n   ;;\n \n-*-mlibc)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  dynamic_linker='mlibc ld.so'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  ;;\n-\n newsos6)\n   version_type=linux # correct to gnu/linux during the next big refactor\n   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n@@ -19356,7 +16818,7 @@ newsos6)\n   dynamic_linker='ldqnx.so'\n   ;;\n \n-openbsd*)\n+openbsd* | bitrig*)\n   version_type=sunos\n   sys_lib_dlsearch_path_spec=/usr/lib\n   need_lib_prefix=no\n@@ -19416,17 +16878,6 @@ rdos*)\n   dynamic_linker=no\n   ;;\n \n-serenity*)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  dynamic_linker='SerenityOS LibELF'\n-  ;;\n-\n solaris*)\n   version_type=linux # correct to gnu/linux during the next big refactor\n   need_lib_prefix=no\n@@ -19475,534 +16926,61 @@ sysv4 | sysv4.3*)\n   esac\n   ;;\n \n-sysv4*MP*)\n-  if test -d /usr/nec; then\n-    version_type=linux # correct to gnu/linux during the next big refactor\n-    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'\n-    soname_spec='$libname$shared_ext.$major'\n-    shlibpath_var=LD_LIBRARY_PATH\n-  fi\n-  ;;\n-\n-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)\n-  version_type=sco\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=yes\n-  hardcode_into_libs=yes\n-  if test yes = \"$with_gnu_ld\"; then\n-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'\n-  else\n-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'\n-    case $host_os in\n-      sco3.2v5*)\n-        sys_lib_search_path_spec=\"$sys_lib_search_path_spec /lib\"\n-\t;;\n-    esac\n-  fi\n-  sys_lib_dlsearch_path_spec='/usr/lib'\n-  ;;\n-\n-tpf*)\n-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  ;;\n-\n-uts4*)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  ;;\n-\n-emscripten*)\n-  version_type=none\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext'\n-  soname_spec='$libname$release$shared_ext'\n-  finish_cmds=\n-  dynamic_linker=\"Emscripten linker\"\n-  lt_prog_compiler_wl_CXX=\n-lt_prog_compiler_pic_CXX=\n-lt_prog_compiler_static_CXX=\n-\n-\n-  # C++ specific cases for pic, static, wl, etc.\n-  if test yes = \"$GXX\"; then\n-    lt_prog_compiler_wl_CXX='-Wl,'\n-    lt_prog_compiler_static_CXX='-static'\n-\n-    case $host_os in\n-    aix*)\n-      # All AIX code is PIC.\n-      if test ia64 = \"$host_cpu\"; then\n-\t# AIX 5 now supports IA64 processor\n-\tlt_prog_compiler_static_CXX='-Bstatic'\n-      fi\n-      lt_prog_compiler_pic_CXX='-fPIC'\n-      ;;\n-\n-    amigaos*)\n-      case $host_cpu in\n-      powerpc)\n-            # see comment about AmigaOS4 .so support\n-            lt_prog_compiler_pic_CXX='-fPIC'\n-        ;;\n-      m68k)\n-            # FIXME: we need at least 68020 code to build shared libraries, but\n-            # adding the '-m68020' flag to GCC prevents building anything better,\n-            # like '-m68040'.\n-            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'\n-        ;;\n-      esac\n-      ;;\n-\n-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)\n-      # PIC is the default for these OSes.\n-      ;;\n-    mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)\n-      # This hack is so that the source file can tell whether it is being\n-      # built for inclusion in a dll (and should export symbols for example).\n-      # Although the cygwin gcc ignores -fPIC, still need this for old-style\n-      # (--disable-auto-import) libraries\n-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'\n-      case $host_os in\n-      os2*)\n-\tlt_prog_compiler_static_CXX='$wl-static'\n-\t;;\n-      esac\n-      ;;\n-    darwin* | rhapsody*)\n-      # PIC is the default on this platform\n-      # Common symbols not allowed in MH_DYLIB files\n-      lt_prog_compiler_pic_CXX='-fno-common'\n-      ;;\n-    *djgpp*)\n-      # DJGPP does not support shared libraries at all\n-      lt_prog_compiler_pic_CXX=\n-      ;;\n-    haiku*)\n-      # PIC is the default for Haiku.\n-      # The \"-static\" flag exists, but is broken.\n-      lt_prog_compiler_static_CXX=\n-      ;;\n-    interix[3-9]*)\n-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.\n-      # Instead, we relocate shared libraries at runtime.\n-      ;;\n-    sysv4*MP*)\n-      if test -d /usr/nec; then\n-\tlt_prog_compiler_pic_CXX=-Kconform_pic\n-      fi\n-      ;;\n-    hpux*)\n-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit\n-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag\n-      # sets the default TLS model and affects inlining.\n-      case $host_cpu in\n-      hppa*64*)\n-\t;;\n-      *)\n-\tlt_prog_compiler_pic_CXX='-fPIC'\n-\t;;\n-      esac\n-      ;;\n-    *qnx* | *nto*)\n-      # QNX uses GNU C++, but need to define -shared option too, otherwise\n-      # it will coredump.\n-      lt_prog_compiler_pic_CXX='-fPIC -shared'\n-      ;;\n-    *)\n-      lt_prog_compiler_pic_CXX='-fPIC'\n-      ;;\n-    esac\n-  else\n-    case $host_os in\n-      aix[4-9]*)\n-\t# All AIX code is PIC.\n-\tif test ia64 = \"$host_cpu\"; then\n-\t  # AIX 5 now supports IA64 processor\n-\t  lt_prog_compiler_static_CXX='-Bstatic'\n-\telse\n-\t  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'\n-\tfi\n-\t;;\n-      chorus*)\n-\tcase $cc_basename in\n-\tcxch68*)\n-\t  # Green Hills C++ Compiler\n-\t  # _LT_TAGVAR(lt_prog_compiler_static, CXX)=\"--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a\"\n-\t  ;;\n-\tesac\n-\t;;\n-      mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)\n-\t# This hack is so that the source file can tell whether it is being\n-\t# built for inclusion in a dll (and should export symbols for example).\n-\tlt_prog_compiler_pic_CXX='-DDLL_EXPORT'\n-\t;;\n-      dgux*)\n-\tcase $cc_basename in\n-\t  ec++*)\n-\t    lt_prog_compiler_pic_CXX='-KPIC'\n-\t    ;;\n-\t  ghcx*)\n-\t    # Green Hills C++ Compiler\n-\t    lt_prog_compiler_pic_CXX='-pic'\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      freebsd* | dragonfly* | midnightbsd*)\n-\t# FreeBSD uses GNU C++\n-\t;;\n-      hpux9* | hpux10* | hpux11*)\n-\tcase $cc_basename in\n-\t  CC*)\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'\n-\t    if test ia64 != \"$host_cpu\"; then\n-\t      lt_prog_compiler_pic_CXX='+Z'\n-\t    fi\n-\t    ;;\n-\t  aCC*)\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_static_CXX='$wl-a ${wl}archive'\n-\t    case $host_cpu in\n-\t    hppa*64*|ia64*)\n-\t      # +Z the default\n-\t      ;;\n-\t    *)\n-\t      lt_prog_compiler_pic_CXX='+Z'\n-\t      ;;\n-\t    esac\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      interix*)\n-\t# This is c89, which is MS Visual C++ (no shared libs)\n-\t# Anyone wants to do a port?\n-\t;;\n-      irix5* | irix6* | nonstopux*)\n-\tcase $cc_basename in\n-\t  CC*)\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_static_CXX='-non_shared'\n-\t    # CC pic flag -KPIC is the default.\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n-\tcase $cc_basename in\n-\t  KCC*)\n-\t    # KAI C++ Compiler\n-\t    lt_prog_compiler_wl_CXX='--backend -Wl,'\n-\t    lt_prog_compiler_pic_CXX='-fPIC'\n-\t    ;;\n-\t  ecpc* )\n-\t    # old Intel C++ for x86_64, which still supported -KPIC.\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_pic_CXX='-KPIC'\n-\t    lt_prog_compiler_static_CXX='-static'\n-\t    ;;\n-\t  icpc* )\n-\t    # Intel C++, used to be incompatible with GCC.\n-\t    # ICC 10 doesn't accept -KPIC any more.\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_pic_CXX='-fPIC'\n-\t    lt_prog_compiler_static_CXX='-static'\n-\t    ;;\n-\t  pgCC* | pgcpp*)\n-\t    # Portland Group C++ compiler\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_pic_CXX='-fpic'\n-\t    lt_prog_compiler_static_CXX='-Bstatic'\n-\t    ;;\n-\t  cxx*)\n-\t    # Compaq C++\n-\t    # Make sure the PIC flag is empty.  It appears that all Alpha\n-\t    # Linux and Compaq Tru64 Unix objects are PIC.\n-\t    lt_prog_compiler_pic_CXX=\n-\t    lt_prog_compiler_static_CXX='-non_shared'\n-\t    ;;\n-\t  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)\n-\t    # IBM XL 8.0, 9.0 on PPC and BlueGene\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_pic_CXX='-qpic'\n-\t    lt_prog_compiler_static_CXX='-qstaticlink'\n-\t    ;;\n-\t  *)\n-\t    case `$CC -V 2>&1 | $SED 5q` in\n-\t    *Sun\\ C*)\n-\t      # Sun C++ 5.9\n-\t      lt_prog_compiler_pic_CXX='-KPIC'\n-\t      lt_prog_compiler_static_CXX='-Bstatic'\n-\t      lt_prog_compiler_wl_CXX='-Qoption ld '\n-\t      ;;\n-\t    esac\n-\t    ;;\n-\tesac\n-\t;;\n-      lynxos*)\n-\t;;\n-      m88k*)\n-\t;;\n-      mvs*)\n-\tcase $cc_basename in\n-\t  cxx*)\n-\t    lt_prog_compiler_pic_CXX='-W c,exportall'\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      netbsd* | netbsdelf*-gnu)\n-\t;;\n-      *-mlibc)\n-\t;;\n-      *qnx* | *nto*)\n-        # QNX uses GNU C++, but need to define -shared option too, otherwise\n-        # it will coredump.\n-        lt_prog_compiler_pic_CXX='-fPIC -shared'\n-        ;;\n-      osf3* | osf4* | osf5*)\n-\tcase $cc_basename in\n-\t  KCC*)\n-\t    lt_prog_compiler_wl_CXX='--backend -Wl,'\n-\t    ;;\n-\t  RCC*)\n-\t    # Rational C++ 2.4.1\n-\t    lt_prog_compiler_pic_CXX='-pic'\n-\t    ;;\n-\t  cxx*)\n-\t    # Digital/Compaq C++\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    # Make sure the PIC flag is empty.  It appears that all Alpha\n-\t    # Linux and Compaq Tru64 Unix objects are PIC.\n-\t    lt_prog_compiler_pic_CXX=\n-\t    lt_prog_compiler_static_CXX='-non_shared'\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      psos*)\n-\t;;\n-      serenity*)\n-        ;;\n-      solaris*)\n-\tcase $cc_basename in\n-\t  CC* | sunCC*)\n-\t    # Sun C++ 4.2, 5.x and Centerline C++\n-\t    lt_prog_compiler_pic_CXX='-KPIC'\n-\t    lt_prog_compiler_static_CXX='-Bstatic'\n-\t    lt_prog_compiler_wl_CXX='-Qoption ld '\n-\t    ;;\n-\t  gcx*)\n-\t    # Green Hills C++ Compiler\n-\t    lt_prog_compiler_pic_CXX='-PIC'\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      sunos4*)\n-\tcase $cc_basename in\n-\t  CC*)\n-\t    # Sun C++ 4.x\n-\t    lt_prog_compiler_pic_CXX='-pic'\n-\t    lt_prog_compiler_static_CXX='-Bstatic'\n-\t    ;;\n-\t  lcc*)\n-\t    # Lucid\n-\t    lt_prog_compiler_pic_CXX='-pic'\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)\n-\tcase $cc_basename in\n-\t  CC*)\n-\t    lt_prog_compiler_wl_CXX='-Wl,'\n-\t    lt_prog_compiler_pic_CXX='-KPIC'\n-\t    lt_prog_compiler_static_CXX='-Bstatic'\n-\t    ;;\n-\tesac\n-\t;;\n-      tandem*)\n-\tcase $cc_basename in\n-\t  NCC*)\n-\t    # NonStop-UX NCC 3.20\n-\t    lt_prog_compiler_pic_CXX='-KPIC'\n-\t    ;;\n-\t  *)\n-\t    ;;\n-\tesac\n-\t;;\n-      vxworks*)\n-\t;;\n-      *)\n-\tlt_prog_compiler_can_build_shared_CXX=no\n-\t;;\n-    esac\n-  fi\n-\n-case $host_os in\n-  # For platforms that do not support PIC, -DPIC is meaningless:\n-  *djgpp*)\n-    lt_prog_compiler_pic_CXX=\n-    ;;\n-  *)\n-    lt_prog_compiler_pic_CXX=\"$lt_prog_compiler_pic_CXX -DPIC\"\n-    ;;\n-esac\n-\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC\" >&5\n-printf %s \"checking for $compiler option to produce PIC... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic_CXX\" >&6; }\n-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX\n-\n-#\n-# Check to make sure the PIC flag actually works.\n-#\n-if test -n \"$lt_prog_compiler_pic_CXX\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works\" >&5\n-printf %s \"checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... \" >&6; }\n-if test ${lt_cv_prog_compiler_pic_works_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_pic_works_CXX=no\n-   ac_outfile=conftest.$ac_objext\n-   echo \"$lt_simple_compile_test_code\" > conftest.$ac_ext\n-   lt_compiler_flag=\"$lt_prog_compiler_pic_CXX -DPIC\"  ## exclude from sc_useless_quotes_in_assignment\n-   # Insert the option either (1) after the last *FLAGS variable, or\n-   # (2) before a word containing \"conftest.\", or (3) at the end.\n-   # Note that $ac_compile itself does not contain backslashes and begins\n-   # with a dollar sign (not a hyphen), so the echo should work correctly.\n-   # The option is referenced via a variable to avoid confusing sed.\n-   lt_compile=`echo \"$ac_compile\" | $SED \\\n-   -e 's:.*FLAGS}\\{0,1\\} :&$lt_compiler_flag :; t' \\\n-   -e 's: [^ ]*conftest\\.: $lt_compiler_flag&:; t' \\\n-   -e 's:$: $lt_compiler_flag:'`\n-   (eval echo \"\\\"\\$as_me:$LINENO: $lt_compile\\\"\" >&5)\n-   (eval \"$lt_compile\" 2>conftest.err)\n-   ac_status=$?\n-   cat conftest.err >&5\n-   echo \"$as_me:$LINENO: \\$? = $ac_status\" >&5\n-   if (exit $ac_status) && test -s \"$ac_outfile\"; then\n-     # The compiler can only warn and ignore the option if not recognized\n-     # So say no if there are warnings other than the usual output.\n-     $ECHO \"$_lt_compiler_boilerplate\" | $SED '/^$/d' >conftest.exp\n-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2\n-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then\n-       lt_cv_prog_compiler_pic_works_CXX=yes\n-     fi\n-   fi\n-   $RM conftest*\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_pic_works_CXX\" >&6; }\n-\n-if test yes = \"$lt_cv_prog_compiler_pic_works_CXX\"; then\n-    case $lt_prog_compiler_pic_CXX in\n-     \"\" | \" \"*) ;;\n-     *) lt_prog_compiler_pic_CXX=\" $lt_prog_compiler_pic_CXX\" ;;\n-     esac\n-else\n-    lt_prog_compiler_pic_CXX=\n-     lt_prog_compiler_can_build_shared_CXX=no\n-fi\n-\n-fi\n-\n-\n-\n-\n-\n-#\n-# Check to make sure the static flag actually works.\n-#\n-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\\\"$lt_prog_compiler_static_CXX\\\"\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works\" >&5\n-printf %s \"checking if $compiler static flag $lt_tmp_static_flag works... \" >&6; }\n-if test ${lt_cv_prog_compiler_static_works_CXX+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) lt_cv_prog_compiler_static_works_CXX=no\n-   save_LDFLAGS=$LDFLAGS\n-   LDFLAGS=\"$LDFLAGS $lt_tmp_static_flag\"\n-   echo \"$lt_simple_link_test_code\" > conftest.$ac_ext\n-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then\n-     # The linker can only warn and ignore the option if not recognized\n-     # So say no if there are warnings\n-     if test -s conftest.err; then\n-       # Append any errors to the config.log.\n-       cat conftest.err 1>&5\n-       $ECHO \"$_lt_linker_boilerplate\" | $SED '/^$/d' > conftest.exp\n-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2\n-       if diff conftest.exp conftest.er2 >/dev/null; then\n-         lt_cv_prog_compiler_static_works_CXX=yes\n-       fi\n-     else\n-       lt_cv_prog_compiler_static_works_CXX=yes\n-     fi\n-   fi\n-   $RM -r conftest*\n-   LDFLAGS=$save_LDFLAGS\n- ;;\n-esac\n-fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX\" >&5\n-printf \"%s\\n\" \"$lt_cv_prog_compiler_static_works_CXX\" >&6; }\n-\n-if test yes = \"$lt_cv_prog_compiler_static_works_CXX\"; then\n-    :\n-else\n-    lt_prog_compiler_static_CXX=\n-fi\n+sysv4*MP*)\n+  if test -d /usr/nec; then\n+    version_type=linux # correct to gnu/linux during the next big refactor\n+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'\n+    soname_spec='$libname$shared_ext.$major'\n+    shlibpath_var=LD_LIBRARY_PATH\n+  fi\n+  ;;\n \n+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)\n+  version_type=sco\n+  need_lib_prefix=no\n+  need_version=no\n+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'\n+  soname_spec='$libname$release$shared_ext$major'\n+  shlibpath_var=LD_LIBRARY_PATH\n+  shlibpath_overrides_runpath=yes\n+  hardcode_into_libs=yes\n+  if test yes = \"$with_gnu_ld\"; then\n+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'\n+  else\n+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'\n+    case $host_os in\n+      sco3.2v5*)\n+        sys_lib_search_path_spec=\"$sys_lib_search_path_spec /lib\"\n+\t;;\n+    esac\n+  fi\n+  sys_lib_dlsearch_path_spec='/usr/lib'\n+  ;;\n \n+tpf*)\n+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.\n+  version_type=linux # correct to gnu/linux during the next big refactor\n+  need_lib_prefix=no\n+  need_version=no\n+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n+  shlibpath_var=LD_LIBRARY_PATH\n+  shlibpath_overrides_runpath=no\n+  hardcode_into_libs=yes\n+  ;;\n \n-='-fPIC'\n-  archive_cmds_CXX='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'\n-  archive_expsym_cmds_CXX='$SED \"s|^|_|\" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'\n-  archive_cmds_need_lc_CXX=no\n-  no_undefined_flag_CXX=\n+uts4*)\n+  version_type=linux # correct to gnu/linux during the next big refactor\n+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n+  soname_spec='$libname$release$shared_ext$major'\n+  shlibpath_var=LD_LIBRARY_PATH\n   ;;\n \n *)\n   dynamic_linker=no\n   ;;\n esac\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $dynamic_linker\" >&5\n-printf \"%s\\n\" \"$dynamic_linker\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $dynamic_linker\" >&5\n+$as_echo \"$dynamic_linker\" >&6; }\n test no = \"$dynamic_linker\" && can_build_shared=no\n \n variables_saved_for_relink=\"PATH $shlibpath_var $runpath_var\"\n@@ -20066,8 +17044,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs\" >&5\n-printf %s \"checking how to hardcode library paths into programs... \" >&6; }\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs\" >&5\n+$as_echo_n \"checking how to hardcode library paths into programs... \" >&6; }\n hardcode_action_CXX=\n if test -n \"$hardcode_libdir_flag_spec_CXX\" ||\n    test -n \"$runpath_var_CXX\" ||\n@@ -20091,8 +17069,8 @@ else\n   # directories.\n   hardcode_action_CXX=unsupported\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX\" >&5\n-printf \"%s\\n\" \"$hardcode_action_CXX\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX\" >&5\n+$as_echo \"$hardcode_action_CXX\" >&6; }\n \n if test relink = \"$hardcode_action_CXX\" ||\n    test yes = \"$inherit_rpath_CXX\"; then\n@@ -20160,13 +17138,12 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'\n ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'\n ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n   ac_success=no\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default\" >&5\n-printf %s \"checking whether $CXX supports C++11 features by default... \" >&6; }\n-if test ${ax_cv_cxx_compile_cxx11+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features by default\" >&5\n+$as_echo_n \"checking whether $CXX supports C++11 features by default... \" >&6; }\n+if ${ax_cv_cxx_compile_cxx11+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n \n@@ -20177,7 +17154,7 @@ else case e in #(\n \n #error \"This is not a C++ compiler\"\n \n-#elif __cplusplus < 201103L && !(defined _MSC_VER)\n+#elif __cplusplus < 201103L\n \n #error \"This is not a C++11 compiler\"\n \n@@ -20455,32 +17432,28 @@ namespace cxx11\n \n \n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   ax_cv_cxx_compile_cxx11=yes\n-else case e in #(\n-  e) ax_cv_cxx_compile_cxx11=no ;;\n-esac\n+else\n+  ax_cv_cxx_compile_cxx11=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11\" >&5\n-printf \"%s\\n\" \"$ax_cv_cxx_compile_cxx11\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx11\" >&5\n+$as_echo \"$ax_cv_cxx_compile_cxx11\" >&6; }\n   if test x$ax_cv_cxx_compile_cxx11 = xyes; then\n     ac_success=yes\n   fi\n \n     if test x$ac_success = xno; then\n     for switch in -std=gnu++11 -std=gnu++0x; do\n-      cachevar=`printf \"%s\\n\" \"ax_cv_cxx_compile_cxx11_$switch\" | sed \"$as_sed_sh\"`\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch\" >&5\n-printf %s \"checking whether $CXX supports C++11 features with $switch... \" >&6; }\n-if eval test \\${$cachevar+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_save_CXX=\"$CXX\"\n+      cachevar=`$as_echo \"ax_cv_cxx_compile_cxx11_$switch\" | $as_tr_sh`\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch\" >&5\n+$as_echo_n \"checking whether $CXX supports C++11 features with $switch... \" >&6; }\n+if eval \\${$cachevar+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_save_CXX=\"$CXX\"\n          CXX=\"$CXX $switch\"\n          cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n@@ -20493,7 +17466,7 @@ else case e in #(\n \n #error \"This is not a C++ compiler\"\n \n-#elif __cplusplus < 201103L && !(defined _MSC_VER)\n+#elif __cplusplus < 201103L\n \n #error \"This is not a C++11 compiler\"\n \n@@ -20771,20 +17744,17 @@ namespace cxx11\n \n \n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   eval $cachevar=yes\n-else case e in #(\n-  e) eval $cachevar=no ;;\n-esac\n+else\n+  eval $cachevar=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-         CXX=\"$ac_save_CXX\" ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+         CXX=\"$ac_save_CXX\"\n fi\n eval ac_res=\\$$cachevar\n-\t       { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n-printf \"%s\\n\" \"$ac_res\" >&6; }\n+\t       { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n+$as_echo \"$ac_res\" >&6; }\n       if eval test x\\$$cachevar = xyes; then\n         CXX=\"$CXX $switch\"\n         if test -n \"$CXXCPP\" ; then\n@@ -20798,14 +17768,13 @@ printf \"%s\\n\" \"$ac_res\" >&6; }\n \n     if test x$ac_success = xno; then\n                 for switch in -std=c++11 -std=c++0x +std=c++11 \"-h std=c++11\"; do\n-      cachevar=`printf \"%s\\n\" \"ax_cv_cxx_compile_cxx11_$switch\" | sed \"$as_sed_sh\"`\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch\" >&5\n-printf %s \"checking whether $CXX supports C++11 features with $switch... \" >&6; }\n-if eval test \\${$cachevar+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) ac_save_CXX=\"$CXX\"\n+      cachevar=`$as_echo \"ax_cv_cxx_compile_cxx11_$switch\" | $as_tr_sh`\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch\" >&5\n+$as_echo_n \"checking whether $CXX supports C++11 features with $switch... \" >&6; }\n+if eval \\${$cachevar+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  ac_save_CXX=\"$CXX\"\n          CXX=\"$CXX $switch\"\n          cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n@@ -20818,7 +17787,7 @@ else case e in #(\n \n #error \"This is not a C++ compiler\"\n \n-#elif __cplusplus < 201103L && !(defined _MSC_VER)\n+#elif __cplusplus < 201103L\n \n #error \"This is not a C++11 compiler\"\n \n@@ -21096,20 +18065,17 @@ namespace cxx11\n \n \n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n   eval $cachevar=yes\n-else case e in #(\n-  e) eval $cachevar=no ;;\n-esac\n+else\n+  eval $cachevar=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n-         CXX=\"$ac_save_CXX\" ;;\n-esac\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+         CXX=\"$ac_save_CXX\"\n fi\n eval ac_res=\\$$cachevar\n-\t       { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n-printf \"%s\\n\" \"$ac_res\" >&6; }\n+\t       { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_res\" >&5\n+$as_echo \"$ac_res\" >&6; }\n       if eval test x\\$$cachevar = xyes; then\n         CXX=\"$CXX $switch\"\n         if test -n \"$CXXCPP\" ; then\n@@ -21133,12 +18099,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu\n   fi\n   if test x$ac_success = xno; then\n     HAVE_CXX11=0\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found\" >&5\n-printf \"%s\\n\" \"$as_me: No compiler with C++11 support was found\" >&6;}\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found\" >&5\n+$as_echo \"$as_me: No compiler with C++11 support was found\" >&6;}\n   else\n     HAVE_CXX11=1\n \n-printf \"%s\\n\" \"#define HAVE_CXX11 1\" >>confdefs.h\n+$as_echo \"#define HAVE_CXX11 1\" >>confdefs.h\n \n   fi\n \n@@ -21146,13 +18112,12 @@ printf \"%s\\n\" \"#define HAVE_CXX11 1\" >>confdefs.h\n \n \n \n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for __attribute__((format))\" >&5\n-printf %s \"checking for __attribute__((format))... \" >&6; }\n-if test ${ax_cv_have_func_attribute_format+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e)\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for __attribute__((format))\" >&5\n+$as_echo_n \"checking for __attribute__((format))... \" >&6; }\n+if ${ax_cv_have_func_attribute_format+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+\n         cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n@@ -21160,7 +18125,7 @@ else case e in #(\n                     int foo(const char *p, ...) __attribute__((format(printf, 1, 2)));\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n@@ -21168,31 +18133,27 @@ main (void)\n }\n \n _ACEOF\n-if ac_fn_cxx_try_link \"$LINENO\"\n-then :\n-                                      if test -s conftest.err\n-then :\n+if ac_fn_cxx_try_link \"$LINENO\"; then :\n+                                      if test -s conftest.err; then :\n   ax_cv_have_func_attribute_format=no\n-else case e in #(\n-  e) ax_cv_have_func_attribute_format=yes ;;\n-esac\n+else\n+  ax_cv_have_func_attribute_format=yes\n fi\n-else case e in #(\n-  e) ax_cv_have_func_attribute_format=no ;;\n-esac\n+else\n+  ax_cv_have_func_attribute_format=no\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam \\\n+rm -f core conftest.err conftest.$ac_objext \\\n     conftest$ac_exeext conftest.$ac_ext\n-     ;;\n-esac\n+\n fi\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_format\" >&5\n-printf \"%s\\n\" \"$ax_cv_have_func_attribute_format\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_format\" >&5\n+$as_echo \"$ax_cv_have_func_attribute_format\" >&6; }\n \n-    if test yes = $ax_cv_have_func_attribute_format\n-then :\n+    if test yes = $ax_cv_have_func_attribute_format; then :\n \n-printf \"%s\\n\" \"#define HAVE_FUNC_ATTRIBUTE_FORMAT 1\" >>confdefs.h\n+cat >>confdefs.h <<_ACEOF\n+#define HAVE_FUNC_ATTRIBUTE_FORMAT 1\n+_ACEOF\n \n fi\n \n@@ -21210,13 +18171,12 @@ if test \"x$ac_cv_env_PKG_CONFIG_set\" != \"xset\"; then\n \tif test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}pkg-config\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}pkg-config; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_path_PKG_CONFIG+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $PKG_CONFIG in\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_path_PKG_CONFIG+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $PKG_CONFIG in\n   [\\\\/]* | ?:[\\\\/]*)\n   ac_cv_path_PKG_CONFIG=\"$PKG_CONFIG\" # Let the user override the test with a path.\n   ;;\n@@ -21225,15 +18185,11 @@ else case e in #(\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_path_PKG_CONFIG=\"$as_dir$ac_word$ac_exec_ext\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_path_PKG_CONFIG=\"$as_dir/$ac_word$ac_exec_ext\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n@@ -21241,16 +18197,15 @@ done\n IFS=$as_save_IFS\n \n   ;;\n-esac ;;\n esac\n fi\n PKG_CONFIG=$ac_cv_path_PKG_CONFIG\n if test -n \"$PKG_CONFIG\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG\" >&5\n-printf \"%s\\n\" \"$PKG_CONFIG\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG\" >&5\n+$as_echo \"$PKG_CONFIG\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -21259,13 +18214,12 @@ if test -z \"$ac_cv_path_PKG_CONFIG\"; then\n   ac_pt_PKG_CONFIG=$PKG_CONFIG\n   # Extract the first word of \"pkg-config\", so it can be a program name with args.\n set dummy pkg-config; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $ac_pt_PKG_CONFIG in\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $ac_pt_PKG_CONFIG in\n   [\\\\/]* | ?:[\\\\/]*)\n   ac_cv_path_ac_pt_PKG_CONFIG=\"$ac_pt_PKG_CONFIG\" # Let the user override the test with a path.\n   ;;\n@@ -21274,15 +18228,11 @@ else case e in #(\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_path_ac_pt_PKG_CONFIG=\"$as_dir$ac_word$ac_exec_ext\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_path_ac_pt_PKG_CONFIG=\"$as_dir/$ac_word$ac_exec_ext\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n@@ -21290,16 +18240,15 @@ done\n IFS=$as_save_IFS\n \n   ;;\n-esac ;;\n esac\n fi\n ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG\n if test -n \"$ac_pt_PKG_CONFIG\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG\" >&5\n-printf \"%s\\n\" \"$ac_pt_PKG_CONFIG\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG\" >&5\n+$as_echo \"$ac_pt_PKG_CONFIG\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_pt_PKG_CONFIG\" = x; then\n@@ -21307,8 +18256,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     PKG_CONFIG=$ac_pt_PKG_CONFIG\n@@ -21320,30 +18269,26 @@ fi\n fi\n if test -n \"$PKG_CONFIG\"; then\n \t_pkg_min_version=0.20\n-\t{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version\" >&5\n-printf %s \"checking pkg-config is at least version $_pkg_min_version... \" >&6; }\n+\t{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version\" >&5\n+$as_echo_n \"checking pkg-config is at least version $_pkg_min_version... \" >&6; }\n \tif $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then\n-\t\t{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\t\t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \telse\n-\t\t{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+\t\t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \t\tPKG_CONFIG=\"\"\n \tfi\n fi\n-if test -z \"$PKG_CONFIG\"; then\n-\tas_fn_error $? \"pkg-config not found\" \"$LINENO\" 5\n-fi\n \n # Extract the first word of \"gperf\", so it can be a program name with args.\n set dummy gperf; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_path_GPERF+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $GPERF in\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_path_GPERF+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $GPERF in\n   [\\\\/]* | ?:[\\\\/]*)\n   ac_cv_path_GPERF=\"$GPERF\" # Let the user override the test with a path.\n   ;;\n@@ -21352,15 +18297,11 @@ else case e in #(\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_path_GPERF=\"$as_dir$ac_word$ac_exec_ext\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_path_GPERF=\"$as_dir/$ac_word$ac_exec_ext\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n@@ -21368,21 +18309,19 @@ done\n IFS=$as_save_IFS\n \n   ;;\n-esac ;;\n esac\n fi\n GPERF=$ac_cv_path_GPERF\n if test -n \"$GPERF\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $GPERF\" >&5\n-printf \"%s\\n\" \"$GPERF\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $GPERF\" >&5\n+$as_echo \"$GPERF\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n-if test -z \"$GPERF\"\n-then :\n+if test -z \"$GPERF\"; then :\n   as_fn_error $? \"gperf not found\" \"$LINENO\" 5\n fi\n \n@@ -21391,17 +18330,17 @@ fi\n # ====================\n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for librevenge-0.0\" >&5\n-printf %s \"checking for librevenge-0.0... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for REVENGE\" >&5\n+$as_echo_n \"checking for REVENGE... \" >&6; }\n \n if test -n \"$REVENGE_CFLAGS\"; then\n     pkg_cv_REVENGE_CFLAGS=\"$REVENGE_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-0.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-0.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"librevenge-0.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_REVENGE_CFLAGS=`$PKG_CONFIG --cflags \"librevenge-0.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21415,10 +18354,10 @@ if test -n \"$REVENGE_LIBS\"; then\n     pkg_cv_REVENGE_LIBS=\"$REVENGE_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-0.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-0.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"librevenge-0.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_REVENGE_LIBS=`$PKG_CONFIG --libs \"librevenge-0.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21432,8 +18371,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -21441,14 +18380,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                REVENGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"librevenge-0.0\" 2>&1`\n+\t        REVENGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"librevenge-0.0\" 2>&1`\n         else\n-                REVENGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"librevenge-0.0\" 2>&1`\n+\t        REVENGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"librevenge-0.0\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$REVENGE_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$REVENGE_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (librevenge-0.0) were not met:\n+\tas_fn_error $? \"Package requirements (librevenge-0.0) were not met:\n \n $REVENGE_PKG_ERRORS\n \n@@ -21459,10 +18398,10 @@ Alternatively, you may set the environment variables REVENGE_CFLAGS\n and REVENGE_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -21472,28 +18411,28 @@ and REVENGE_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        REVENGE_CFLAGS=$pkg_cv_REVENGE_CFLAGS\n-        REVENGE_LIBS=$pkg_cv_REVENGE_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tREVENGE_CFLAGS=$pkg_cv_REVENGE_CFLAGS\n+\tREVENGE_LIBS=$pkg_cv_REVENGE_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for libxml-2.0\" >&5\n-printf %s \"checking for libxml-2.0... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for XML\" >&5\n+$as_echo_n \"checking for XML... \" >&6; }\n \n if test -n \"$XML_CFLAGS\"; then\n     pkg_cv_XML_CFLAGS=\"$XML_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libxml-2.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libxml-2.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"libxml-2.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_XML_CFLAGS=`$PKG_CONFIG --cflags \"libxml-2.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21507,10 +18446,10 @@ if test -n \"$XML_LIBS\"; then\n     pkg_cv_XML_LIBS=\"$XML_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libxml-2.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libxml-2.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"libxml-2.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_XML_LIBS=`$PKG_CONFIG --libs \"libxml-2.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21524,8 +18463,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -21533,14 +18472,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"libxml-2.0\" 2>&1`\n+\t        XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"libxml-2.0\" 2>&1`\n         else\n-                XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"libxml-2.0\" 2>&1`\n+\t        XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"libxml-2.0\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$XML_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$XML_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (libxml-2.0) were not met:\n+\tas_fn_error $? \"Package requirements (libxml-2.0) were not met:\n \n $XML_PKG_ERRORS\n \n@@ -21551,10 +18490,10 @@ Alternatively, you may set the environment variables XML_CFLAGS\n and XML_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -21564,28 +18503,28 @@ and XML_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        XML_CFLAGS=$pkg_cv_XML_CFLAGS\n-        XML_LIBS=$pkg_cv_XML_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tXML_CFLAGS=$pkg_cv_XML_CFLAGS\n+\tXML_LIBS=$pkg_cv_XML_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for zlib\" >&5\n-printf %s \"checking for zlib... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for ZLIB\" >&5\n+$as_echo_n \"checking for ZLIB... \" >&6; }\n \n if test -n \"$ZLIB_CFLAGS\"; then\n     pkg_cv_ZLIB_CFLAGS=\"$ZLIB_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"zlib\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"zlib\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"zlib\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags \"zlib\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21599,10 +18538,10 @@ if test -n \"$ZLIB_LIBS\"; then\n     pkg_cv_ZLIB_LIBS=\"$ZLIB_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"zlib\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"zlib\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"zlib\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs \"zlib\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21616,8 +18555,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -21625,14 +18564,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"zlib\" 2>&1`\n+\t        ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"zlib\" 2>&1`\n         else\n-                ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"zlib\" 2>&1`\n+\t        ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"zlib\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$ZLIB_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$ZLIB_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (zlib) were not met:\n+\tas_fn_error $? \"Package requirements (zlib) were not met:\n \n $ZLIB_PKG_ERRORS\n \n@@ -21643,10 +18582,10 @@ Alternatively, you may set the environment variables ZLIB_CFLAGS\n and ZLIB_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -21656,12 +18595,12 @@ and ZLIB_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS\n-        ZLIB_LIBS=$pkg_cv_ZLIB_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS\n+\tZLIB_LIBS=$pkg_cv_ZLIB_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -21670,31 +18609,28 @@ fi\n # ===============\n \n # Check whether --with-liblangtag was given.\n-if test ${with_liblangtag+y}\n-then :\n+if test \"${with_liblangtag+set}\" = set; then :\n   withval=$with_liblangtag; with_liblangtag=\"$withval\"\n-else case e in #(\n-  e) with_liblangtag=\"yes\"\n- ;;\n-esac\n+else\n+  with_liblangtag=\"yes\"\n+\n fi\n \n-if test \"x$with_liblangtag\" = \"xyes\"\n-then :\n+if test \"x$with_liblangtag\" = \"xyes\"; then :\n \n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for liblangtag\" >&5\n-printf %s \"checking for liblangtag... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for LANGTAG\" >&5\n+$as_echo_n \"checking for LANGTAG... \" >&6; }\n \n if test -n \"$LANGTAG_CFLAGS\"; then\n     pkg_cv_LANGTAG_CFLAGS=\"$LANGTAG_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"liblangtag\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"liblangtag\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"liblangtag\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_LANGTAG_CFLAGS=`$PKG_CONFIG --cflags \"liblangtag\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21708,10 +18644,10 @@ if test -n \"$LANGTAG_LIBS\"; then\n     pkg_cv_LANGTAG_LIBS=\"$LANGTAG_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"liblangtag\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"liblangtag\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"liblangtag\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_LANGTAG_LIBS=`$PKG_CONFIG --libs \"liblangtag\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21725,8 +18661,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -21734,14 +18670,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                LANGTAG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"liblangtag\" 2>&1`\n+\t        LANGTAG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"liblangtag\" 2>&1`\n         else\n-                LANGTAG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"liblangtag\" 2>&1`\n+\t        LANGTAG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"liblangtag\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$LANGTAG_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$LANGTAG_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (liblangtag) were not met:\n+\tas_fn_error $? \"Package requirements (liblangtag) were not met:\n \n $LANGTAG_PKG_ERRORS\n \n@@ -21752,10 +18688,10 @@ Alternatively, you may set the environment variables LANGTAG_CFLAGS\n and LANGTAG_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -21765,16 +18701,16 @@ and LANGTAG_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        LANGTAG_CFLAGS=$pkg_cv_LANGTAG_CFLAGS\n-        LANGTAG_LIBS=$pkg_cv_LANGTAG_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tLANGTAG_CFLAGS=$pkg_cv_LANGTAG_CFLAGS\n+\tLANGTAG_LIBS=$pkg_cv_LANGTAG_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n-printf \"%s\\n\" \"#define WITH_LIBLANGTAG 1\" >>confdefs.h\n+$as_echo \"#define WITH_LIBLANGTAG 1\" >>confdefs.h\n \n \n fi\n@@ -21787,30 +18723,21 @@ else\n fi\n \n \n-if test \"x$enable_experimental\" = \"xyes\"\n-then :\n+if test \"x$enable_experimental\" = \"xyes\"; then :\n \n # ===========\n # Find libcss\n # ===========\n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for\n-    libcss >= 0.6.0\n-    libparserutils\n-    libwapcaplet\n-\" >&5\n-printf %s \"checking for\n-    libcss >= 0.6.0\n-    libparserutils\n-    libwapcaplet\n-... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for CSS\" >&5\n+$as_echo_n \"checking for CSS... \" >&6; }\n \n if test -n \"$CSS_CFLAGS\"; then\n     pkg_cv_CSS_CFLAGS=\"$CSS_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"\n     libcss >= 0.6.0\n     libparserutils\n     libwapcaplet\n@@ -21821,7 +18748,7 @@ if test -n \"$CSS_CFLAGS\"; then\n     libwapcaplet\n \") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_CSS_CFLAGS=`$PKG_CONFIG --cflags \"\n     libcss >= 0.6.0\n@@ -21839,7 +18766,7 @@ if test -n \"$CSS_LIBS\"; then\n     pkg_cv_CSS_LIBS=\"$CSS_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"\n     libcss >= 0.6.0\n     libparserutils\n     libwapcaplet\n@@ -21850,7 +18777,7 @@ if test -n \"$CSS_LIBS\"; then\n     libwapcaplet\n \") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_CSS_LIBS=`$PKG_CONFIG --libs \"\n     libcss >= 0.6.0\n@@ -21868,8 +18795,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -21877,22 +18804,22 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                CSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"\n+\t        CSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"\n     libcss >= 0.6.0\n     libparserutils\n     libwapcaplet\n \" 2>&1`\n         else\n-                CSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"\n+\t        CSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"\n     libcss >= 0.6.0\n     libparserutils\n     libwapcaplet\n \" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$CSS_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$CSS_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (\n+\tas_fn_error $? \"Package requirements (\n     libcss >= 0.6.0\n     libparserutils\n     libwapcaplet\n@@ -21907,10 +18834,10 @@ Alternatively, you may set the environment variables CSS_CFLAGS\n and CSS_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -21920,12 +18847,12 @@ and CSS_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        CSS_CFLAGS=$pkg_cv_CSS_CFLAGS\n-        CSS_LIBS=$pkg_cv_CSS_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tCSS_CFLAGS=$pkg_cv_CSS_CFLAGS\n+\tCSS_LIBS=$pkg_cv_CSS_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -21934,17 +18861,17 @@ fi\n # ===========\n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for libhubbub >= 0.3.0\" >&5\n-printf %s \"checking for libhubbub >= 0.3.0... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for HUBBUB\" >&5\n+$as_echo_n \"checking for HUBBUB... \" >&6; }\n \n if test -n \"$HUBBUB_CFLAGS\"; then\n     pkg_cv_HUBBUB_CFLAGS=\"$HUBBUB_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libhubbub >= 0.3.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libhubbub >= 0.3.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"libhubbub >= 0.3.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_HUBBUB_CFLAGS=`$PKG_CONFIG --cflags \"libhubbub >= 0.3.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21958,10 +18885,10 @@ if test -n \"$HUBBUB_LIBS\"; then\n     pkg_cv_HUBBUB_LIBS=\"$HUBBUB_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libhubbub >= 0.3.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libhubbub >= 0.3.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"libhubbub >= 0.3.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_HUBBUB_LIBS=`$PKG_CONFIG --libs \"libhubbub >= 0.3.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -21975,8 +18902,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -21984,14 +18911,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                HUBBUB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"libhubbub >= 0.3.0\" 2>&1`\n+\t        HUBBUB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"libhubbub >= 0.3.0\" 2>&1`\n         else\n-                HUBBUB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"libhubbub >= 0.3.0\" 2>&1`\n+\t        HUBBUB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"libhubbub >= 0.3.0\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$HUBBUB_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$HUBBUB_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (libhubbub >= 0.3.0) were not met:\n+\tas_fn_error $? \"Package requirements (libhubbub >= 0.3.0) were not met:\n \n $HUBBUB_PKG_ERRORS\n \n@@ -22002,10 +18929,10 @@ Alternatively, you may set the environment variables HUBBUB_CFLAGS\n and HUBBUB_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -22015,12 +18942,12 @@ and HUBBUB_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        HUBBUB_CFLAGS=$pkg_cv_HUBBUB_CFLAGS\n-        HUBBUB_LIBS=$pkg_cv_HUBBUB_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tHUBBUB_CFLAGS=$pkg_cv_HUBBUB_CFLAGS\n+\tHUBBUB_LIBS=$pkg_cv_HUBBUB_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -22029,17 +18956,17 @@ fi\n # ==============\n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for libmspack\" >&5\n-printf %s \"checking for libmspack... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for MSPACK\" >&5\n+$as_echo_n \"checking for MSPACK... \" >&6; }\n \n if test -n \"$MSPACK_CFLAGS\"; then\n     pkg_cv_MSPACK_CFLAGS=\"$MSPACK_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libmspack\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libmspack\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"libmspack\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_MSPACK_CFLAGS=`$PKG_CONFIG --cflags \"libmspack\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22053,10 +18980,10 @@ if test -n \"$MSPACK_LIBS\"; then\n     pkg_cv_MSPACK_LIBS=\"$MSPACK_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libmspack\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"libmspack\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"libmspack\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_MSPACK_LIBS=`$PKG_CONFIG --libs \"libmspack\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22070,8 +18997,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -22079,14 +19006,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                MSPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"libmspack\" 2>&1`\n+\t        MSPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"libmspack\" 2>&1`\n         else\n-                MSPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"libmspack\" 2>&1`\n+\t        MSPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"libmspack\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$MSPACK_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$MSPACK_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (libmspack) were not met:\n+\tas_fn_error $? \"Package requirements (libmspack) were not met:\n \n $MSPACK_PKG_ERRORS\n \n@@ -22097,10 +19024,10 @@ Alternatively, you may set the environment variables MSPACK_CFLAGS\n and MSPACK_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -22110,12 +19037,12 @@ and MSPACK_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        MSPACK_CFLAGS=$pkg_cv_MSPACK_CFLAGS\n-        MSPACK_LIBS=$pkg_cv_MSPACK_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tMSPACK_CFLAGS=$pkg_cv_MSPACK_CFLAGS\n+\tMSPACK_LIBS=$pkg_cv_MSPACK_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -22140,24 +19067,33 @@ fi\n # ==================\n saved_CPPFLAGS=\"${CPPFLAGS}\"\n CPPFLAGS=\"${BOOST_CFLAGS} ${CPPFLAGS}\"\n-       for ac_header in boost/algorithm/string/classification.hpp boost/algorithm/string/predicate.hpp boost/algorithm/string/split.hpp boost/cstdint.hpp boost/fusion/include/std_pair.hpp boost/intrusive_ptr.hpp boost/numeric/conversion/cast.hpp boost/optional.hpp boost/spirit/include/qi.hpp boost/variant.hpp\n+for ac_header in boost/algorithm/string/classification.hpp \\\n+        boost/algorithm/string/predicate.hpp \\\n+        boost/algorithm/string/split.hpp \\\n+        boost/cstdint.hpp \\\n+        boost/fusion/include/std_pair.hpp \\\n+        boost/intrusive_ptr.hpp \\\n+        boost/numeric/conversion/cast.hpp \\\n+        boost/optional.hpp \\\n+        boost/spirit/include/qi.hpp \\\n+        boost/variant.hpp \\\n+\n do :\n-  as_ac_Header=`printf \"%s\\n\" \"ac_cv_header_$ac_header\" | sed \"$as_sed_sh\"`\n+  as_ac_Header=`$as_echo \"ac_cv_header_$ac_header\" | $as_tr_sh`\n ac_fn_cxx_check_header_compile \"$LINENO\" \"$ac_header\" \"$as_ac_Header\" \"\n \n \"\n-if eval test \\\"x\\$\"$as_ac_Header\"\\\" = x\"yes\"\n-then :\n+if eval test \\\"x\\$\"$as_ac_Header\"\\\" = x\"yes\"; then :\n   cat >>confdefs.h <<_ACEOF\n-#define `printf \"%s\\n\" \"HAVE_$ac_header\" | sed \"$as_sed_cpp\"` 1\n+#define `$as_echo \"HAVE_$ac_header\" | $as_tr_cpp` 1\n _ACEOF\n \n-else case e in #(\n-  e) as_fn_error $? \"Required boost headers not found.\" \"$LINENO\" 5 ;;\n-esac\n+else\n+  as_fn_error $? \"Required boost headers not found.\" \"$LINENO\" 5\n fi\n \n done\n+\n CPPFLAGS=\"${saved_CPPFLAGS}\"\n \n \n@@ -22166,17 +19102,17 @@ CPPFLAGS=\"${saved_CPPFLAGS}\"\n # ========\n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for icu-i18n\" >&5\n-printf %s \"checking for icu-i18n... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for ICU\" >&5\n+$as_echo_n \"checking for ICU... \" >&6; }\n \n if test -n \"$ICU_CFLAGS\"; then\n     pkg_cv_ICU_CFLAGS=\"$ICU_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"icu-i18n\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"icu-i18n\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"icu-i18n\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags \"icu-i18n\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22190,10 +19126,10 @@ if test -n \"$ICU_LIBS\"; then\n     pkg_cv_ICU_LIBS=\"$ICU_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"icu-i18n\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"icu-i18n\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"icu-i18n\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs \"icu-i18n\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22207,8 +19143,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -22216,14 +19152,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"icu-i18n\" 2>&1`\n+\t        ICU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"icu-i18n\" 2>&1`\n         else\n-                ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"icu-i18n\" 2>&1`\n+\t        ICU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"icu-i18n\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$ICU_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$ICU_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (icu-i18n) were not met:\n+\tas_fn_error $? \"Package requirements (icu-i18n) were not met:\n \n $ICU_PKG_ERRORS\n \n@@ -22234,10 +19170,10 @@ Alternatively, you may set the environment variables ICU_CFLAGS\n and ICU_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -22247,12 +19183,12 @@ and ICU_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        ICU_CFLAGS=$pkg_cv_ICU_CFLAGS\n-        ICU_LIBS=$pkg_cv_ICU_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tICU_CFLAGS=$pkg_cv_ICU_CFLAGS\n+\tICU_LIBS=$pkg_cv_ICU_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -22265,9 +19201,9 @@ EBOOK_MAJOR_VERSION=0\n \n EBOOK_MINOR_VERSION=1\n \n-EBOOK_MICRO_VERSION=4\n+EBOOK_MICRO_VERSION=3\n \n-EBOOK_VERSION=0.1.4\n+EBOOK_VERSION=0.1.3\n \n # AC_SUBST(LT_RELEASE, [libe_book_version_major.libe_book_version_minor])\n LT_CURRENT=`expr 100 '*' 0 + 1`\n@@ -22275,15 +19211,15 @@ LT_CURRENT=`expr 100 '*' 0 + 1`\n LT_AGE=0\n # LT_AGE=libe_book_version_minor\n \n-LT_REVISION=4\n+LT_REVISION=3\n \n \n \n # ==========================\n # Platform check for windows\n # ==========================\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for native Win32\" >&5\n-printf %s \"checking for native Win32... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for native Win32\" >&5\n+$as_echo_n \"checking for native Win32... \" >&6; }\n case $host in #(\n   *-*-mingw*) :\n \n@@ -22303,8 +19239,8 @@ case $host in #(\n \n  ;;\n esac\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $native_win32\" >&5\n-printf \"%s\\n\" \"$native_win32\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $native_win32\" >&5\n+$as_echo \"$native_win32\" >&6; }\n  if test \"x$native_win32\" = \"xyes\"; then\n   OS_WIN32_TRUE=\n   OS_WIN32_FALSE='#'\n@@ -22318,8 +19254,8 @@ fi\n \n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for Win32 platform in general\" >&5\n-printf %s \"checking for Win32 platform in general... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for Win32 platform in general\" >&5\n+$as_echo_n \"checking for Win32 platform in general... \" >&6; }\n case $host in #(\n   *-*-mingw*|*-*-cygwin*) :\n     platform_win32=yes ;; #(\n@@ -22327,8 +19263,8 @@ case $host in #(\n     platform_win32=no\n  ;;\n esac\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $platform_win32\" >&5\n-printf \"%s\\n\" \"$platform_win32\" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: $platform_win32\" >&5\n+$as_echo \"$platform_win32\" >&6; }\n  if test \"x$platform_win32\" = \"xyes\"; then\n   PLATFORM_WIN32_TRUE=\n   PLATFORM_WIN32_FALSE='#'\n@@ -22338,134 +19274,116 @@ else\n fi\n \n \n-if test \"x$platform_win32\" = \"xyes\"\n-then :\n+if test \"x$platform_win32\" = \"xyes\"; then :\n \n-else case e in #(\n-  e)\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag\" >&5\n-printf %s \"checking for -fvisibility=hidden compiler flag... \" >&6; }\n+else\n+\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag\" >&5\n+$as_echo_n \"checking for -fvisibility=hidden compiler flag... \" >&6; }\n         saved_CXXFLAGS=\"$CXXFLAGS\"\n         CXXFLAGS=\"$CXXFLAGS -fvisibility=hidden\"\n         cat confdefs.h - <<_ACEOF >conftest.$ac_ext\n /* end confdefs.h.  */\n \n int\n-main (void)\n+main ()\n {\n \n   ;\n   return 0;\n }\n _ACEOF\n-if ac_fn_cxx_try_compile \"$LINENO\"\n-then :\n+if ac_fn_cxx_try_compile \"$LINENO\"; then :\n \n-                { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+                { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n                 CXXFLAGS=\"$CXXFLAGS -DLIBE_BOOK_VISIBILITY\"\n \n-else case e in #(\n-  e)\n-                { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+else\n+\n+                { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n                 CXXFLAGS=\"$saved_CXXFLAGS\"\n \n-         ;;\n-esac\n+\n fi\n-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext\n+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext\n+\n \n- ;;\n-esac\n fi\n \n # ================\n # Check for cflags\n # ================\n # Check whether --enable-werror was given.\n-if test ${enable_werror+y}\n-then :\n+if test \"${enable_werror+set}\" = set; then :\n   enableval=$enable_werror; enable_werror=\"$enableval\"\n-else case e in #(\n-  e) enable_werror=no\n- ;;\n-esac\n+else\n+  enable_werror=no\n+\n fi\n \n-if test x\"$enable_werror\" != \"xno\"\n-then :\n+if test x\"$enable_werror\" != \"xno\"; then :\n \n     CFLAGS=\"$CFLAGS -Werror\"\n     CXXFLAGS=\"$CXXFLAGS -Werror\"\n \n fi\n # Check whether --enable-weffc was given.\n-if test ${enable_weffc+y}\n-then :\n+if test \"${enable_weffc+set}\" = set; then :\n   enableval=$enable_weffc; enable_weffc=\"$enableval\"\n-else case e in #(\n-  e) enable_weffc=yes\n- ;;\n-esac\n+else\n+  enable_weffc=yes\n+\n fi\n \n # Check whether --enable-wparanoic was given.\n-if test ${enable_wparanoic+y}\n-then :\n+if test \"${enable_wparanoic+set}\" = set; then :\n   enableval=$enable_wparanoic; enable_wparanoic=\"$enableval\"\n-else case e in #(\n-  e) enable_wparanoic=no\n- ;;\n-esac\n+else\n+  enable_wparanoic=no\n+\n fi\n \n # Courtesy of Glib: Ensure MSVC-compatible struct packing convention\n # is used when compiling for Win32 with gcc.\n-if test \"x$native_win32\" = \"xyes\"\n-then :\n+if test \"x$native_win32\" = \"xyes\"; then :\n \n     if test -n \"$ac_tool_prefix\"; then\n   # Extract the first word of \"${ac_tool_prefix}windres\", so it can be a program name with args.\n set dummy ${ac_tool_prefix}windres; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_WINDRES+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$WINDRES\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_WINDRES+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$WINDRES\"; then\n   ac_cv_prog_WINDRES=\"$WINDRES\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_WINDRES=\"${ac_tool_prefix}windres\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n WINDRES=$ac_cv_prog_WINDRES\n if test -n \"$WINDRES\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $WINDRES\" >&5\n-printf \"%s\\n\" \"$WINDRES\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $WINDRES\" >&5\n+$as_echo \"$WINDRES\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n@@ -22474,44 +19392,38 @@ if test -z \"$ac_cv_prog_WINDRES\"; then\n   ac_ct_WINDRES=$WINDRES\n   # Extract the first word of \"windres\", so it can be a program name with args.\n set dummy windres; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_prog_ac_ct_WINDRES+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) if test -n \"$ac_ct_WINDRES\"; then\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  if test -n \"$ac_ct_WINDRES\"; then\n   ac_cv_prog_ac_ct_WINDRES=\"$ac_ct_WINDRES\" # Let the user override the test.\n else\n as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n     ac_cv_prog_ac_ct_WINDRES=\"windres\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n   done\n IFS=$as_save_IFS\n \n-fi ;;\n-esac\n+fi\n fi\n ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES\n if test -n \"$ac_ct_WINDRES\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES\" >&5\n-printf \"%s\\n\" \"$ac_ct_WINDRES\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES\" >&5\n+$as_echo \"$ac_ct_WINDRES\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n   if test \"x$ac_ct_WINDRES\" = x; then\n@@ -22519,8 +19431,8 @@ fi\n   else\n     case $cross_compiling:$ac_tool_warned in\n yes:)\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet\" >&5\n+$as_echo \"$as_me: WARNING: using cross tools not prefixed with host triplet\" >&2;}\n ac_tool_warned=yes ;;\n esac\n     WINDRES=$ac_ct_WINDRES\n@@ -22529,61 +19441,53 @@ else\n   WINDRES=\"$ac_cv_prog_WINDRES\"\n fi\n \n-    if test x\"$GCC\" = xyes\n-then :\n+    if test x\"$GCC\" = xyes; then :\n \n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking how to get MSVC-compatible struct packing\" >&5\n-printf %s \"checking how to get MSVC-compatible struct packing... \" >&6; }\n-        if test -z \"$ac_cv_prog_CC\"\n-then :\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: checking how to get MSVC-compatible struct packing\" >&5\n+$as_echo_n \"checking how to get MSVC-compatible struct packing... \" >&6; }\n+        if test -z \"$ac_cv_prog_CC\"; then :\n \n             our_gcc=\"$CC\"\n \n-else case e in #(\n-  e)\n+else\n+\n             our_gcc=\"$ac_cv_prog_CC\"\n-         ;;\n-esac\n+\n fi\n-        if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null\n-then :\n+        if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then :\n \n             msnative_struct=\"-mms-bitfields\"\n             CFLAGS=\"$CFLAGS $msnative_struct\"\n             CXXFLAGS=\"$CXXFLAGS $msnative_struct\"\n-            { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: ${msnative_struct}\" >&5\n-printf \"%s\\n\" \"${msnative_struct}\" >&6; }\n-\n-else case e in #(\n-  e)\n-            { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no way\" >&5\n-printf \"%s\\n\" \"no way\" >&6; }\n-            { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: produced libraries might be incompatible with MSVC-compiled code\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code\" >&2;}\n-         ;;\n-esac\n+            { $as_echo \"$as_me:${as_lineno-$LINENO}: result: ${msnative_struct}\" >&5\n+$as_echo \"${msnative_struct}\" >&6; }\n+\n+else\n+\n+            { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no way\" >&5\n+$as_echo \"no way\" >&6; }\n+            { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: produced libraries might be incompatible with MSVC-compiled code\" >&5\n+$as_echo \"$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code\" >&2;}\n+\n fi\n \n fi\n     CFLAGS=\"$CFLAGS -Wall -Wextra -pedantic\"\n     CXXFLAGS=\"$CXXFLAGS -Wall -Wextra -Wshadow -pedantic\"\n \n-else case e in #(\n-  e)\n-    if test x\"$GCC\" = xyes\n-then :\n+else\n+\n+    if test x\"$GCC\" = xyes; then :\n \n         # Be tough with warnings and produce less careless code\n         CFLAGS=\"$CFLAGS -Wall -Wextra -pedantic\"\n         CXXFLAGS=\"$CXXFLAGS -Wall -Wextra -pedantic -Wshadow -Wunused-variable\"\n-        if test x\"$enable_weffc\" != \"xno\"\n-then :\n+        if test x\"$enable_weffc\" != \"xno\"; then :\n \n             CXXFLAGS=\"$CXXFLAGS -Weffc++\"\n \n fi\n-        if test x\"$enable_wparanoic\" != \"xno\"\n-then :\n+        if test x\"$enable_wparanoic\" != \"xno\"; then :\n \n             CXXFLAGS=\"$CXXFLAGS -Wcast-align -Wcast-qual -Wchar-subscripts\"\n             CXXFLAGS=\"$CXXFLAGS -Wcomment -Wconversion -Wdisabled-optimization\"\n@@ -22604,8 +19508,7 @@ then :\n fi\n \n fi\n- ;;\n-esac\n+\n fi\n \n \n@@ -22613,27 +19516,23 @@ fi\n # Debug switch\n # ============\n # Check whether --enable-debug was given.\n-if test ${enable_debug+y}\n-then :\n+if test \"${enable_debug+set}\" = set; then :\n   enableval=$enable_debug; enable_debug=\"$enableval\"\n-else case e in #(\n-  e) enable_debug=no\n- ;;\n-esac\n+else\n+  enable_debug=no\n+\n fi\n \n-if test \"x$enable_debug\" = \"xyes\"\n-then :\n+if test \"x$enable_debug\" = \"xyes\"; then :\n \n     DEBUG_CXXFLAGS=\"-DDEBUG -g\"\n     CXXFLAGS=\"$CXXFLAGS -O0\"\n     CFLAGS=\"$CFLAGS -O0\"\n \n-else case e in #(\n-  e)\n+else\n+\n     DEBUG_CXXFLAGS=\"-DNDEBUG\"\n- ;;\n-esac\n+\n fi\n \n \n@@ -22641,31 +19540,28 @@ fi\n # Unit tests\n # ==========\n # Check whether --enable-tests was given.\n-if test ${enable_tests+y}\n-then :\n+if test \"${enable_tests+set}\" = set; then :\n   enableval=$enable_tests; enable_tests=\"$enableval\"\n-else case e in #(\n-  e) enable_tests=yes\n- ;;\n-esac\n+else\n+  enable_tests=yes\n+\n fi\n \n-if test \"x$enable_tests\" = \"xyes\"\n-then :\n+if test \"x$enable_tests\" = \"xyes\"; then :\n \n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for cppunit\" >&5\n-printf %s \"checking for cppunit... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for CPPUNIT\" >&5\n+$as_echo_n \"checking for CPPUNIT... \" >&6; }\n \n if test -n \"$CPPUNIT_CFLAGS\"; then\n     pkg_cv_CPPUNIT_CFLAGS=\"$CPPUNIT_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"cppunit\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"cppunit\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"cppunit\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags \"cppunit\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22679,10 +19575,10 @@ if test -n \"$CPPUNIT_LIBS\"; then\n     pkg_cv_CPPUNIT_LIBS=\"$CPPUNIT_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"cppunit\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"cppunit\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"cppunit\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_CPPUNIT_LIBS=`$PKG_CONFIG --libs \"cppunit\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22696,8 +19592,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -22705,14 +19601,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"cppunit\" 2>&1`\n+\t        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"cppunit\" 2>&1`\n         else\n-                CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"cppunit\" 2>&1`\n+\t        CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"cppunit\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$CPPUNIT_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$CPPUNIT_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (cppunit) were not met:\n+\tas_fn_error $? \"Package requirements (cppunit) were not met:\n \n $CPPUNIT_PKG_ERRORS\n \n@@ -22723,10 +19619,10 @@ Alternatively, you may set the environment variables CPPUNIT_CFLAGS\n and CPPUNIT_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -22736,12 +19632,12 @@ and CPPUNIT_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        CPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS\n-        CPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tCPPUNIT_CFLAGS=$pkg_cv_CPPUNIT_CFLAGS\n+\tCPPUNIT_LIBS=$pkg_cv_CPPUNIT_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -22756,8 +19652,7 @@ else\n   WITH_LIBEBOOK_TESTS_FALSE=\n fi\n \n-if test \"x$enable_tests\" = \"xyes\"\n-then :\n+if test \"x$enable_tests\" = \"xyes\"; then :\n   need_stream=yes\n fi\n \n@@ -22766,33 +19661,27 @@ fi\n # =============\n \n # Check whether --with-docs was given.\n-if test ${with_docs+y}\n-then :\n+if test \"${with_docs+set}\" = set; then :\n   withval=$with_docs; with_docs=\"$withval\"\n-else case e in #(\n-  e) if test \"x$native_win32\" = \"xyes\"\n-then :\n+else\n+  if test \"x$native_win32\" = \"xyes\"; then :\n   with_docs=no\n-else case e in #(\n-  e) with_docs=yes ;;\n-esac\n+else\n+  with_docs=yes\n fi\n- ;;\n-esac\n+\n fi\n \n-if test \"x$with_docs\" != \"xno\"\n-then :\n+if test \"x$with_docs\" != \"xno\"; then :\n \n     # Extract the first word of \"doxygen\", so it can be a program name with args.\n set dummy doxygen; ac_word=$2\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n-printf %s \"checking for $ac_word... \" >&6; }\n-if test ${ac_cv_path_DOXYGEN+y}\n-then :\n-  printf %s \"(cached) \" >&6\n-else case e in #(\n-  e) case $DOXYGEN in\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for $ac_word\" >&5\n+$as_echo_n \"checking for $ac_word... \" >&6; }\n+if ${ac_cv_path_DOXYGEN+:} false; then :\n+  $as_echo_n \"(cached) \" >&6\n+else\n+  case $DOXYGEN in\n   [\\\\/]* | ?:[\\\\/]*)\n   ac_cv_path_DOXYGEN=\"$DOXYGEN\" # Let the user override the test with a path.\n   ;;\n@@ -22801,15 +19690,11 @@ else case e in #(\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n+  test -z \"$as_dir\" && as_dir=.\n     for ac_exec_ext in '' $ac_executable_extensions; do\n-  if as_fn_executable_p \"$as_dir$ac_word$ac_exec_ext\"; then\n-    ac_cv_path_DOXYGEN=\"$as_dir$ac_word$ac_exec_ext\"\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext\" >&5\n+  if as_fn_executable_p \"$as_dir/$ac_word$ac_exec_ext\"; then\n+    ac_cv_path_DOXYGEN=\"$as_dir/$ac_word$ac_exec_ext\"\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext\" >&5\n     break 2\n   fi\n done\n@@ -22817,36 +19702,32 @@ done\n IFS=$as_save_IFS\n \n   ;;\n-esac ;;\n esac\n fi\n DOXYGEN=$ac_cv_path_DOXYGEN\n if test -n \"$DOXYGEN\"; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: $DOXYGEN\" >&5\n-printf \"%s\\n\" \"$DOXYGEN\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: $DOXYGEN\" >&5\n+$as_echo \"$DOXYGEN\" >&6; }\n else\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n fi\n \n \n-    if test -z \"$DOXYGEN\"\n-then :\n+    if test -z \"$DOXYGEN\"; then :\n \n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: *** Could not find doxygen in your PATH.\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: *** Could not find doxygen in your PATH.\" >&2;}\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: *** The documentation will not be built.\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: *** The documentation will not be built.\" >&2;}\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: *** Could not find doxygen in your PATH.\" >&5\n+$as_echo \"$as_me: WARNING: *** Could not find doxygen in your PATH.\" >&2;}\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: *** The documentation will not be built.\" >&5\n+$as_echo \"$as_me: WARNING: *** The documentation will not be built.\" >&2;}\n         build_docs=no\n \n-else case e in #(\n-  e) build_docs=yes ;;\n-esac\n+else\n+  build_docs=yes\n fi\n \n-else case e in #(\n-  e) build_docs=no ;;\n-esac\n+else\n+  build_docs=no\n fi\n  if test \"x$build_docs\" != \"xno\"; then\n   WITH_LIBEBOOK_DOCS_TRUE=\n@@ -22862,19 +19743,15 @@ fi\n # ================\n \n # Check whether --with-tools was given.\n-if test ${with_tools+y}\n-then :\n+if test \"${with_tools+set}\" = set; then :\n   withval=$with_tools; with_tools=\"$withval\"\n-else case e in #(\n-  e) if test \"x$native_win32\" = \"xyes\"\n-then :\n+else\n+  if test \"x$native_win32\" = \"xyes\"; then :\n   with_tools=no\n-else case e in #(\n-  e) with_tools=yes ;;\n-esac\n+else\n+  with_tools=yes\n fi\n- ;;\n-esac\n+\n fi\n \n  if test \"x$with_tools\" != \"xno\"; then\n@@ -22885,8 +19762,7 @@ else\n   WITH_LIBEBOOK_TOOLS_FALSE=\n fi\n \n-if test \"x$with_tools\" = \"xyes\"\n-then :\n+if test \"x$with_tools\" = \"xyes\"; then :\n   need_stream=yes; need_generators=yes\n fi\n \n@@ -22894,13 +19770,11 @@ fi\n # Fuzzers\n # =======\n # Check whether --enable-fuzzers was given.\n-if test ${enable_fuzzers+y}\n-then :\n+if test \"${enable_fuzzers+set}\" = set; then :\n   enableval=$enable_fuzzers; enable_fuzzers=\"$enableval\"\n-else case e in #(\n-  e) enable_fuzzers=no\n- ;;\n-esac\n+else\n+  enable_fuzzers=no\n+\n fi\n \n  if test \"x$enable_fuzzers\" = \"xyes\"; then\n@@ -22911,27 +19785,25 @@ else\n   BUILD_FUZZERS_FALSE=\n fi\n \n-if test \"x$enable_fuzzers\" = \"xyes\"\n-then :\n+if test \"x$enable_fuzzers\" = \"xyes\"; then :\n   need_stream=yes; need_generators=yes\n fi\n \n-if test \"x$need_generators\" = \"xyes\"\n-then :\n+if test \"x$need_generators\" = \"xyes\"; then :\n \n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for librevenge-generators-0.0\" >&5\n-printf %s \"checking for librevenge-generators-0.0... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for REVENGE_GENERATORS\" >&5\n+$as_echo_n \"checking for REVENGE_GENERATORS... \" >&6; }\n \n if test -n \"$REVENGE_GENERATORS_CFLAGS\"; then\n     pkg_cv_REVENGE_GENERATORS_CFLAGS=\"$REVENGE_GENERATORS_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-generators-0.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-generators-0.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"librevenge-generators-0.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_REVENGE_GENERATORS_CFLAGS=`$PKG_CONFIG --cflags \"librevenge-generators-0.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22945,10 +19817,10 @@ if test -n \"$REVENGE_GENERATORS_LIBS\"; then\n     pkg_cv_REVENGE_GENERATORS_LIBS=\"$REVENGE_GENERATORS_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-generators-0.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-generators-0.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"librevenge-generators-0.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_REVENGE_GENERATORS_LIBS=`$PKG_CONFIG --libs \"librevenge-generators-0.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -22962,8 +19834,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -22971,14 +19843,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                REVENGE_GENERATORS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"librevenge-generators-0.0\" 2>&1`\n+\t        REVENGE_GENERATORS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"librevenge-generators-0.0\" 2>&1`\n         else\n-                REVENGE_GENERATORS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"librevenge-generators-0.0\" 2>&1`\n+\t        REVENGE_GENERATORS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"librevenge-generators-0.0\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$REVENGE_GENERATORS_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$REVENGE_GENERATORS_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (librevenge-generators-0.0) were not met:\n+\tas_fn_error $? \"Package requirements (librevenge-generators-0.0) were not met:\n \n $REVENGE_GENERATORS_PKG_ERRORS\n \n@@ -22989,10 +19861,10 @@ Alternatively, you may set the environment variables REVENGE_GENERATORS_CFLAGS\n and REVENGE_GENERATORS_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -23002,32 +19874,31 @@ and REVENGE_GENERATORS_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        REVENGE_GENERATORS_CFLAGS=$pkg_cv_REVENGE_GENERATORS_CFLAGS\n-        REVENGE_GENERATORS_LIBS=$pkg_cv_REVENGE_GENERATORS_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tREVENGE_GENERATORS_CFLAGS=$pkg_cv_REVENGE_GENERATORS_CFLAGS\n+\tREVENGE_GENERATORS_LIBS=$pkg_cv_REVENGE_GENERATORS_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n fi\n-if test \"x$need_stream\" = \"xyes\"\n-then :\n+if test \"x$need_stream\" = \"xyes\"; then :\n \n \n pkg_failed=no\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking for librevenge-stream-0.0\" >&5\n-printf %s \"checking for librevenge-stream-0.0... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking for REVENGE_STREAM\" >&5\n+$as_echo_n \"checking for REVENGE_STREAM... \" >&6; }\n \n if test -n \"$REVENGE_STREAM_CFLAGS\"; then\n     pkg_cv_REVENGE_STREAM_CFLAGS=\"$REVENGE_STREAM_CFLAGS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-stream-0.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-stream-0.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"librevenge-stream-0.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_REVENGE_STREAM_CFLAGS=`$PKG_CONFIG --cflags \"librevenge-stream-0.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -23041,10 +19912,10 @@ if test -n \"$REVENGE_STREAM_LIBS\"; then\n     pkg_cv_REVENGE_STREAM_LIBS=\"$REVENGE_STREAM_LIBS\"\n  elif test -n \"$PKG_CONFIG\"; then\n     if test -n \"$PKG_CONFIG\" && \\\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-stream-0.0\\\"\"; } >&5\n+    { { $as_echo \"$as_me:${as_lineno-$LINENO}: \\$PKG_CONFIG --exists --print-errors \\\"librevenge-stream-0.0\\\"\"; } >&5\n   ($PKG_CONFIG --exists --print-errors \"librevenge-stream-0.0\") 2>&5\n   ac_status=$?\n-  printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n+  $as_echo \"$as_me:${as_lineno-$LINENO}: \\$? = $ac_status\" >&5\n   test $ac_status = 0; }; then\n   pkg_cv_REVENGE_STREAM_LIBS=`$PKG_CONFIG --libs \"librevenge-stream-0.0\" 2>/dev/null`\n \t\t      test \"x$?\" != \"x0\" && pkg_failed=yes\n@@ -23058,8 +19929,8 @@ fi\n \n \n if test $pkg_failed = yes; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n+   \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n \n if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then\n         _pkg_short_errors_supported=yes\n@@ -23067,14 +19938,14 @@ else\n         _pkg_short_errors_supported=no\n fi\n         if test $_pkg_short_errors_supported = yes; then\n-                REVENGE_STREAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"librevenge-stream-0.0\" 2>&1`\n+\t        REVENGE_STREAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs \"librevenge-stream-0.0\" 2>&1`\n         else\n-                REVENGE_STREAM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"librevenge-stream-0.0\" 2>&1`\n+\t        REVENGE_STREAM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs \"librevenge-stream-0.0\" 2>&1`\n         fi\n-        # Put the nasty error message in config.log where it belongs\n-        echo \"$REVENGE_STREAM_PKG_ERRORS\" >&5\n+\t# Put the nasty error message in config.log where it belongs\n+\techo \"$REVENGE_STREAM_PKG_ERRORS\" >&5\n \n-        as_fn_error $? \"Package requirements (librevenge-stream-0.0) were not met:\n+\tas_fn_error $? \"Package requirements (librevenge-stream-0.0) were not met:\n \n $REVENGE_STREAM_PKG_ERRORS\n \n@@ -23085,10 +19956,10 @@ Alternatively, you may set the environment variables REVENGE_STREAM_CFLAGS\n and REVENGE_STREAM_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\" \"$LINENO\" 5\n elif test $pkg_failed = untried; then\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n-printf \"%s\\n\" \"no\" >&6; }\n-        { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n+     \t{ $as_echo \"$as_me:${as_lineno-$LINENO}: result: no\" >&5\n+$as_echo \"no\" >&6; }\n+\t{ { $as_echo \"$as_me:${as_lineno-$LINENO}: error: in \\`$ac_pwd':\" >&5\n+$as_echo \"$as_me: error: in \\`$ac_pwd':\" >&2;}\n as_fn_error $? \"The pkg-config script could not be found or is too old.  Make sure it\n is in your PATH or set the PKG_CONFIG environment variable to the full\n path to pkg-config.\n@@ -23098,12 +19969,12 @@ and REVENGE_STREAM_LIBS to avoid the need to call pkg-config.\n See the pkg-config man page for more details.\n \n To get pkg-config, see <http://pkg-config.freedesktop.org/>.\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n+See \\`config.log' for more details\" \"$LINENO\" 5; }\n else\n-        REVENGE_STREAM_CFLAGS=$pkg_cv_REVENGE_STREAM_CFLAGS\n-        REVENGE_STREAM_LIBS=$pkg_cv_REVENGE_STREAM_LIBS\n-        { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n-printf \"%s\\n\" \"yes\" >&6; }\n+\tREVENGE_STREAM_CFLAGS=$pkg_cv_REVENGE_STREAM_CFLAGS\n+\tREVENGE_STREAM_LIBS=$pkg_cv_REVENGE_STREAM_LIBS\n+        { $as_echo \"$as_me:${as_lineno-$LINENO}: result: yes\" >&5\n+$as_echo \"yes\" >&6; }\n \n fi\n \n@@ -23124,8 +19995,8 @@ cat >confcache <<\\_ACEOF\n # config.status only pays attention to the cache file if you give it\n # the --recheck option to rerun configure.\n #\n-# 'ac_cv_env_foo' variables (set or unset) will be overridden when\n-# loading this file, other *unset* 'ac_cv_foo' will be assigned the\n+# `ac_cv_env_foo' variables (set or unset) will be overridden when\n+# loading this file, other *unset* `ac_cv_foo' will be assigned the\n # following values.\n \n _ACEOF\n@@ -23141,8 +20012,8 @@ _ACEOF\n     case $ac_val in #(\n     *${as_nl}*)\n       case $ac_var in #(\n-      *_cv_*) { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;} ;;\n+      *_cv_*) { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline\" >&5\n+$as_echo \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;} ;;\n       esac\n       case $ac_var in #(\n       _ | IFS | as_nl) ;; #(\n@@ -23155,14 +20026,14 @@ printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;}\n   (set) 2>&1 |\n     case $as_nl`(ac_space=' '; set) 2>&1` in #(\n     *${as_nl}ac_space=\\ *)\n-      # 'set' does not quote correctly, so add quotes: double-quote\n+      # `set' does not quote correctly, so add quotes: double-quote\n       # substitution turns \\\\\\\\ into \\\\, and sed turns \\\\ into \\.\n       sed -n \\\n \t\"s/'/'\\\\\\\\''/g;\n \t  s/^\\\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\\\)=\\\\(.*\\\\)/\\\\1='\\\\2'/p\"\n       ;; #(\n     *)\n-      # 'set' quotes correctly as required by POSIX, so do not add quotes.\n+      # `set' quotes correctly as required by POSIX, so do not add quotes.\n       sed -n \"/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p\"\n       ;;\n     esac |\n@@ -23172,15 +20043,15 @@ printf \"%s\\n\" \"$as_me: WARNING: cache variable $ac_var contains a newline\" >&2;}\n      /^ac_cv_env_/b end\n      t clear\n      :clear\n-     s/^\\([^=]*\\)=\\(.*[{}].*\\)$/test ${\\1+y} || &/\n+     s/^\\([^=]*\\)=\\(.*[{}].*\\)$/test \"${\\1+set}\" = set || &/\n      t end\n      s/^\\([^=]*\\)=\\(.*\\)$/\\1=${\\1=\\2}/\n      :end' >>confcache\n if diff \"$cache_file\" confcache >/dev/null 2>&1; then :; else\n   if test -w \"$cache_file\"; then\n     if test \"x$cache_file\" != \"x/dev/null\"; then\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: updating cache $cache_file\" >&5\n-printf \"%s\\n\" \"$as_me: updating cache $cache_file\" >&6;}\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: updating cache $cache_file\" >&5\n+$as_echo \"$as_me: updating cache $cache_file\" >&6;}\n       if test ! -f \"$cache_file\" || test -h \"$cache_file\"; then\n \tcat confcache >\"$cache_file\"\n       else\n@@ -23194,8 +20065,8 @@ printf \"%s\\n\" \"$as_me: updating cache $cache_file\" >&6;}\n       fi\n     fi\n   else\n-    { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file\" >&5\n-printf \"%s\\n\" \"$as_me: not updating unwritable cache $cache_file\" >&6;}\n+    { $as_echo \"$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file\" >&5\n+$as_echo \"$as_me: not updating unwritable cache $cache_file\" >&6;}\n   fi\n fi\n rm -f confcache\n@@ -23212,7 +20083,7 @@ U=\n for ac_i in : $LIBOBJS; do test \"x$ac_i\" = x: && continue\n   # 1. Remove the extension, and $U if already installed.\n   ac_script='s/\\$U\\././;s/\\.o$//;s/\\.obj$//'\n-  ac_i=`printf \"%s\\n\" \"$ac_i\" | sed \"$ac_script\"`\n+  ac_i=`$as_echo \"$ac_i\" | sed \"$ac_script\"`\n   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR\n   #    will be set to the directory where LIBOBJS objects are built.\n   as_fn_append ac_libobjs \" \\${LIBOBJDIR}$ac_i\\$U.$ac_objext\"\n@@ -23223,26 +20094,14 @@ LIBOBJS=$ac_libobjs\n LTLIBOBJS=$ac_ltlibobjs\n \n \n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure\" >&5\n-printf %s \"checking that generated files are newer than configure... \" >&6; }\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure\" >&5\n+$as_echo_n \"checking that generated files are newer than configure... \" >&6; }\n    if test -n \"$am_sleep_pid\"; then\n      # Hide warnings about reused PIDs.\n      wait $am_sleep_pid 2>/dev/null\n    fi\n-   { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: result: done\" >&5\n-printf \"%s\\n\" \"done\" >&6; }\n-case $enable_silent_rules in # (((\n-  yes) AM_DEFAULT_VERBOSITY=0;;\n-   no) AM_DEFAULT_VERBOSITY=1;;\n-esac\n-if test $am_cv_make_support_nested_variables = yes; then\n-    AM_V='$(V)'\n-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'\n-else\n-  AM_V=$AM_DEFAULT_VERBOSITY\n-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY\n-fi\n-\n+   { $as_echo \"$as_me:${as_lineno-$LINENO}: result: done\" >&5\n+$as_echo \"done\" >&6; }\n  if test -n \"$EXEEXT\"; then\n   am__EXEEXT_TRUE=\n   am__EXEEXT_FALSE='#'\n@@ -23304,8 +20163,8 @@ fi\n ac_write_fail=0\n ac_clean_files_save=$ac_clean_files\n ac_clean_files=\"$ac_clean_files $CONFIG_STATUS\"\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS\" >&5\n-printf \"%s\\n\" \"$as_me: creating $CONFIG_STATUS\" >&6;}\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS\" >&5\n+$as_echo \"$as_me: creating $CONFIG_STATUS\" >&6;}\n as_write_fail=0\n cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1\n #! $SHELL\n@@ -23328,65 +20187,63 @@ cat >>$CONFIG_STATUS <<\\_ASEOF || as_write_fail=1\n \n # Be more Bourne compatible\n DUALCASE=1; export DUALCASE # for MKS sh\n-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1\n-then :\n+if test -n \"${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :\n   emulate sh\n   NULLCMD=:\n   # Pre-4.2 versions of Zsh do word splitting on ${1+\"$@\"}, which\n   # is contrary to our usage.  Disable this feature.\n   alias -g '${1+\"$@\"}'='\"$@\"'\n   setopt NO_GLOB_SUBST\n-else case e in #(\n-  e) case `(set -o) 2>/dev/null` in #(\n+else\n+  case `(set -o) 2>/dev/null` in #(\n   *posix*) :\n     set -o posix ;; #(\n   *) :\n      ;;\n-esac ;;\n esac\n fi\n \n \n-\n-# Reset variables that may have inherited troublesome values from\n-# the environment.\n-\n-# IFS needs to be set, to space, tab, and newline, in precisely that order.\n-# (If _AS_PATH_WALK were called with IFS unset, it would have the\n-# side effect of setting IFS to empty, thus disabling word splitting.)\n-# Quoting is to prevent editors from complaining about space-tab.\n as_nl='\n '\n export as_nl\n-IFS=\" \"\"\t$as_nl\"\n-\n-PS1='$ '\n-PS2='> '\n-PS4='+ '\n-\n-# Ensure predictable behavior from utilities with locale-dependent output.\n-LC_ALL=C\n-export LC_ALL\n-LANGUAGE=C\n-export LANGUAGE\n-\n-# We cannot yet rely on \"unset\" to work, but we need these variables\n-# to be unset--not just set to an empty or harmless value--now, to\n-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct\n-# also avoids known problems related to \"unset\" and subshell syntax\n-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).\n-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH\n-do eval test \\${$as_var+y} \\\n-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :\n-done\n-\n-# Ensure that fds 0, 1, and 2 are open.\n-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi\n-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi\n-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi\n+# Printing a long string crashes Solaris 7 /usr/bin/printf.\n+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'\n+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo\n+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo\n+# Prefer a ksh shell builtin over an external printf program on Solaris,\n+# but without wasting forks for bash or zsh.\n+if test -z \"$BASH_VERSION$ZSH_VERSION\" \\\n+    && (test \"X`print -r -- $as_echo`\" = \"X$as_echo\") 2>/dev/null; then\n+  as_echo='print -r --'\n+  as_echo_n='print -rn --'\n+elif (test \"X`printf %s $as_echo`\" = \"X$as_echo\") 2>/dev/null; then\n+  as_echo='printf %s\\n'\n+  as_echo_n='printf %s'\n+else\n+  if test \"X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`\" = \"X-n $as_echo\"; then\n+    as_echo_body='eval /usr/ucb/echo -n \"$1$as_nl\"'\n+    as_echo_n='/usr/ucb/echo -n'\n+  else\n+    as_echo_body='eval expr \"X$1\" : \"X\\\\(.*\\\\)\"'\n+    as_echo_n_body='eval\n+      arg=$1;\n+      case $arg in #(\n+      *\"$as_nl\"*)\n+\texpr \"X$arg\" : \"X\\\\(.*\\\\)$as_nl\";\n+\targ=`expr \"X$arg\" : \".*$as_nl\\\\(.*\\\\)\"`;;\n+      esac;\n+      expr \"X$arg\" : \"X\\\\(.*\\\\)\" | tr -d \"$as_nl\"\n+    '\n+    export as_echo_n_body\n+    as_echo_n='sh -c $as_echo_n_body as_echo'\n+  fi\n+  export as_echo_body\n+  as_echo='sh -c $as_echo_body as_echo'\n+fi\n \n # The user is always right.\n-if ${PATH_SEPARATOR+false} :; then\n+if test \"${PATH_SEPARATOR+set}\" != set; then\n   PATH_SEPARATOR=:\n   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {\n     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||\n@@ -23395,6 +20252,13 @@ if ${PATH_SEPARATOR+false} :; then\n fi\n \n \n+# IFS\n+# We need space, tab and new line, in precisely that order.  Quoting is\n+# there to prevent editors from complaining about space-tab.\n+# (If _AS_PATH_WALK were called with IFS unset, it would disable word\n+# splitting by setting IFS to empty value.)\n+IFS=\" \"\"\t$as_nl\"\n+\n # Find who we are.  Look in the path if we contain no directory separator.\n as_myself=\n case $0 in #((\n@@ -23403,27 +20267,43 @@ case $0 in #((\n for as_dir in $PATH\n do\n   IFS=$as_save_IFS\n-  case $as_dir in #(((\n-    '') as_dir=./ ;;\n-    */) ;;\n-    *) as_dir=$as_dir/ ;;\n-  esac\n-    test -r \"$as_dir$0\" && as_myself=$as_dir$0 && break\n+  test -z \"$as_dir\" && as_dir=.\n+    test -r \"$as_dir/$0\" && as_myself=$as_dir/$0 && break\n   done\n IFS=$as_save_IFS\n \n      ;;\n esac\n-# We did not find ourselves, most probably we were run as 'sh COMMAND'\n+# We did not find ourselves, most probably we were run as `sh COMMAND'\n # in which case we are not to be found in the path.\n if test \"x$as_myself\" = x; then\n   as_myself=$0\n fi\n if test ! -f \"$as_myself\"; then\n-  printf \"%s\\n\" \"$as_myself: error: cannot find myself; rerun with an absolute file name\" >&2\n+  $as_echo \"$as_myself: error: cannot find myself; rerun with an absolute file name\" >&2\n   exit 1\n fi\n \n+# Unset variables that we do not need and which cause bugs (e.g. in\n+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the \"|| exit 1\"\n+# suppresses any \"Segmentation fault\" message there.  '((' could\n+# trigger a bug in pdksh 5.2.14.\n+for as_var in BASH_ENV ENV MAIL MAILPATH\n+do eval test x\\${$as_var+set} = xset \\\n+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :\n+done\n+PS1='$ '\n+PS2='> '\n+PS4='+ '\n+\n+# NLS nuisances.\n+LC_ALL=C\n+export LC_ALL\n+LANGUAGE=C\n+export LANGUAGE\n+\n+# CDPATH.\n+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH\n \n \n # as_fn_error STATUS ERROR [LINENO LOG_FD]\n@@ -23436,9 +20316,9 @@ as_fn_error ()\n   as_status=$1; test $as_status -eq 0 && as_status=1\n   if test \"$4\"; then\n     as_lineno=${as_lineno-\"$3\"} as_lineno_stack=as_lineno_stack=$as_lineno_stack\n-    printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: $2\" >&$4\n+    $as_echo \"$as_me:${as_lineno-$LINENO}: error: $2\" >&$4\n   fi\n-  printf \"%s\\n\" \"$as_me: error: $2\" >&2\n+  $as_echo \"$as_me: error: $2\" >&2\n   as_fn_exit $as_status\n } # as_fn_error\n \n@@ -23469,25 +20349,22 @@ as_fn_unset ()\n   { eval $1=; unset $1;}\n }\n as_unset=as_fn_unset\n-\n # as_fn_append VAR VALUE\n # ----------------------\n # Append the text in VALUE to the end of the definition contained in VAR. Take\n # advantage of any shell optimizations that allow amortized linear growth over\n # repeated appends, instead of the typical quadratic growth present in naive\n # implementations.\n-if (eval \"as_var=1; as_var+=2; test x\\$as_var = x12\") 2>/dev/null\n-then :\n+if (eval \"as_var=1; as_var+=2; test x\\$as_var = x12\") 2>/dev/null; then :\n   eval 'as_fn_append ()\n   {\n     eval $1+=\\$2\n   }'\n-else case e in #(\n-  e) as_fn_append ()\n+else\n+  as_fn_append ()\n   {\n     eval $1=\\$$1\\$2\n-  } ;;\n-esac\n+  }\n fi # as_fn_append\n \n # as_fn_arith ARG...\n@@ -23495,18 +20372,16 @@ fi # as_fn_append\n # Perform arithmetic evaluation on the ARGs, and store the result in the\n # global $as_val. Take advantage of shells that can avoid forks. The arguments\n # must be portable across $(()) and expr.\n-if (eval \"test \\$(( 1 + 1 )) = 2\") 2>/dev/null\n-then :\n+if (eval \"test \\$(( 1 + 1 )) = 2\") 2>/dev/null; then :\n   eval 'as_fn_arith ()\n   {\n     as_val=$(( $* ))\n   }'\n-else case e in #(\n-  e) as_fn_arith ()\n+else\n+  as_fn_arith ()\n   {\n     as_val=`expr \"$@\" || test $? -eq 1`\n-  } ;;\n-esac\n+  }\n fi # as_fn_arith\n \n \n@@ -23533,7 +20408,7 @@ as_me=`$as_basename -- \"$0\" ||\n $as_expr X/\"$0\" : '.*/\\([^/][^/]*\\)/*$' \\| \\\n \t X\"$0\" : 'X\\(//\\)$' \\| \\\n \t X\"$0\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X/\"$0\" |\n+$as_echo X/\"$0\" |\n     sed '/^.*\\/\\([^/][^/]*\\)\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -23555,10 +20430,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS\n as_cr_digits='0123456789'\n as_cr_alnum=$as_cr_Letters$as_cr_digits\n \n-\n-# Determine whether it's possible to make 'echo' print without a newline.\n-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed\n-# for compatibility with existing Makefiles.\n ECHO_C= ECHO_N= ECHO_T=\n case `echo -n x` in #(((((\n -n*)\n@@ -23572,12 +20443,6 @@ case `echo -n x` in #(((((\n   ECHO_N='-n';;\n esac\n \n-# For backward compatibility with old third-party macros, we provide\n-# the shell variables $as_echo and $as_echo_n.  New code should use\n-# AS_ECHO([\"message\"]) and AS_ECHO_N([\"message\"]), respectively.\n-as_echo='printf %s\\n'\n-as_echo_n='printf %s'\n-\n rm -f conf$$ conf$$.exe conf$$.file\n if test -d conf$$.dir; then\n   rm -f conf$$.dir/conf$$.file\n@@ -23589,9 +20454,9 @@ if (echo >conf$$.file) 2>/dev/null; then\n   if ln -s conf$$.file conf$$ 2>/dev/null; then\n     as_ln_s='ln -s'\n     # ... but there are two gotchas:\n-    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.\n-    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.\n-    # In both cases, we have to default to 'cp -pR'.\n+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.\n+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.\n+    # In both cases, we have to default to `cp -pR'.\n     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||\n       as_ln_s='cp -pR'\n   elif ln conf$$.file conf$$ 2>/dev/null; then\n@@ -23619,7 +20484,7 @@ as_fn_mkdir_p ()\n     as_dirs=\n     while :; do\n       case $as_dir in #(\n-      *\\'*) as_qdir=`printf \"%s\\n\" \"$as_dir\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;; #'(\n+      *\\'*) as_qdir=`$as_echo \"$as_dir\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;; #'(\n       *) as_qdir=$as_dir;;\n       esac\n       as_dirs=\"'$as_qdir' $as_dirs\"\n@@ -23628,7 +20493,7 @@ $as_expr X\"$as_dir\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n \t X\"$as_dir\" : 'X\\(//\\)[^/]' \\| \\\n \t X\"$as_dir\" : 'X\\(//\\)$' \\| \\\n \t X\"$as_dir\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X\"$as_dir\" |\n+$as_echo X\"$as_dir\" |\n     sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -23672,12 +20537,10 @@ as_test_x='test -x'\n as_executable_p=as_fn_executable_p\n \n # Sed expression to map a string onto a valid CPP name.\n-as_sed_cpp=\"y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g\"\n-as_tr_cpp=\"eval sed '$as_sed_cpp'\" # deprecated\n+as_tr_cpp=\"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'\"\n \n # Sed expression to map a string onto a valid variable name.\n-as_sed_sh=\"y%*+%pp%;s%[^_$as_cr_alnum]%_%g\"\n-as_tr_sh=\"eval sed '$as_sed_sh'\" # deprecated\n+as_tr_sh=\"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'\"\n \n \n exec 6>&1\n@@ -23692,8 +20555,8 @@ cat >>$CONFIG_STATUS <<\\_ACEOF || ac_write_fail=1\n # report actual input values of CONFIG_FILES etc. instead of their\n # values after options handling.\n ac_log=\"\n-This file was extended by libe-book $as_me 0.1.4, which was\n-generated by GNU Autoconf 2.72.  Invocation command line was\n+This file was extended by libe-book $as_me 0.1.3, which was\n+generated by GNU Autoconf 2.69.  Invocation command line was\n \n   CONFIG_FILES    = $CONFIG_FILES\n   CONFIG_HEADERS  = $CONFIG_HEADERS\n@@ -23725,7 +20588,7 @@ _ACEOF\n \n cat >>$CONFIG_STATUS <<\\_ACEOF || ac_write_fail=1\n ac_cs_usage=\"\\\n-'$as_me' instantiates files and other configuration actions\n+\\`$as_me' instantiates files and other configuration actions\n from templates according to the current configuration.  Unless the files\n and actions are specified as TAGs, all are instantiated by default.\n \n@@ -23755,16 +20618,14 @@ $config_commands\n Report bugs to the package provider.\"\n \n _ACEOF\n-ac_cs_config=`printf \"%s\\n\" \"$ac_configure_args\" | sed \"$ac_safe_unquote\"`\n-ac_cs_config_escaped=`printf \"%s\\n\" \"$ac_cs_config\" | sed \"s/^ //; s/'/'\\\\\\\\\\\\\\\\''/g\"`\n cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1\n-ac_cs_config='$ac_cs_config_escaped'\n+ac_cs_config=\"`$as_echo \"$ac_configure_args\" | sed 's/^ //; s/[\\\\\"\"\\`\\$]/\\\\\\\\&/g'`\"\n ac_cs_version=\"\\\\\n-libe-book config.status 0.1.4\n-configured by $0, generated by GNU Autoconf 2.72,\n+libe-book config.status 0.1.3\n+configured by $0, generated by GNU Autoconf 2.69,\n   with options \\\\\"\\$ac_cs_config\\\\\"\n \n-Copyright (C) 2023 Free Software Foundation, Inc.\n+Copyright (C) 2012 Free Software Foundation, Inc.\n This config.status script is free software; the Free Software Foundation\n gives unlimited permission to copy, distribute and modify it.\"\n \n@@ -23804,15 +20665,15 @@ do\n   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)\n     ac_cs_recheck=: ;;\n   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )\n-    printf \"%s\\n\" \"$ac_cs_version\"; exit ;;\n+    $as_echo \"$ac_cs_version\"; exit ;;\n   --config | --confi | --conf | --con | --co | --c )\n-    printf \"%s\\n\" \"$ac_cs_config\"; exit ;;\n+    $as_echo \"$ac_cs_config\"; exit ;;\n   --debug | --debu | --deb | --de | --d | -d )\n     debug=: ;;\n   --file | --fil | --fi | --f )\n     $ac_shift\n     case $ac_optarg in\n-    *\\'*) ac_optarg=`printf \"%s\\n\" \"$ac_optarg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n+    *\\'*) ac_optarg=`$as_echo \"$ac_optarg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n     '') as_fn_error $? \"missing file argument\" ;;\n     esac\n     as_fn_append CONFIG_FILES \" '$ac_optarg'\"\n@@ -23820,23 +20681,23 @@ do\n   --header | --heade | --head | --hea )\n     $ac_shift\n     case $ac_optarg in\n-    *\\'*) ac_optarg=`printf \"%s\\n\" \"$ac_optarg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n+    *\\'*) ac_optarg=`$as_echo \"$ac_optarg\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"` ;;\n     esac\n     as_fn_append CONFIG_HEADERS \" '$ac_optarg'\"\n     ac_need_defaults=false;;\n   --he | --h)\n     # Conflict between --help and --header\n-    as_fn_error $? \"ambiguous option: '$1'\n-Try '$0 --help' for more information.\";;\n+    as_fn_error $? \"ambiguous option: \\`$1'\n+Try \\`$0 --help' for more information.\";;\n   --help | --hel | -h )\n-    printf \"%s\\n\" \"$ac_cs_usage\"; exit ;;\n+    $as_echo \"$ac_cs_usage\"; exit ;;\n   -q | -quiet | --quiet | --quie | --qui | --qu | --q \\\n   | -silent | --silent | --silen | --sile | --sil | --si | --s)\n     ac_cs_silent=: ;;\n \n   # This is an error.\n-  -*) as_fn_error $? \"unrecognized option: '$1'\n-Try '$0 --help' for more information.\" ;;\n+  -*) as_fn_error $? \"unrecognized option: \\`$1'\n+Try \\`$0 --help' for more information.\" ;;\n \n   *) as_fn_append ac_config_targets \" $1\"\n      ac_need_defaults=false ;;\n@@ -23857,7 +20718,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1\n if \\$ac_cs_recheck; then\n   set X $SHELL '$0' $ac_configure_args \\$ac_configure_extra_args --no-create --no-recursion\n   shift\n-  \\printf \"%s\\n\" \"running CONFIG_SHELL=$SHELL \\$*\" >&6\n+  \\$as_echo \"running CONFIG_SHELL=$SHELL \\$*\" >&6\n   CONFIG_SHELL='$SHELL'\n   export CONFIG_SHELL\n   exec \"\\$@\"\n@@ -23871,7 +20732,7 @@ exec 5>>config.log\n   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX\n ## Running $as_me. ##\n _ASBOX\n-  printf \"%s\\n\" \"$ac_log\"\n+  $as_echo \"$ac_log\"\n } >&5\n \n _ACEOF\n@@ -23879,7 +20740,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1\n #\n # INIT-COMMANDS\n #\n-AMDEP_TRUE=\"$AMDEP_TRUE\" MAKE=\"${MAKE-make}\"\n+AMDEP_TRUE=\"$AMDEP_TRUE\" ac_aux_dir=\"$ac_aux_dir\"\n \n \n # The HP-UX ksh and POSIX shell print the target directory to stdout\n@@ -23926,14 +20787,12 @@ lt_cv_to_host_file_cmd='`$ECHO \"$lt_cv_to_host_file_cmd\" | $SED \"$delay_single_q\n lt_cv_to_tool_file_cmd='`$ECHO \"$lt_cv_to_tool_file_cmd\" | $SED \"$delay_single_quote_subst\"`'\n reload_flag='`$ECHO \"$reload_flag\" | $SED \"$delay_single_quote_subst\"`'\n reload_cmds='`$ECHO \"$reload_cmds\" | $SED \"$delay_single_quote_subst\"`'\n-FILECMD='`$ECHO \"$FILECMD\" | $SED \"$delay_single_quote_subst\"`'\n deplibs_check_method='`$ECHO \"$deplibs_check_method\" | $SED \"$delay_single_quote_subst\"`'\n file_magic_cmd='`$ECHO \"$file_magic_cmd\" | $SED \"$delay_single_quote_subst\"`'\n file_magic_glob='`$ECHO \"$file_magic_glob\" | $SED \"$delay_single_quote_subst\"`'\n want_nocaseglob='`$ECHO \"$want_nocaseglob\" | $SED \"$delay_single_quote_subst\"`'\n sharedlib_from_linklib_cmd='`$ECHO \"$sharedlib_from_linklib_cmd\" | $SED \"$delay_single_quote_subst\"`'\n AR='`$ECHO \"$AR\" | $SED \"$delay_single_quote_subst\"`'\n-lt_ar_flags='`$ECHO \"$lt_ar_flags\" | $SED \"$delay_single_quote_subst\"`'\n AR_FLAGS='`$ECHO \"$AR_FLAGS\" | $SED \"$delay_single_quote_subst\"`'\n archiver_list_spec='`$ECHO \"$archiver_list_spec\" | $SED \"$delay_single_quote_subst\"`'\n STRIP='`$ECHO \"$STRIP\" | $SED \"$delay_single_quote_subst\"`'\n@@ -24111,13 +20970,13 @@ LN_S \\\n lt_SP2NL \\\n lt_NL2SP \\\n reload_flag \\\n-FILECMD \\\n deplibs_check_method \\\n file_magic_cmd \\\n file_magic_glob \\\n want_nocaseglob \\\n sharedlib_from_linklib_cmd \\\n AR \\\n+AR_FLAGS \\\n archiver_list_spec \\\n STRIP \\\n RANLIB \\\n@@ -24299,7 +21158,7 @@ do\n     \"docs/doxygen/Makefile\") CONFIG_FILES=\"$CONFIG_FILES docs/doxygen/Makefile\" ;;\n     \"libe-book-$EBOOK_MAJOR_VERSION.$EBOOK_MINOR_VERSION.pc\") CONFIG_FILES=\"$CONFIG_FILES libe-book-$EBOOK_MAJOR_VERSION.$EBOOK_MINOR_VERSION.pc:libe-book.pc.in\" ;;\n \n-  *) as_fn_error $? \"invalid argument: '$ac_config_target'\" \"$LINENO\" 5;;\n+  *) as_fn_error $? \"invalid argument: \\`$ac_config_target'\" \"$LINENO\" 5;;\n   esac\n done\n \n@@ -24309,9 +21168,9 @@ done\n # We use the long form for the default assignment because of an extremely\n # bizarre bug on SunOS 4.1.3.\n if $ac_need_defaults; then\n-  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files\n-  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers\n-  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands\n+  test \"${CONFIG_FILES+set}\" = set || CONFIG_FILES=$config_files\n+  test \"${CONFIG_HEADERS+set}\" = set || CONFIG_HEADERS=$config_headers\n+  test \"${CONFIG_COMMANDS+set}\" = set || CONFIG_COMMANDS=$config_commands\n fi\n \n # Have a temporary directory for convenience.  Make it in the build tree\n@@ -24319,7 +21178,7 @@ fi\n # creating and moving files from /tmp can sometimes cause problems.\n # Hook for its removal unless debugging.\n # Note that there is a small window in which the directory will not be cleaned:\n-# after its creation but before its name has been assigned to '$tmp'.\n+# after its creation but before its name has been assigned to `$tmp'.\n $debug ||\n {\n   tmp= ac_tmp=\n@@ -24343,7 +21202,7 @@ ac_tmp=$tmp\n \n # Set up the scripts for CONFIG_FILES section.\n # No need to generate them if there are no CONFIG_FILES.\n-# This happens for instance with './config.status config.h'.\n+# This happens for instance with `./config.status config.h'.\n if test -n \"$CONFIG_FILES\"; then\n \n \n@@ -24501,13 +21360,13 @@ fi # test -n \"$CONFIG_FILES\"\n \n # Set up the scripts for CONFIG_HEADERS section.\n # No need to generate them if there are no CONFIG_HEADERS.\n-# This happens for instance with './config.status Makefile'.\n+# This happens for instance with `./config.status Makefile'.\n if test -n \"$CONFIG_HEADERS\"; then\n cat >\"$ac_tmp/defines.awk\" <<\\_ACAWK ||\n BEGIN {\n _ACEOF\n \n-# Transform confdefs.h into an awk script 'defines.awk', embedded as\n+# Transform confdefs.h into an awk script `defines.awk', embedded as\n # here-document in config.status, that substitutes the proper values into\n # config.h.in to produce config.h.\n \n@@ -24617,7 +21476,7 @@ do\n   esac\n   case $ac_mode$ac_tag in\n   :[FHL]*:*);;\n-  :L* | :C*:*) as_fn_error $? \"invalid tag '$ac_tag'\" \"$LINENO\" 5;;\n+  :L* | :C*:*) as_fn_error $? \"invalid tag \\`$ac_tag'\" \"$LINENO\" 5;;\n   :[FH]-) ac_tag=-:-;;\n   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;\n   esac\n@@ -24639,33 +21498,33 @@ do\n       -) ac_f=\"$ac_tmp/stdin\";;\n       *) # Look for the file first in the build tree, then in the source tree\n \t # (if the path is not absolute).  The absolute path cannot be DOS-style,\n-\t # because $ac_f cannot contain ':'.\n+\t # because $ac_f cannot contain `:'.\n \t test -f \"$ac_f\" ||\n \t   case $ac_f in\n \t   [\\\\/$]*) false;;\n \t   *) test -f \"$srcdir/$ac_f\" && ac_f=\"$srcdir/$ac_f\";;\n \t   esac ||\n-\t   as_fn_error 1 \"cannot find input file: '$ac_f'\" \"$LINENO\" 5;;\n+\t   as_fn_error 1 \"cannot find input file: \\`$ac_f'\" \"$LINENO\" 5;;\n       esac\n-      case $ac_f in *\\'*) ac_f=`printf \"%s\\n\" \"$ac_f\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;; esac\n+      case $ac_f in *\\'*) ac_f=`$as_echo \"$ac_f\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;; esac\n       as_fn_append ac_file_inputs \" '$ac_f'\"\n     done\n \n-    # Let's still pretend it is 'configure' which instantiates (i.e., don't\n+    # Let's still pretend it is `configure' which instantiates (i.e., don't\n     # use $as_me), people would be surprised to read:\n     #    /* config.h.  Generated by config.status.  */\n     configure_input='Generated from '`\n-\t  printf \"%s\\n\" \"$*\" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'\n+\t  $as_echo \"$*\" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'\n \t`' by configure.'\n     if test x\"$ac_file\" != x-; then\n       configure_input=\"$ac_file.  $configure_input\"\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: creating $ac_file\" >&5\n-printf \"%s\\n\" \"$as_me: creating $ac_file\" >&6;}\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: creating $ac_file\" >&5\n+$as_echo \"$as_me: creating $ac_file\" >&6;}\n     fi\n     # Neutralize special characters interpreted by sed in replacement strings.\n     case $configure_input in #(\n     *\\&* | *\\|* | *\\\\* )\n-       ac_sed_conf_input=`printf \"%s\\n\" \"$configure_input\" |\n+       ac_sed_conf_input=`$as_echo \"$configure_input\" |\n        sed 's/[\\\\\\\\&|]/\\\\\\\\&/g'`;; #(\n     *) ac_sed_conf_input=$configure_input;;\n     esac\n@@ -24682,7 +21541,7 @@ $as_expr X\"$ac_file\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n \t X\"$ac_file\" : 'X\\(//\\)[^/]' \\| \\\n \t X\"$ac_file\" : 'X\\(//\\)$' \\| \\\n \t X\"$ac_file\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X\"$ac_file\" |\n+$as_echo X\"$ac_file\" |\n     sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -24706,9 +21565,9 @@ printf \"%s\\n\" X\"$ac_file\" |\n case \"$ac_dir\" in\n .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;\n *)\n-  ac_dir_suffix=/`printf \"%s\\n\" \"$ac_dir\" | sed 's|^\\.[\\\\/]||'`\n+  ac_dir_suffix=/`$as_echo \"$ac_dir\" | sed 's|^\\.[\\\\/]||'`\n   # A \"..\" for each directory in $ac_dir_suffix.\n-  ac_top_builddir_sub=`printf \"%s\\n\" \"$ac_dir_suffix\" | sed 's|/[^\\\\/]*|/..|g;s|/||'`\n+  ac_top_builddir_sub=`$as_echo \"$ac_dir_suffix\" | sed 's|/[^\\\\/]*|/..|g;s|/||'`\n   case $ac_top_builddir_sub in\n   \"\") ac_top_builddir_sub=. ac_top_build_prefix= ;;\n   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;\n@@ -24770,8 +21629,8 @@ ac_sed_dataroot='\n case `eval \"sed -n \\\"\\$ac_sed_dataroot\\\" $ac_file_inputs\"` in\n *datarootdir*) ac_datarootdir_seen=yes;;\n *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting\" >&2;}\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting\" >&5\n+$as_echo \"$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting\" >&2;}\n _ACEOF\n cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1\n   ac_datarootdir_hack='\n@@ -24784,7 +21643,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1\n esac\n _ACEOF\n \n-# Neutralize VPATH when '$srcdir' = '.'.\n+# Neutralize VPATH when `$srcdir' = `.'.\n # Shell code in configure.ac might set extrasub.\n # FIXME: do we really want to maintain this feature?\n cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1\n@@ -24815,9 +21674,9 @@ test -z \"$ac_datarootdir_hack$ac_datarootdir_seen\" &&\n   { ac_out=`sed -n '/\\${datarootdir}/p' \"$ac_tmp/out\"`; test -n \"$ac_out\"; } &&\n   { ac_out=`sed -n '/^[\t ]*datarootdir[\t ]*:*=/p' \\\n       \"$ac_tmp/out\"`; test -z \"$ac_out\"; } &&\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \\`datarootdir'\n which seems to be undefined.  Please make sure it is defined\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'\n+$as_echo \"$as_me: WARNING: $ac_file contains a reference to the variable \\`datarootdir'\n which seems to be undefined.  Please make sure it is defined\" >&2;}\n \n   rm -f \"$ac_tmp/stdin\"\n@@ -24833,20 +21692,20 @@ which seems to be undefined.  Please make sure it is defined\" >&2;}\n   #\n   if test x\"$ac_file\" != x-; then\n     {\n-      printf \"%s\\n\" \"/* $configure_input  */\" >&1 \\\n+      $as_echo \"/* $configure_input  */\" \\\n       && eval '$AWK -f \"$ac_tmp/defines.awk\"' \"$ac_file_inputs\"\n     } >\"$ac_tmp/config.h\" \\\n       || as_fn_error $? \"could not create $ac_file\" \"$LINENO\" 5\n     if diff \"$ac_file\" \"$ac_tmp/config.h\" >/dev/null 2>&1; then\n-      { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: $ac_file is unchanged\" >&5\n-printf \"%s\\n\" \"$as_me: $ac_file is unchanged\" >&6;}\n+      { $as_echo \"$as_me:${as_lineno-$LINENO}: $ac_file is unchanged\" >&5\n+$as_echo \"$as_me: $ac_file is unchanged\" >&6;}\n     else\n       rm -f \"$ac_file\"\n       mv \"$ac_tmp/config.h\" \"$ac_file\" \\\n \t|| as_fn_error $? \"could not create $ac_file\" \"$LINENO\" 5\n     fi\n   else\n-    printf \"%s\\n\" \"/* $configure_input  */\" >&1 \\\n+    $as_echo \"/* $configure_input  */\" \\\n       && eval '$AWK -f \"$ac_tmp/defines.awk\"' \"$ac_file_inputs\" \\\n       || as_fn_error $? \"could not create -\" \"$LINENO\" 5\n   fi\n@@ -24866,7 +21725,7 @@ $as_expr X\"$_am_arg\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n \t X\"$_am_arg\" : 'X\\(//\\)[^/]' \\| \\\n \t X\"$_am_arg\" : 'X\\(//\\)$' \\| \\\n \t X\"$_am_arg\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X\"$_am_arg\" |\n+$as_echo X\"$_am_arg\" |\n     sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -24886,8 +21745,8 @@ printf \"%s\\n\" X\"$_am_arg\" |\n \t  s/.*/./; q'`/stamp-h$_am_stamp_count\n  ;;\n \n-  :C)  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: executing $ac_file commands\" >&5\n-printf \"%s\\n\" \"$as_me: executing $ac_file commands\" >&6;}\n+  :C)  { $as_echo \"$as_me:${as_lineno-$LINENO}: executing $ac_file commands\" >&5\n+$as_echo \"$as_me: executing $ac_file commands\" >&6;}\n  ;;\n   esac\n \n@@ -24897,35 +21756,29 @@ printf \"%s\\n\" \"$as_me: executing $ac_file commands\" >&6;}\n   # Older Autoconf quotes --file arguments for eval, but not when files\n   # are listed without --file.  Let's play safe and only enable the eval\n   # if we detect the quoting.\n-  # TODO: see whether this extra hack can be removed once we start\n-  # requiring Autoconf 2.70 or later.\n-  case $CONFIG_FILES in #(\n-  *\\'*) :\n-    eval set x \"$CONFIG_FILES\" ;; #(\n-  *) :\n-    set x $CONFIG_FILES ;; #(\n-  *) :\n-     ;;\n-esac\n+  case $CONFIG_FILES in\n+  *\\'*) eval set x \"$CONFIG_FILES\" ;;\n+  *)   set x $CONFIG_FILES ;;\n+  esac\n   shift\n-  # Used to flag and report bootstrapping failures.\n-  am_rc=0\n-  for am_mf\n+  for mf\n   do\n     # Strip MF so we end up with the name of the file.\n-    am_mf=`printf \"%s\\n\" \"$am_mf\" | sed -e 's/:.*$//'`\n-    # Check whether this is an Automake generated Makefile which includes\n-    # dependency-tracking related rules and includes.\n-    # Grep'ing the whole file directly is not great: AIX grep has a line\n+    mf=`echo \"$mf\" | sed -e 's/:.*$//'`\n+    # Check whether this is an Automake generated Makefile or not.\n+    # We used to match only the files named 'Makefile.in', but\n+    # some people rename them; so instead we look at the file content.\n+    # Grep'ing the first line is not enough: some people post-process\n+    # each Makefile.in and add a new line on top of each file to say so.\n+    # Grep'ing the whole file is not good either: AIX grep has a line\n     # limit of 2048, but all sed's we know have understand at least 4000.\n-    sed -n 's,^am--depfiles:.*,X,p' \"$am_mf\" | grep X >/dev/null 2>&1 \\\n-      || continue\n-    am_dirpart=`$as_dirname -- \"$am_mf\" ||\n-$as_expr X\"$am_mf\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n-\t X\"$am_mf\" : 'X\\(//\\)[^/]' \\| \\\n-\t X\"$am_mf\" : 'X\\(//\\)$' \\| \\\n-\t X\"$am_mf\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X\"$am_mf\" |\n+    if sed -n 's,^#.*generated by automake.*,X,p' \"$mf\" | grep X >/dev/null 2>&1; then\n+      dirpart=`$as_dirname -- \"$mf\" ||\n+$as_expr X\"$mf\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n+\t X\"$mf\" : 'X\\(//\\)[^/]' \\| \\\n+\t X\"$mf\" : 'X\\(//\\)$' \\| \\\n+\t X\"$mf\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n+$as_echo X\"$mf\" |\n     sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n@@ -24943,50 +21796,53 @@ printf \"%s\\n\" X\"$am_mf\" |\n \t    q\n \t  }\n \t  s/.*/./; q'`\n-    am_filepart=`$as_basename -- \"$am_mf\" ||\n-$as_expr X/\"$am_mf\" : '.*/\\([^/][^/]*\\)/*$' \\| \\\n-\t X\"$am_mf\" : 'X\\(//\\)$' \\| \\\n-\t X\"$am_mf\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n-printf \"%s\\n\" X/\"$am_mf\" |\n-    sed '/^.*\\/\\([^/][^/]*\\)\\/*$/{\n+    else\n+      continue\n+    fi\n+    # Extract the definition of DEPDIR, am__include, and am__quote\n+    # from the Makefile without running 'make'.\n+    DEPDIR=`sed -n 's/^DEPDIR = //p' < \"$mf\"`\n+    test -z \"$DEPDIR\" && continue\n+    am__include=`sed -n 's/^am__include = //p' < \"$mf\"`\n+    test -z \"$am__include\" && continue\n+    am__quote=`sed -n 's/^am__quote = //p' < \"$mf\"`\n+    # Find all dependency output files, they are included files with\n+    # $(DEPDIR) in their names.  We invoke sed twice because it is the\n+    # simplest approach to changing $(DEPDIR) to its actual value in the\n+    # expansion.\n+    for file in `sed -n \"\n+      s/^$am__include $am__quote\\(.*(DEPDIR).*\\)$am__quote\"'$/\\1/p' <\"$mf\" | \\\n+\t sed -e 's/\\$(DEPDIR)/'\"$DEPDIR\"'/g'`; do\n+      # Make sure the directory exists.\n+      test -f \"$dirpart/$file\" && continue\n+      fdir=`$as_dirname -- \"$file\" ||\n+$as_expr X\"$file\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n+\t X\"$file\" : 'X\\(//\\)[^/]' \\| \\\n+\t X\"$file\" : 'X\\(//\\)$' \\| \\\n+\t X\"$file\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n+$as_echo X\"$file\" |\n+    sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n \t    s//\\1/\n \t    q\n \t  }\n-\t  /^X\\/\\(\\/\\/\\)$/{\n+\t  /^X\\(\\/\\/\\)[^/].*/{\n \t    s//\\1/\n \t    q\n \t  }\n-\t  /^X\\/\\(\\/\\).*/{\n+\t  /^X\\(\\/\\/\\)$/{\n+\t    s//\\1/\n+\t    q\n+\t  }\n+\t  /^X\\(\\/\\).*/{\n \t    s//\\1/\n \t    q\n \t  }\n \t  s/.*/./; q'`\n-    { echo \"$as_me:$LINENO: cd \"$am_dirpart\" \\\n-      && sed -e '/# am--include-marker/d' \"$am_filepart\" \\\n-        | $MAKE -f - am--depfiles\" >&5\n-   (cd \"$am_dirpart\" \\\n-      && sed -e '/# am--include-marker/d' \"$am_filepart\" \\\n-        | $MAKE -f - am--depfiles) >&5 2>&5\n-   ac_status=$?\n-   echo \"$as_me:$LINENO: \\$? = $ac_status\" >&5\n-   (exit $ac_status); } || am_rc=$?\n+      as_dir=$dirpart/$fdir; as_fn_mkdir_p\n+      # echo \"creating $dirpart/$file\"\n+      echo '# dummy' > \"$dirpart/$file\"\n+    done\n   done\n-  if test $am_rc -ne 0; then\n-    { { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':\" >&5\n-printf \"%s\\n\" \"$as_me: error: in '$ac_pwd':\" >&2;}\n-as_fn_error $? \"Something went wrong bootstrapping makefile fragments\n-    for automatic dependency tracking.  If GNU make was not used, consider\n-    re-running the configure script with MAKE=\\\"gmake\\\" (or whatever is\n-    necessary).  You can also try re-running configure with the\n-    '--disable-dependency-tracking' option to at least be able to build\n-    the package (albeit without support for automatic dependency tracking).\n-See 'config.log' for more details\" \"$LINENO\" 5; }\n-  fi\n-  { am_dirpart=; unset am_dirpart;}\n-  { am_filepart=; unset am_filepart;}\n-  { am_mf=; unset am_mf;}\n-  { am_rc=; unset am_rc;}\n-  rm -f conftest-deps.mk\n }\n  ;;\n     \"libtool\":C)\n@@ -25004,18 +21860,19 @@ See 'config.log' for more details\" \"$LINENO\" 5; }\n     cat <<_LT_EOF >> \"$cfgfile\"\n #! $SHELL\n # Generated automatically by $as_me ($PACKAGE) $VERSION\n+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:\n # NOTE: Changes made to this file will be lost: look at ltmain.sh.\n \n # Provide generalized library-building support services.\n # Written by Gordon Matzigkeit, 1996\n \n-# Copyright (C) 2024 Free Software Foundation, Inc.\n+# Copyright (C) 2014 Free Software Foundation, Inc.\n # This is free software; see the source for copying conditions.  There is NO\n # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n \n # GNU Libtool is free software; you can redistribute it and/or modify\n # it under the terms of the GNU General Public License as published by\n-# the Free Software Foundation; either version 2 of the License, or\n+# the Free Software Foundation; either version 2 of of the License, or\n # (at your option) any later version.\n #\n # As a special exception to the GNU General Public License, if you\n@@ -25132,9 +21989,6 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd\n # convert \\$build files to toolchain format.\n to_tool_file_cmd=$lt_cv_to_tool_file_cmd\n \n-# A file(cmd) program that detects file types.\n-FILECMD=$lt_FILECMD\n-\n # Method to check whether dependent libraries are shared objects.\n deplibs_check_method=$lt_deplibs_check_method\n \n@@ -25153,11 +22007,8 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd\n # The archiver.\n AR=$lt_AR\n \n-# Flags to create an archive (by configure).\n-lt_ar_flags=$lt_ar_flags\n-\n # Flags to create an archive.\n-AR_FLAGS=\\${ARFLAGS-\"\\$lt_ar_flags\"}\n+AR_FLAGS=$lt_AR_FLAGS\n \n # How to feed a file listing to the archiver.\n archiver_list_spec=$lt_archiver_list_spec\n@@ -25399,7 +22250,7 @@ hardcode_direct=$hardcode_direct\n \n # Set to \"yes\" if using DIR/libNAME\\$shared_ext during linking hardcodes\n # DIR into the resulting binary and the resulting library dependency is\n-# \"absolute\",i.e. impossible to change by setting \\$shlibpath_var if the\n+# \"absolute\",i.e impossible to change by setting \\$shlibpath_var if the\n # library is relocated.\n hardcode_direct_absolute=$hardcode_direct_absolute\n \n@@ -25539,7 +22390,6 @@ _LT_EOF\n   esac\n \n \n-\n ltmain=$ac_aux_dir/ltmain.sh\n \n \n@@ -25547,7 +22397,7 @@ ltmain=$ac_aux_dir/ltmain.sh\n   # if finds mixed CR/LF and LF-only lines.  Since sed operates in\n   # text mode, it properly converts lines to CR/LF.  This bash problem\n   # is reportedly fixed, but why not run on old versions too?\n-  $SED '$q' \"$ltmain\" >> \"$cfgfile\" \\\n+  sed '$q' \"$ltmain\" >> \"$cfgfile\" \\\n      || (rm -f \"$cfgfile\"; exit 1)\n \n    mv -f \"$cfgfile\" \"$ofile\" ||\n@@ -25642,7 +22492,7 @@ hardcode_direct=$hardcode_direct_CXX\n \n # Set to \"yes\" if using DIR/libNAME\\$shared_ext during linking hardcodes\n # DIR into the resulting binary and the resulting library dependency is\n-# \"absolute\",i.e. impossible to change by setting \\$shlibpath_var if the\n+# \"absolute\",i.e impossible to change by setting \\$shlibpath_var if the\n # library is relocated.\n hardcode_direct_absolute=$hardcode_direct_absolute_CXX\n \n@@ -25742,15 +22592,15 @@ if test \"$no_create\" != yes; then\n   $ac_cs_success || as_fn_exit 1\n fi\n if test -n \"$ac_unrecognized_opts\" && test \"$enable_option_checking\" != no; then\n-  { printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts\" >&5\n-printf \"%s\\n\" \"$as_me: WARNING: unrecognized options: $ac_unrecognized_opts\" >&2;}\n+  { $as_echo \"$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts\" >&5\n+$as_echo \"$as_me: WARNING: unrecognized options: $ac_unrecognized_opts\" >&2;}\n fi\n \n \n # ==============================================\n # Display final informations about configuration\n # ==============================================\n-{ printf \"%s\\n\" \"$as_me:${as_lineno-$LINENO}:\n+{ $as_echo \"$as_me:${as_lineno-$LINENO}:\n ==============================================================================\n Build configuration:\n     debug:           ${enable_debug}\n@@ -25763,7 +22613,7 @@ Build configuration:\n     werror:          ${enable_werror}\n ==============================================================================\n \" >&5\n-printf \"%s\\n\" \"$as_me:\n+$as_echo \"$as_me:\n ==============================================================================\n Build configuration:\n     debug:           ${enable_debug}\n@@ -25777,4 +22627,3 @@ Build configuration:\n ==============================================================================\n \" >&6;}\n \n-\ndiff --git a/configure.ac b/configure.ac\nindex 25afb2d..1ac6e8c 100644\n--- a/configure.ac\n+++ b/configure.ac\n@@ -8,7 +8,7 @@ AC_PREREQ([2.65])\n # ====================\n m4_define([libe_book_version_major],[0])\n m4_define([libe_book_version_minor],[1])\n-m4_define([libe_book_version_micro],[4])\n+m4_define([libe_book_version_micro],[3])\n m4_define([libe_book_version],[libe_book_version_major.libe_book_version_minor.libe_book_version_micro])\n \n # =============\ndiff --git a/data/Makefile.in b/data/Makefile.in\nindex 24c5e82..cfaa5b3 100644\n--- a/data/Makefile.in\n+++ b/data/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -146,9 +144,10 @@ am__base_list = \\\n   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\\n/ /g' | \\\n   sed '$$!N;$$!N;$$!N;$$!N;s/\\n/ /g'\n am__uninstall_files_from_dir = { \\\n-  { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n-  || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n-       $(am__cd) \"$$dir\" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \\\n+  test -z \"$$files\" \\\n+    || { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n+    || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n+         $(am__cd) \"$$dir\" && rm -f $$files; }; \\\n   }\n am__installdirs = \"$(DESTDIR)$(libebookdir)\"\n DATA = $(libebook_DATA)\n@@ -172,10 +171,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -200,10 +197,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -282,10 +277,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -318,7 +311,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -353,8 +345,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -398,10 +390,8 @@ ctags CTAGS:\n \n cscope cscopelist:\n \n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -462,8 +452,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -555,10 +545,3 @@ uninstall-am: uninstall-libebookDATA\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/debian/changelog b/debian/changelog\nindex 361559f..6739152 100644\n--- a/debian/changelog\n+++ b/debian/changelog\n@@ -1,9 +1,3 @@\n-libe-book (0.1.4-1) unstable; urgency=medium\n-\n-  * New upstream version 0.1.4\n-\n- -- Rene Engelhard <rene@debian.org>  Tue, 21 Jul 2026 10:00:07 -0300\n-\n libe-book (0.1.3-4) unstable; urgency=medium\n \n   * source upload \ndiff --git a/debian/patches/no-icu-boolean.diff b/debian/patches/no-icu-boolean.diff\nnew file mode 100644\nindex 0000000..7f57af1\n--- /dev/null\n+++ b/debian/patches/no-icu-boolean.diff\n@@ -0,0 +1,13 @@\n+diff -ur libebook.org/src/lib/EBOOKCharsetConverter.cpp libebook/src/lib/EBOOKCharsetConverter.cpp\n+--- libebook.org/src/lib/EBOOKCharsetConverter.cpp\t2018-01-01 12:16:28.000000000 +0100\n++++ libebook/src/lib/EBOOKCharsetConverter.cpp\t2020-11-16 21:19:46.699315299 +0100\n+@@ -124,7 +124,7 @@\n+       m_converterToUTF8.get(), m_converterToUnicode.get(),\n+       &outText, outText + out.size(), &inText, inText + length,\n+       nullptr, nullptr, nullptr, nullptr,\n+-      TRUE, TRUE, &status)\n++      true, true, &status)\n+     ;\n+     if (status==U_BUFFER_OVERFLOW_ERROR)\n+     {\n+\ndiff --git a/debian/patches/series b/debian/patches/series\nnew file mode 100644\nindex 0000000..186e8b2\n--- /dev/null\n+++ b/debian/patches/series\n@@ -0,0 +1 @@\n+no-icu-boolean.diff\ndiff --git a/depcomp b/depcomp\nindex 1f0aa97..b39f98f 100755\n--- a/depcomp\n+++ b/depcomp\n@@ -1,9 +1,9 @@\n #! /bin/sh\n # depcomp - compile a program generating dependencies as side-effects\n \n-scriptversion=2024-06-19.01; # UTC\n+scriptversion=2016-01-11.22; # UTC\n \n-# Copyright (C) 1999-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1999-2017 Free Software Foundation, Inc.\n \n # This program is free software; you can redistribute it and/or modify\n # it under the terms of the GNU General Public License as published by\n@@ -16,7 +16,7 @@ scriptversion=2024-06-19.01; # UTC\n # GNU General Public License for more details.\n \n # You should have received a copy of the GNU General Public License\n-# along with this program.  If not, see <https://www.gnu.org/licenses/>.\n+# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n \n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n@@ -47,13 +47,11 @@ Environment variables:\n   libtool     Whether libtool is used (yes/no).\n \n Report bugs to <bug-automake@gnu.org>.\n-GNU Automake home page: <https://www.gnu.org/software/automake/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\n EOF\n     exit $?\n     ;;\n   -v | --v*)\n-    echo \"depcomp (GNU Automake) $scriptversion\"\n+    echo \"depcomp $scriptversion\"\n     exit $?\n     ;;\n esac\n@@ -115,6 +113,7 @@ nl='\n # These definitions help.\n upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ\n lower=abcdefghijklmnopqrstuvwxyz\n+digits=0123456789\n alpha=${upper}${lower}\n \n if test -z \"$depmode\" || test -z \"$source\" || test -z \"$object\"; then\n@@ -129,7 +128,7 @@ tmpdepfile=${tmpdepfile-`echo \"$depfile\" | sed 's/\\.\\([^.]*\\)$/.T\\1/'`}\n \n rm -f \"$tmpdepfile\"\n \n-# Avoid interference from the environment.\n+# Avoid interferences from the environment.\n gccflag= dashmflag=\n \n # Some modes work just like other modes, but use different flags.  We\n@@ -199,8 +198,8 @@ gcc3)\n   ;;\n \n gcc)\n-## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.\n-## but also to in-use compilers like IBM xlc/xlC and the HP C compiler.\n+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.\n+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.\n ## (see the conditional assignment to $gccflag above).\n ## There are various ways to get dependency output from gcc.  Here's\n ## why we pick this rather obscure method:\n@@ -784,7 +783,7 @@ exit 0\n # Local Variables:\n # mode: shell-script\n # sh-indentation: 2\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"scriptversion=\"\n # time-stamp-format: \"%:y-%02m-%02d.%02H\"\n # time-stamp-time-zone: \"UTC0\"\ndiff --git a/docs/Makefile.in b/docs/Makefile.in\nindex f2bf0ff..b24c51f 100644\n--- a/docs/Makefile.in\n+++ b/docs/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -138,7 +136,7 @@ am__recursive_targets = \\\n   $(RECURSIVE_CLEAN_TARGETS) \\\n   $(am__extra_recursive_targets)\n AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \\\n-\tdistdir distdir-am\n+\tdistdir\n am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)\n # Read a list of newline-separated strings from the standard input,\n # and print each of them once, without duplicates.  Input order is\n@@ -156,6 +154,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n DIST_SUBDIRS = $(SUBDIRS)\n am__DIST_COMMON = $(srcdir)/Makefile.in\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -201,10 +201,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -229,10 +227,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -311,10 +307,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -347,7 +341,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -377,8 +370,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -494,10 +487,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -581,8 +572,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -674,10 +665,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/docs/doxygen/Makefile.in b/docs/doxygen/Makefile.in\nindex 3291f4a..f570f34 100644\n--- a/docs/doxygen/Makefile.in\n+++ b/docs/doxygen/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -143,10 +141,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -171,10 +167,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -253,10 +247,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -289,7 +281,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -322,8 +313,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -346,10 +337,8 @@ ctags CTAGS:\n \n cscope cscopelist:\n \n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -407,8 +396,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -521,10 +510,3 @@ clean-local:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/inc/Makefile.in b/inc/Makefile.in\nindex 01a1f46..1cd20ef 100644\n--- a/inc/Makefile.in\n+++ b/inc/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -138,7 +136,7 @@ am__recursive_targets = \\\n   $(RECURSIVE_CLEAN_TARGETS) \\\n   $(am__extra_recursive_targets)\n AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \\\n-\tdistdir distdir-am\n+\tdistdir\n am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)\n # Read a list of newline-separated strings from the standard input,\n # and print each of them once, without duplicates.  Input order is\n@@ -156,6 +154,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n DIST_SUBDIRS = $(SUBDIRS)\n am__DIST_COMMON = $(srcdir)/Makefile.in\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -201,10 +201,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -229,10 +227,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -311,10 +307,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -347,7 +341,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -377,8 +370,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -494,10 +487,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -581,8 +572,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -674,10 +665,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/inc/libe-book/Makefile.in b/inc/libe-book/Makefile.in\nindex fe3186c..e54f30e 100644\n--- a/inc/libe-book/Makefile.in\n+++ b/inc/libe-book/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -147,9 +145,10 @@ am__base_list = \\\n   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\\n/ /g' | \\\n   sed '$$!N;$$!N;$$!N;$$!N;s/\\n/ /g'\n am__uninstall_files_from_dir = { \\\n-  { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n-  || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n-       $(am__cd) \"$$dir\" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \\\n+  test -z \"$$files\" \\\n+    || { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n+    || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n+         $(am__cd) \"$$dir\" && rm -f $$files; }; \\\n   }\n am__installdirs = \"$(DESTDIR)$(libebookdir)\"\n HEADERS = $(dist_libebook_HEADERS)\n@@ -170,6 +169,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__DIST_COMMON = $(srcdir)/Makefile.in\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n ACLOCAL = @ACLOCAL@\n@@ -189,10 +190,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -217,10 +216,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -299,10 +296,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -335,7 +330,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -369,8 +363,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -460,10 +454,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -524,8 +516,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -618,10 +610,3 @@ uninstall-am: uninstall-dist_libebookHEADERS\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/install-sh b/install-sh\nindex b1d7a6f..a9244eb 100755\n--- a/install-sh\n+++ b/install-sh\n@@ -1,7 +1,7 @@\n #!/bin/sh\n # install - install a program, script, or datafile\n \n-scriptversion=2024-06-19.01; # UTC\n+scriptversion=2011-01-19.21; # UTC\n \n # This originates from X11R5 (mit/util/scripts/install.sh), which was\n # later released in X11R6 (xc/config/util/install.sh) with the\n@@ -35,21 +35,25 @@ scriptversion=2024-06-19.01; # UTC\n # FSF changes to this file are in the public domain.\n #\n # Calling this script install-sh is preferred over install.sh, to prevent\n-# 'make' implicit rules from creating a file called install from it\n+# `make' implicit rules from creating a file called install from it\n # when there is no Makefile.\n #\n # This script is compatible with the BSD install script, but was written\n # from scratch.\n \n-tab='\t'\n nl='\n '\n-IFS=\" $tab$nl\"\n+IFS=\" \"\"\t$nl\"\n \n-# Set DOITPROG to \"echo\" to test this script.\n+# set DOITPROG to echo to test this script\n \n+# Don't use :- since 4.3BSD and earlier shells don't like it.\n doit=${DOITPROG-}\n-doit_exec=${doit:-exec}\n+if test -z \"$doit\"; then\n+  doit_exec=exec\n+else\n+  doit_exec=$doit\n+fi\n \n # Put in absolute file names if you don't have them in your path;\n # or use environment vars.\n@@ -64,16 +68,22 @@ mvprog=${MVPROG-mv}\n rmprog=${RMPROG-rm}\n stripprog=${STRIPPROG-strip}\n \n+posix_glob='?'\n+initialize_posix_glob='\n+  test \"$posix_glob\" != \"?\" || {\n+    if (set -f) 2>/dev/null; then\n+      posix_glob=\n+    else\n+      posix_glob=:\n+    fi\n+  }\n+'\n+\n posix_mkdir=\n \n # Desired mode of installed file.\n mode=0755\n \n-# Create dirs (including intermediate dirs) using mode 755.\n-# This is like GNU 'install' as of coreutils 8.32 (2020).\n-mkdir_umask=22\n-\n-backupsuffix=\n chgrpcmd=\n chmodcmd=$chmodprog\n chowncmd=\n@@ -87,7 +97,7 @@ dir_arg=\n dst_arg=\n \n copy_on_change=false\n-is_target_a_directory=possibly\n+no_target_directory=\n \n usage=\"\\\n Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE\n@@ -104,29 +114,19 @@ Options:\n      --version  display version info and exit.\n \n   -c            (ignored)\n-  -C            install only if different (preserve data modification time)\n+  -C            install only if different (preserve the last data modification time)\n   -d            create directories instead of installing files.\n   -g GROUP      $chgrpprog installed files to GROUP.\n   -m MODE       $chmodprog installed files to MODE.\n   -o USER       $chownprog installed files to USER.\n-  -p            pass -p to $cpprog.\n   -s            $stripprog installed files.\n-  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.\n   -t DIRECTORY  install into DIRECTORY.\n   -T            report an error if DSTFILE is a directory.\n \n Environment variables override the default commands:\n   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG\n   RMPROG STRIPPROG\n-\n-By default, rm is invoked with -f; when overridden with RMPROG,\n-it's up to you to specify -f if you want it.\n-\n-If -S is not specified, no backups are attempted.\n-\n-Report bugs to <bug-automake@gnu.org>.\n-GNU Automake home page: <https://www.gnu.org/software/automake/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\"\n+\"\n \n while test $# -ne 0; do\n   case $1 in\n@@ -137,62 +137,46 @@ while test $# -ne 0; do\n     -d) dir_arg=true;;\n \n     -g) chgrpcmd=\"$chgrpprog $2\"\n-        shift;;\n+\tshift;;\n \n     --help) echo \"$usage\"; exit $?;;\n \n     -m) mode=$2\n-        case $mode in\n-          *' '* | *\"$tab\"* | *\"$nl\"* | *'*'* | *'?'* | *'['*)\n-            echo \"$0: invalid mode: $mode\" >&2\n-            exit 1;;\n-        esac\n-        shift;;\n+\tcase $mode in\n+\t  *' '* | *'\t'* | *'\n+'*\t  | *'*'* | *'?'* | *'['*)\n+\t    echo \"$0: invalid mode: $mode\" >&2\n+\t    exit 1;;\n+\tesac\n+\tshift;;\n \n     -o) chowncmd=\"$chownprog $2\"\n-        shift;;\n-\n-    -p) cpprog=\"$cpprog -p\";;\n+\tshift;;\n \n     -s) stripcmd=$stripprog;;\n \n-    -S) backupsuffix=\"$2\"\n-        shift;;\n+    -t) dst_arg=$2\n+\t# Protect names problematic for `test' and other utilities.\n+\tcase $dst_arg in\n+\t  -* | [=\\(\\)!]) dst_arg=./$dst_arg;;\n+\tesac\n+\tshift;;\n \n-    -t)\n-        is_target_a_directory=always\n-        dst_arg=$2\n-        # Protect names problematic for 'test' and other utilities.\n-        case $dst_arg in\n-          -* | [=\\(\\)!]) dst_arg=./$dst_arg;;\n-        esac\n-        shift;;\n+    -T) no_target_directory=true;;\n \n-    -T) is_target_a_directory=never;;\n+    --version) echo \"$0 $scriptversion\"; exit $?;;\n \n-    --version) echo \"$0 (GNU Automake) $scriptversion\"; exit $?;;\n+    --)\tshift\n+\tbreak;;\n \n-    --) shift\n-        break;;\n-\n-    -*) echo \"$0: invalid option: $1\" >&2\n-        exit 1;;\n+    -*)\techo \"$0: invalid option: $1\" >&2\n+\texit 1;;\n \n     *)  break;;\n   esac\n   shift\n done\n \n-# We allow the use of options -d and -T together, by making -d\n-# take the precedence; this is for compatibility with GNU install.\n-\n-if test -n \"$dir_arg\"; then\n-  if test -n \"$dst_arg\"; then\n-    echo \"$0: target directory not allowed when installing a directory.\" >&2\n-    exit 1\n-  fi\n-fi\n-\n if test $# -ne 0 && test -z \"$dir_arg$dst_arg\"; then\n   # When -d is used, all remaining arguments are directories to create.\n   # When -t is used, the destination is already specified.\n@@ -206,7 +190,7 @@ if test $# -ne 0 && test -z \"$dir_arg$dst_arg\"; then\n     fi\n     shift # arg\n     dst_arg=$arg\n-    # Protect names problematic for 'test' and other utilities.\n+    # Protect names problematic for `test' and other utilities.\n     case $dst_arg in\n       -* | [=\\(\\)!]) dst_arg=./$dst_arg;;\n     esac\n@@ -218,20 +202,11 @@ if test $# -eq 0; then\n     echo \"$0: no input file specified.\" >&2\n     exit 1\n   fi\n-  # It's OK to call 'install-sh -d' without argument.\n+  # It's OK to call `install-sh -d' without argument.\n   # This can happen when creating conditional directories.\n   exit 0\n fi\n \n-if test -z \"$dir_arg\"; then\n-  if test $# -gt 1 || test \"$is_target_a_directory\" = always; then\n-    if test ! -d \"$dst_arg\"; then\n-      echo \"$0: $dst_arg: Is not a directory.\" >&2\n-      exit 1\n-    fi\n-  fi\n-fi\n-\n if test -z \"$dir_arg\"; then\n   do_exit='(exit $ret); exit $ret'\n   trap \"ret=129; $do_exit\" 1\n@@ -248,16 +223,16 @@ if test -z \"$dir_arg\"; then\n \n     *[0-7])\n       if test -z \"$stripcmd\"; then\n-        u_plus_rw=\n+\tu_plus_rw=\n       else\n-        u_plus_rw='% 200'\n+\tu_plus_rw='% 200'\n       fi\n       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;\n     *)\n       if test -z \"$stripcmd\"; then\n-        u_plus_rw=\n+\tu_plus_rw=\n       else\n-        u_plus_rw=,u+rw\n+\tu_plus_rw=,u+rw\n       fi\n       cp_umask=$mode$u_plus_rw;;\n   esac\n@@ -265,7 +240,7 @@ fi\n \n for src\n do\n-  # Protect names problematic for 'test' and other utilities.\n+  # Protect names problematic for `test' and other utilities.\n   case $src in\n     -* | [=\\(\\)!]) src=./$src;;\n   esac\n@@ -275,10 +250,6 @@ do\n     dstdir=$dst\n     test -d \"$dstdir\"\n     dstdir_status=$?\n-    # Don't chown directories that already exist.\n-    if test $dstdir_status = 0; then\n-      chowncmd=\"\"\n-    fi\n   else\n \n     # Waiting for this to be detected by the \"$cpprog $src $dsttmp\" command\n@@ -295,148 +266,178 @@ do\n     fi\n     dst=$dst_arg\n \n-    # If destination is a directory, append the input filename.\n+    # If destination is a directory, append the input filename; won't work\n+    # if double slashes aren't ignored.\n     if test -d \"$dst\"; then\n-      if test \"$is_target_a_directory\" = never; then\n-        echo \"$0: $dst_arg: Is a directory\" >&2\n-        exit 1\n+      if test -n \"$no_target_directory\"; then\n+\techo \"$0: $dst_arg: Is a directory\" >&2\n+\texit 1\n       fi\n       dstdir=$dst\n-      dstbase=`basename \"$src\"`\n-      case $dst in\n-\t*/) dst=$dst$dstbase;;\n-\t*)  dst=$dst/$dstbase;;\n-      esac\n+      dst=$dstdir/`basename \"$src\"`\n       dstdir_status=0\n     else\n-      dstdir=`dirname \"$dst\"`\n+      # Prefer dirname, but fall back on a substitute if dirname fails.\n+      dstdir=`\n+\t(dirname \"$dst\") 2>/dev/null ||\n+\texpr X\"$dst\" : 'X\\(.*[^/]\\)//*[^/][^/]*/*$' \\| \\\n+\t     X\"$dst\" : 'X\\(//\\)[^/]' \\| \\\n+\t     X\"$dst\" : 'X\\(//\\)$' \\| \\\n+\t     X\"$dst\" : 'X\\(/\\)' \\| . 2>/dev/null ||\n+\techo X\"$dst\" |\n+\t    sed '/^X\\(.*[^/]\\)\\/\\/*[^/][^/]*\\/*$/{\n+\t\t   s//\\1/\n+\t\t   q\n+\t\t }\n+\t\t /^X\\(\\/\\/\\)[^/].*/{\n+\t\t   s//\\1/\n+\t\t   q\n+\t\t }\n+\t\t /^X\\(\\/\\/\\)$/{\n+\t\t   s//\\1/\n+\t\t   q\n+\t\t }\n+\t\t /^X\\(\\/\\).*/{\n+\t\t   s//\\1/\n+\t\t   q\n+\t\t }\n+\t\t s/.*/./; q'\n+      `\n+\n       test -d \"$dstdir\"\n       dstdir_status=$?\n     fi\n   fi\n \n-  case $dstdir in\n-    */) dstdirslash=$dstdir;;\n-    *)  dstdirslash=$dstdir/;;\n-  esac\n-\n   obsolete_mkdir_used=false\n \n   if test $dstdir_status != 0; then\n     case $posix_mkdir in\n       '')\n-        # With -d, create the new directory with the user-specified mode.\n-        # Otherwise, rely on $mkdir_umask.\n-        if test -n \"$dir_arg\"; then\n-          mkdir_mode=-m$mode\n-        else\n-          mkdir_mode=\n-        fi\n-\n-        posix_mkdir=false\n-\t# The $RANDOM variable is not portable (e.g., dash).  Use it\n-\t# here however when possible just to lower collision chance.\n-\ttmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$\n-\n-\ttrap '\n-\t  ret=$?\n-\t  rmdir \"$tmpdir/a/b\" \"$tmpdir/a\" \"$tmpdir\" 2>/dev/null\n-\t  exit $ret\n-\t' 0\n-\n-\t# Because \"mkdir -p\" follows existing symlinks and we likely work\n-\t# directly in world-writable /tmp, make sure that the '$tmpdir'\n-\t# directory is successfully created first before we actually test\n-\t# 'mkdir -p'.\n-\tif (umask $mkdir_umask &&\n-\t    $mkdirprog $mkdir_mode \"$tmpdir\" &&\n-\t    exec $mkdirprog $mkdir_mode -p -- \"$tmpdir/a/b\") >/dev/null 2>&1\n-\tthen\n-\t  if test -z \"$dir_arg\" || {\n-\t       # Check for POSIX incompatibility with -m.\n-\t       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or\n-\t       # other-writable bit of parent directory when it shouldn't.\n-\t       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.\n-\t       test_tmpdir=\"$tmpdir/a\"\n-\t       ls_ld_tmpdir=`ls -ld \"$test_tmpdir\"`\n-\t       case $ls_ld_tmpdir in\n-\t\t d????-?r-*) different_mode=700;;\n-\t\t d????-?--*) different_mode=755;;\n-\t\t *) false;;\n-\t       esac &&\n-\t       $mkdirprog -m$different_mode -p -- \"$test_tmpdir\" && {\n-\t\t ls_ld_tmpdir_1=`ls -ld \"$test_tmpdir\"`\n-\t\t test \"$ls_ld_tmpdir\" = \"$ls_ld_tmpdir_1\"\n-\t       }\n-\t     }\n-\t  then posix_mkdir=:\n-\t  fi\n-\t  rmdir \"$tmpdir/a/b\" \"$tmpdir/a\" \"$tmpdir\"\n+\t# Create intermediate dirs using mode 755 as modified by the umask.\n+\t# This is like FreeBSD 'install' as of 1997-10-28.\n+\tumask=`umask`\n+\tcase $stripcmd.$umask in\n+\t  # Optimize common cases.\n+\t  *[2367][2367]) mkdir_umask=$umask;;\n+\t  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;\n+\n+\t  *[0-7])\n+\t    mkdir_umask=`expr $umask + 22 \\\n+\t      - $umask % 100 % 40 + $umask % 20 \\\n+\t      - $umask % 10 % 4 + $umask % 2\n+\t    `;;\n+\t  *) mkdir_umask=$umask,go-w;;\n+\tesac\n+\n+\t# With -d, create the new directory with the user-specified mode.\n+\t# Otherwise, rely on $mkdir_umask.\n+\tif test -n \"$dir_arg\"; then\n+\t  mkdir_mode=-m$mode\n \telse\n-\t  # Remove any dirs left behind by ancient mkdir implementations.\n-\t  rmdir ./$mkdir_mode ./-p ./-- \"$tmpdir\" 2>/dev/null\n+\t  mkdir_mode=\n \tfi\n-\ttrap '' 0;;\n+\n+\tposix_mkdir=false\n+\tcase $umask in\n+\t  *[123567][0-7][0-7])\n+\t    # POSIX mkdir -p sets u+wx bits regardless of umask, which\n+\t    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.\n+\t    ;;\n+\t  *)\n+\t    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$\n+\t    trap 'ret=$?; rmdir \"$tmpdir/d\" \"$tmpdir\" 2>/dev/null; exit $ret' 0\n+\n+\t    if (umask $mkdir_umask &&\n+\t\texec $mkdirprog $mkdir_mode -p -- \"$tmpdir/d\") >/dev/null 2>&1\n+\t    then\n+\t      if test -z \"$dir_arg\" || {\n+\t\t   # Check for POSIX incompatibilities with -m.\n+\t\t   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or\n+\t\t   # other-writeable bit of parent directory when it shouldn't.\n+\t\t   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.\n+\t\t   ls_ld_tmpdir=`ls -ld \"$tmpdir\"`\n+\t\t   case $ls_ld_tmpdir in\n+\t\t     d????-?r-*) different_mode=700;;\n+\t\t     d????-?--*) different_mode=755;;\n+\t\t     *) false;;\n+\t\t   esac &&\n+\t\t   $mkdirprog -m$different_mode -p -- \"$tmpdir\" && {\n+\t\t     ls_ld_tmpdir_1=`ls -ld \"$tmpdir\"`\n+\t\t     test \"$ls_ld_tmpdir\" = \"$ls_ld_tmpdir_1\"\n+\t\t   }\n+\t\t }\n+\t      then posix_mkdir=:\n+\t      fi\n+\t      rmdir \"$tmpdir/d\" \"$tmpdir\"\n+\t    else\n+\t      # Remove any dirs left behind by ancient mkdir implementations.\n+\t      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null\n+\t    fi\n+\t    trap '' 0;;\n+\tesac;;\n     esac\n \n     if\n       $posix_mkdir && (\n-        umask $mkdir_umask &&\n-        $doit_exec $mkdirprog $mkdir_mode -p -- \"$dstdir\"\n+\tumask $mkdir_umask &&\n+\t$doit_exec $mkdirprog $mkdir_mode -p -- \"$dstdir\"\n       )\n     then :\n     else\n \n-      # mkdir does not conform to POSIX,\n+      # The umask is ridiculous, or mkdir does not conform to POSIX,\n       # or it failed possibly due to a race condition.  Create the\n       # directory the slow way, step by step, checking for races as we go.\n \n       case $dstdir in\n-        /*) prefix='/';;\n-        [-=\\(\\)!]*) prefix='./';;\n-        *)  prefix='';;\n+\t/*) prefix='/';;\n+\t[-=\\(\\)!]*) prefix='./';;\n+\t*)  prefix='';;\n       esac\n \n+      eval \"$initialize_posix_glob\"\n+\n       oIFS=$IFS\n       IFS=/\n-      set -f\n+      $posix_glob set -f\n       set fnord $dstdir\n       shift\n-      set +f\n+      $posix_glob set +f\n       IFS=$oIFS\n \n       prefixes=\n \n       for d\n       do\n-        test X\"$d\" = X && continue\n-\n-        prefix=$prefix$d\n-        if test -d \"$prefix\"; then\n-          prefixes=\n-        else\n-          if $posix_mkdir; then\n-            (umask $mkdir_umask &&\n-             $doit_exec $mkdirprog $mkdir_mode -p -- \"$dstdir\") && break\n-            # Don't fail if two instances are running concurrently.\n-            test -d \"$prefix\" || exit 1\n-          else\n-            case $prefix in\n-              *\\'*) qprefix=`echo \"$prefix\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;;\n-              *) qprefix=$prefix;;\n-            esac\n-            prefixes=\"$prefixes '$qprefix'\"\n-          fi\n-        fi\n-        prefix=$prefix/\n+\ttest X\"$d\" = X && continue\n+\n+\tprefix=$prefix$d\n+\tif test -d \"$prefix\"; then\n+\t  prefixes=\n+\telse\n+\t  if $posix_mkdir; then\n+\t    (umask=$mkdir_umask &&\n+\t     $doit_exec $mkdirprog $mkdir_mode -p -- \"$dstdir\") && break\n+\t    # Don't fail if two instances are running concurrently.\n+\t    test -d \"$prefix\" || exit 1\n+\t  else\n+\t    case $prefix in\n+\t      *\\'*) qprefix=`echo \"$prefix\" | sed \"s/'/'\\\\\\\\\\\\\\\\''/g\"`;;\n+\t      *) qprefix=$prefix;;\n+\t    esac\n+\t    prefixes=\"$prefixes '$qprefix'\"\n+\t  fi\n+\tfi\n+\tprefix=$prefix/\n       done\n \n       if test -n \"$prefixes\"; then\n-        # Don't fail if two instances are running concurrently.\n-        (umask $mkdir_umask &&\n-         eval \"\\$doit_exec \\$mkdirprog $prefixes\") ||\n-          test -d \"$dstdir\" || exit 1\n-        obsolete_mkdir_used=true\n+\t# Don't fail if two instances are running concurrently.\n+\t(umask $mkdir_umask &&\n+\t eval \"\\$doit_exec \\$mkdirprog $prefixes\") ||\n+\t  test -d \"$dstdir\" || exit 1\n+\tobsolete_mkdir_used=true\n       fi\n     fi\n   fi\n@@ -449,25 +450,14 @@ do\n   else\n \n     # Make a couple of temp file names in the proper directory.\n-    dsttmp=${dstdirslash}_inst.$$_\n-    rmtmp=${dstdirslash}_rm.$$_\n+    dsttmp=$dstdir/_inst.$$_\n+    rmtmp=$dstdir/_rm.$$_\n \n     # Trap to clean up those temp files at exit.\n     trap 'ret=$?; rm -f \"$dsttmp\" \"$rmtmp\" && exit $ret' 0\n \n     # Copy the file name to the temp name.\n-    (umask $cp_umask &&\n-     { test -z \"$stripcmd\" || {\n-\t # Create $dsttmp read-write so that cp doesn't create it read-only,\n-\t # which would cause strip to fail.\n-\t if test -z \"$doit\"; then\n-\t   : >\"$dsttmp\" # No need to fork-exec 'touch'.\n-\t else\n-\t   $doit touch \"$dsttmp\"\n-\t fi\n-       }\n-     } &&\n-     $doit_exec $cpprog \"$src\" \"$dsttmp\") &&\n+    (umask $cp_umask && $doit_exec $cpprog \"$src\" \"$dsttmp\") &&\n \n     # and set any options; do chmod last to preserve setuid bits.\n     #\n@@ -482,24 +472,20 @@ do\n \n     # If -C, don't bother to copy if it wouldn't change the file.\n     if $copy_on_change &&\n-       old=`LC_ALL=C ls -dlL \"$dst\"     2>/dev/null` &&\n-       new=`LC_ALL=C ls -dlL \"$dsttmp\"  2>/dev/null` &&\n-       set -f &&\n+       old=`LC_ALL=C ls -dlL \"$dst\"\t2>/dev/null` &&\n+       new=`LC_ALL=C ls -dlL \"$dsttmp\"\t2>/dev/null` &&\n+\n+       eval \"$initialize_posix_glob\" &&\n+       $posix_glob set -f &&\n        set X $old && old=:$2:$4:$5:$6 &&\n        set X $new && new=:$2:$4:$5:$6 &&\n-       set +f &&\n+       $posix_glob set +f &&\n+\n        test \"$old\" = \"$new\" &&\n        $cmpprog \"$dst\" \"$dsttmp\" >/dev/null 2>&1\n     then\n       rm -f \"$dsttmp\"\n     else\n-      # If $backupsuffix is set, and the file being installed\n-      # already exists, attempt a backup.  Don't worry if it fails,\n-      # e.g., if mv doesn't support -f.\n-      if test -n \"$backupsuffix\" && test -f \"$dst\"; then\n-        $doit $mvcmd -f \"$dst\" \"$dst$backupsuffix\" 2>/dev/null\n-      fi\n-\n       # Rename the file to the real destination.\n       $doit $mvcmd -f \"$dsttmp\" \"$dst\" 2>/dev/null ||\n \n@@ -507,24 +493,24 @@ do\n       # to itself, or perhaps because mv is so ancient that it does not\n       # support -f.\n       {\n-        # Now remove or move aside any old file at destination location.\n-        # We try this two ways since rm can't unlink itself on some\n-        # systems and the destination file might be busy for other\n-        # reasons.  In this case, the final cleanup might fail but the new\n-        # file should still install successfully.\n-        {\n-          test ! -f \"$dst\" ||\n-          $doit $rmcmd \"$dst\" 2>/dev/null ||\n-          { $doit $mvcmd -f \"$dst\" \"$rmtmp\" 2>/dev/null &&\n-            { $doit $rmcmd \"$rmtmp\" 2>/dev/null; :; }\n-          } ||\n-          { echo \"$0: cannot unlink or rename $dst\" >&2\n-            (exit 1); exit 1\n-          }\n-        } &&\n-\n-        # Now rename the file to the real destination.\n-        $doit $mvcmd \"$dsttmp\" \"$dst\"\n+\t# Now remove or move aside any old file at destination location.\n+\t# We try this two ways since rm can't unlink itself on some\n+\t# systems and the destination file might be busy for other\n+\t# reasons.  In this case, the final cleanup might fail but the new\n+\t# file should still install successfully.\n+\t{\n+\t  test ! -f \"$dst\" ||\n+\t  $doit $rmcmd -f \"$dst\" 2>/dev/null ||\n+\t  { $doit $mvcmd -f \"$dst\" \"$rmtmp\" 2>/dev/null &&\n+\t    { $doit $rmcmd -f \"$rmtmp\" 2>/dev/null; :; }\n+\t  } ||\n+\t  { echo \"$0: cannot unlink or rename $dst\" >&2\n+\t    (exit 1); exit 1\n+\t  }\n+\t} &&\n+\n+\t# Now rename the file to the real destination.\n+\t$doit $mvcmd \"$dsttmp\" \"$dst\"\n       }\n     fi || exit 1\n \n@@ -533,9 +519,9 @@ do\n done\n \n # Local variables:\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"scriptversion=\"\n # time-stamp-format: \"%:y-%02m-%02d.%02H\"\n-# time-stamp-time-zone: \"UTC0\"\n+# time-stamp-time-zone: \"UTC\"\n # time-stamp-end: \"; # UTC\"\n # End:\ndiff --git a/ltmain.sh b/ltmain.sh\nindex ff2d73a..0f0a2da 100644\n--- a/ltmain.sh\n+++ b/ltmain.sh\n@@ -1,12 +1,12 @@\n-#! /usr/bin/env sh\n+#! /bin/sh\n ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in\n-##               by inline-source v2019-02-19.15\n+##               by inline-source v2014-01-03.01\n \n-# libtool (GNU libtool) 2.5.4\n+# libtool (GNU libtool) 2.4.6\n # Provide generalized library-building support services.\n # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996\n \n-# Copyright (C) 1996-2019, 2021-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1996-2015 Free Software Foundation, Inc.\n # This is free software; see the source for copying conditions.  There is NO\n # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n \n@@ -31,8 +31,8 @@\n \n PROGRAM=libtool\n PACKAGE=libtool\n-VERSION=2.5.4\n-package_revision=2.5.4\n+VERSION=2.4.6\n+package_revision=2.4.6\n \n \n ## ------ ##\n@@ -64,25 +64,34 @@ package_revision=2.5.4\n # libraries, which are installed to $pkgauxdir.\n \n # Set a version string for this script.\n-scriptversion=2019-02-19.15; # UTC\n+scriptversion=2015-01-20.17; # UTC\n \n # General shell script boiler plate, and helper functions.\n # Written by Gary V. Vaughan, 2004\n \n-# This is free software.  There is NO warranty; not even for\n-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n-#\n-# Copyright (C) 2004-2019, 2021, 2023-2024 Bootstrap Authors\n-#\n-# This file is dual licensed under the terms of the MIT license\n-# <https://opensource.org/licenses/MIT>, and GPL version 2 or later\n-# <https://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of\n-# these licenses when using or redistributing this software or any of\n-# the files within it.  See the URLs above, or the file `LICENSE`\n-# included in the Bootstrap distribution for the full license texts.\n+# Copyright (C) 2004-2015 Free Software Foundation, Inc.\n+# This is free software; see the source for copying conditions.  There is NO\n+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n+\n+# This program is free software; you can redistribute it and/or modify\n+# it under the terms of the GNU General Public License as published by\n+# the Free Software Foundation; either version 3 of the License, or\n+# (at your option) any later version.\n+\n+# As a special exception to the GNU General Public License, if you distribute\n+# this file as part of a program or library that is built using GNU Libtool,\n+# you may include this file under the same distribution terms that you use\n+# for the rest of that program.\n+\n+# This program is distributed in the hope that it will be useful,\n+# but WITHOUT ANY WARRANTY; without even the implied warranty of\n+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU\n+# General Public License for more details.\n \n-# Please report bugs or propose patches to:\n-# <https://github.com/gnulib-modules/bootstrap/issues>\n+# You should have received a copy of the GNU General Public License\n+# along with this program. If not, see <http://www.gnu.org/licenses/>.\n+\n+# Please report bugs or propose patches to gary@gnu.org.\n \n \n ## ------ ##\n@@ -130,12 +139,9 @@ do\n \t  _G_safe_locale=\\\"$_G_var=C; \\$_G_safe_locale\\\"\n \tfi\"\n done\n-# These NLS vars are set unconditionally (bootstrap issue #24).  Unset those\n-# in case the environment reset is needed later and the $save_* variant is not\n-# defined (see the code above).\n-LC_ALL=C\n-LANGUAGE=C\n-export LANGUAGE LC_ALL\n+\n+# CDPATH.\n+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH\n \n # Make sure IFS has a sensible default\n sp=' '\n@@ -143,7 +149,7 @@ nl='\n '\n IFS=\"$sp\t$nl\"\n \n-# There are apparently some systems that use ';' as a PATH separator!\n+# There are apparently some retarded systems that use ';' as a PATH separator!\n if test \"${PATH_SEPARATOR+set}\" != set; then\n   PATH_SEPARATOR=:\n   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {\n@@ -153,26 +159,6 @@ if test \"${PATH_SEPARATOR+set}\" != set; then\n fi\n \n \n-# func_unset VAR\n-# --------------\n-# Portably unset VAR.\n-# In some shells, an 'unset VAR' statement leaves a non-zero return\n-# status if VAR is already unset, which might be problematic if the\n-# statement is used at the end of a function (thus poisoning its return\n-# value) or when 'set -e' is active (causing even a spurious abort of\n-# the script in this case).\n-func_unset ()\n-{\n-    { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; }\n-}\n-\n-\n-# Make sure CDPATH doesn't cause `cd` commands to output the target dir.\n-func_unset CDPATH\n-\n-# Make sure ${,E,F}GREP behave sanely.\n-func_unset GREP_OPTIONS\n-\n \n ## ------------------------- ##\n ## Locate command utilities. ##\n@@ -273,7 +259,7 @@ test -z \"$SED\" && {\n     rm -f conftest.in conftest.tmp conftest.nl conftest.out\n   }\n \n-  func_path_progs \"sed gsed\" func_check_prog_sed \"$PATH:/usr/xpg4/bin\"\n+  func_path_progs \"sed gsed\" func_check_prog_sed $PATH:/usr/xpg4/bin\n   rm -f conftest.sed\n   SED=$func_path_progs_result\n }\n@@ -309,7 +295,7 @@ test -z \"$GREP\" && {\n     rm -f conftest.in conftest.tmp conftest.nl conftest.out\n   }\n \n-  func_path_progs \"grep ggrep\" func_check_prog_grep \"$PATH:/usr/xpg4/bin\"\n+  func_path_progs \"grep ggrep\" func_check_prog_grep $PATH:/usr/xpg4/bin\n   GREP=$func_path_progs_result\n }\n \n@@ -374,35 +360,6 @@ sed_double_backslash=\"\\\n   s/\\\\([^$_G_bs]\\\\)$_G_bs2$_G_dollar/\\\\1$_G_bs2$_G_bs$_G_dollar/g\n   s/\\n//g\"\n \n-# require_check_ifs_backslash\n-# ---------------------------\n-# Check if we can use backslash as IFS='\\' separator, and set\n-# $check_ifs_backshlash_broken to ':' or 'false'.\n-require_check_ifs_backslash=func_require_check_ifs_backslash\n-func_require_check_ifs_backslash ()\n-{\n-  _G_save_IFS=$IFS\n-  IFS='\\'\n-  _G_check_ifs_backshlash='a\\\\b'\n-  for _G_i in $_G_check_ifs_backshlash\n-  do\n-  case $_G_i in\n-  a)\n-    check_ifs_backshlash_broken=false\n-    ;;\n-  '')\n-    break\n-    ;;\n-  *)\n-    check_ifs_backshlash_broken=:\n-    break\n-    ;;\n-  esac\n-  done\n-  IFS=$_G_save_IFS\n-  require_check_ifs_backslash=:\n-}\n-\n \n ## ----------------- ##\n ## Global variables. ##\n@@ -589,7 +546,7 @@ func_require_term_colors ()\n \n   # _G_HAVE_PLUSEQ_OP\n   # Can be empty, in which case the shell is probed, \"yes\" if += is\n-  # usable or anything else if it does not work.\n+  # useable or anything else if it does not work.\n   test -z \"$_G_HAVE_PLUSEQ_OP\" \\\n     && (eval 'x=a; x+=\" b\"; test \"a b\" = \"$x\"') 2>/dev/null \\\n     && _G_HAVE_PLUSEQ_OP=yes\n@@ -623,16 +580,16 @@ if test yes = \"$_G_HAVE_PLUSEQ_OP\"; then\n   {\n     $debug_cmd\n \n-    func_quote_arg pretty \"$2\"\n-    eval \"$1+=\\\\ \\$func_quote_arg_result\"\n+    func_quote_for_eval \"$2\"\n+    eval \"$1+=\\\\ \\$func_quote_for_eval_result\"\n   }'\n else\n   func_append_quoted ()\n   {\n     $debug_cmd\n \n-    func_quote_arg pretty \"$2\"\n-    eval \"$1=\\$$1\\\\ \\$func_quote_arg_result\"\n+    func_quote_for_eval \"$2\"\n+    eval \"$1=\\$$1\\\\ \\$func_quote_for_eval_result\"\n   }\n fi\n \n@@ -739,7 +696,7 @@ eval 'func_dirname ()\n #             to NONDIR_REPLACEMENT.\n #             value returned in \"$func_dirname_result\"\n #   basename: Compute filename of FILE.\n-#             value returned in \"$func_basename_result\"\n+#             value retuned in \"$func_basename_result\"\n # For efficiency, we do not delegate to the functions above but instead\n # duplicate the functionality here.\n eval 'func_dirname_and_basename ()\n@@ -897,7 +854,7 @@ func_mkdir_p ()\n       # While some portion of DIR does not yet exist...\n       while test ! -d \"$_G_directory_path\"; do\n         # ...make a list in topmost first order.  Use a colon delimited\n-\t# list in case some portion of path contains whitespace.\n+\t# list incase some portion of path contains whitespace.\n         _G_dir_list=$_G_directory_path:$_G_dir_list\n \n         # If the last portion added has no slash in it, the list is done\n@@ -1134,203 +1091,85 @@ func_relative_path ()\n }\n \n \n-# func_quote_portable EVAL ARG\n-# ----------------------------\n-# Internal function to portably implement func_quote_arg.  Note that we still\n-# keep attention to performance here so we as much as possible try to avoid\n-# calling sed binary (so far O(N) complexity as long as func_append is O(1)).\n-func_quote_portable ()\n+# func_quote_for_eval ARG...\n+# --------------------------\n+# Aesthetically quote ARGs to be evaled later.\n+# This function returns two values:\n+#   i) func_quote_for_eval_result\n+#      double-quoted, suitable for a subsequent eval\n+#  ii) func_quote_for_eval_unquoted_result\n+#      has all characters that are still active within double\n+#      quotes backslashified.\n+func_quote_for_eval ()\n {\n     $debug_cmd\n \n-    $require_check_ifs_backslash\n-\n-    func_quote_portable_result=$2\n-\n-    # one-time-loop (easy break)\n-    while true\n-    do\n-      if $1; then\n-        func_quote_portable_result=`$ECHO \"$2\" | $SED \\\n-          -e \"$sed_double_quote_subst\" -e \"$sed_double_backslash\"`\n-        break\n-      fi\n-\n-      # Quote for eval.\n-      case $func_quote_portable_result in\n+    func_quote_for_eval_unquoted_result=\n+    func_quote_for_eval_result=\n+    while test 0 -lt $#; do\n+      case $1 in\n         *[\\\\\\`\\\"\\$]*)\n-          # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string\n-          # contains the shell wildcard characters.\n-          case $check_ifs_backshlash_broken$func_quote_portable_result in\n-            :*|*[\\[\\*\\?]*)\n-              func_quote_portable_result=`$ECHO \"$func_quote_portable_result\" \\\n-                  | $SED \"$sed_quote_subst\"`\n-              break\n-              ;;\n-          esac\n+\t  _G_unquoted_arg=`printf '%s\\n' \"$1\" |$SED \"$sed_quote_subst\"` ;;\n+        *)\n+          _G_unquoted_arg=$1 ;;\n+      esac\n+      if test -n \"$func_quote_for_eval_unquoted_result\"; then\n+\tfunc_append func_quote_for_eval_unquoted_result \" $_G_unquoted_arg\"\n+      else\n+        func_append func_quote_for_eval_unquoted_result \"$_G_unquoted_arg\"\n+      fi\n \n-          func_quote_portable_old_IFS=$IFS\n-          for _G_char in '\\' '`' '\"' '$'\n-          do\n-            # STATE($1) PREV($2) SEPARATOR($3)\n-            set start \"\" \"\"\n-            func_quote_portable_result=dummy\"$_G_char$func_quote_portable_result$_G_char\"dummy\n-            IFS=$_G_char\n-            for _G_part in $func_quote_portable_result\n-            do\n-              case $1 in\n-              quote)\n-                func_append func_quote_portable_result \"$3$2\"\n-                set quote \"$_G_part\" \"\\\\$_G_char\"\n-                ;;\n-              start)\n-                set first \"\" \"\"\n-                func_quote_portable_result=\n-                ;;\n-              first)\n-                set quote \"$_G_part\" \"\"\n-                ;;\n-              esac\n-            done\n-          done\n-          IFS=$func_quote_portable_old_IFS\n+      case $_G_unquoted_arg in\n+        # Double-quote args containing shell metacharacters to delay\n+        # word splitting, command substitution and variable expansion\n+        # for a subsequent eval.\n+        # Many Bourne shells cannot handle close brackets correctly\n+        # in scan sets, so we specify it separately.\n+        *[\\[\\~\\#\\^\\&\\*\\(\\)\\{\\}\\|\\;\\<\\>\\?\\'\\ \\\t]*|*]*|\"\")\n+          _G_quoted_arg=\\\"$_G_unquoted_arg\\\"\n           ;;\n-        *) ;;\n+        *)\n+          _G_quoted_arg=$_G_unquoted_arg\n+\t  ;;\n       esac\n-      break\n-    done\n \n-    func_quote_portable_unquoted_result=$func_quote_portable_result\n-    case $func_quote_portable_result in\n-      # double-quote args containing shell metacharacters to delay\n-      # word splitting, command substitution and variable expansion\n-      # for a subsequent eval.\n-      # many bourne shells cannot handle close brackets correctly\n-      # in scan sets, so we specify it separately.\n-      *[\\[\\~\\#\\^\\&\\*\\(\\)\\{\\}\\|\\;\\<\\>\\?\\'\\ \\\t]*|*]*|\"\")\n-        func_quote_portable_result=\\\"$func_quote_portable_result\\\"\n-        ;;\n-    esac\n+      if test -n \"$func_quote_for_eval_result\"; then\n+\tfunc_append func_quote_for_eval_result \" $_G_quoted_arg\"\n+      else\n+        func_append func_quote_for_eval_result \"$_G_quoted_arg\"\n+      fi\n+      shift\n+    done\n }\n \n \n-# func_quotefast_eval ARG\n-# -----------------------\n-# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',\n-# but optimized for speed.  Result is stored in $func_quotefast_eval.\n-if test xyes = `(x=; printf -v x %q yes; echo x\"$x\") 2>/dev/null`; then\n-  printf -v _GL_test_printf_tilde %q '~'\n-  if test '\\~' = \"$_GL_test_printf_tilde\"; then\n-    func_quotefast_eval ()\n-    {\n-      printf -v func_quotefast_eval_result %q \"$1\"\n-    }\n-  else\n-    # Broken older Bash implementations.  Make those faster too if possible.\n-    func_quotefast_eval ()\n-    {\n-      case $1 in\n-        '~'*)\n-          func_quote_portable false \"$1\"\n-          func_quotefast_eval_result=$func_quote_portable_result\n-          ;;\n-        *)\n-          printf -v func_quotefast_eval_result %q \"$1\"\n-          ;;\n-      esac\n-    }\n-  fi\n-else\n-  func_quotefast_eval ()\n-  {\n-    func_quote_portable false \"$1\"\n-    func_quotefast_eval_result=$func_quote_portable_result\n-  }\n-fi\n-\n+# func_quote_for_expand ARG\n+# -------------------------\n+# Aesthetically quote ARG to be evaled later; same as above,\n+# but do not quote variable references.\n+func_quote_for_expand ()\n+{\n+    $debug_cmd\n \n-# func_quote_arg MODEs ARG\n-# ------------------------\n-# Quote one ARG to be evaled later.  MODEs argument may contain zero or more\n-# specifiers listed below separated by ',' character.  This function returns two\n-# values:\n-#   i) func_quote_arg_result\n-#      double-quoted (when needed), suitable for a subsequent eval\n-#  ii) func_quote_arg_unquoted_result\n-#      has all characters that are still active within double\n-#      quotes backslashified.  Available only if 'unquoted' is specified.\n-#\n-# Available modes:\n-# ----------------\n-# 'eval' (default)\n-#       - escape shell special characters\n-# 'expand'\n-#       - the same as 'eval';  but do not quote variable references\n-# 'pretty'\n-#       - request aesthetic output, i.e. '\"a b\"' instead of 'a\\ b'.  This might\n-#         be used later in func_quote to get output like: 'echo \"a b\"' instead\n-#         of 'echo a\\ b'.  This is slower than default on some shells.\n-# 'unquoted'\n-#       - produce also $func_quote_arg_unquoted_result which does not contain\n-#         wrapping double-quotes.\n-#\n-# Examples for 'func_quote_arg pretty,unquoted string':\n-#\n-#   string      | *_result              | *_unquoted_result\n-#   ------------+-----------------------+-------------------\n-#   \"           | \\\"                    | \\\"\n-#   a b         | \"a b\"                 | a b\n-#   \"a b\"       | \"\\\"a b\\\"\"             | \\\"a b\\\"\n-#   *           | \"*\"                   | *\n-#   z=\"${x-$y}\" | \"z=\\\"\\${x-\\$y}\\\"\"     | z=\\\"\\${x-\\$y}\\\"\n-#\n-# Examples for 'func_quote_arg pretty,unquoted,expand string':\n-#\n-#   string        |   *_result          |  *_unquoted_result\n-#   --------------+---------------------+--------------------\n-#   z=\"${x-$y}\"   | \"z=\\\"${x-$y}\\\"\"     | z=\\\"${x-$y}\\\"\n-func_quote_arg ()\n-{\n-    _G_quote_expand=false\n-    case ,$1, in\n-      *,expand,*)\n-        _G_quote_expand=:\n-        ;;\n+    case $1 in\n+      *[\\\\\\`\\\"]*)\n+\t_G_arg=`$ECHO \"$1\" | $SED \\\n+\t    -e \"$sed_double_quote_subst\" -e \"$sed_double_backslash\"` ;;\n+      *)\n+        _G_arg=$1 ;;\n     esac\n \n-    case ,$1, in\n-      *,pretty,*|*,expand,*|*,unquoted,*)\n-        func_quote_portable $_G_quote_expand \"$2\"\n-        func_quote_arg_result=$func_quote_portable_result\n-        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result\n-        ;;\n-      *)\n-        # Faster quote-for-eval for some shells.\n-        func_quotefast_eval \"$2\"\n-        func_quote_arg_result=$func_quotefast_eval_result\n+    case $_G_arg in\n+      # Double-quote args containing shell metacharacters to delay\n+      # word splitting and command substitution for a subsequent eval.\n+      # Many Bourne shells cannot handle close brackets correctly\n+      # in scan sets, so we specify it separately.\n+      *[\\[\\~\\#\\^\\&\\*\\(\\)\\{\\}\\|\\;\\<\\>\\?\\'\\ \\\t]*|*]*|\"\")\n+        _G_arg=\\\"$_G_arg\\\"\n         ;;\n     esac\n-}\n-\n \n-# func_quote MODEs ARGs...\n-# ------------------------\n-# Quote all ARGs to be evaled later and join them into single command.  See\n-# func_quote_arg's description for more info.\n-func_quote ()\n-{\n-    $debug_cmd\n-    _G_func_quote_mode=$1 ; shift\n-    func_quote_result=\n-    while test 0 -lt $#; do\n-      func_quote_arg \"$_G_func_quote_mode\" \"$1\"\n-      if test -n \"$func_quote_result\"; then\n-        func_append func_quote_result \" $func_quote_arg_result\"\n-      else\n-        func_append func_quote_result \"$func_quote_arg_result\"\n-      fi\n-      shift\n-    done\n+    func_quote_for_expand_result=$_G_arg\n }\n \n \n@@ -1376,8 +1215,8 @@ func_show_eval ()\n     _G_cmd=$1\n     _G_fail_exp=${2-':'}\n \n-    func_quote_arg pretty,expand \"$_G_cmd\"\n-    eval \"func_notquiet $func_quote_arg_result\"\n+    func_quote_for_expand \"$_G_cmd\"\n+    eval \"func_notquiet $func_quote_for_expand_result\"\n \n     $opt_dry_run || {\n       eval \"$_G_cmd\"\n@@ -1402,8 +1241,8 @@ func_show_eval_locale ()\n     _G_fail_exp=${2-':'}\n \n     $opt_quiet || {\n-      func_quote_arg expand,pretty \"$_G_cmd\"\n-      eval \"func_echo $func_quote_arg_result\"\n+      func_quote_for_expand \"$_G_cmd\"\n+      eval \"func_echo $func_quote_for_expand_result\"\n     }\n \n     $opt_dry_run || {\n@@ -1530,26 +1369,30 @@ func_lt_ver ()\n # End:\n #! /bin/sh\n \n+# Set a version string for this script.\n+scriptversion=2014-01-07.03; # UTC\n+\n # A portable, pluggable option parser for Bourne shell.\n # Written by Gary V. Vaughan, 2010\n \n-# This is free software.  There is NO warranty; not even for\n-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n-#\n-# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors\n-#\n-# This file is dual licensed under the terms of the MIT license\n-# <https://opensource.org/licenses/MIT>, and GPL version 2 or later\n-# <https://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of\n-# these licenses when using or redistributing this software or any of\n-# the files within it.  See the URLs above, or the file `LICENSE`\n-# included in the Bootstrap distribution for the full license texts.\n+# Copyright (C) 2010-2015 Free Software Foundation, Inc.\n+# This is free software; see the source for copying conditions.  There is NO\n+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n \n-# Please report bugs or propose patches to:\n-# <https://github.com/gnulib-modules/bootstrap/issues>\n+# This program is free software: you can redistribute it and/or modify\n+# it under the terms of the GNU General Public License as published by\n+# the Free Software Foundation, either version 3 of the License, or\n+# (at your option) any later version.\n \n-# Set a version string for this script.\n-scriptversion=2019-02-19.15; # UTC\n+# This program is distributed in the hope that it will be useful,\n+# but WITHOUT ANY WARRANTY; without even the implied warranty of\n+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n+# GNU General Public License for more details.\n+\n+# You should have received a copy of the GNU General Public License\n+# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n+\n+# Please report bugs or propose patches to gary@gnu.org.\n \n \n ## ------ ##\n@@ -1572,7 +1415,7 @@ scriptversion=2019-02-19.15; # UTC\n #\n # In order for the '--version' option to work, you will need to have a\n # suitably formatted comment like the one at the top of this file\n-# starting with '# Written by ' and ending with '# Copyright'.\n+# starting with '# Written by ' and ending with '# warranty; '.\n #\n # For '-h' and '--help' to work, you will also need a one line\n # description of your script's purpose in a comment directly above the\n@@ -1584,7 +1427,7 @@ scriptversion=2019-02-19.15; # UTC\n # to display verbose messages only when your user has specified\n # '--verbose'.\n #\n-# After sourcing this file, you can plug in processing for additional\n+# After sourcing this file, you can plug processing for additional\n # options by amending the variables from the 'Configuration' section\n # below, and following the instructions in the 'Option parsing'\n # section further down.\n@@ -1633,8 +1476,8 @@ fatal_help=\"Try '\\$progname --help' for more information.\"\n ## ------------------------- ##\n \n # This section contains functions for adding, removing, and running hooks\n-# in the main code.  A hook is just a list of function names that can be\n-# run in order later on.\n+# to the main code.  A hook is just a named list of of function, that can\n+# be run in order later on.\n \n # func_hookable FUNC_NAME\n # -----------------------\n@@ -1667,8 +1510,7 @@ func_add_hook ()\n \n # func_remove_hook FUNC_NAME HOOK_FUNC\n # ------------------------------------\n-# Remove HOOK_FUNC from the list of hook functions to be called by\n-# FUNC_NAME.\n+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.\n func_remove_hook ()\n {\n     $debug_cmd\n@@ -1677,28 +1519,10 @@ func_remove_hook ()\n }\n \n \n-# func_propagate_result FUNC_NAME_A FUNC_NAME_B\n-# ---------------------------------------------\n-# If the *_result variable of FUNC_NAME_A _is set_, assign its value to\n-# *_result variable of FUNC_NAME_B.\n-func_propagate_result ()\n-{\n-    $debug_cmd\n-\n-    func_propagate_result_result=:\n-    if eval \"test \\\"\\${${1}_result+set}\\\" = set\"\n-    then\n-      eval \"${2}_result=\\$${1}_result\"\n-    else\n-      func_propagate_result_result=false\n-    fi\n-}\n-\n-\n # func_run_hooks FUNC_NAME [ARG]...\n # ---------------------------------\n # Run all hook functions registered to FUNC_NAME.\n-# It's assumed that the list of hook functions contains nothing more\n+# It is assumed that the list of hook functions contains nothing more\n # than a whitespace-delimited list of legal shell function names, and\n # no effort is wasted trying to catch shell meta-characters or preserve\n # whitespace.\n@@ -1708,19 +1532,22 @@ func_run_hooks ()\n \n     case \" $hookable_fns \" in\n       *\" $1 \"*) ;;\n-      *) func_fatal_error \"'$1' does not support hook functions.\" ;;\n+      *) func_fatal_error \"'$1' does not support hook funcions.n\" ;;\n     esac\n \n     eval _G_hook_fns=\\$$1_hooks; shift\n \n     for _G_hook in $_G_hook_fns; do\n-      func_unset \"${_G_hook}_result\"\n-      eval $_G_hook '${1+\"$@\"}'\n-      func_propagate_result $_G_hook func_run_hooks\n-      if $func_propagate_result_result; then\n-        eval set dummy \"$func_run_hooks_result\"; shift\n-      fi\n+      eval $_G_hook '\"$@\"'\n+\n+      # store returned options list back into positional\n+      # parameters for next 'cmd' execution.\n+      eval _G_hook_result=\\$${_G_hook}_result\n+      eval set dummy \"$_G_hook_result\"; shift\n     done\n+\n+    func_quote_for_eval ${1+\"$@\"}\n+    func_run_hooks_result=$func_quote_for_eval_result\n }\n \n \n@@ -1730,18 +1557,10 @@ func_run_hooks ()\n ## --------------- ##\n \n # In order to add your own option parsing hooks, you must accept the\n-# full positional parameter list from your hook function.  You may remove\n-# or edit any options that you action, and then pass back the remaining\n-# unprocessed options in '<hooked_function_name>_result', escaped\n-# suitably for 'eval'.\n-#\n-# The '<hooked_function_name>_result' variable is automatically unset\n-# before your hook gets called; for best performance, only set the\n-# *_result variable when necessary (i.e. don't call the 'func_quote'\n-# function unnecessarily because it can be an expensive operation on some\n-# machines).\n-#\n-# Like this:\n+# full positional parameter list in your hook function, remove any\n+# options that you action, and then pass back the remaining unprocessed\n+# options in '<hooked_function_name>_result', escaped suitably for\n+# 'eval'.  Like this:\n #\n #    my_options_prep ()\n #    {\n@@ -1751,8 +1570,9 @@ func_run_hooks ()\n #        usage_message=$usage_message'\n #      -s, --silent       don'\\''t print informational messages\n #    '\n-#        # No change in '$@' (ignored completely by this hook).  Leave\n-#        # my_options_prep_result variable intact.\n+#\n+#        func_quote_for_eval ${1+\"$@\"}\n+#        my_options_prep_result=$func_quote_for_eval_result\n #    }\n #    func_add_hook func_options_prep my_options_prep\n #\n@@ -1761,36 +1581,25 @@ func_run_hooks ()\n #    {\n #        $debug_cmd\n #\n-#        args_changed=false\n-#\n-#        # Note that, for efficiency, we parse as many options as we can\n+#        # Note that for efficiency, we parse as many options as we can\n #        # recognise in a loop before passing the remainder back to the\n #        # caller on the first unrecognised argument we encounter.\n #        while test $# -gt 0; do\n #          opt=$1; shift\n #          case $opt in\n-#            --silent|-s) opt_silent=:\n-#                         args_changed=:\n-#                         ;;\n+#            --silent|-s) opt_silent=: ;;\n #            # Separate non-argument short options:\n #            -s*)         func_split_short_opt \"$_G_opt\"\n #                         set dummy \"$func_split_short_opt_name\" \\\n #                             \"-$func_split_short_opt_arg\" ${1+\"$@\"}\n #                         shift\n-#                         args_changed=:\n #                         ;;\n-#            *)           # Make sure the first unrecognised option \"$_G_opt\"\n-#                         # is added back to \"$@\" in case we need it later,\n-#                         # if $args_changed was set to 'true'.\n-#                         set dummy \"$_G_opt\" ${1+\"$@\"}; shift; break ;;\n+#            *)            set dummy \"$_G_opt\" \"$*\"; shift; break ;;\n #          esac\n #        done\n #\n-#        # Only call 'func_quote' here if we processed at least one argument.\n-#        if $args_changed; then\n-#          func_quote eval ${1+\"$@\"}\n-#          my_silent_option_result=$func_quote_result\n-#        fi\n+#        func_quote_for_eval ${1+\"$@\"}\n+#        my_silent_option_result=$func_quote_for_eval_result\n #    }\n #    func_add_hook func_parse_options my_silent_option\n #\n@@ -1801,26 +1610,17 @@ func_run_hooks ()\n #\n #        $opt_silent && $opt_verbose && func_fatal_help \"\\\n #    '--silent' and '--verbose' options are mutually exclusive.\"\n+#\n+#        func_quote_for_eval ${1+\"$@\"}\n+#        my_option_validation_result=$func_quote_for_eval_result\n #    }\n #    func_add_hook func_validate_options my_option_validation\n #\n-# You'll also need to manually amend $usage_message to reflect the extra\n+# You'll alse need to manually amend $usage_message to reflect the extra\n # options you parse.  It's preferable to append if you can, so that\n # multiple option parsing hooks can be added safely.\n \n \n-# func_options_finish [ARG]...\n-# ----------------------------\n-# Finishing the option parse loop (call 'func_options' hooks ATM).\n-func_options_finish ()\n-{\n-    $debug_cmd\n-\n-    func_run_hooks func_options ${1+\"$@\"}\n-    func_propagate_result func_run_hooks func_options_finish\n-}\n-\n-\n # func_options [ARG]...\n # ---------------------\n # All the functions called inside func_options are hookable. See the\n@@ -1830,27 +1630,17 @@ func_options ()\n {\n     $debug_cmd\n \n-    _G_options_quoted=false\n+    func_options_prep ${1+\"$@\"}\n+    eval func_parse_options \\\n+        ${func_options_prep_result+\"$func_options_prep_result\"}\n+    eval func_validate_options \\\n+        ${func_parse_options_result+\"$func_parse_options_result\"}\n \n-    for my_func in options_prep parse_options validate_options options_finish\n-    do\n-      func_unset func_${my_func}_result\n-      func_unset func_run_hooks_result\n-      eval func_$my_func '${1+\"$@\"}'\n-      func_propagate_result func_$my_func func_options\n-      if $func_propagate_result_result; then\n-        eval set dummy \"$func_options_result\"; shift\n-        _G_options_quoted=:\n-      fi\n-    done\n+    eval func_run_hooks func_options \\\n+        ${func_validate_options_result+\"$func_validate_options_result\"}\n \n-    $_G_options_quoted || {\n-      # As we (func_options) are top-level options-parser function and\n-      # nobody quoted \"$@\" for us yet, we need to do it explicitly for\n-      # caller.\n-      func_quote eval ${1+\"$@\"}\n-      func_options_result=$func_quote_result\n-    }\n+    # save modified positional parameters for caller\n+    func_options_result=$func_run_hooks_result\n }\n \n \n@@ -1859,8 +1649,9 @@ func_options ()\n # All initialisations required before starting the option parse loop.\n # Note that when calling hook functions, we pass through the list of\n # positional parameters.  If a hook function modifies that list, and\n-# needs to propagate that back to rest of this script, then the complete\n-# modified list must be put in 'func_run_hooks_result' before returning.\n+# needs to propogate that back to rest of this script, then the complete\n+# modified list must be put in 'func_run_hooks_result' before\n+# returning.\n func_hookable func_options_prep\n func_options_prep ()\n {\n@@ -1871,7 +1662,9 @@ func_options_prep ()\n     opt_warning_types=\n \n     func_run_hooks func_options_prep ${1+\"$@\"}\n-    func_propagate_result func_run_hooks func_options_prep\n+\n+    # save modified positional parameters for caller\n+    func_options_prep_result=$func_run_hooks_result\n }\n \n \n@@ -1883,32 +1676,25 @@ func_parse_options ()\n {\n     $debug_cmd\n \n-    _G_parse_options_requote=false\n+    func_parse_options_result=\n+\n     # this just eases exit handling\n     while test $# -gt 0; do\n       # Defer to hook functions for initial option parsing, so they\n       # get priority in the event of reusing an option name.\n       func_run_hooks func_parse_options ${1+\"$@\"}\n-      func_propagate_result func_run_hooks func_parse_options\n-      if $func_propagate_result_result; then\n-        eval set dummy \"$func_parse_options_result\"; shift\n-        # Even though we may have changed \"$@\", we passed the \"$@\" array\n-        # down into the hook and it quoted it for us (because we are in\n-        # this if-branch).  No need to quote it again.\n-        _G_parse_options_requote=false\n-      fi\n+\n+      # Adjust func_parse_options positional parameters to match\n+      eval set dummy \"$func_run_hooks_result\"; shift\n \n       # Break out of the loop if we already parsed every option.\n       test $# -gt 0 || break\n \n-      # We expect that one of the options parsed in this function matches\n-      # and thus we remove _G_opt from \"$@\" and need to re-quote.\n-      _G_match_parse_options=:\n       _G_opt=$1\n       shift\n       case $_G_opt in\n         --debug|-x)   debug_cmd='set -x'\n-                      func_echo \"enabling shell trace mode\" >&2\n+                      func_echo \"enabling shell trace mode\"\n                       $debug_cmd\n                       ;;\n \n@@ -1918,10 +1704,7 @@ func_parse_options ()\n \t\t      ;;\n \n         --warnings|--warning|-W)\n-                      if test $# = 0 && func_missing_arg $_G_opt; then\n-                        _G_parse_options_requote=:\n-                        break\n-                      fi\n+                      test $# = 0 && func_missing_arg $_G_opt && break\n                       case \" $warning_categories $1\" in\n                         *\" $1 \"*)\n                           # trailing space prevents matching last $1 above\n@@ -1974,24 +1757,15 @@ func_parse_options ()\n                       shift\n                       ;;\n \n-        --)           _G_parse_options_requote=: ; break ;;\n+        --)           break ;;\n         -*)           func_fatal_help \"unrecognised option: '$_G_opt'\" ;;\n-        *)            set dummy \"$_G_opt\" ${1+\"$@\"}; shift\n-                      _G_match_parse_options=false\n-                      break\n-                      ;;\n+        *)            set dummy \"$_G_opt\" ${1+\"$@\"}; shift; break ;;\n       esac\n-\n-      if $_G_match_parse_options; then\n-        _G_parse_options_requote=:\n-      fi\n     done\n \n-    if $_G_parse_options_requote; then\n-      # save modified positional parameters for caller\n-      func_quote eval ${1+\"$@\"}\n-      func_parse_options_result=$func_quote_result\n-    fi\n+    # save modified positional parameters for caller\n+    func_quote_for_eval ${1+\"$@\"}\n+    func_parse_options_result=$func_quote_for_eval_result\n }\n \n \n@@ -2008,10 +1782,12 @@ func_validate_options ()\n     test -n \"$opt_warning_types\" || opt_warning_types=\" $warning_categories\"\n \n     func_run_hooks func_validate_options ${1+\"$@\"}\n-    func_propagate_result func_run_hooks func_validate_options\n \n     # Bail if the options were screwed!\n     $exit_cmd $EXIT_FAILURE\n+\n+    # save modified positional parameters for caller\n+    func_validate_options_result=$func_run_hooks_result\n }\n \n \n@@ -2067,8 +1843,8 @@ func_missing_arg ()\n \n # func_split_equals STRING\n # ------------------------\n-# Set func_split_equals_lhs and func_split_equals_rhs shell variables\n-# after splitting STRING at the '=' sign.\n+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after\n+# splitting STRING at the '=' sign.\n test -z \"$_G_HAVE_XSI_OPS\" \\\n     && (eval 'x=a/b/c;\n       test 5aa/bb/cc = \"${#x}${x%%/*}${x%/*}${x#*/}${x##*/}\"') 2>/dev/null \\\n@@ -2083,9 +1859,8 @@ then\n \n       func_split_equals_lhs=${1%%=*}\n       func_split_equals_rhs=${1#*=}\n-      if test \"x$func_split_equals_lhs\" = \"x$1\"; then\n-        func_split_equals_rhs=\n-      fi\n+      test \"x$func_split_equals_lhs\" = \"x$1\" \\\n+        && func_split_equals_rhs=\n   }'\n else\n   # ...otherwise fall back to using expr, which is often a shell builtin.\n@@ -2095,7 +1870,7 @@ else\n \n       func_split_equals_lhs=`expr \"x$1\" : 'x\\([^=]*\\)'`\n       func_split_equals_rhs=\n-      test \"x$func_split_equals_lhs=\" = \"x$1\" \\\n+      test \"x$func_split_equals_lhs\" = \"x$1\" \\\n         || func_split_equals_rhs=`expr \"x$1\" : 'x[^=]*=\\(.*\\)$'`\n   }\n fi #func_split_equals\n@@ -2121,7 +1896,7 @@ else\n   {\n       $debug_cmd\n \n-      func_split_short_opt_name=`expr \"x$1\" : 'x\\(-.\\)'`\n+      func_split_short_opt_name=`expr \"x$1\" : 'x-\\(.\\)'`\n       func_split_short_opt_arg=`expr \"x$1\" : 'x-.\\(.*\\)$'`\n   }\n fi #func_split_short_opt\n@@ -2163,44 +1938,31 @@ func_usage_message ()\n # func_version\n # ------------\n # Echo version message to standard output and exit.\n-# The version message is extracted from the calling file's header\n-# comments, with leading '# ' stripped:\n-#   1. First display the progname and version\n-#   2. Followed by the header comment line matching  /^# Written by /\n-#   3. Then a blank line followed by the first following line matching\n-#      /^# Copyright /\n-#   4. Immediately followed by any lines between the previous matches,\n-#      except lines preceding the intervening completely blank line.\n-# For example, see the header comments of this file.\n func_version ()\n {\n     $debug_cmd\n \n     printf '%s\\n' \"$progname $scriptversion\"\n     $SED -n '\n-        /^# Written by /!b\n-        s|^# ||; p; n\n-\n-        :fwd2blnk\n-        /./ {\n-          n\n-          b fwd2blnk\n+        /(C)/!b go\n+        :more\n+        /\\./!{\n+          N\n+          s|\\n# | |\n+          b more\n         }\n-        p; n\n-\n-        :holdwrnt\n-        s|^# ||\n-        s|^# *$||\n-        /^Copyright /!{\n-          /./H\n-          n\n-          b holdwrnt\n+        :go\n+        /^# Written by /,/# warranty; / {\n+          s|^# ||\n+          s|^# *$||\n+          s|\\((C)\\)[ 0-9,-]*[ ,-]\\([1-9][0-9]* \\)|\\1 \\2|\n+          p\n         }\n-\n-        s|\\((C)\\)[ 0-9,-]*[ ,-]\\([1-9][0-9]* \\)|\\1 \\2|\n-        G\n-        s|\\(\\n\\)\\n*|\\1|g\n-        p; q' < \"$progpath\"\n+        /^# Written by / {\n+          s|^# ||\n+          p\n+        }\n+        /^warranty; /q' < \"$progpath\"\n \n     exit $?\n }\n@@ -2210,35 +1972,12 @@ func_version ()\n # mode: shell-script\n # sh-indentation: 2\n # eval: (add-hook 'before-save-hook 'time-stamp)\n-# time-stamp-pattern: \"30/scriptversion=%:y-%02m-%02d.%02H; # UTC\"\n+# time-stamp-pattern: \"10/scriptversion=%:y-%02m-%02d.%02H; # UTC\"\n # time-stamp-time-zone: \"UTC\"\n # End:\n \n # Set a version string.\n-scriptversion='(GNU libtool) 2.5.4'\n-\n-# func_version\n-# ------------\n-# Echo version message to standard output and exit.\n-func_version ()\n-{\n-    $debug_cmd\n-\n-\tyear=`date +%Y`\n-\n-\tcat <<EOF\n-$progname $scriptversion\n-Copyright (C) $year Free Software Foundation, Inc.\n-License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl.html>\n-This is free software: you are free to change and redistribute it.\n-There is NO WARRANTY, to the extent permitted by law.\n-\n-Originally written by Gordon Matzigkeit, 1996\n-(See AUTHORS for complete contributor listing)\n-EOF\n-\n-    exit $?\n-}\n+scriptversion='(GNU libtool) 2.4.6'\n \n \n # func_echo ARG...\n@@ -2261,6 +2000,18 @@ func_echo ()\n }\n \n \n+# func_warning ARG...\n+# -------------------\n+# Libtool warnings are not categorized, so override funclib.sh\n+# func_warning with this simpler definition.\n+func_warning ()\n+{\n+    $debug_cmd\n+\n+    $warning_func ${1+\"$@\"}\n+}\n+\n+\n ## ---------------- ##\n ## Options parsing. ##\n ## ---------------- ##\n@@ -2272,23 +2023,19 @@ usage='$progpath [OPTION]... [MODE-ARG]...'\n \n # Short help message in response to '-h'.\n usage_message=\"Options:\n-       --config                 show all configuration variables\n-       --debug                  enable verbose shell tracing\n-   -n, --dry-run                display commands without modifying any files\n-       --features               display basic configuration information\n-       --finish                 use operation '--mode=finish'\n-       --mode=MODE              use operation mode MODE\n-       --no-finish              don't update shared library cache\n-       --no-quiet, --no-silent  print default informational messages\n-       --no-warnings            equivalent to '-Wnone'\n-       --preserve-dup-deps      don't remove duplicate dependency libraries\n-       --quiet, --silent        don't print informational messages\n-       --reorder-cache=DIRS     reorder shared library cache for preferred DIRS\n-       --tag=TAG                use configuration variables from tag TAG\n-   -v, --verbose                print more informational messages than default\n-       --version                print version information\n-   -W, --warnings=CATEGORY      report the warnings falling in CATEGORY [all]\n-   -h, --help, --help-all       print short, long, or detailed help message\n+       --config             show all configuration variables\n+       --debug              enable verbose shell tracing\n+   -n, --dry-run            display commands without modifying any files\n+       --features           display basic configuration information and exit\n+       --mode=MODE          use operation mode MODE\n+       --no-warnings        equivalent to '-Wnone'\n+       --preserve-dup-deps  don't remove duplicate dependency libraries\n+       --quiet, --silent    don't print informational messages\n+       --tag=TAG            use configuration variables from tag TAG\n+   -v, --verbose            print more informational messages than default\n+       --version            print version information\n+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]\n+   -h, --help, --help-all   print short, long, or detailed help message\n \"\n \n # Additional text appended to 'usage_message' in response to '--help'.\n@@ -2321,13 +2068,13 @@ include the following information:\n        compiler:       $LTCC\n        compiler flags: $LTCFLAGS\n        linker:         $LD (gnu? $with_gnu_ld)\n-       version:        $progname $scriptversion\n+       version:        $progname (GNU libtool) 2.4.6\n        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`\n        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`\n \n Report bugs to <bug-libtool@gnu.org>.\n-GNU libtool home page: <https://www.gnu.org/software/libtool/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\"\n+GNU libtool home page: <http://www.gnu.org/software/libtool/>.\n+General help using GNU software: <http://www.gnu.org/gethelp/>.\"\n     exit 0\n }\n \n@@ -2377,7 +2124,7 @@ fi\n # a configuration failure hint, and exit.\n func_fatal_configuration ()\n {\n-    func_fatal_error ${1+\"$@\"} \\\n+    func__fatal_error ${1+\"$@\"} \\\n       \"See the $PACKAGE documentation for more information.\" \\\n       \"Fatal configuration error.\"\n }\n@@ -2517,17 +2264,12 @@ libtool_options_prep ()\n     opt_dry_run=false\n     opt_help=false\n     opt_mode=\n-    opt_reorder_cache=false\n     opt_preserve_dup_deps=false\n     opt_quiet=false\n-    opt_finishing=true\n-    opt_warning=\n \n     nonopt=\n     preserve_args=\n \n-    _G_rc_lt_options_prep=:\n-\n     # Shorthand for --mode=foo, only valid as the first argument\n     case $1 in\n     clean|clea|cle|cl)\n@@ -2551,16 +2293,11 @@ libtool_options_prep ()\n     uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)\n       shift; set dummy --mode uninstall ${1+\"$@\"}; shift\n       ;;\n-    *)\n-      _G_rc_lt_options_prep=false\n-      ;;\n     esac\n \n-    if $_G_rc_lt_options_prep; then\n-      # Pass back the list of options.\n-      func_quote eval ${1+\"$@\"}\n-      libtool_options_prep_result=$func_quote_result\n-    fi\n+    # Pass back the list of options.\n+    func_quote_for_eval ${1+\"$@\"}\n+    libtool_options_prep_result=$func_quote_for_eval_result\n }\n func_add_hook func_options_prep libtool_options_prep\n \n@@ -2572,12 +2309,9 @@ libtool_parse_options ()\n {\n     $debug_cmd\n \n-    _G_rc_lt_parse_options=false\n-\n     # Perform our own loop to consume as many options as possible in\n     # each iteration.\n     while test $# -gt 0; do\n-      _G_match_lt_parse_options=:\n       _G_opt=$1\n       shift\n       case $_G_opt in\n@@ -2611,18 +2345,14 @@ libtool_parse_options ()\n                           clean|compile|execute|finish|install|link|relink|uninstall) ;;\n \n                           # Catch anything else as an error\n-                          *) func_error \"invalid argument '$1' for $_G_opt\"\n+                          *) func_error \"invalid argument for $_G_opt\"\n                              exit_cmd=exit\n+                             break\n                              ;;\n                         esac\n                         shift\n                         ;;\n \n-        --no-finish)\n-                        opt_finishing=false\n-                        func_append preserve_args \" $_G_opt\"\n-                        ;;\n-\n         --no-silent|--no-quiet)\n                         opt_quiet=false\n                         func_append preserve_args \" $_G_opt\"\n@@ -2638,24 +2368,6 @@ libtool_parse_options ()\n                         func_append preserve_args \" $_G_opt\"\n                         ;;\n \n-        --reorder-cache)\n-                        opt_reorder_cache=true\n-                        shared_lib_dirs=$1\n-                        if test -n \"$shared_lib_dirs\"; then\n-                          case $1 in\n-                            # Must begin with /:\n-                            /*) ;;\n-\n-                            # Catch anything else as an error (relative paths)\n-                            *) func_error \"invalid argument '$1' for $_G_opt\"\n-                               func_error \"absolute paths are required for $_G_opt\"\n-                               exit_cmd=exit\n-                               ;;\n-                          esac\n-                        fi\n-                        shift\n-                        ;;\n-\n         --silent|--quiet)\n                         opt_quiet=:\n                         opt_verbose=false\n@@ -2674,36 +2386,19 @@ libtool_parse_options ()\n                         func_append preserve_args \" $_G_opt\"\n                         ;;\n \n-        # An option not handled by this hook function:\n-        *)              set dummy \"$_G_opt\" ${1+\"$@\"} ; shift\n-                        _G_match_lt_parse_options=false\n-                        break\n-                        ;;\n+\t# An option not handled by this hook function:\n+        *)\t\tset dummy \"$_G_opt\" ${1+\"$@\"};\tshift; break  ;;\n       esac\n-      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:\n     done\n \n-    if $_G_rc_lt_parse_options; then\n-      # save modified positional parameters for caller\n-      func_quote eval ${1+\"$@\"}\n-      libtool_parse_options_result=$func_quote_result\n-    fi\n+\n+    # save modified positional parameters for caller\n+    func_quote_for_eval ${1+\"$@\"}\n+    libtool_parse_options_result=$func_quote_for_eval_result\n }\n func_add_hook func_parse_options libtool_parse_options\n \n \n-# func_warning ARG...\n-# -------------------\n-# Libtool warnings are not categorized, so override funclib.sh\n-# func_warning with this simpler definition.\n-func_warning ()\n-{\n-    if $opt_warning; then\n-        $debug_cmd\n-        $warning_func ${1+\"$@\"}\n-    fi\n-}\n-\n \n # libtool_validate_options [ARG]...\n # ---------------------------------\n@@ -2720,10 +2415,17 @@ libtool_validate_options ()\n     # preserve --debug\n     test : = \"$debug_cmd\" || func_append preserve_args \" --debug\"\n \n-    # Keeping compiler generated duplicates in $postdeps and $predeps is not\n-    # harmful, and is necessary in a majority of systems that use it to satisfy\n-    # symbol dependencies.\n-    opt_duplicate_compiler_generated_deps=:\n+    case $host in\n+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452\n+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788\n+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)\n+        # don't eliminate duplications in $postdeps and $predeps\n+        opt_duplicate_compiler_generated_deps=:\n+        ;;\n+      *)\n+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps\n+        ;;\n+    esac\n \n     $opt_help || {\n       # Sanity checks first:\n@@ -2749,8 +2451,8 @@ libtool_validate_options ()\n     }\n \n     # Pass back the unparsed argument list\n-    func_quote eval ${1+\"$@\"}\n-    libtool_validate_options_result=$func_quote_result\n+    func_quote_for_eval ${1+\"$@\"}\n+    libtool_validate_options_result=$func_quote_for_eval_result\n }\n func_add_hook func_validate_options libtool_validate_options\n \n@@ -3048,7 +2750,7 @@ EOF\n \n # func_convert_core_file_wine_to_w32 ARG\n # Helper function used by file name conversion functions when $build is *nix,\n-# and $host is mingw, windows, cygwin, or some other w32 environment. Relies on a\n+# and $host is mingw, cygwin, or some other w32 environment. Relies on a\n # correctly configured wine environment available, with the winepath program\n # in $build's $PATH.\n #\n@@ -3080,10 +2782,9 @@ func_convert_core_file_wine_to_w32 ()\n \n # func_convert_core_path_wine_to_w32 ARG\n # Helper function used by path conversion functions when $build is *nix, and\n-# $host is mingw, windows, cygwin, or some other w32 environment. Relies on a\n-# correctly configured wine environment available, with the winepath program\n-# in $build's $PATH. Assumes ARG has no leading or trailing path separator\n-# characters.\n+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly\n+# configured wine environment available, with the winepath program in $build's\n+# $PATH. Assumes ARG has no leading or trailing path separator characters.\n #\n # ARG is path to be converted from $build format to win32.\n # Result is available in $func_convert_core_path_wine_to_w32_result.\n@@ -3226,15 +2927,6 @@ func_convert_path_front_back_pathsep ()\n # end func_convert_path_front_back_pathsep\n \n \n-# func_convert_delimited_path PATH ORIG_DELIMITER NEW_DELIMITER\n-# Replaces a delimiter for a given path.\n-func_convert_delimited_path ()\n-{\n-\tconverted_path=`$ECHO \"$1\" | $SED \"s#$2#$3#g\"`\n-}\n-# end func_convert_delimited_path\n-\n-\n ##################################################\n # $build to $host FILE NAME CONVERSION FUNCTIONS #\n ##################################################\n@@ -3569,65 +3261,6 @@ func_dll_def_p ()\n }\n \n \n-# func_reorder_shared_lib_cache DIRS\n-# Reorder the shared library cache by unconfiguring previous shared library cache\n-# and configuring preferred search directories before previous search directories.\n-# Previous shared library cache: /usr/lib /usr/local/lib\n-# Preferred search directories: /tmp/testing\n-# Reordered shared library cache: /tmp/testing /usr/lib /usr/local/lib\n-func_reorder_shared_lib_cache ()\n-{\n-\t$debug_cmd\n-\n-\tcase $host_os in\n-\t  openbsd*)\n-\t    get_search_directories=`PATH=\"$PATH:/sbin\" ldconfig -r | $GREP \"search directories\" | $SED \"s#.*search directories:\\ ##g\"`\n-\t    func_convert_delimited_path \"$get_search_directories\" ':' '\\ '\n-\t    save_search_directories=$converted_path\n-\t    func_convert_delimited_path \"$1\" ':' '\\ '\n-\n-\t    # Ensure directories exist\n-\t    for dir in $converted_path; do\n-\t      # Ensure each directory is an absolute path\n-\t      case $dir in\n-\t        /*) ;;\n-\t        *) func_error \"Directory '$dir' is not an absolute path\"\n-\t           exit $EXIT_FAILURE ;;\n-\t      esac\n-\t      # Ensure no trailing slashes\n-\t      func_stripname '' '/' \"$dir\"\n-\t      dir=$func_stripname_result\n-\t      if test -d \"$dir\"; then\n-\t        if test -n \"$preferred_search_directories\"; then\n-\t          preferred_search_directories=\"$preferred_search_directories $dir\"\n-\t        else\n-\t          preferred_search_directories=$dir\n-\t        fi\n-\t      else\n-\t        func_error \"Directory '$dir' does not exist\"\n-\t        exit $EXIT_FAILURE\n-\t      fi\n-\t    done\n-\n-\t    PATH=\"$PATH:/sbin\" ldconfig -U $save_search_directories\n-\t    PATH=\"$PATH:/sbin\" ldconfig -m $preferred_search_directories $save_search_directories\n-\t    get_search_directories=`PATH=\"$PATH:/sbin\" ldconfig -r | $GREP \"search directories\" | $SED \"s#.*search directories:\\ ##g\"`\n-\t    func_convert_delimited_path \"$get_search_directories\" ':' '\\ '\n-\t    reordered_search_directories=$converted_path\n-\n-\t    $ECHO \"Original: $save_search_directories\"\n-\t    $ECHO \"Reordered: $reordered_search_directories\"\n-\t    exit $EXIT_SUCCESS\n-\t  ;;\n-\t  *)\n-\t    func_error \"--reorder-cache is not supported for host_os=$host_os.\"\n-\t    exit $EXIT_FAILURE\n-\t  ;;\n-\tesac\n-}\n-# end func_reorder_shared_lib_cache\n-\n-\n # func_mode_compile arg...\n func_mode_compile ()\n {\n@@ -3785,8 +3418,8 @@ func_mode_compile ()\n       esac\n     done\n \n-    func_quote_arg pretty \"$libobj\"\n-    test \"X$libobj\" != \"X$func_quote_arg_result\" \\\n+    func_quote_for_eval \"$libobj\"\n+    test \"X$libobj\" != \"X$func_quote_for_eval_result\" \\\n       && $ECHO \"X$libobj\" | $GREP '[]~#^*{};<>?\"'\"'\"'\t &()|`$[]' \\\n       && func_warning \"libobj name '$libobj' may not contain shell special characters.\"\n     func_dirname_and_basename \"$obj\" \"/\" \"\"\n@@ -3806,7 +3439,7 @@ func_mode_compile ()\n \n     # On Cygwin there's no \"real\" PIC flag so we must build both object types\n     case $host_os in\n-    cygwin* | mingw* | windows* | pw32* | os2* | cegcc*)\n+    cygwin* | mingw* | pw32* | os2* | cegcc*)\n       pic_mode=default\n       ;;\n     esac\n@@ -3859,8 +3492,8 @@ compiler.\"\n \n     func_to_tool_file \"$srcfile\" func_convert_file_msys_to_w32\n     srcfile=$func_to_tool_file_result\n-    func_quote_arg pretty \"$srcfile\"\n-    qsrcfile=$func_quote_arg_result\n+    func_quote_for_eval \"$srcfile\"\n+    qsrcfile=$func_quote_for_eval_result\n \n     # Only build a PIC object if we are building libtool libraries.\n     if test yes = \"$build_libtool_libs\"; then\n@@ -4015,8 +3648,7 @@ This mode accepts the following additional options:\n   -prefer-non-pic   try to build non-PIC objects only\n   -shared           do not build a '.o' file suitable for static linking\n   -static           only build a '.o' file suitable for static linking\n-  -Wc,FLAG\n-  -Xcompiler FLAG   pass FLAG directly to the compiler\n+  -Wc,FLAG          pass FLAG directly to the compiler\n \n COMPILE-COMMAND is a command to be used in creating a 'standard' object file\n from the given SOURCEFILE.\n@@ -4122,8 +3754,6 @@ The following components of LINK-COMMAND are treated specially:\n   -weak LIBNAME     declare that the target provides the LIBNAME interface\n   -Wc,FLAG\n   -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler\n-  -Wa,FLAG\n-  -Xassembler FLAG  pass linker-specific FLAG directly to the assembler\n   -Wl,FLAG\n   -Xlinker FLAG     pass linker-specific FLAG directly to the linker\n   -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)\n@@ -4200,12 +3830,6 @@ if $opt_help; then\n fi\n \n \n-# If option '--reorder-cache', reorder the shared library cache and exit.\n-if $opt_reorder_cache; then\n-    func_reorder_shared_lib_cache $shared_lib_dirs\n-fi\n-\n-\n # func_mode_execute arg...\n func_mode_execute ()\n {\n@@ -4390,7 +4014,7 @@ func_mode_finish ()\n       fi\n     fi\n \n-    if test -n \"$finish_cmds$finish_eval\" && test -n \"$libdirs\" && $opt_finishing; then\n+    if test -n \"$finish_cmds$finish_eval\" && test -n \"$libdirs\"; then\n       for libdir in $libdirs; do\n \tif test -n \"$finish_cmds\"; then\n \t  # Do each command in the finish commands.\n@@ -4415,12 +4039,6 @@ func_mode_finish ()\n       for libdir in $libdirs; do\n \t$ECHO \"   $libdir\"\n       done\n-      if test \"false\" = \"$opt_finishing\"; then\n-        echo\n-        echo \"NOTE: finish_cmds were not executed during testing, so you must\"\n-        echo \"manually run ldconfig to add a given test directory, LIBDIR, to\"\n-        echo \"the search path for generated executables.\"\n-      fi\n       echo\n       echo \"If you ever happen to want to link against installed libraries\"\n       echo \"in a given directory, LIBDIR, you must either use libtool, and\"\n@@ -4478,8 +4096,8 @@ func_mode_install ()\n        case $nonopt in *shtool*) :;; *) false;; esac\n     then\n       # Aesthetically quote it.\n-      func_quote_arg pretty \"$nonopt\"\n-      install_prog=\"$func_quote_arg_result \"\n+      func_quote_for_eval \"$nonopt\"\n+      install_prog=\"$func_quote_for_eval_result \"\n       arg=$1\n       shift\n     else\n@@ -4489,8 +4107,8 @@ func_mode_install ()\n \n     # The real first argument should be the name of the installation program.\n     # Aesthetically quote it.\n-    func_quote_arg pretty \"$arg\"\n-    func_append install_prog \"$func_quote_arg_result\"\n+    func_quote_for_eval \"$arg\"\n+    func_append install_prog \"$func_quote_for_eval_result\"\n     install_shared_prog=$install_prog\n     case \" $install_prog \" in\n       *[\\\\\\ /]cp\\ *) install_cp=: ;;\n@@ -4547,12 +4165,12 @@ func_mode_install ()\n       esac\n \n       # Aesthetically quote the argument.\n-      func_quote_arg pretty \"$arg\"\n-      func_append install_prog \" $func_quote_arg_result\"\n+      func_quote_for_eval \"$arg\"\n+      func_append install_prog \" $func_quote_for_eval_result\"\n       if test -n \"$arg2\"; then\n-\tfunc_quote_arg pretty \"$arg2\"\n+\tfunc_quote_for_eval \"$arg2\"\n       fi\n-      func_append install_shared_prog \" $func_quote_arg_result\"\n+      func_append install_shared_prog \" $func_quote_for_eval_result\"\n     done\n \n     test -z \"$install_prog\" && \\\n@@ -4563,8 +4181,8 @@ func_mode_install ()\n \n     if test -n \"$install_override_mode\" && $no_mode; then\n       if $install_cp; then :; else\n-\tfunc_quote_arg pretty \"$install_override_mode\"\n-\tfunc_append install_shared_prog \" -m $func_quote_arg_result\"\n+\tfunc_quote_for_eval \"$install_override_mode\"\n+\tfunc_append install_shared_prog \" -m $func_quote_for_eval_result\"\n       fi\n     fi\n \n@@ -4657,15 +4275,8 @@ func_mode_install ()\n \tfunc_append dir \"$objdir\"\n \n \tif test -n \"$relink_command\"; then\n-\t  # Strip any trailing slash from the destination.\n-\t  func_stripname '' '/' \"$libdir\"\n-\t  destlibdir=$func_stripname_result\n-\n-\t  func_stripname '' '/' \"$destdir\"\n-\t  s_destdir=$func_stripname_result\n-\n \t  # Determine the prefix the user has applied to our future dir.\n-\t  inst_prefix_dir=`$ECHO \"X$s_destdir\" | $Xsed -e \"s%$destlibdir\\$%%\"`\n+\t  inst_prefix_dir=`$ECHO \"$destdir\" | $SED -e \"s%$libdir\\$%%\"`\n \n \t  # Don't allow the user to place us outside of our expected\n \t  # location b/c this prevents finding dependent libraries that\n@@ -4702,7 +4313,7 @@ func_mode_install ()\n \t      'exit $?'\n \t  tstripme=$stripme\n \t  case $host_os in\n-\t  cygwin* | mingw* | windows* | pw32* | cegcc*)\n+\t  cygwin* | mingw* | pw32* | cegcc*)\n \t    case $realname in\n \t    *.dll.a)\n \t      tstripme=\n@@ -4815,7 +4426,7 @@ func_mode_install ()\n \n \t# Do a test to see if this is really a libtool program.\n \tcase $host in\n-\t*cygwin* | *mingw* | *windows*)\n+\t*cygwin* | *mingw*)\n \t    if func_ltwrapper_executable_p \"$file\"; then\n \t      func_ltwrapper_scriptname \"$file\"\n \t      wrapper=$func_ltwrapper_scriptname_result\n@@ -4867,8 +4478,8 @@ func_mode_install ()\n \t        relink_command=`$ECHO \"$relink_command\" | $SED 's%@OUTPUT@%'\"$outputname\"'%g'`\n \n \t        $opt_quiet || {\n-\t          func_quote_arg expand,pretty \"$relink_command\"\n-\t\t  eval \"func_echo $func_quote_arg_result\"\n+\t          func_quote_for_expand \"$relink_command\"\n+\t\t  eval \"func_echo $func_quote_for_expand_result\"\n \t        }\n \t        if eval \"$relink_command\"; then :\n \t          else\n@@ -5043,7 +4654,7 @@ extern \\\"C\\\" {\n \t      $RM $export_symbols\n \t      eval \"$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \\(.*\\)$/\\1/p' \"'< \"$nlist\" > \"$export_symbols\"'\n \t      case $host in\n-\t      *cygwin* | *mingw* | *windows* | *cegcc* )\n+\t      *cygwin* | *mingw* | *cegcc* )\n                 eval \"echo EXPORTS \"'> \"$output_objdir/$outputname.def\"'\n                 eval 'cat \"$export_symbols\" >> \"$output_objdir/$outputname.def\"'\n \t        ;;\n@@ -5055,7 +4666,7 @@ extern \\\"C\\\" {\n \t      eval '$GREP -f \"$output_objdir/$outputname.exp\" < \"$nlist\" > \"$nlist\"T'\n \t      eval '$MV \"$nlist\"T \"$nlist\"'\n \t      case $host in\n-\t        *cygwin* | *mingw* | *windows* | *cegcc* )\n+\t        *cygwin* | *mingw* | *cegcc* )\n \t          eval \"echo EXPORTS \"'> \"$output_objdir/$outputname.def\"'\n \t          eval 'cat \"$nlist\" >> \"$output_objdir/$outputname.def\"'\n \t          ;;\n@@ -5069,7 +4680,7 @@ extern \\\"C\\\" {\n \t  func_basename \"$dlprefile\"\n \t  name=$func_basename_result\n           case $host in\n-\t    *cygwin* | *mingw* | *windows* | *cegcc* )\n+\t    *cygwin* | *mingw* | *cegcc* )\n \t      # if an import library, we need to obtain dlname\n \t      if func_win32_import_lib_p \"$dlprefile\"; then\n \t        func_tr_sh \"$dlprefile\"\n@@ -5095,16 +4706,8 @@ extern \\\"C\\\" {\n \t            eval '$ECHO \": $name \" >> \"$nlist\"'\n \t          fi\n \t          func_to_tool_file \"$dlprefile\" func_convert_file_msys_to_w32\n-\t          case $host in\n-\t            i[3456]86-*-mingw32*)\n-\t              eval \"$NM \\\"$func_to_tool_file_result\\\" 2>/dev/null | $global_symbol_pipe |\n-\t                $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'\"\n-\t            ;;\n-\t            *)\n-\t              eval \"$NM \\\"$func_to_tool_file_result\\\" 2>/dev/null | $global_symbol_pipe |\n-\t                $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/__nm_//' >> '$nlist'\"\n-\t            ;;\n-\t          esac\n+\t          eval \"$NM \\\"$func_to_tool_file_result\\\" 2>/dev/null | $global_symbol_pipe |\n+\t            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'\"\n \t        }\n \t      else # not an import lib\n \t        $opt_dry_run || {\n@@ -5252,7 +4855,7 @@ static const void *lt_preloaded_setup() {\n \t# Transform the symbol file into the correct name.\n \tsymfileobj=$output_objdir/${my_outputname}S.$objext\n \tcase $host in\n-\t*cygwin* | *mingw* | *windows* | *cegcc* )\n+\t*cygwin* | *mingw* | *cegcc* )\n \t  if test -f \"$output_objdir/$my_outputname.def\"; then\n \t    compile_command=`$ECHO \"$compile_command\" | $SED \"s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%\"`\n \t    finalize_command=`$ECHO \"$finalize_command\" | $SED \"s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%\"`\n@@ -5328,7 +4931,7 @@ func_win32_libid ()\n   *ar\\ archive*) # could be an import, or static\n     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.\n     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |\n-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then\n+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then\n       case $nm_interface in\n       \"MS dumpbin\")\n \tif func_cygming_ms_implib_p \"$1\" ||\n@@ -5595,7 +5198,7 @@ func_extract_archives ()\n #\n # Emit a libtool wrapper script on stdout.\n # Don't directly open a file because we may want to\n-# incorporate the script contents within a cygwin/mingw/windows\n+# incorporate the script contents within a cygwin/mingw\n # wrapper executable.  Must ONLY be called from within\n # func_mode_link because it depends on a number of variables\n # set therein.\n@@ -5603,7 +5206,7 @@ func_extract_archives ()\n # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\n # variable will take.  If 'yes', then the emitted script\n # will assume that the directory where it is stored is\n-# the $objdir directory.  This is a cygwin/mingw/windows-specific\n+# the $objdir directory.  This is a cygwin/mingw-specific\n # behavior.\n func_emit_wrapper ()\n {\n@@ -5655,8 +5258,7 @@ else\n   if test \\\"\\$libtool_execute_magic\\\" != \\\"$magic\\\"; then\n     file=\\\"\\$0\\\"\"\n \n-    func_quote_arg pretty \"$ECHO\"\n-    qECHO=$func_quote_arg_result\n+    qECHO=`$ECHO \"$ECHO\" | $SED \"$sed_quote_subst\"`\n     $ECHO \"\\\n \n # A function that is used when there is no print builtin or printf.\n@@ -5666,7 +5268,7 @@ func_fallback_echo ()\n \\$1\n _LTECHO_EOF'\n }\n-    ECHO=$qECHO\n+    ECHO=\\\"$qECHO\\\"\n   fi\n \n # Very basic option parsing. These options are (a) specific to\n@@ -5728,7 +5330,7 @@ func_exec_program_core ()\n \"\n   case $host in\n   # Backslashes separate directories on plain windows\n-  *-*-mingw* | *-*-windows* | *-*-os2* | *-cegcc*)\n+  *-*-mingw | *-*-os2* | *-cegcc*)\n     $ECHO \"\\\n       if test -n \\\"\\$lt_option_debug\\\"; then\n         \\$ECHO \\\"$outputname:$output:\\$LINENO: newargv[0]: \\$progdir\\\\\\\\\\$program\\\" 1>&2\n@@ -5796,7 +5398,7 @@ func_exec_program ()\n     file=\\`ls -ld \\\"\\$thisdir/\\$file\\\" | $SED -n 's/.*-> //p'\\`\n   done\n \n-  # Usually 'no', except on cygwin/mingw/windows when embedded into\n+  # Usually 'no', except on cygwin/mingw when embedded into\n   # the cwrapper.\n   WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1\n   if test \\\"\\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\\\" = \\\"yes\\\"; then\n@@ -5928,7 +5530,7 @@ EOF\n #endif\n #include <stdio.h>\n #include <stdlib.h>\n-#if defined _WIN32 && !defined __GNUC__\n+#ifdef _MSC_VER\n # include <direct.h>\n # include <process.h>\n # include <io.h>\n@@ -5953,7 +5555,7 @@ EOF\n /* declarations of non-ANSI functions */\n #if defined __MINGW32__\n # ifdef __STRICT_ANSI__\n-_CRTIMP int __cdecl _putenv (const char *);\n+int _putenv (const char *);\n # endif\n #elif defined __CYGWIN__\n # ifdef __STRICT_ANSI__\n@@ -6151,7 +5753,7 @@ main (int argc, char *argv[])\n \t{\n EOF\n \t    case $host in\n-\t      *mingw* | *windows* | *cygwin* )\n+\t      *mingw* | *cygwin* )\n \t\t# make stdout use \"unix\" line endings\n \t\techo \"          setmode(1,_O_BINARY);\"\n \t\t;;\n@@ -6170,7 +5772,7 @@ EOF\n         {\n           /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX\n              namespace, but it is not one of the ones we know about and\n-             have already dealt with, above (including dump-script), then\n+             have already dealt with, above (inluding dump-script), then\n              report an error. Otherwise, targets might begin to believe\n              they are allowed to use options in the LTWRAPPER_OPTION_PREFIX\n              namespace. The first time any user complains about this, we'll\n@@ -6254,7 +5856,7 @@ EOF\n EOF\n \n \t    case $host_os in\n-\t      mingw* | windows*)\n+\t      mingw*)\n \t    cat <<\"EOF\"\n   {\n     char* p;\n@@ -6296,7 +5898,7 @@ EOF\n EOF\n \n \t    case $host_os in\n-\t      mingw* | windows*)\n+\t      mingw*)\n \t\tcat <<\"EOF\"\n   /* execv doesn't actually work on mingw as expected on unix */\n   newargz = prepare_spawn (newargz);\n@@ -6715,7 +6317,7 @@ lt_update_lib_path (const char *name, const char *value)\n \n EOF\n \t    case $host_os in\n-\t      mingw* | windows*)\n+\t      mingw*)\n \t\tcat <<\"EOF\"\n \n /* Prepares an argument vector before calling spawn().\n@@ -6890,7 +6492,7 @@ func_mode_link ()\n     $debug_cmd\n \n     case $host in\n-    *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)\n+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)\n       # It is impossible to link a dll without this setting, and\n       # we shouldn't force the makefile maintainer to figure out\n       # what system we are compiling for in order to pass an extra\n@@ -6914,7 +6516,6 @@ func_mode_link ()\n     finalize_command=$nonopt\n \n     compile_rpath=\n-    compile_rpath_tail=\n     finalize_rpath=\n     compile_shlibpath=\n     finalize_shlibpath=\n@@ -6955,12 +6556,10 @@ func_mode_link ()\n     xrpath=\n     perm_rpath=\n     temp_rpath=\n-    temp_rpath_tail=\n     thread_safe=no\n     vinfo=\n     vinfo_number=no\n     weak_libs=\n-    rpath_arg=\n     single_module=$wl-single_module\n     func_infer_tag $base_compile\n \n@@ -7012,9 +6611,9 @@ func_mode_link ()\n     while test \"$#\" -gt 0; do\n       arg=$1\n       shift\n-      func_quote_arg pretty,unquoted \"$arg\"\n-      qarg=$func_quote_arg_unquoted_result\n-      func_append libtool_args \" $func_quote_arg_result\"\n+      func_quote_for_eval \"$arg\"\n+      qarg=$func_quote_for_eval_unquoted_result\n+      func_append libtool_args \" $func_quote_for_eval_result\"\n \n       # If the previous option needs an argument, assign it.\n       if test -n \"$prev\"; then\n@@ -7223,7 +6822,7 @@ func_mode_link ()\n \t  case $arg in\n \t  [\\\\/]* | [A-Za-z]:[\\\\/]*) ;;\n \t  *)\n-\t    func_fatal_error \"argument to -rpath is not absolute: $arg\"\n+\t    func_fatal_error \"only absolute run-paths are allowed\"\n \t    ;;\n \t  esac\n \t  if test rpath = \"$prev\"; then\n@@ -7250,13 +6849,6 @@ func_mode_link ()\n \t  prev=\n \t  continue\n \t  ;;\n-\txassembler)\n-\t  func_append compiler_flags \" -Xassembler $qarg\"\n-\t  prev=\n-\t  func_append compile_command \" -Xassembler $qarg\"\n-\t  func_append finalize_command \" -Xassembler $qarg\"\n-\t  continue\n-\t  ;;\n \txcclinker)\n \t  func_append linker_flags \" $qarg\"\n \t  func_append compiler_flags \" $qarg\"\n@@ -7399,7 +6991,7 @@ func_mode_link ()\n \t  ;;\n \tesac\n \tcase $host in\n-\t*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)\n+\t*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)\n \t  testbindir=`$ECHO \"$dir\" | $SED 's*/lib$*/bin*'`\n \t  case :$dllsearchpath: in\n \t  *\":$dir:\"*) ;;\n@@ -7419,7 +7011,7 @@ func_mode_link ()\n       -l*)\n \tif test X-lc = \"X$arg\" || test X-lm = \"X$arg\"; then\n \t  case $host in\n-\t  *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)\n+\t  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)\n \t    # These systems don't actually have a C or math library (as such)\n \t    continue\n \t    ;;\n@@ -7427,7 +7019,7 @@ func_mode_link ()\n \t    # These systems don't actually have a C library (as such)\n \t    test X-lc = \"X$arg\" && continue\n \t    ;;\n-\t  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)\n+\t  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)\n \t    # Do not include libc due to us having libc/libc_r.\n \t    test X-lc = \"X$arg\" && continue\n \t    ;;\n@@ -7447,7 +7039,7 @@ func_mode_link ()\n \t  esac\n \telif test X-lc_r = \"X$arg\"; then\n \t case $host in\n-\t *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)\n+\t *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)\n \t   # Do not include libc_r directly, use -pthread flag.\n \t   continue\n \t   ;;\n@@ -7470,29 +7062,16 @@ func_mode_link ()\n       # Tru64 UNIX uses -model [arg] to determine the layout of C++\n       # classes, name mangling, and exception handling.\n       # Darwin uses the -arch flag to determine output architecture.\n-      # -q <option> for IBM XL C/C++ compiler.\n-      -model|-arch|-isysroot|--sysroot|-q)\n+      -model|-arch|-isysroot|--sysroot)\n \tfunc_append compiler_flags \" $arg\"\n \tfunc_append compile_command \" $arg\"\n \tfunc_append finalize_command \" $arg\"\n \tprev=xcompiler\n \tcontinue\n \t;;\n-     # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.\n-     -pthread)\n-\tcase $host in\n-\t  *solaris2*) ;;\n-\t  *)\n-\t    case \"$new_inherited_linker_flags \" in\n-\t        *\" $arg \"*) ;;\n-\t        * ) func_append new_inherited_linker_flags \" $arg\" ;;\n-\t    esac\n-\t  ;;\n-\tesac\n-\tcontinue\n-\t;;\n-      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \\\n-      |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)\n+\n+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \\\n+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)\n \tfunc_append compiler_flags \" $arg\"\n \tfunc_append compile_command \" $arg\"\n \tfunc_append finalize_command \" $arg\"\n@@ -7515,7 +7094,7 @@ func_mode_link ()\n \n       -no-install)\n \tcase $host in\n-\t*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)\n+\t*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)\n \t  # The PATH hackery in wrapper scripts is required on Windows\n \t  # and Darwin in order for the loader to find any dlls it needs.\n \t  func_warning \"'-no-install' is ignored for $host\"\n@@ -7575,7 +7154,7 @@ func_mode_link ()\n \t  dir=$lt_sysroot$func_stripname_result\n \t  ;;\n \t*)\n-\t  func_fatal_error \"argument ($arg) to '-R' is not an absolute path: $dir\"\n+\t  func_fatal_error \"only absolute run-paths are allowed\"\n \t  ;;\n \tesac\n \tcase \"$xrpath \" in\n@@ -7632,9 +7211,9 @@ func_mode_link ()\n \tsave_ifs=$IFS; IFS=,\n \tfor flag in $args; do\n \t  IFS=$save_ifs\n-          func_quote_arg pretty \"$flag\"\n-\t  func_append arg \" $func_quote_arg_result\"\n-\t  func_append compiler_flags \" $func_quote_arg_result\"\n+          func_quote_for_eval \"$flag\"\n+\t  func_append arg \" $func_quote_for_eval_result\"\n+\t  func_append compiler_flags \" $func_quote_for_eval_result\"\n \tdone\n \tIFS=$save_ifs\n \tfunc_stripname ' ' '' \"$arg\"\n@@ -7648,21 +7227,16 @@ func_mode_link ()\n \tsave_ifs=$IFS; IFS=,\n \tfor flag in $args; do\n \t  IFS=$save_ifs\n-          func_quote_arg pretty \"$flag\"\n-\t  func_append arg \" $wl$func_quote_arg_result\"\n-\t  func_append compiler_flags \" $wl$func_quote_arg_result\"\n-\t  func_append linker_flags \" $func_quote_arg_result\"\n+          func_quote_for_eval \"$flag\"\n+\t  func_append arg \" $wl$func_quote_for_eval_result\"\n+\t  func_append compiler_flags \" $wl$func_quote_for_eval_result\"\n+\t  func_append linker_flags \" $func_quote_for_eval_result\"\n \tdone\n \tIFS=$save_ifs\n \tfunc_stripname ' ' '' \"$arg\"\n \targ=$func_stripname_result\n \t;;\n \n-      -Xassembler)\n-        prev=xassembler\n-        continue\n-        ;;\n-\n       -Xcompiler)\n \tprev=xcompiler\n \tcontinue\n@@ -7680,8 +7254,8 @@ func_mode_link ()\n \n       # -msg_* for osf cc\n       -msg_*)\n-\tfunc_quote_arg pretty \"$arg\"\n-\targ=$func_quote_arg_result\n+\tfunc_quote_for_eval \"$arg\"\n+\targ=$func_quote_for_eval_result\n \t;;\n \n       # Flags to be passed through unchanged, with rationale:\n@@ -7698,33 +7272,12 @@ func_mode_link ()\n       # -tp=*                Portland pgcc target processor selection\n       # --sysroot=*          for sysroot support\n       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization\n-      # -specs=*             GCC specs files\n       # -stdlib=*            select c++ std lib with clang\n-      # -fdiagnostics-color* simply affects output\n-      # -frecord-gcc-switches used to verify flags were respected\n-      # -fsanitize=*         Clang/GCC memory and address sanitizer\n-      # -fno-sanitize*       Clang/GCC memory and address sanitizer\n-      # -shared-libsan       Link with shared sanitizer runtimes (Clang)\n-      # -static-libsan       Link with static sanitizer runtimes (Clang)\n-      # -no-canonical-prefixes Do not expand any symbolic links\n-      # -fuse-ld=*           Linker select flags for GCC\n-      # -static-*            direct GCC to link specific libraries statically\n-      # -fcilkplus           Cilk Plus language extension features for C/C++\n-      # -rtlib=*             select c runtime lib with clang\n-      # --unwindlib=*        select unwinder library with clang\n-      # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking\n-      # -Wa,*                Pass flags directly to the assembler\n-      # -Werror, -Werror=*   Report (specified) warnings as errors\n       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \\\n       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \\\n-      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \\\n-      -stdlib=*|-rtlib=*|--unwindlib=*| \\\n-      -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \\\n-      -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \\\n-      -fdiagnostics-color*|-frecord-gcc-switches| \\\n-      -fuse-ld=*|-static-*|-fcilkplus|-Wa,*|-Werror|-Werror=*)\n-        func_quote_arg pretty \"$arg\"\n-\targ=$func_quote_arg_result\n+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)\n+        func_quote_for_eval \"$arg\"\n+\targ=$func_quote_for_eval_result\n         func_append compile_command \" $arg\"\n         func_append finalize_command \" $arg\"\n         func_append compiler_flags \" $arg\"\n@@ -7745,15 +7298,15 @@ func_mode_link ()\n \t  continue\n         else\n \t  # Otherwise treat like 'Some other compiler flag' below\n-\t  func_quote_arg pretty \"$arg\"\n-\t  arg=$func_quote_arg_result\n+\t  func_quote_for_eval \"$arg\"\n+\t  arg=$func_quote_for_eval_result\n         fi\n \t;;\n \n       # Some other compiler flag.\n       -* | +*)\n-        func_quote_arg pretty \"$arg\"\n-\targ=$func_quote_arg_result\n+        func_quote_for_eval \"$arg\"\n+\targ=$func_quote_for_eval_result\n \t;;\n \n       *.$objext)\n@@ -7873,27 +7426,15 @@ func_mode_link ()\n       *)\n \t# Unknown arguments in both finalize_command and compile_command need\n \t# to be aesthetically quoted because they are evaled later.\n-\tfunc_quote_arg pretty \"$arg\"\n-\targ=$func_quote_arg_result\n+\tfunc_quote_for_eval \"$arg\"\n+\targ=$func_quote_for_eval_result\n \t;;\n       esac # arg\n \n       # Now actually substitute the argument into the commands.\n       if test -n \"$arg\"; then\n-\tif test -n \"$rpath_arg\"; then\n-          func_append finalize_rpath \" ${arg##*,}\"\n-\t  unset rpath_arg\n-\telse\n-\t  case $arg in\n-          -Wl,-rpath,*)\n-\t    func_append finalize_rpath \" ${arg##*,}\";;\n-          -Wl,-rpath)\n-\t    rpath_arg=1;;\n-          *)\n-            func_append compile_command \" $arg\"\n-\t    func_append finalize_command \" $arg\"\n-\t  esac\n-        fi\n+\tfunc_append compile_command \" $arg\"\n+\tfunc_append finalize_command \" $arg\"\n       fi\n     done # argument parsing loop\n \n@@ -8064,7 +7605,7 @@ func_mode_link ()\n \tfound=false\n \tcase $deplib in\n \t-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \\\n-        |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)\n+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)\n \t  if test prog,link = \"$linkmode,$pass\"; then\n \t    compile_deplibs=\"$deplib $compile_deplibs\"\n \t    finalize_deplibs=\"$deplib $finalize_deplibs\"\n@@ -8241,15 +7782,18 @@ func_mode_link ()\n \t\t;;\n \t      esac\n \t      if $valid_a_lib; then\n-\t\tfunc_warning \"Linking the shared library $output against the static library $deplib is not portable!\"\n+\t\techo\n+\t\t$ECHO \"*** Warning: Linking the shared library $output against the\"\n+\t\t$ECHO \"*** static library $deplib is not portable!\"\n \t\tdeplibs=\"$deplib $deplibs\"\n \t      else\n-\t\tfunc_warning \"Trying to link with static lib archive $deplib.\"\n-\t\tfunc_warning \"I have the capability to make that library automatically link in when\"\n-\t\tfunc_warning \"you link to this library.  But I can only do this if you have a\"\n-\t\tfunc_warning \"shared version of the library, which you do not appear to have\"\n-\t\tfunc_warning \"because the file extensions .$libext of this argument makes me believe\"\n-\t\tfunc_warning \"that it is just a static archive that I should not use here.\"\n+\t\techo\n+\t\t$ECHO \"*** Warning: Trying to link with static lib archive $deplib.\"\n+\t\techo \"*** I have the capability to make that library automatically link in when\"\n+\t\techo \"*** you link to this library.  But I can only do this if you have a\"\n+\t\techo \"*** shared version of the library, which you do not appear to have\"\n+\t\techo \"*** because the file extensions .$libext of this argument makes me believe\"\n+\t\techo \"*** that it is just a static archive that I should not use here.\"\n \t      fi\n \t      ;;\n \t    esac\n@@ -8444,7 +7988,7 @@ func_mode_link ()\n \t  fi\n \t  case $host in\n \t    # special handling for platforms with PE-DLLs.\n-\t    *cygwin* | *mingw* | *windows* | *cegcc* )\n+\t    *cygwin* | *mingw* | *cegcc* )\n \t      # Linker will automatically link against shared library if both\n \t      # static and shared are present.  Therefore, ensure we extract\n \t      # symbols from the import library if a shared library is present\n@@ -8544,10 +8088,7 @@ func_mode_link ()\n \t      # Make sure the rpath contains only unique directories.\n \t      case $temp_rpath: in\n \t      *\"$absdir:\"*) ;;\n-              *) case $absdir in\n-                 \"$progdir/\"*) func_append temp_rpath \"$absdir:\" ;;\n-                 *)            func_append temp_rpath_tail \"$absdir:\" ;;\n-                 esac\n+\t      *) func_append temp_rpath \"$absdir:\" ;;\n \t      esac\n \t    fi\n \n@@ -8557,12 +8098,9 @@ func_mode_link ()\n \t    case \" $sys_lib_dlsearch_path \" in\n \t    *\" $absdir \"*) ;;\n \t    *)\n-\t      case \"$compile_rpath$compile_rpath_tail \" in\n+\t      case \"$compile_rpath \" in\n \t      *\" $absdir \"*) ;;\n-\t      *) case $absdir in\n-                 \"$progdir/\"*) func_append compile_rpath \" $absdir\" ;;\n-                 *) func_append compile_rpath_tail \" $absdir\" ;;\n-\t\t esac\n+\t      *) func_append compile_rpath \" $absdir\" ;;\n \t      esac\n \t      ;;\n \t    esac\n@@ -8593,8 +8131,8 @@ func_mode_link ()\n \tfi\n \tif test -n \"$library_names\" &&\n \t   { test no = \"$use_static_libs\" || test -z \"$old_library\"; }; then\n-\t  case $host_os in\n-\t  cygwin* | mingw* | windows* | cegcc* | os2*)\n+\t  case $host in\n+\t  *cygwin* | *mingw* | *cegcc* | *os2*)\n \t      # No point in relinking DLLs because paths are not encoded\n \t      func_append notinst_deplibs \" $lib\"\n \t      need_relink=no\n@@ -8620,11 +8158,11 @@ func_mode_link ()\n \t  if test -z \"$dlopenmodule\" && test yes = \"$shouldnotlink\" && test link = \"$pass\"; then\n \t    echo\n \t    if test prog = \"$linkmode\"; then\n-\t      func_warning \"Linking the executable $output against the loadable module\"\n+\t      $ECHO \"*** Warning: Linking the executable $output against the loadable module\"\n \t    else\n-\t      func_warning \"Linking the shared library $output against the loadable module\"\n+\t      $ECHO \"*** Warning: Linking the shared library $output against the loadable module\"\n \t    fi\n-\t    func_warning \"$linklib is not portable!\"\n+\t    $ECHO \"*** $linklib is not portable!\"\n \t  fi\n \t  if test lib = \"$linkmode\" &&\n \t     test yes = \"$hardcode_into_libs\"; then\n@@ -8634,12 +8172,9 @@ func_mode_link ()\n \t    case \" $sys_lib_dlsearch_path \" in\n \t    *\" $absdir \"*) ;;\n \t    *)\n-\t      case \"$compile_rpath$compile_rpath_tail \" in\n+\t      case \"$compile_rpath \" in\n \t      *\" $absdir \"*) ;;\n-\t      *) case $absdir in\n-                 \"$progdir/\"*) func_append compile_rpath \" $absdir\" ;;\n-                 *) func_append compile_rpath_tail \" $absdir\" ;;\n-\t\t esac\n+\t      *) func_append compile_rpath \" $absdir\" ;;\n \t      esac\n \t      ;;\n \t    esac\n@@ -8666,8 +8201,8 @@ func_mode_link ()\n \t      soname=$dlname\n \t    elif test -n \"$soname_spec\"; then\n \t      # bleh windows\n-\t      case $host_os in\n-\t      cygwin* | mingw* | windows* | cegcc* | os2*)\n+\t      case $host in\n+\t      *cygwin* | mingw* | *cegcc* | *os2*)\n \t        func_arith $current - $age\n \t\tmajor=$func_arith_result\n \t\tversuffix=-$major\n@@ -8714,7 +8249,6 @@ func_mode_link ()\n \t\tcase $host in\n \t\t  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;\n \t\t  *-*-sysv4*uw2*) add_dir=-L$dir ;;\n-\t\t  *-*-emscripten*) add_dir=-L$dir ;;\n \t\t  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \\\n \t\t    *-*-unixware7*) add_dir=-L$dir ;;\n \t\t  *-*-darwin* )\n@@ -8723,10 +8257,11 @@ func_mode_link ()\n \t\t    if /usr/bin/file -L $add 2> /dev/null |\n \t\t\t $GREP \": [^:]* bundle\" >/dev/null; then\n \t\t      if test \"X$dlopenmodule\" != \"X$lib\"; then\n-\t\t\tfunc_warning \"lib $linklib is a module, not a shared library\"\n+\t\t\t$ECHO \"*** Warning: lib $linklib is a module, not a shared library\"\n \t\t\tif test -z \"$old_library\"; then\n-\t\t\t  func_warning \"And there doesn't seem to be a static archive available\"\n-\t\t\t  func_warning \"The link will probably fail, sorry\"\n+\t\t\t  echo\n+\t\t\t  echo \"*** And there doesn't seem to be a static archive available\"\n+\t\t\t  echo \"*** The link will probably fail, sorry\"\n \t\t\telse\n \t\t\t  add=$dir/$old_library\n \t\t\tfi\n@@ -8809,7 +8344,7 @@ func_mode_link ()\n \t       test no = \"$hardcode_direct_absolute\"; then\n \t      add=$libdir/$linklib\n \t    elif test yes = \"$hardcode_minus_L\"; then\n-\t      add_dir=-L$lt_sysroot$libdir\n+\t      add_dir=-L$libdir\n \t      add=-l$name\n \t    elif test yes = \"$hardcode_shlibpath_var\"; then\n \t      case :$finalize_shlibpath: in\n@@ -8826,7 +8361,7 @@ func_mode_link ()\n \t      fi\n \t    else\n \t      # We cannot seem to hardcode it, guess we'll fake it.\n-\t      add_dir=-L$lt_sysroot$libdir\n+\t      add_dir=-L$libdir\n \t      # Try looking first in the location we're being installed to.\n \t      if test -n \"$inst_prefix_dir\"; then\n \t\tcase $libdir in\n@@ -8866,19 +8401,21 @@ func_mode_link ()\n \n \t    # Just print a warning and add the library to dependency_libs so\n \t    # that the program can be linked against the static library.\n-\t    func_warning \"This system cannot link to static lib archive $lib.\"\n-\t    func_warning \"I have the capability to make that library automatically link in when\"\n-\t    func_warning \"you link to this library.  But I can only do this if you have a\"\n-\t    func_warning \"shared version of the library, which you do not appear to have.\"\n+\t    echo\n+\t    $ECHO \"*** Warning: This system cannot link to static lib archive $lib.\"\n+\t    echo \"*** I have the capability to make that library automatically link in when\"\n+\t    echo \"*** you link to this library.  But I can only do this if you have a\"\n+\t    echo \"*** shared version of the library, which you do not appear to have.\"\n \t    if test yes = \"$module\"; then\n-\t      func_warning \"But as you try to build a module library, libtool will still create \"\n-\t      func_warning \"a static module, that should work as long as the dlopening application\"\n-\t      func_warning \"is linked with the -dlopen flag to resolve symbols at runtime.\"\n+\t      echo \"*** But as you try to build a module library, libtool will still create \"\n+\t      echo \"*** a static module, that should work as long as the dlopening application\"\n+\t      echo \"*** is linked with the -dlopen flag to resolve symbols at runtime.\"\n \t      if test -z \"$global_symbol_pipe\"; then\n-\t\tfunc_warning \"However, this would only work if libtool was able to extract symbol\"\n-\t\tfunc_warning \"lists from a program, using 'nm' or equivalent, but libtool could\"\n-\t\tfunc_warning \"not find such a program.  So, this module is probably useless.\"\n-\t\tfunc_warning \"'nm' from GNU binutils and a full rebuild may help.\"\n+\t\techo\n+\t\techo \"*** However, this would only work if libtool was able to extract symbol\"\n+\t\techo \"*** lists from a program, using 'nm' or equivalent, but libtool could\"\n+\t\techo \"*** not find such a program.  So, this module is probably useless.\"\n+\t\techo \"*** 'nm' from GNU binutils and a full rebuild may help.\"\n \t      fi\n \t      if test no = \"$build_old_libs\"; then\n \t\tbuild_libtool_libs=module\n@@ -9001,10 +8538,6 @@ func_mode_link ()\n \t  fi # link_all_deplibs != no\n \tfi # linkmode = lib\n       done # for deplib in $libs\n-\n-      func_append temp_rpath \"$temp_rpath_tail\"\n-      func_append compile_rpath \"$compile_rpath_tail\"\n-\n       if test link = \"$pass\"; then\n \tif test prog = \"$linkmode\"; then\n \t  compile_deplibs=\"$new_inherited_linker_flags $compile_deplibs\"\n@@ -9042,46 +8575,42 @@ func_mode_link ()\n \t  # Add libraries to $var in reverse order\n \t  eval tmp_libs=\\\"\\$$var\\\"\n \t  new_libs=\n-\t  # FIXME: Pedantically, this is the right thing to do, so\n-\t  #        that some nasty dependency loop isn't accidentally\n-\t  #        broken: new_libs=\"$deplib $new_libs\"\n \t  for deplib in $tmp_libs; do\n-\t    if $opt_preserve_dup_deps; then\n-\t      new_libs=\"$deplib $new_libs\"\n-\t    else\n-\t      # Pragmatically, this seems to cause very few problems in\n-\t      # practice:\n-\t      case $deplib in\n-\t      -L*) new_libs=\"$deplib $new_libs\" ;;\n-\t      -R*) ;;\n+\t    # FIXME: Pedantically, this is the right thing to do, so\n+\t    #        that some nasty dependency loop isn't accidentally\n+\t    #        broken:\n+\t    #new_libs=\"$deplib $new_libs\"\n+\t    # Pragmatically, this seems to cause very few problems in\n+\t    # practice:\n+\t    case $deplib in\n+\t    -L*) new_libs=\"$deplib $new_libs\" ;;\n+\t    -R*) ;;\n+\t    *)\n+\t      # And here is the reason: when a library appears more\n+\t      # than once as an explicit dependence of a library, or\n+\t      # is implicitly linked in more than once by the\n+\t      # compiler, it is considered special, and multiple\n+\t      # occurrences thereof are not removed.  Compare this\n+\t      # with having the same library being listed as a\n+\t      # dependency of multiple other libraries: in this case,\n+\t      # we know (pedantically, we assume) the library does not\n+\t      # need to be listed more than once, so we keep only the\n+\t      # last copy.  This is not always right, but it is rare\n+\t      # enough that we require users that really mean to play\n+\t      # such unportable linking tricks to link the library\n+\t      # using -Wl,-lname, so that libtool does not consider it\n+\t      # for duplicate removal.\n+\t      case \" $specialdeplibs \" in\n+\t      *\" $deplib \"*) new_libs=\"$deplib $new_libs\" ;;\n \t      *)\n-\t        # And here is the reason: when a library appears more\n-\t        # than once as an explicit dependence of a library, or\n-\t        # is implicitly linked in more than once by the\n-\t        # compiler, it is considered special, and multiple\n-\t        # occurrences thereof are not removed.  Compare this\n-\t        # with having the same library being listed as a\n-\t        # dependency of multiple other libraries: in this case,\n-\t        # we know (pedantically, we assume) the library does not\n-\t        # need to be listed more than once, so we keep only the\n-\t        # last copy.  This is not always right, but it is rare\n-\t        # enough that we require users that really mean to play\n-\t        # such unportable linking tricks to link the library\n-\t        # using -Wl,-lname, so that libtool does not consider it\n-\t        # for duplicate removal.  And if not possible for portability\n-\t        # reasons, then --preserve-dup-deps should be used.\n-\t        case \" $specialdeplibs \" in\n-\t        *\" $deplib \"*) new_libs=\"$deplib $new_libs\" ;;\n-\t        *)\n-\t          case \" $new_libs \" in\n-\t          *\" $deplib \"*) ;;\n-\t          *) new_libs=\"$deplib $new_libs\" ;;\n-\t          esac\n-\t          ;;\n-\t        esac\n-\t        ;;\n+\t\tcase \" $new_libs \" in\n+\t\t*\" $deplib \"*) ;;\n+\t\t*) new_libs=\"$deplib $new_libs\" ;;\n+\t\tesac\n+\t\t;;\n \t      esac\n-\t    fi\n+\t      ;;\n+\t    esac\n \t  done\n \t  tmp_libs=\n \t  for deplib in $new_libs; do\n@@ -9103,7 +8632,7 @@ func_mode_link ()\n       test CXX = \"$tagname\" && {\n         case $host_os in\n         linux*)\n-          case `$CC -V 2>&1 | $SED 5q` in\n+          case `$CC -V 2>&1 | sed 5q` in\n           *Sun\\ C*) # Sun C++ 5.9\n             func_suncc_cstd_abi\n \n@@ -9213,7 +8742,9 @@ func_mode_link ()\n \tif test pass_all != \"$deplibs_check_method\"; then\n \t  func_fatal_error \"cannot build libtool library '$output' from non-libtool objects on this host:$objs\"\n \telse\n-\t  func_warning \"Linking the shared library $output against the non-libtool objects $objs is not portable!\"\n+\t  echo\n+\t  $ECHO \"*** Warning: Linking the shared library $output against the non-libtool\"\n+\t  $ECHO \"*** objects $objs is not portable!\"\n \t  func_append libobjs \" $objs\"\n \tfi\n       fi\n@@ -9274,13 +8805,13 @@ func_mode_link ()\n \t  #\n \t  case $version_type in\n \t  # correct linux to gnu/linux during the next big refactor\n-\t  darwin|freebsd-elf|linux|midnightbsd-elf|osf|qnx|windows|none)\n+\t  darwin|freebsd-elf|linux|osf|windows|none)\n \t    func_arith $number_major + $number_minor\n \t    current=$func_arith_result\n \t    age=$number_minor\n \t    revision=$number_revision\n \t    ;;\n-\t  freebsd-aout|sco|sunos)\n+\t  freebsd-aout|qnx|sunos)\n \t    current=$number_major\n \t    revision=$number_minor\n \t    age=0\n@@ -9292,9 +8823,6 @@ func_mode_link ()\n \t    revision=$number_minor\n \t    lt_irix_increment=no\n \t    ;;\n-\t  *)\n-\t    func_fatal_configuration \"$modename: unknown library version type '$version_type'\"\n-\t    ;;\n \t  esac\n \t  ;;\n \tno)\n@@ -9368,7 +8896,7 @@ func_mode_link ()\n \t  versuffix=.$current.$revision\n \t  ;;\n \n-\tfreebsd-elf | midnightbsd-elf)\n+\tfreebsd-elf)\n \t  func_arith $current - $age\n \t  major=.$func_arith_result\n \t  versuffix=$major.$age.$revision\n@@ -9430,9 +8958,8 @@ func_mode_link ()\n \t  ;;\n \n \tqnx)\n-\t  func_arith $current - $age\n-\t  major=.$func_arith_result\n-\t  versuffix=$major.$age.$revision\n+\t  major=.$current\n+\t  versuffix=.$current\n \t  ;;\n \n \tsco)\n@@ -9585,7 +9112,7 @@ func_mode_link ()\n       if test yes = \"$build_libtool_libs\"; then\n \tif test -n \"$rpath\"; then\n \t  case $host in\n-\t  *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)\n+\t  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)\n \t    # these systems don't actually have a c library (as such)!\n \t    ;;\n \t  *-*-rhapsody* | *-*-darwin1.[012])\n@@ -9595,7 +9122,7 @@ func_mode_link ()\n \t  *-*-netbsd*)\n \t    # Don't link with libc until the a.out ld.so is fixed.\n \t    ;;\n-\t  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)\n+\t  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)\n \t    # Do not include libc due to us having libc/libc_r.\n \t    ;;\n \t  *-*-sco3.2v5* | *-*-sco5v6*)\n@@ -9636,6 +9163,108 @@ func_mode_link ()\n \t  # implementing what was already the behavior.\n \t  newdeplibs=$deplibs\n \t  ;;\n+\ttest_compile)\n+\t  # This code stresses the \"libraries are programs\" paradigm to its\n+\t  # limits. Maybe even breaks it.  We compile a program, linking it\n+\t  # against the deplibs as a proxy for the library.  Then we can check\n+\t  # whether they linked in statically or dynamically with ldd.\n+\t  $opt_dry_run || $RM conftest.c\n+\t  cat > conftest.c <<EOF\n+\t  int main() { return 0; }\n+EOF\n+\t  $opt_dry_run || $RM conftest\n+\t  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then\n+\t    ldd_output=`ldd conftest`\n+\t    for i in $deplibs; do\n+\t      case $i in\n+\t      -l*)\n+\t\tfunc_stripname -l '' \"$i\"\n+\t\tname=$func_stripname_result\n+\t\tif test yes = \"$allow_libtool_libs_with_static_runtimes\"; then\n+\t\t  case \" $predeps $postdeps \" in\n+\t\t  *\" $i \"*)\n+\t\t    func_append newdeplibs \" $i\"\n+\t\t    i=\n+\t\t    ;;\n+\t\t  esac\n+\t\tfi\n+\t\tif test -n \"$i\"; then\n+\t\t  libname=`eval \"\\\\$ECHO \\\"$libname_spec\\\"\"`\n+\t\t  deplib_matches=`eval \"\\\\$ECHO \\\"$library_names_spec\\\"\"`\n+\t\t  set dummy $deplib_matches; shift\n+\t\t  deplib_match=$1\n+\t\t  if test `expr \"$ldd_output\" : \".*$deplib_match\"` -ne 0; then\n+\t\t    func_append newdeplibs \" $i\"\n+\t\t  else\n+\t\t    droppeddeps=yes\n+\t\t    echo\n+\t\t    $ECHO \"*** Warning: dynamic linker does not accept needed library $i.\"\n+\t\t    echo \"*** I have the capability to make that library automatically link in when\"\n+\t\t    echo \"*** you link to this library.  But I can only do this if you have a\"\n+\t\t    echo \"*** shared version of the library, which I believe you do not have\"\n+\t\t    echo \"*** because a test_compile did reveal that the linker did not use it for\"\n+\t\t    echo \"*** its dynamic dependency list that programs get resolved with at runtime.\"\n+\t\t  fi\n+\t\tfi\n+\t\t;;\n+\t      *)\n+\t\tfunc_append newdeplibs \" $i\"\n+\t\t;;\n+\t      esac\n+\t    done\n+\t  else\n+\t    # Error occurred in the first compile.  Let's try to salvage\n+\t    # the situation: Compile a separate program for each library.\n+\t    for i in $deplibs; do\n+\t      case $i in\n+\t      -l*)\n+\t\tfunc_stripname -l '' \"$i\"\n+\t\tname=$func_stripname_result\n+\t\t$opt_dry_run || $RM conftest\n+\t\tif $LTCC $LTCFLAGS -o conftest conftest.c $i; then\n+\t\t  ldd_output=`ldd conftest`\n+\t\t  if test yes = \"$allow_libtool_libs_with_static_runtimes\"; then\n+\t\t    case \" $predeps $postdeps \" in\n+\t\t    *\" $i \"*)\n+\t\t      func_append newdeplibs \" $i\"\n+\t\t      i=\n+\t\t      ;;\n+\t\t    esac\n+\t\t  fi\n+\t\t  if test -n \"$i\"; then\n+\t\t    libname=`eval \"\\\\$ECHO \\\"$libname_spec\\\"\"`\n+\t\t    deplib_matches=`eval \"\\\\$ECHO \\\"$library_names_spec\\\"\"`\n+\t\t    set dummy $deplib_matches; shift\n+\t\t    deplib_match=$1\n+\t\t    if test `expr \"$ldd_output\" : \".*$deplib_match\"` -ne 0; then\n+\t\t      func_append newdeplibs \" $i\"\n+\t\t    else\n+\t\t      droppeddeps=yes\n+\t\t      echo\n+\t\t      $ECHO \"*** Warning: dynamic linker does not accept needed library $i.\"\n+\t\t      echo \"*** I have the capability to make that library automatically link in when\"\n+\t\t      echo \"*** you link to this library.  But I can only do this if you have a\"\n+\t\t      echo \"*** shared version of the library, which you do not appear to have\"\n+\t\t      echo \"*** because a test_compile did reveal that the linker did not use this one\"\n+\t\t      echo \"*** as a dynamic dependency that programs can get resolved with at runtime.\"\n+\t\t    fi\n+\t\t  fi\n+\t\telse\n+\t\t  droppeddeps=yes\n+\t\t  echo\n+\t\t  $ECHO \"*** Warning!  Library $i is needed by this library but I was not able to\"\n+\t\t  echo \"*** make it link in!  You will probably need to install it or some\"\n+\t\t  echo \"*** library that it depends on before this library will be fully\"\n+\t\t  echo \"*** functional.  Installing it before continuing would be even better.\"\n+\t\tfi\n+\t\t;;\n+\t      *)\n+\t\tfunc_append newdeplibs \" $i\"\n+\t\t;;\n+\t      esac\n+\t    done\n+\t  fi\n+\t  ;;\n \tfile_magic*)\n \t  set dummy $deplibs_check_method; shift\n \t  file_magic_regex=`expr \"$deplibs_check_method\" : \"$1 \\(.*\\)\"`\n@@ -9699,16 +9328,17 @@ func_mode_link ()\n \t      fi\n \t      if test -n \"$a_deplib\"; then\n \t\tdroppeddeps=yes\n-\t\tfunc_warning \"Linker path does not have real file for library $a_deplib.\"\n-\t\tfunc_warning \"I have the capability to make that library automatically link in when\"\n-\t\tfunc_warning \"you link to this library.  But I can only do this if you have a\"\n-\t\tfunc_warning \"shared version of the library, which you do not appear to have\"\n-\t\tfunc_warning \"because I did check the linker path looking for a file starting\"\n+\t\techo\n+\t\t$ECHO \"*** Warning: linker path does not have real file for library $a_deplib.\"\n+\t\techo \"*** I have the capability to make that library automatically link in when\"\n+\t\techo \"*** you link to this library.  But I can only do this if you have a\"\n+\t\techo \"*** shared version of the library, which you do not appear to have\"\n+\t\techo \"*** because I did check the linker path looking for a file starting\"\n \t\tif test -z \"$potlib\"; then\n-\t\t  func_warning \"with $libname but no candidates were found. (...for file magic test)\"\n+\t\t  $ECHO \"*** with $libname but no candidates were found. (...for file magic test)\"\n \t\telse\n-\t\t  func_warning \"with $libname and none of the candidates passed a file format test\"\n-\t\t  func_warning \"using a file magic. Last file checked: $potlib\"\n+\t\t  $ECHO \"*** with $libname and none of the candidates passed a file format test\"\n+\t\t  $ECHO \"*** using a file magic. Last file checked: $potlib\"\n \t\tfi\n \t      fi\n \t      ;;\n@@ -9752,16 +9382,17 @@ func_mode_link ()\n \t      fi\n \t      if test -n \"$a_deplib\"; then\n \t\tdroppeddeps=yes\n-\t\tfunc_warning \"Linker path does not have real file for library $a_deplib.\"\n-\t\tfunc_warning \"I have the capability to make that library automatically link in when\"\n-\t\tfunc_warning \"you link to this library.  But I can only do this if you have a\"\n-\t\tfunc_warning \"shared version of the library, which you do not appear to have\"\n-\t\tfunc_warning \"because I did check the linker path looking for a file starting\"\n+\t\techo\n+\t\t$ECHO \"*** Warning: linker path does not have real file for library $a_deplib.\"\n+\t\techo \"*** I have the capability to make that library automatically link in when\"\n+\t\techo \"*** you link to this library.  But I can only do this if you have a\"\n+\t\techo \"*** shared version of the library, which you do not appear to have\"\n+\t\techo \"*** because I did check the linker path looking for a file starting\"\n \t\tif test -z \"$potlib\"; then\n-\t\t  func_warning \"with $libname but no candidates were found. (...for regex pattern test)\"\n+\t\t  $ECHO \"*** with $libname but no candidates were found. (...for regex pattern test)\"\n \t\telse\n-\t\t  func_warning \"with $libname and none of the candidates passed a file format test\"\n-\t\t  func_warning \"using a regex pattern. Last file checked: $potlib\"\n+\t\t  $ECHO \"*** with $libname and none of the candidates passed a file format test\"\n+\t\t  $ECHO \"*** using a regex pattern. Last file checked: $potlib\"\n \t\tfi\n \t      fi\n \t      ;;\n@@ -9785,11 +9416,11 @@ func_mode_link ()\n \t  *[!\\\t\\ ]*)\n \t    echo\n \t    if test none = \"$deplibs_check_method\"; then\n-\t      func_warning \"Inter-library dependencies are not supported in this platform.\"\n+\t      echo \"*** Warning: inter-library dependencies are not supported in this platform.\"\n \t    else\n-\t      func_warning \"Inter-library dependencies are not known to be supported.\"\n+\t      echo \"*** Warning: inter-library dependencies are not known to be supported.\"\n \t    fi\n-\t    func_warning \"All declared inter-library dependencies are being dropped.\"\n+\t    echo \"*** All declared inter-library dependencies are being dropped.\"\n \t    droppeddeps=yes\n \t    ;;\n \t  esac\n@@ -9810,15 +9441,17 @@ func_mode_link ()\n \n \tif test yes = \"$droppeddeps\"; then\n \t  if test yes = \"$module\"; then\n-\t    func_warning \"libtool could not satisfy all declared inter-library\"\n-\t    func_warning \"dependencies of module $libname.  Therefore, libtool will create\"\n-\t    func_warning \"a static module, that should work as long as the dlopening\"\n-\t    func_warning \"application is linked with the -dlopen flag.\"\n+\t    echo\n+\t    echo \"*** Warning: libtool could not satisfy all declared inter-library\"\n+\t    $ECHO \"*** dependencies of module $libname.  Therefore, libtool will create\"\n+\t    echo \"*** a static module, that should work as long as the dlopening\"\n+\t    echo \"*** application is linked with the -dlopen flag.\"\n \t    if test -z \"$global_symbol_pipe\"; then\n-\t      func_warning \"However, this would only work if libtool was able to extract symbol\"\n-\t      func_warning \"lists from a program, using 'nm' or equivalent, but libtool could\"\n-\t      func_warning \"not find such a program.  So, this module is probably useless.\"\n-\t      func_warning \"'nm' from GNU binutils and a full rebuild may help.\"\n+\t      echo\n+\t      echo \"*** However, this would only work if libtool was able to extract symbol\"\n+\t      echo \"*** lists from a program, using 'nm' or equivalent, but libtool could\"\n+\t      echo \"*** not find such a program.  So, this module is probably useless.\"\n+\t      echo \"*** 'nm' from GNU binutils and a full rebuild may help.\"\n \t    fi\n \t    if test no = \"$build_old_libs\"; then\n \t      oldlibs=$output_objdir/$libname.$libext\n@@ -9993,7 +9626,7 @@ func_mode_link ()\n \n \torig_export_symbols=\n \tcase $host_os in\n-\tcygwin* | mingw* | windows* | cegcc*)\n+\tcygwin* | mingw* | cegcc*)\n \t  if test -n \"$export_symbols\" && test -z \"$export_symbols_regex\"; then\n \t    # exporting using user supplied symfile\n \t    func_dll_def_p \"$export_symbols\" || {\n@@ -10191,7 +9824,20 @@ func_mode_link ()\n \t  last_robj=\n \t  k=1\n \n-\t  if test -n \"$save_libobjs\" && test : != \"$skipped_export\" && test -n \"$file_list_spec\"; then\n+\t  if test -n \"$save_libobjs\" && test : != \"$skipped_export\" && test yes = \"$with_gnu_ld\"; then\n+\t    output=$output_objdir/$output_la.lnkscript\n+\t    func_verbose \"creating GNU ld script: $output\"\n+\t    echo 'INPUT (' > $output\n+\t    for obj in $save_libobjs\n+\t    do\n+\t      func_to_tool_file \"$obj\"\n+\t      $ECHO \"$func_to_tool_file_result\" >> $output\n+\t    done\n+\t    echo ')' >> $output\n+\t    func_append delfiles \" $output\"\n+\t    func_to_tool_file \"$output\"\n+\t    output=$func_to_tool_file_result\n+\t  elif test -n \"$save_libobjs\" && test : != \"$skipped_export\" && test -n \"$file_list_spec\"; then\n \t    output=$output_objdir/$output_la.lnk\n \t    func_verbose \"creating linker input file list: $output\"\n \t    : > $output\n@@ -10210,19 +9856,6 @@ func_mode_link ()\n \t    func_append delfiles \" $output\"\n \t    func_to_tool_file \"$output\"\n \t    output=$firstobj\\\"$file_list_spec$func_to_tool_file_result\\\"\n-\t  elif test -n \"$save_libobjs\" && test : != \"$skipped_export\" && test yes = \"$with_gnu_ld\"; then\n-\t    output=$output_objdir/$output_la.lnkscript\n-\t    func_verbose \"creating GNU ld script: $output\"\n-\t    echo 'INPUT (' > $output\n-\t    for obj in $save_libobjs\n-\t    do\n-\t      func_to_tool_file \"$obj\"\n-\t      $ECHO \"$func_to_tool_file_result\" >> $output\n-\t    done\n-\t    echo ')' >> $output\n-\t    func_append delfiles \" $output\"\n-\t    func_to_tool_file \"$output\"\n-\t    output=$func_to_tool_file_result\n \t  else\n \t    if test -n \"$save_libobjs\"; then\n \t      func_verbose \"creating reloadable object files...\"\n@@ -10300,8 +9933,8 @@ func_mode_link ()\n \t    for cmd in $concat_cmds; do\n \t      IFS=$save_ifs\n \t      $opt_quiet || {\n-\t\t  func_quote_arg expand,pretty \"$cmd\"\n-\t\t  eval \"func_echo $func_quote_arg_result\"\n+\t\t  func_quote_for_expand \"$cmd\"\n+\t\t  eval \"func_echo $func_quote_for_expand_result\"\n \t      }\n \t      $opt_dry_run || eval \"$cmd\" || {\n \t\tlt_exit=$?\n@@ -10394,8 +10027,8 @@ func_mode_link ()\n \t  eval cmd=\\\"$cmd\\\"\n \t  IFS=$save_ifs\n \t  $opt_quiet || {\n-\t    func_quote_arg expand,pretty \"$cmd\"\n-\t    eval \"func_echo $func_quote_arg_result\"\n+\t    func_quote_for_expand \"$cmd\"\n+\t    eval \"func_echo $func_quote_for_expand_result\"\n \t  }\n \t  $opt_dry_run || eval \"$cmd\" || {\n \t    lt_exit=$?\n@@ -10663,7 +10296,7 @@ func_mode_link ()\n \t  esac\n \tfi\n \tcase $host in\n-\t*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)\n+\t*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)\n \t  testbindir=`$ECHO \"$libdir\" | $SED -e 's*/lib$*/bin*'`\n \t  case :$dllsearchpath: in\n \t  *\":$libdir:\"*) ;;\n@@ -10741,7 +10374,7 @@ func_mode_link ()\n         # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.\n         wrappers_required=false\n         ;;\n-      *cygwin* | *mingw* | *windows* )\n+      *cygwin* | *mingw* )\n         test yes = \"$build_libtool_libs\" || wrappers_required=false\n         ;;\n       *)\n@@ -10869,13 +10502,12 @@ func_mode_link ()\n \t  elif eval var_value=\\$$var; test -z \"$var_value\"; then\n \t    relink_command=\"$var=; export $var; $relink_command\"\n \t  else\n-\t    func_quote_arg pretty \"$var_value\"\n-\t    relink_command=\"$var=$func_quote_arg_result; export $var; $relink_command\"\n+\t    func_quote_for_eval \"$var_value\"\n+\t    relink_command=\"$var=$func_quote_for_eval_result; export $var; $relink_command\"\n \t  fi\n \tdone\n-\tfunc_quote eval cd \"`pwd`\"\n-\tfunc_quote_arg pretty,unquoted \"($func_quote_result; $relink_command)\"\n-\trelink_command=$func_quote_arg_unquoted_result\n+\trelink_command=\"(cd `pwd`; $relink_command)\"\n+\trelink_command=`$ECHO \"$relink_command\" | $SED \"$sed_quote_subst\"`\n       fi\n \n       # Only actually do things if not in dry run mode.\n@@ -10895,7 +10527,7 @@ func_mode_link ()\n \t  *) exeext= ;;\n \tesac\n \tcase $host in\n-\t  *cygwin* | *mingw* | windows* )\n+\t  *cygwin* | *mingw* )\n \t    func_dirname_and_basename \"$output\" \"\" \".\"\n \t    output_name=$func_basename_result\n \t    output_path=$func_dirname_result\n@@ -11115,15 +10747,13 @@ func_mode_link ()\n \telif eval var_value=\\$$var; test -z \"$var_value\"; then\n \t  relink_command=\"$var=; export $var; $relink_command\"\n \telse\n-\t  func_quote_arg pretty,unquoted \"$var_value\"\n-\t  relink_command=\"$var=$func_quote_arg_unquoted_result; export $var; $relink_command\"\n+\t  func_quote_for_eval \"$var_value\"\n+\t  relink_command=\"$var=$func_quote_for_eval_result; export $var; $relink_command\"\n \tfi\n       done\n       # Quote the link command for shipping.\n-      func_quote eval cd \"`pwd`\"\n-      relink_command=\"($func_quote_result; $SHELL \\\"$progpath\\\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)\"\n-      func_quote_arg pretty,unquoted \"$relink_command\"\n-      relink_command=$func_quote_arg_unquoted_result\n+      relink_command=\"(cd `pwd`; $SHELL \\\"$progpath\\\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)\"\n+      relink_command=`$ECHO \"$relink_command\" | $SED \"$sed_quote_subst\"`\n       if test yes = \"$hardcode_automatic\"; then\n \trelink_command=\n       fi\n@@ -11229,7 +10859,7 @@ func_mode_link ()\n \t  # tests/bindir.at for full details.\n \t  tdlname=$dlname\n \t  case $host,$output,$installed,$module,$dlname in\n-\t    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)\n+\t    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)\n \t      # If a -bindir argument was supplied, place the dll there.\n \t      if test -n \"$bindir\"; then\n \t\tfunc_relative_path \"$install_libdir\" \"$bindir\"\ndiff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4\nindex d9cec90..2c18e49 100644\n--- a/m4/ax_cxx_compile_stdcxx.m4\n+++ b/m4/ax_cxx_compile_stdcxx.m4\n@@ -160,7 +160,7 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[\n \n #error \"This is not a C++ compiler\"\n \n-#elif __cplusplus < 201103L && !(defined _MSC_VER)\n+#elif __cplusplus < 201103L\n \n #error \"This is not a C++11 compiler\"\n \ndiff --git a/m4/libtool.m4 b/m4/libtool.m4\nindex 0a2ea25..a644432 100644\n--- a/m4/libtool.m4\n+++ b/m4/libtool.m4\n@@ -1,7 +1,6 @@\n # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-\n #\n-#   Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software\n-#   Foundation, Inc.\n+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.\n #   Written by Gordon Matzigkeit, 1996\n #\n # This file is free software; the Free Software Foundation gives\n@@ -9,13 +8,13 @@\n # modifications, as long as this notice is preserved.\n \n m4_define([_LT_COPYING], [dnl\n-# Copyright (C) 2024 Free Software Foundation, Inc.\n+# Copyright (C) 2014 Free Software Foundation, Inc.\n # This is free software; see the source for copying conditions.  There is NO\n # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n \n # GNU Libtool is free software; you can redistribute it and/or modify\n # it under the terms of the GNU General Public License as published by\n-# the Free Software Foundation; either version 2 of the License, or\n+# the Free Software Foundation; either version 2 of of the License, or\n # (at your option) any later version.\n #\n # As a special exception to the GNU General Public License, if you\n@@ -32,7 +31,7 @@ m4_define([_LT_COPYING], [dnl\n # along with this program.  If not, see <http://www.gnu.org/licenses/>.\n ])\n \n-# serial 63 LT_INIT\n+# serial 58 LT_INIT\n \n \n # LT_PREREQ(VERSION)\n@@ -60,7 +59,7 @@ esac\n # LT_INIT([OPTIONS])\n # ------------------\n AC_DEFUN([LT_INIT],\n-[AC_PREREQ([2.64])dnl We use AC_PATH_PROGS_FEATURE_CHECK\n+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK\n AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl\n AC_BEFORE([$0], [LT_LANG])dnl\n AC_BEFORE([$0], [LT_OUTPUT])dnl\n@@ -182,7 +181,6 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl\n m4_require([_LT_CHECK_SHELL_FEATURES])dnl\n m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl\n m4_require([_LT_CMD_RELOAD])dnl\n-m4_require([_LT_DECL_FILECMD])dnl\n m4_require([_LT_CHECK_MAGIC_METHOD])dnl\n m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl\n m4_require([_LT_CMD_OLD_ARCHIVE])dnl\n@@ -221,8 +219,8 @@ esac\n ofile=libtool\n can_build_shared=yes\n \n-# All known linkers require a '.a' archive for static linking (except MSVC and\n-# ICC, which need '.lib').\n+# All known linkers require a '.a' archive for static linking (except MSVC,\n+# which needs '.lib').\n libext=a\n \n with_gnu_ld=$lt_cv_prog_gnu_ld\n@@ -616,7 +614,7 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT\n # LT_OUTPUT\n # ---------\n # This macro allows early generation of the libtool script (before\n-# AC_OUTPUT is called), in case it is used in configure for compilation\n+# AC_OUTPUT is called), incase it is used in configure for compilation\n # tests.\n AC_DEFUN([LT_OUTPUT],\n [: ${CONFIG_LT=./config.lt}\n@@ -651,9 +649,9 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl\n m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])\n configured by $[0], generated by m4_PACKAGE_STRING.\n \n-Copyright (C) 2024 Free Software Foundation, Inc.\n+Copyright (C) 2011 Free Software Foundation, Inc.\n This config.lt script is free software; the Free Software Foundation\n-gives unlimited permission to copy, distribute and modify it.\"\n+gives unlimited permision to copy, distribute and modify it.\"\n \n while test 0 != $[#]\n do\n@@ -730,6 +728,7 @@ _LT_CONFIG_SAVE_COMMANDS([\n     cat <<_LT_EOF >> \"$cfgfile\"\n #! $SHELL\n # Generated automatically by $as_me ($PACKAGE) $VERSION\n+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:\n # NOTE: Changes made to this file will be lost: look at ltmain.sh.\n \n # Provide generalized library-building support services.\n@@ -779,7 +778,7 @@ _LT_EOF\n   # if finds mixed CR/LF and LF-only lines.  Since sed operates in\n   # text mode, it properly converts lines to CR/LF.  This bash problem\n   # is reportedly fixed, but why not run on old versions too?\n-  $SED '$q' \"$ltmain\" >> \"$cfgfile\" \\\n+  sed '$q' \"$ltmain\" >> \"$cfgfile\" \\\n      || (rm -f \"$cfgfile\"; exit 1)\n \n    mv -f \"$cfgfile\" \"$ofile\" ||\n@@ -974,7 +973,6 @@ _lt_linker_boilerplate=`cat conftest.err`\n $RM -r conftest*\n ])# _LT_LINKER_BOILERPLATE\n \n-\n # _LT_REQUIRED_DARWIN_CHECKS\n # -------------------------\n m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[\n@@ -1025,21 +1023,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[\n \trm -f conftest.*\n       fi])\n \n-    # Feature test to disable chained fixups since it is not\n-    # compatible with '-undefined dynamic_lookup'\n-    AC_CACHE_CHECK([for -no_fixup_chains linker flag],\n-      [lt_cv_support_no_fixup_chains],\n-      [ save_LDFLAGS=$LDFLAGS\n-        LDFLAGS=\"$LDFLAGS -Wl,-no_fixup_chains\"\n-        AC_LINK_IFELSE(\n-          [AC_LANG_PROGRAM([],[])],\n-          lt_cv_support_no_fixup_chains=yes,\n-          lt_cv_support_no_fixup_chains=no\n-        )\n-        LDFLAGS=$save_LDFLAGS\n-      ]\n-    )\n-\n     AC_CACHE_CHECK([for -exported_symbols_list linker flag],\n       [lt_cv_ld_exported_symbols_list],\n       [lt_cv_ld_exported_symbols_list=no\n@@ -1059,12 +1042,12 @@ int forced_loaded() { return 2;}\n _LT_EOF\n       echo \"$LTCC $LTCFLAGS -c -o conftest.o conftest.c\" >&AS_MESSAGE_LOG_FD\n       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD\n-      echo \"$AR $AR_FLAGS libconftest.a conftest.o\" >&AS_MESSAGE_LOG_FD\n-      $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD\n+      echo \"$AR cru libconftest.a conftest.o\" >&AS_MESSAGE_LOG_FD\n+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD\n       echo \"$RANLIB libconftest.a\" >&AS_MESSAGE_LOG_FD\n       $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD\n       cat > conftest.c << _LT_EOF\n-int main(void) { return 0;}\n+int main() { return 0;}\n _LT_EOF\n       echo \"$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a\" >&AS_MESSAGE_LOG_FD\n       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err\n@@ -1084,37 +1067,23 @@ _LT_EOF\n       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;\n     darwin1.*)\n       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;\n-    darwin*)\n-      case $MACOSX_DEPLOYMENT_TARGET,$host in\n-        10.[[012]],*|,*powerpc*-darwin[[5-8]]*)\n-          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;\n-        *)\n-          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'\n-          if test yes = \"$lt_cv_support_no_fixup_chains\"; then\n-            AS_VAR_APPEND([_lt_dar_allow_undefined], [' $wl-no_fixup_chains'])\n-          fi\n-        ;;\n+    darwin*) # darwin 5.x on\n+      # if running on 10.5 or later, the deployment target defaults\n+      # to the OS version, if on x86, and 10.4, the deployment\n+      # target defaults to 10.4. Don't you love it?\n+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in\n+\t10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)\n+\t  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;\n+\t10.[[012]][[,.]]*)\n+\t  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;\n+\t10.*)\n+\t  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;\n       esac\n     ;;\n   esac\n     if test yes = \"$lt_cv_apple_cc_single_mod\"; then\n       _lt_dar_single_mod='$single_module'\n     fi\n-    _lt_dar_needs_single_mod=no\n-    case $host_os in\n-    rhapsody* | darwin1.*)\n-      _lt_dar_needs_single_mod=yes ;;\n-    darwin*)\n-      # When targeting Mac OS X 10.4 (darwin 8) or later,\n-      # -single_module is the default and -multi_module is unsupported.\n-      # The toolchain on macOS 10.14 (darwin 18) and later cannot\n-      # target any OS version that needs -single_module.\n-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in\n-      10.0,*-darwin[[567]].*|10.[[0-3]],*-darwin[[5-9]].*|10.[[0-3]],*-darwin1[[0-7]].*)\n-        _lt_dar_needs_single_mod=yes ;;\n-      esac\n-    ;;\n-    esac\n     if test yes = \"$lt_cv_ld_exported_symbols_list\"; then\n       _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'\n     else\n@@ -1157,12 +1126,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],\n     output_verbose_link_cmd=func_echo_all\n     _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\"\n     _LT_TAGVAR(module_cmds, $1)=\"\\$CC \\$allow_undefined_flag -o \\$lib -bundle \\$libobjs \\$deplibs \\$compiler_flags$_lt_dsymutil\"\n-    _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\"\n-    _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\"\n+    _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\"\n+    _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\"\n     m4_if([$1], [CXX],\n-[   if test yes = \"$_lt_dar_needs_single_mod\" -a yes != \"$lt_cv_apple_cc_single_mod\"; then\n+[   if test yes != \"$lt_cv_apple_cc_single_mod\"; then\n       _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\"\n-      _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\"\n+      _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\"\n     fi\n ],[])\n   else\n@@ -1276,8 +1245,7 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])\n # _LT_WITH_SYSROOT\n # ----------------\n AC_DEFUN([_LT_WITH_SYSROOT],\n-[m4_require([_LT_DECL_SED])dnl\n-AC_MSG_CHECKING([for sysroot])\n+[AC_MSG_CHECKING([for sysroot])\n AC_ARG_WITH([sysroot],\n [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],\n   [Search for dependent libraries within DIR (or the compiler's sysroot\n@@ -1290,13 +1258,11 @@ lt_sysroot=\n case $with_sysroot in #(\n  yes)\n    if test yes = \"$GCC\"; then\n-     # Trim trailing / since we'll always append absolute paths and we want\n-     # to avoid //, if only for less confusing output for the user.\n-     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\\+$::'`\n+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`\n    fi\n    ;; #(\n  /*)\n-   lt_sysroot=`echo \"$with_sysroot\" | $SED -e \"$sed_quote_subst\"`\n+   lt_sysroot=`echo \"$with_sysroot\" | sed -e \"$sed_quote_subst\"`\n    ;; #(\n  no|'')\n    ;; #(\n@@ -1326,7 +1292,7 @@ ia64-*-hpux*)\n   # options accordingly.\n   echo 'int i;' > conftest.$ac_ext\n   if AC_TRY_EVAL(ac_compile); then\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *ELF-32*)\n \tHPUX_IA64_MODE=32\n \t;;\n@@ -1343,7 +1309,7 @@ ia64-*-hpux*)\n   echo '[#]line '$LINENO' \"configure\"' > conftest.$ac_ext\n   if AC_TRY_EVAL(ac_compile); then\n     if test yes = \"$lt_cv_prog_gnu_ld\"; then\n-      case `$FILECMD conftest.$ac_objext` in\n+      case `/usr/bin/file conftest.$ac_objext` in\n \t*32-bit*)\n \t  LD=\"${LD-ld} -melf32bsmip\"\n \t  ;;\n@@ -1355,7 +1321,7 @@ ia64-*-hpux*)\n \t;;\n       esac\n     else\n-      case `$FILECMD conftest.$ac_objext` in\n+      case `/usr/bin/file conftest.$ac_objext` in\n \t*32-bit*)\n \t  LD=\"${LD-ld} -32\"\n \t  ;;\n@@ -1377,7 +1343,7 @@ mips64*-*linux*)\n   echo '[#]line '$LINENO' \"configure\"' > conftest.$ac_ext\n   if AC_TRY_EVAL(ac_compile); then\n     emul=elf\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *32-bit*)\n \temul=\"${emul}32\"\n \t;;\n@@ -1385,7 +1351,7 @@ mips64*-*linux*)\n \temul=\"${emul}64\"\n \t;;\n     esac\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *MSB*)\n \temul=\"${emul}btsmip\"\n \t;;\n@@ -1393,7 +1359,7 @@ mips64*-*linux*)\n \temul=\"${emul}ltsmip\"\n \t;;\n     esac\n-    case `$FILECMD conftest.$ac_objext` in\n+    case `/usr/bin/file conftest.$ac_objext` in\n       *N32*)\n \temul=\"${emul}n32\"\n \t;;\n@@ -1404,7 +1370,7 @@ mips64*-*linux*)\n   ;;\n \n x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \\\n-s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)\n   # Find out what ABI is being produced by ac_compile, and set linker\n   # options accordingly.  Note that the listed cases only cover the\n   # situations where additional linker options are needed (such as when\n@@ -1413,14 +1379,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n   # not appear in the list.\n   echo 'int i;' > conftest.$ac_ext\n   if AC_TRY_EVAL(ac_compile); then\n-    case `$FILECMD conftest.o` in\n+    case `/usr/bin/file conftest.o` in\n       *32-bit*)\n \tcase $host in\n \t  x86_64-*kfreebsd*-gnu)\n \t    LD=\"${LD-ld} -m elf_i386_fbsd\"\n \t    ;;\n-\t  x86_64-*linux*|x86_64-gnu*)\n-\t    case `$FILECMD conftest.o` in\n+\t  x86_64-*linux*)\n+\t    case `/usr/bin/file conftest.o` in\n \t      *x86-64*)\n \t\tLD=\"${LD-ld} -m elf32_x86_64\"\n \t\t;;\n@@ -1448,7 +1414,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n \t  x86_64-*kfreebsd*-gnu)\n \t    LD=\"${LD-ld} -m elf_x86_64_fbsd\"\n \t    ;;\n-\t  x86_64-*linux*|x86_64-gnu*)\n+\t  x86_64-*linux*)\n \t    LD=\"${LD-ld} -m elf_x86_64\"\n \t    ;;\n \t  powerpcle-*linux*)\n@@ -1488,7 +1454,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)\n   # options accordingly.\n   echo 'int i;' > conftest.$ac_ext\n   if AC_TRY_EVAL(ac_compile); then\n-    case `$FILECMD conftest.o` in\n+    case `/usr/bin/file conftest.o` in\n     *64-bit*)\n       case $lt_cv_prog_gnu_ld in\n       yes*)\n@@ -1527,22 +1493,9 @@ need_locks=$enable_libtool_lock\n m4_defun([_LT_PROG_AR],\n [AC_CHECK_TOOLS(AR, [ar], false)\n : ${AR=ar}\n+: ${AR_FLAGS=cru}\n _LT_DECL([], [AR], [1], [The archiver])\n-\n-# Use ARFLAGS variable as AR's operation code to sync the variable naming with\n-# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have\n-# higher priority because that's what people were doing historically (setting\n-# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS\n-# variable obsoleted/removed.\n-\n-test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}\n-lt_ar_flags=$AR_FLAGS\n-_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])\n-\n-# Make AR_FLAGS overridable by 'make ARFLAGS='.  Don't try to run-time override\n-# by AR_FLAGS because that was never working and AR_FLAGS is about to die.\n-_LT_DECL([], [AR_FLAGS], [\\@S|@{ARFLAGS-\"\\@S|@lt_ar_flags\"}],\n-         [Flags to create an archive])\n+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])\n \n AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],\n   [lt_cv_ar_at_file=no\n@@ -1581,7 +1534,7 @@ AC_CHECK_TOOL(STRIP, strip, :)\n test -z \"$STRIP\" && STRIP=:\n _LT_DECL([], [STRIP], [1], [A symbol stripping program])\n \n-AC_REQUIRE([AC_PROG_RANLIB])\n+AC_CHECK_TOOL(RANLIB, ranlib, :)\n test -z \"$RANLIB\" && RANLIB=:\n _LT_DECL([], [RANLIB], [1],\n     [Commands used to install an old-style archive])\n@@ -1592,8 +1545,15 @@ old_postinstall_cmds='chmod 644 $oldlib'\n old_postuninstall_cmds=\n \n if test -n \"$RANLIB\"; then\n+  case $host_os in\n+  bitrig* | openbsd*)\n+    old_postinstall_cmds=\"$old_postinstall_cmds~\\$RANLIB -t \\$tool_oldlib\"\n+    ;;\n+  *)\n+    old_postinstall_cmds=\"$old_postinstall_cmds~\\$RANLIB \\$tool_oldlib\"\n+    ;;\n+  esac\n   old_archive_cmds=\"$old_archive_cmds~\\$RANLIB \\$tool_oldlib\"\n-  old_postinstall_cmds=\"$old_postinstall_cmds~\\$RANLIB \\$tool_oldlib\"\n fi\n \n case $host_os in\n@@ -1725,14 +1685,14 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl\n     lt_cv_sys_max_cmd_len=12288;    # 12K is about right\n     ;;\n \n-  gnu* | ironclad*)\n-    # Under GNU Hurd and Ironclad, this test is not required because there\n-    # is no limit to the length of command line arguments.\n+  gnu*)\n+    # Under GNU Hurd, this test is not required because there is\n+    # no limit to the length of command line arguments.\n     # Libtool will interpret -1 as no limit whatsoever\n     lt_cv_sys_max_cmd_len=-1;\n     ;;\n \n-  cygwin* | mingw* | windows* | cegcc*)\n+  cygwin* | mingw* | cegcc*)\n     # On Win9x/ME, this test blows up -- it succeeds, but takes\n     # about 5 minutes as the teststring grows exponentially.\n     # Worse, since 9x/ME are not pre-emptively multitasking,\n@@ -1754,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl\n     lt_cv_sys_max_cmd_len=8192;\n     ;;\n \n-  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)\n+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)\n     # This has been around since 386BSD, at least.  Likely further.\n     if test -x /sbin/sysctl; then\n       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`\n@@ -1797,7 +1757,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl\n   sysv5* | sco5v6* | sysv4.2uw2*)\n     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`\n     if test -n \"$kargmax\"; then\n-      lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[\t ]]//'`\n+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[\t ]]//'`\n     else\n       lt_cv_sys_max_cmd_len=32768\n     fi\n@@ -1914,11 +1874,11 @@ else\n /* When -fvisibility=hidden is used, assume the code has been annotated\n    correspondingly for the symbols needed.  */\n #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))\n-int fnord (void) __attribute__((visibility(\"default\")));\n+int fnord () __attribute__((visibility(\"default\")));\n #endif\n \n-int fnord (void) { return 42; }\n-int main (void)\n+int fnord () { return 42; }\n+int main ()\n {\n   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);\n   int status = $lt_dlunknown;\n@@ -1975,7 +1935,7 @@ else\n     lt_cv_dlopen_self=yes\n     ;;\n \n-  mingw* | windows* | pw32* | cegcc*)\n+  mingw* | pw32* | cegcc*)\n     lt_cv_dlopen=LoadLibrary\n     lt_cv_dlopen_libs=\n     ;;\n@@ -2247,35 +2207,26 @@ m4_defun([_LT_CMD_STRIPLIB],\n striplib=\n old_striplib=\n AC_MSG_CHECKING([whether stripping libraries is possible])\n-if test -z \"$STRIP\"; then\n-  AC_MSG_RESULT([no])\n+if test -n \"$STRIP\" && $STRIP -V 2>&1 | $GREP \"GNU strip\" >/dev/null; then\n+  test -z \"$old_striplib\" && old_striplib=\"$STRIP --strip-debug\"\n+  test -z \"$striplib\" && striplib=\"$STRIP --strip-unneeded\"\n+  AC_MSG_RESULT([yes])\n else\n-  if $STRIP -V 2>&1 | $GREP \"GNU strip\" >/dev/null; then\n-    old_striplib=\"$STRIP --strip-debug\"\n-    striplib=\"$STRIP --strip-unneeded\"\n-    AC_MSG_RESULT([yes])\n-  else\n-    case $host_os in\n-    darwin*)\n-      # FIXME - insert some real tests, host_os isn't really good enough\n+# FIXME - insert some real tests, host_os isn't really good enough\n+  case $host_os in\n+  darwin*)\n+    if test -n \"$STRIP\"; then\n       striplib=\"$STRIP -x\"\n       old_striplib=\"$STRIP -S\"\n       AC_MSG_RESULT([yes])\n-      ;;\n-    freebsd*)\n-      if $STRIP -V 2>&1 | $GREP \"elftoolchain\" >/dev/null; then\n-        old_striplib=\"$STRIP --strip-debug\"\n-        striplib=\"$STRIP --strip-unneeded\"\n-        AC_MSG_RESULT([yes])\n-      else\n-        AC_MSG_RESULT([no])\n-      fi\n-      ;;\n-    *)\n+    else\n       AC_MSG_RESULT([no])\n-      ;;\n-    esac\n-  fi\n+    fi\n+    ;;\n+  *)\n+    AC_MSG_RESULT([no])\n+    ;;\n+  esac\n fi\n _LT_DECL([], [old_striplib], [1], [Commands to strip libraries])\n _LT_DECL([], [striplib], [1])\n@@ -2343,7 +2294,7 @@ if test yes = \"$GCC\"; then\n     *) lt_awk_arg='/^libraries:/' ;;\n   esac\n   case $host_os in\n-    mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\\([[A-Za-z]]:\\)|\\1|g' ;;\n+    mingw* | cegcc*) lt_sed_strip_eq='s|=\\([[A-Za-z]]:\\)|\\1|g' ;;\n     *) lt_sed_strip_eq='s|=/|/|g' ;;\n   esac\n   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e \"s/^libraries://\" -e $lt_sed_strip_eq`\n@@ -2401,7 +2352,7 @@ BEGIN {RS = \" \"; FS = \"/|\\n\";} {\n   # AWK program above erroneously prepends '/' to C:/dos/paths\n   # for these hosts.\n   case $host_os in\n-    mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO \"$lt_search_path_spec\" |\\\n+    mingw* | cegcc*) lt_search_path_spec=`$ECHO \"$lt_search_path_spec\" |\\\n       $SED 's|/\\([[A-Za-z]]:\\)|\\1|g'` ;;\n   esac\n   sys_lib_search_path_spec=`$ECHO \"$lt_search_path_spec\" | $lt_NL2SP`\n@@ -2476,7 +2427,7 @@ aix[[4-9]]*)\n     # Unfortunately, runtime linking may impact performance, so we do\n     # not want this to be the default eventually. Also, we use the\n     # versioned .so libs for executables only if there is the -brtl\n-    # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.\n+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.\n     # To allow for filename-based versioning support, we need to create\n     # libNAME.so.V as an archive file, containing:\n     # *) an Import File, referring to the versioned filename of the\n@@ -2570,7 +2521,7 @@ bsdi[[45]]*)\n   # libtool to hard-code these into programs\n   ;;\n \n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   version_type=windows\n   shrext_cmds=.dll\n   need_version=no\n@@ -2581,29 +2532,15 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     # gcc\n     library_names_spec='$libname.dll.a'\n     # DLL is installed to $(libdir)/../bin by postinstall_cmds\n-    # If user builds GCC with multilib enabled,\n-    # it should just install on $(libdir)\n-    # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.\n-    if test xyes = x\"$multilib\"; then\n-      postinstall_cmds='base_file=`basename \\$file`~\n-        dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n-        dldir=$destdir/`dirname \\$dlpath`~\n-        $install_prog $dir/$dlname $destdir/$dlname~\n-        chmod a+x $destdir/$dlname~\n-        if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n-          eval '\\''$striplib $destdir/$dlname'\\'' || exit \\$?;\n-        fi'\n-    else\n-      postinstall_cmds='base_file=`basename \\$file`~\n-        dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n-        dldir=$destdir/`dirname \\$dlpath`~\n-        test -d \\$dldir || mkdir -p \\$dldir~\n-        $install_prog $dir/$dlname \\$dldir/$dlname~\n-        chmod a+x \\$dldir/$dlname~\n-        if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n-          eval '\\''$striplib \\$dldir/$dlname'\\'' || exit \\$?;\n-        fi'\n-    fi\n+    postinstall_cmds='base_file=`basename \\$file`~\n+      dlpath=`$SHELL 2>&1 -c '\\''. $dir/'\\''\\$base_file'\\''i; echo \\$dlname'\\''`~\n+      dldir=$destdir/`dirname \\$dlpath`~\n+      test -d \\$dldir || mkdir -p \\$dldir~\n+      $install_prog $dir/$dlname \\$dldir/$dlname~\n+      chmod a+x \\$dldir/$dlname~\n+      if test -n '\\''$stripme'\\'' && test -n '\\''$striplib'\\''; then\n+        eval '\\''$striplib \\$dldir/$dlname'\\'' || exit \\$?;\n+      fi'\n     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\\''. $file; echo \\$dlname'\\''`~\n       dlpath=$dir/\\$dldll~\n        $RM \\$dlpath'\n@@ -2612,30 +2549,30 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)\n     case $host_os in\n     cygwin*)\n       # Cygwin DLLs use 'cyg' prefix rather than 'lib'\n-      soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'\n+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'\n m4_if([$1], [],[\n       sys_lib_search_path_spec=\"$sys_lib_search_path_spec /usr/lib/w32api\"])\n       ;;\n-    mingw* | windows* | cegcc*)\n+    mingw* | cegcc*)\n       # MinGW DLLs use traditional 'lib' prefix\n       soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'\n       ;;\n     pw32*)\n       # pw32 DLLs use 'pw' prefix rather than 'lib'\n-      library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'\n+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'\n       ;;\n     esac\n     dynamic_linker='Win32 ld.exe'\n     ;;\n \n-  *,cl* | *,icl*)\n-    # Native MSVC or ICC\n+  *,cl*)\n+    # Native MSVC\n     libname_spec='$name'\n     soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'\n     library_names_spec='$libname.dll.lib'\n \n     case $build_os in\n-    mingw* | windows*)\n+    mingw*)\n       sys_lib_search_path_spec=\n       lt_save_ifs=$IFS\n       IFS=';'\n@@ -2648,7 +2585,7 @@ m4_if([$1], [],[\n       done\n       IFS=$lt_save_ifs\n       # Convert to MSYS style.\n-      sys_lib_search_path_spec=`$ECHO \"$sys_lib_search_path_spec\" | $SED -e 's|\\\\\\\\|/|g' -e 's| \\\\([[a-zA-Z]]\\\\):| /\\\\1|g' -e 's|^ ||'`\n+      sys_lib_search_path_spec=`$ECHO \"$sys_lib_search_path_spec\" | sed -e 's|\\\\\\\\|/|g' -e 's| \\\\([[a-zA-Z]]\\\\):| /\\\\1|g' -e 's|^ ||'`\n       ;;\n     cygwin*)\n       # Convert to unix form, then to dos form, then back to unix form\n@@ -2685,7 +2622,7 @@ m4_if([$1], [],[\n     ;;\n \n   *)\n-    # Assume MSVC and ICC wrapper\n+    # Assume MSVC wrapper\n     library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'\n     dynamic_linker='Win32 ld.exe'\n     ;;\n@@ -2718,7 +2655,7 @@ dgux*)\n   shlibpath_var=LD_LIBRARY_PATH\n   ;;\n \n-freebsd* | dragonfly* | midnightbsd*)\n+freebsd* | dragonfly*)\n   # DragonFly does not have aout.  When/if they implement a new\n   # versioning mechanism, adjust this.\n   if test -x /usr/bin/objformat; then\n@@ -2742,21 +2679,7 @@ freebsd* | dragonfly* | midnightbsd*)\n       need_version=yes\n       ;;\n   esac\n-  case $host_cpu in\n-    powerpc64)\n-      # On FreeBSD bi-arch platforms, a different variable is used for 32-bit\n-      # binaries.  See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.\n-      AC_COMPILE_IFELSE(\n-        [AC_LANG_SOURCE(\n-           [[int test_pointer_size[sizeof (void *) - 5];\n-           ]])],\n-        [shlibpath_var=LD_LIBRARY_PATH],\n-        [shlibpath_var=LD_32_LIBRARY_PATH])\n-      ;;\n-    *)\n-      shlibpath_var=LD_LIBRARY_PATH\n-      ;;\n-  esac\n+  shlibpath_var=LD_LIBRARY_PATH\n   case $host_os in\n   freebsd2.*)\n     shlibpath_overrides_runpath=yes\n@@ -2786,9 +2709,8 @@ haiku*)\n   soname_spec='$libname$release$shared_ext$major'\n   shlibpath_var=LIBRARY_PATH\n   shlibpath_overrides_runpath=no\n-  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'\n-  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'\n-  hardcode_into_libs=no\n+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'\n+  hardcode_into_libs=yes\n   ;;\n \n hpux9* | hpux10* | hpux11*)\n@@ -2898,7 +2820,7 @@ linux*android*)\n   version_type=none # Android doesn't support versioned libraries.\n   need_lib_prefix=no\n   need_version=no\n-  library_names_spec='$libname$release$shared_ext $libname$shared_ext'\n+  library_names_spec='$libname$release$shared_ext'\n   soname_spec='$libname$release$shared_ext'\n   finish_cmds=\n   shlibpath_var=LD_LIBRARY_PATH\n@@ -2910,9 +2832,8 @@ linux*android*)\n   hardcode_into_libs=yes\n \n   dynamic_linker='Android linker'\n-  # -rpath works at least for libraries that are not overridden by\n-  # libraries installed in system locations.\n-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'\n+  # Don't embed -rpath directories since the linker doesn't support them.\n+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'\n   ;;\n \n # This must be glibc/ELF.\n@@ -2949,7 +2870,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n   # Add ABI-specific directories to the system library path.\n   sys_lib_dlsearch_path_spec=\"/lib64 /usr/lib64 /lib /usr/lib\"\n \n-  # Ideally, we could use ldconfig to report *all* directories which are\n+  # Ideally, we could use ldconfig to report *all* directores which are\n   # searched for libraries, however this is still not possible.  Aside from not\n   # being certain /sbin/ldconfig is available, command\n   # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,\n@@ -2969,18 +2890,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n   dynamic_linker='GNU/Linux ld.so'\n   ;;\n \n-netbsdelf*-gnu)\n-  version_type=linux\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  dynamic_linker='NetBSD ld.elf_so'\n-  ;;\n-\n netbsd*)\n   version_type=sunos\n   need_lib_prefix=no\n@@ -2999,18 +2908,6 @@ netbsd*)\n   hardcode_into_libs=yes\n   ;;\n \n-*-mlibc)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  dynamic_linker='mlibc ld.so'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  hardcode_into_libs=yes\n-  ;;\n-\n newsos6)\n   version_type=linux # correct to gnu/linux during the next big refactor\n   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n@@ -3030,7 +2927,7 @@ newsos6)\n   dynamic_linker='ldqnx.so'\n   ;;\n \n-openbsd*)\n+openbsd* | bitrig*)\n   version_type=sunos\n   sys_lib_dlsearch_path_spec=/usr/lib\n   need_lib_prefix=no\n@@ -3090,17 +2987,6 @@ rdos*)\n   dynamic_linker=no\n   ;;\n \n-serenity*)\n-  version_type=linux # correct to gnu/linux during the next big refactor\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'\n-  soname_spec='$libname$release$shared_ext$major'\n-  shlibpath_var=LD_LIBRARY_PATH\n-  shlibpath_overrides_runpath=no\n-  dynamic_linker='SerenityOS LibELF'\n-  ;;\n-\n solaris*)\n   version_type=linux # correct to gnu/linux during the next big refactor\n   need_lib_prefix=no\n@@ -3198,21 +3084,6 @@ uts4*)\n   shlibpath_var=LD_LIBRARY_PATH\n   ;;\n \n-emscripten*)\n-  version_type=none\n-  need_lib_prefix=no\n-  need_version=no\n-  library_names_spec='$libname$release$shared_ext'\n-  soname_spec='$libname$release$shared_ext'\n-  finish_cmds=\n-  dynamic_linker=\"Emscripten linker\"\n-  _LT_COMPILER_PIC($1)='-fPIC'\n-  _LT_TAGVAR(archive_cmds, $1)='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'\n-  _LT_TAGVAR(archive_expsym_cmds, $1)='$SED \"s|^|_|\" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'\n-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no\n-  _LT_TAGVAR(no_undefined_flag, $1)=\n-  ;;\n-\n *)\n   dynamic_linker=no\n   ;;\n@@ -3388,7 +3259,7 @@ if test yes = \"$GCC\"; then\n   # Check if gcc -print-prog-name=ld gives a path.\n   AC_MSG_CHECKING([for ld used by $CC])\n   case $host in\n-  *-*-mingw* | *-*-windows*)\n+  *-*-mingw*)\n     # gcc leaves a trailing carriage return, which upsets mingw\n     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\\015'` ;;\n   *)\n@@ -3497,7 +3368,7 @@ case $reload_flag in\n esac\n reload_cmds='$LD$reload_flag -o $output$reload_objs'\n case $host_os in\n-  cygwin* | mingw* | windows* | pw32* | cegcc*)\n+  cygwin* | mingw* | pw32* | cegcc*)\n     if test yes != \"$GCC\"; then\n       reload_cmds=false\n     fi\n@@ -3569,6 +3440,7 @@ lt_cv_deplibs_check_method='unknown'\n # 'none' -- dependencies not supported.\n # 'unknown' -- same as none, but documents that we really don't know.\n # 'pass_all' -- all dependencies passed with no checks.\n+# 'test_compile' -- check by making test program.\n # 'file_magic [[regex]]' -- check by looking for files in library path\n # that responds to the $file_magic_cmd with a given extended regex.\n # If you have 'file' or equivalent on your system and you're not sure\n@@ -3585,7 +3457,7 @@ beos*)\n \n bsdi[[45]]*)\n   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'\n-  lt_cv_file_magic_cmd='$FILECMD -L'\n+  lt_cv_file_magic_cmd='/usr/bin/file -L'\n   lt_cv_file_magic_test_file=/shlib/libc.so\n   ;;\n \n@@ -3595,7 +3467,7 @@ cygwin*)\n   lt_cv_file_magic_cmd='func_win32_libid'\n   ;;\n \n-mingw* | windows* | pw32*)\n+mingw* | pw32*)\n   # Base MSYS/MinGW do not provide the 'file' command needed by\n   # func_win32_libid shell function, so use a weaker test based on 'objdump',\n   # unless we find 'file', for example because we are cross-compiling.\n@@ -3604,7 +3476,7 @@ mingw* | windows* | pw32*)\n     lt_cv_file_magic_cmd='func_win32_libid'\n   else\n     # Keep this pattern in sync with the one in func_win32_libid.\n-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'\n+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'\n     lt_cv_file_magic_cmd='$OBJDUMP -f'\n   fi\n   ;;\n@@ -3619,14 +3491,14 @@ darwin* | rhapsody*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-freebsd* | dragonfly* | midnightbsd*)\n+freebsd* | dragonfly*)\n   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then\n     case $host_cpu in\n     i*86 )\n       # Not sure whether the presence of OpenBSD here was a mistake.\n       # Let's accept both of them until this is cleared up.\n       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'\n-      lt_cv_file_magic_cmd=$FILECMD\n+      lt_cv_file_magic_cmd=/usr/bin/file\n       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`\n       ;;\n     esac\n@@ -3640,7 +3512,7 @@ haiku*)\n   ;;\n \n hpux10.20* | hpux11*)\n-  lt_cv_file_magic_cmd=$FILECMD\n+  lt_cv_file_magic_cmd=/usr/bin/file\n   case $host_cpu in\n   ia64*)\n     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'\n@@ -3677,11 +3549,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-*-mlibc)\n-  lt_cv_deplibs_check_method=pass_all\n-  ;;\n-\n-netbsd* | netbsdelf*-gnu)\n+netbsd*)\n   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then\n     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\\.so\\.[[0-9]]+\\.[[0-9]]+|_pic\\.a)$'\n   else\n@@ -3691,7 +3559,7 @@ netbsd* | netbsdelf*-gnu)\n \n newos6*)\n   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'\n-  lt_cv_file_magic_cmd=$FILECMD\n+  lt_cv_file_magic_cmd=/usr/bin/file\n   lt_cv_file_magic_test_file=/usr/lib/libnls.so\n   ;;\n \n@@ -3699,7 +3567,7 @@ newos6*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-openbsd*)\n+openbsd* | bitrig*)\n   if test -z \"`echo __ELF__ | $CC -E - | $GREP __ELF__`\"; then\n     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\\.so\\.[[0-9]]+\\.[[0-9]]+|\\.so|_pic\\.a)$'\n   else\n@@ -3715,10 +3583,6 @@ rdos*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n \n-serenity*)\n-  lt_cv_deplibs_check_method=pass_all\n-  ;;\n-\n solaris*)\n   lt_cv_deplibs_check_method=pass_all\n   ;;\n@@ -3767,7 +3631,7 @@ file_magic_glob=\n want_nocaseglob=no\n if test \"$build\" = \"$host\"; then\n   case $host_os in\n-  mingw* | windows* | pw32*)\n+  mingw* | pw32*)\n     if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then\n       want_nocaseglob=yes\n     else\n@@ -3819,16 +3683,16 @@ else\n \t# Tru64's nm complains that /dev/null is an invalid object file\n \t# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty\n \tcase $build_os in\n-\tmingw* | windows*) lt_bad_file=conftest.nm/nofile ;;\n+\tmingw*) lt_bad_file=conftest.nm/nofile ;;\n \t*) lt_bad_file=/dev/null ;;\n \tesac\n-\tcase `\"$tmp_nm\" -B $lt_bad_file 2>&1 | $SED '1q'` in\n+\tcase `\"$tmp_nm\" -B $lt_bad_file 2>&1 | sed '1q'` in\n \t*$lt_bad_file* | *'Invalid file or object type'*)\n \t  lt_cv_path_NM=\"$tmp_nm -B\"\n \t  break 2\n \t  ;;\n \t*)\n-\t  case `\"$tmp_nm\" -p /dev/null 2>&1 | $SED '1q'` in\n+\t  case `\"$tmp_nm\" -p /dev/null 2>&1 | sed '1q'` in\n \t  */dev/null*)\n \t    lt_cv_path_NM=\"$tmp_nm -p\"\n \t    break 2\n@@ -3854,7 +3718,7 @@ else\n     # Let the user override the test.\n   else\n     AC_CHECK_TOOLS(DUMPBIN, [dumpbin \"link -dump\"], :)\n-    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in\n+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in\n     *COFF*)\n       DUMPBIN=\"$DUMPBIN -symbols -headers\"\n       ;;\n@@ -3910,7 +3774,7 @@ lt_cv_sharedlib_from_linklib_cmd,\n [lt_cv_sharedlib_from_linklib_cmd='unknown'\n \n case $host_os in\n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   # two different shell functions defined in ltmain.sh;\n   # decide which one to use based on capabilities of $DLLTOOL\n   case `$DLLTOOL --help 2>&1` in\n@@ -3942,16 +3806,16 @@ _LT_DECL([], [sharedlib_from_linklib_cmd], [1],\n m4_defun([_LT_PATH_MANIFEST_TOOL],\n [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)\n test -z \"$MANIFEST_TOOL\" && MANIFEST_TOOL=mt\n-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_manifest_tool],\n-  [lt_cv_path_manifest_tool=no\n+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],\n+  [lt_cv_path_mainfest_tool=no\n   echo \"$as_me:$LINENO: $MANIFEST_TOOL '-?'\" >&AS_MESSAGE_LOG_FD\n   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out\n   cat conftest.err >&AS_MESSAGE_LOG_FD\n   if $GREP 'Manifest Tool' conftest.out > /dev/null; then\n-    lt_cv_path_manifest_tool=yes\n+    lt_cv_path_mainfest_tool=yes\n   fi\n   rm -f conftest*])\n-if test yes != \"$lt_cv_path_manifest_tool\"; then\n+if test yes != \"$lt_cv_path_mainfest_tool\"; then\n   MANIFEST_TOOL=:\n fi\n _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl\n@@ -3980,7 +3844,7 @@ AC_DEFUN([LT_LIB_M],\n [AC_REQUIRE([AC_CANONICAL_HOST])dnl\n LIBM=\n case $host in\n-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)\n+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)\n   # These system don't have libm, or don't need it\n   ;;\n *-ncr-sysv4.3*)\n@@ -4055,7 +3919,7 @@ case $host_os in\n aix*)\n   symcode='[[BCDT]]'\n   ;;\n-cygwin* | mingw* | windows* | pw32* | cegcc*)\n+cygwin* | mingw* | pw32* | cegcc*)\n   symcode='[[ABCDGISTW]]'\n   ;;\n hpux*)\n@@ -4070,7 +3934,7 @@ osf*)\n   symcode='[[BCDEGQRST]]'\n   ;;\n solaris*)\n-  symcode='[[BCDRT]]'\n+  symcode='[[BDRT]]'\n   ;;\n sco3.2v5*)\n   symcode='[[DT]]'\n@@ -4094,7 +3958,7 @@ esac\n \n if test \"$lt_cv_nm_interface\" = \"MS dumpbin\"; then\n   # Gets list of data symbols to import.\n-  lt_cv_sys_global_symbol_to_import=\"$SED -n -e 's/^I .* \\(.*\\)$/\\1/p'\"\n+  lt_cv_sys_global_symbol_to_import=\"sed -n -e 's/^I .* \\(.*\\)$/\\1/p'\"\n   # Adjust the below global symbol transforms to fixup imported variables.\n   lt_cdecl_hook=\" -e 's/^I .* \\(.*\\)$/extern __declspec(dllimport) char \\1;/p'\"\n   lt_c_name_hook=\" -e 's/^I .* \\(.*\\)$/  {\\\"\\1\\\", (void *) 0},/p'\"\n@@ -4112,20 +3976,20 @@ fi\n # Transform an extracted symbol line into a proper C declaration.\n # Some systems (esp. on ia64) link data and code symbols differently,\n # so use this general approach.\n-lt_cv_sys_global_symbol_to_cdecl=\"$SED -n\"\\\n+lt_cv_sys_global_symbol_to_cdecl=\"sed -n\"\\\n $lt_cdecl_hook\\\n \" -e 's/^T .* \\(.*\\)$/extern int \\1();/p'\"\\\n \" -e 's/^$symcode$symcode* .* \\(.*\\)$/extern char \\1;/p'\"\n \n # Transform an extracted symbol line into symbol name and symbol address\n-lt_cv_sys_global_symbol_to_c_name_address=\"$SED -n\"\\\n+lt_cv_sys_global_symbol_to_c_name_address=\"sed -n\"\\\n $lt_c_name_hook\\\n \" -e 's/^: \\(.*\\) .*$/  {\\\"\\1\\\", (void *) 0},/p'\"\\\n \" -e 's/^$symcode$symcode* .* \\(.*\\)$/  {\\\"\\1\\\", (void *) \\&\\1},/p'\"\n \n # Transform an extracted symbol line into symbol name with lib prefix and\n # symbol address.\n-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix=\"$SED -n\"\\\n+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix=\"sed -n\"\\\n $lt_c_name_lib_hook\\\n \" -e 's/^: \\(.*\\) .*$/  {\\\"\\1\\\", (void *) 0},/p'\"\\\n \" -e 's/^$symcode$symcode* .* \\(lib.*\\)$/  {\\\"\\1\\\", (void *) \\&\\1},/p'\"\\\n@@ -4134,7 +3998,7 @@ $lt_c_name_lib_hook\\\n # Handle CRLF in mingw tool chain\n opt_cr=\n case $build_os in\n-mingw* | windows*)\n+mingw*)\n   opt_cr=`$ECHO 'x\\{0,1\\}' | tr x '\\015'` # option cr in regexp\n   ;;\n esac\n@@ -4149,7 +4013,7 @@ for ac_symprfx in \"\" \"_\"; do\n   if test \"$lt_cv_nm_interface\" = \"MS dumpbin\"; then\n     # Fake it for dumpbin and say T for any non-static function,\n     # D for any global variable and I for any imported variable.\n-    # Also find C++ and __fastcall symbols from MSVC++ or ICC,\n+    # Also find C++ and __fastcall symbols from MSVC++,\n     # which start with @ or ?.\n     lt_cv_sys_global_symbol_pipe=\"$AWK ['\"\\\n \"     {last_section=section; section=\\$ 3};\"\\\n@@ -4167,9 +4031,9 @@ for ac_symprfx in \"\" \"_\"; do\n \"     s[1]~prfx {split(s[1],t,\\\"@\\\"); print f,t[1],substr(t[1],length(prfx))}\"\\\n \"     ' prfx=^$ac_symprfx]\"\n   else\n-    lt_cv_sys_global_symbol_pipe=\"$SED -n -e 's/^.*[[\t ]]\\($symcode$symcode*\\)[[\t ]][[\t ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'\"\n+    lt_cv_sys_global_symbol_pipe=\"sed -n -e 's/^.*[[\t ]]\\($symcode$symcode*\\)[[\t ]][[\t ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'\"\n   fi\n-  lt_cv_sys_global_symbol_pipe=\"$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'\"\n+  lt_cv_sys_global_symbol_pipe=\"$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'\"\n \n   # Check to see that the pipe works correctly.\n   pipe_works=no\n@@ -4185,14 +4049,13 @@ void nm_test_func(void){}\n #ifdef __cplusplus\n }\n #endif\n-int main(void){nm_test_var='a';nm_test_func();return(0);}\n+int main(){nm_test_var='a';nm_test_func();return(0);}\n _LT_EOF\n \n   if AC_TRY_EVAL(ac_compile); then\n     # Now try to grab the symbols.\n     nlist=conftest.nm\n-    $ECHO \"$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist\" >&AS_MESSAGE_LOG_FD\n-    if eval \"$NM\" conftest.$ac_objext \\| \"$lt_cv_sys_global_symbol_pipe\" \\> $nlist 2>&AS_MESSAGE_LOG_FD && test -s \"$nlist\"; then\n+    if AC_TRY_EVAL(NM conftest.$ac_objext \\| \"$lt_cv_sys_global_symbol_pipe\" \\> $nlist) && test -s \"$nlist\"; then\n       # Try sorting and uniquifying the output.\n       if sort \"$nlist\" | uniq > \"$nlist\"T; then\n \tmv -f \"$nlist\"T \"$nlist\"\n@@ -4362,7 +4225,7 @@ m4_if([$1], [CXX], [\n     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)\n       # PIC is the default for these OSes.\n       ;;\n-    mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)\n+    mingw* | cygwin* | os2* | pw32* | cegcc*)\n       # This hack is so that the source file can tell whether it is being\n       # built for inclusion in a dll (and should export symbols for example).\n       # Although the cygwin gcc ignores -fPIC, still need this for old-style\n@@ -4438,7 +4301,7 @@ m4_if([$1], [CXX], [\n \t  ;;\n \tesac\n \t;;\n-      mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)\n+      mingw* | cygwin* | os2* | pw32* | cegcc*)\n \t# This hack is so that the source file can tell whether it is being\n \t# built for inclusion in a dll (and should export symbols for example).\n \tm4_if([$1], [GCJ], [],\n@@ -4457,7 +4320,7 @@ m4_if([$1], [CXX], [\n \t    ;;\n \tesac\n \t;;\n-      freebsd* | dragonfly* | midnightbsd*)\n+      freebsd* | dragonfly*)\n \t# FreeBSD uses GNU C++\n \t;;\n       hpux9* | hpux10* | hpux11*)\n@@ -4540,7 +4403,7 @@ m4_if([$1], [CXX], [\n \t    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'\n \t    ;;\n \t  *)\n-\t    case `$CC -V 2>&1 | $SED 5q` in\n+\t    case `$CC -V 2>&1 | sed 5q` in\n \t    *Sun\\ C*)\n \t      # Sun C++ 5.9\n \t      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'\n@@ -4564,9 +4427,7 @@ m4_if([$1], [CXX], [\n \t    ;;\n \tesac\n \t;;\n-      netbsd* | netbsdelf*-gnu)\n-\t;;\n-      *-mlibc)\n+      netbsd*)\n \t;;\n       *qnx* | *nto*)\n         # QNX uses GNU C++, but need to define -shared option too, otherwise\n@@ -4596,8 +4457,6 @@ m4_if([$1], [CXX], [\n \t;;\n       psos*)\n \t;;\n-      serenity*)\n-        ;;\n       solaris*)\n \tcase $cc_basename in\n \t  CC* | sunCC*)\n@@ -4690,7 +4549,7 @@ m4_if([$1], [CXX], [\n       # PIC is the default for these OSes.\n       ;;\n \n-    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)\n+    mingw* | cygwin* | pw32* | os2* | cegcc*)\n       # This hack is so that the source file can tell whether it is being\n       # built for inclusion in a dll (and should export symbols for example).\n       # Although the cygwin gcc ignores -fPIC, still need this for old-style\n@@ -4794,7 +4653,7 @@ m4_if([$1], [CXX], [\n       esac\n       ;;\n \n-    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)\n+    mingw* | cygwin* | pw32* | os2* | cegcc*)\n       # This hack is so that the source file can tell whether it is being\n       # built for inclusion in a dll (and should export symbols for example).\n       m4_if([$1], [GCJ], [],\n@@ -4836,12 +4695,6 @@ m4_if([$1], [CXX], [\n \t_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'\n \t_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'\n         ;;\n-      *flang* | ftn | f18* | f95*)\n-        # Flang compiler.\n-\t_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'\n-\t_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'\n-\t_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'\n-        ;;\n       # icc used to be incompatible with GCC.\n       # ICC 10 doesn't accept -KPIC any more.\n       icc* | ifort*)\n@@ -4886,7 +4739,7 @@ m4_if([$1], [CXX], [\n \t_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'\n \t;;\n       *)\n-\tcase `$CC -V 2>&1 | $SED 5q` in\n+\tcase `$CC -V 2>&1 | sed 5q` in\n \t*Sun\\ Ceres\\ Fortran* | *Sun*Fortran*\\ [[1-7]].* | *Sun*Fortran*\\ 8.[[0-3]]*)\n \t  # Sun Fortran 8.3 passes all unrecognized flags to the linker\n \t  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'\n@@ -4924,12 +4777,6 @@ m4_if([$1], [CXX], [\n       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'\n       ;;\n \n-    *-mlibc)\n-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'\n-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'\n-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'\n-      ;;\n-\n     *nto* | *qnx*)\n       # QNX uses GNU C++, but need to define -shared option too, otherwise\n       # it will coredump.\n@@ -4946,9 +4793,6 @@ m4_if([$1], [CXX], [\n       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'\n       ;;\n \n-    serenity*)\n-      ;;\n-\n     solaris*)\n       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'\n       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'\n@@ -5078,15 +4922,15 @@ m4_if([$1], [CXX], [\n     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then\n       _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'\n     else\n-      _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 == \"L\") || (\\$ 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'\n+      _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'\n     fi\n     ;;\n   pw32*)\n     _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds\n     ;;\n-  cygwin* | mingw* | windows* | cegcc*)\n+  cygwin* | mingw* | cegcc*)\n     case $cc_basename in\n-    cl* | icl*)\n+    cl*)\n       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'\n       ;;\n     *)\n@@ -5142,18 +4986,21 @@ dnl Note also adjust exclude_expsyms for C++ above.\n   extract_expsyms_cmds=\n \n   case $host_os in\n-  cygwin* | mingw* | windows* | pw32* | cegcc*)\n-    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time\n+  cygwin* | mingw* | pw32* | cegcc*)\n+    # FIXME: the MSVC++ port hasn't been tested in a loooong time\n     # When not using gcc, we currently assume that we are using\n-    # Microsoft Visual C++ or Intel C++ Compiler.\n+    # Microsoft Visual C++.\n     if test yes != \"$GCC\"; then\n       with_gnu_ld=no\n     fi\n     ;;\n   interix*)\n-    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)\n+    # we just hope/assume this is gcc and not c89 (= MSVC++)\n     with_gnu_ld=yes\n     ;;\n+  openbsd* | bitrig*)\n+    with_gnu_ld=no\n+    ;;\n   esac\n \n   _LT_TAGVAR(ld_shlibs, $1)=yes\n@@ -5200,7 +5047,7 @@ dnl Note also adjust exclude_expsyms for C++ above.\n       _LT_TAGVAR(whole_archive_flag_spec, $1)=\n     fi\n     supports_anon_versioning=no\n-    case `$LD -v | $SED -e 's/([[^)]]\\+)\\s\\+//' 2>&1` in\n+    case `$LD -v | $SED -e 's/([^)]\\+)\\s\\+//' 2>&1` in\n       *GNU\\ gold*) supports_anon_versioning=yes ;;\n       *\\ [[01]].* | *\\ 2.[[0-9]].* | *\\ 2.10.*) ;; # catch versions < 2.11\n       *\\ 2.11.93.0.2\\ *) supports_anon_versioning=yes ;; # RH7.3 ...\n@@ -5254,7 +5101,7 @@ _LT_EOF\n       fi\n       ;;\n \n-    cygwin* | mingw* | windows* | pw32* | cegcc*)\n+    cygwin* | mingw* | pw32* | cegcc*)\n       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,\n       # as there is no search path for DLLs.\n       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'\n@@ -5264,7 +5111,6 @@ _LT_EOF\n       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes\n       _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'\n       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']\n-      _LT_TAGVAR(file_list_spec, $1)='@'\n \n       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then\n         _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'\n@@ -5284,7 +5130,7 @@ _LT_EOF\n \n     haiku*)\n       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n-      _LT_TAGVAR(link_all_deplibs, $1)=no\n+      _LT_TAGVAR(link_all_deplibs, $1)=yes\n       ;;\n \n     os2*)\n@@ -5311,9 +5157,8 @@ _LT_EOF\n \tcat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~\n \t$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~\n \temximp -o $lib $output_objdir/$libname.def'\n-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes\n-      _LT_TAGVAR(file_list_spec, $1)='@'\n       ;;\n \n     interix[[3-9]]*)\n@@ -5328,7 +5173,7 @@ _LT_EOF\n       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link\n       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.\n       _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'\n-      _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'\n+      _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'\n       ;;\n \n     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)\n@@ -5371,7 +5216,7 @@ _LT_EOF\n \t  _LT_TAGVAR(compiler_needs_object, $1)=yes\n \t  ;;\n \tesac\n-\tcase `$CC -V 2>&1 | $SED 5q` in\n+\tcase `$CC -V 2>&1 | sed 5q` in\n \t*Sun\\ C*)\t\t\t# Sun C 5.9\n \t  _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'\n \t  _LT_TAGVAR(compiler_needs_object, $1)=yes\n@@ -5383,14 +5228,13 @@ _LT_EOF\n \n         if test yes = \"$supports_anon_versioning\"; then\n           _LT_TAGVAR(archive_expsym_cmds, $1)='echo \"{ global:\" > $output_objdir/$libname.ver~\n-            cat $export_symbols | $SED -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n+            cat $export_symbols | sed -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n             echo \"local: *; };\" >> $output_objdir/$libname.ver~\n             $CC '\"$tmp_sharedflag\"\"$tmp_addflag\"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'\n         fi\n \n \tcase $cc_basename in\n \ttcc*)\n-\t  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'\n \t  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'\n \t  ;;\n \txlf* | bgf* | bgxlf* | mpixlf*)\n@@ -5400,7 +5244,7 @@ _LT_EOF\n \t  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'\n \t  if test yes = \"$supports_anon_versioning\"; then\n \t    _LT_TAGVAR(archive_expsym_cmds, $1)='echo \"{ global:\" > $output_objdir/$libname.ver~\n-              cat $export_symbols | $SED -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n+              cat $export_symbols | sed -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n               echo \"local: *; };\" >> $output_objdir/$libname.ver~\n               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'\n \t  fi\n@@ -5411,12 +5255,7 @@ _LT_EOF\n       fi\n       ;;\n \n-    *-mlibc)\n-\t_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n-\t_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'\n-      ;;\n-\n-    netbsd* | netbsdelf*-gnu)\n+    netbsd*)\n       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then\n \t_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'\n \twlarc=\n@@ -5537,7 +5376,7 @@ _LT_EOF\n \tif $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then\n \t  _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'\n \telse\n-\t  _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 == \"L\") || (\\$ 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'\n+\t  _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'\n \tfi\n \taix_use_runtimelinking=no\n \n@@ -5718,14 +5557,14 @@ _LT_EOF\n       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic\n       ;;\n \n-    cygwin* | mingw* | windows* | pw32* | cegcc*)\n+    cygwin* | mingw* | pw32* | cegcc*)\n       # When not using gcc, we currently assume that we are using\n-      # Microsoft Visual C++ or Intel C++ Compiler.\n+      # Microsoft Visual C++.\n       # hardcode_libdir_flag_spec is actually meaningless, as there is\n       # no search path for DLLs.\n       case $cc_basename in\n-      cl* | icl*)\n-\t# Native MSVC or ICC\n+      cl*)\n+\t# Native MSVC\n \t_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '\n \t_LT_TAGVAR(allow_undefined_flag, $1)=unsupported\n \t_LT_TAGVAR(always_export_symbols, $1)=yes\n@@ -5735,14 +5574,14 @@ _LT_EOF\n \t# Tell ltmain to make .dll files, not .so files.\n \tshrext_cmds=.dll\n \t# FIXME: Setting linknames here is a bad hack.\n-\t_LT_TAGVAR(archive_cmds, $1)='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~linknames='\n+\t_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~linknames='\n \t_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then\n             cp \"$export_symbols\" \"$output_objdir/$soname.def\";\n             echo \"$tool_output_objdir$soname.def\" > \"$output_objdir/$soname.exp\";\n           else\n             $SED -e '\\''s/^/-link -EXPORT:/'\\'' < $export_symbols > $output_objdir/$soname.exp;\n           fi~\n-          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs \"@$tool_output_objdir$soname.exp\" -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~\n+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs \"@$tool_output_objdir$soname.exp\" -Wl,-DLL,-IMPLIB:\"$tool_output_objdir$libname.dll.lib\"~\n           linknames='\n \t# The linker will not automatically build a static lib if we build a DLL.\n \t# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'\n@@ -5766,7 +5605,7 @@ _LT_EOF\n           fi'\n \t;;\n       *)\n-\t# Assume MSVC and ICC wrapper\n+\t# Assume MSVC wrapper\n \t_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '\n \t_LT_TAGVAR(allow_undefined_flag, $1)=unsupported\n \t# Tell ltmain to make .lib files, not .a files.\n@@ -5814,7 +5653,7 @@ _LT_EOF\n       ;;\n \n     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.\n-    freebsd* | dragonfly* | midnightbsd*)\n+    freebsd* | dragonfly*)\n       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'\n       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'\n       _LT_TAGVAR(hardcode_direct, $1)=yes\n@@ -5954,15 +5793,11 @@ _LT_EOF\n \t# Fabrice Bellard et al's Tiny C Compiler\n \t_LT_TAGVAR(ld_shlibs, $1)=yes\n \t_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'\n-\t_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'\n \t;;\n       esac\n       ;;\n \n-    *-mlibc)\n-      ;;\n-\n-    netbsd* | netbsdelf*-gnu)\n+    netbsd*)\n       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then\n \t_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out\n       else\n@@ -5984,7 +5819,7 @@ _LT_EOF\n     *nto* | *qnx*)\n       ;;\n \n-    openbsd*)\n+    openbsd* | bitrig*)\n       if test -f /usr/libexec/ld.so; then\n \t_LT_TAGVAR(hardcode_direct, $1)=yes\n \t_LT_TAGVAR(hardcode_shlibpath_var, $1)=no\n@@ -6027,9 +5862,8 @@ _LT_EOF\n \tcat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~\n \t$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~\n \temximp -o $lib $output_objdir/$libname.def'\n-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes\n-      _LT_TAGVAR(file_list_spec, $1)='@'\n       ;;\n \n     osf3*)\n@@ -6063,9 +5897,6 @@ _LT_EOF\n       _LT_TAGVAR(hardcode_libdir_separator, $1)=:\n       ;;\n \n-    serenity*)\n-      ;;\n-\n     solaris*)\n       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'\n       if test yes = \"$GCC\"; then\n@@ -6324,7 +6155,7 @@ _LT_TAGDECL([], [hardcode_direct], [0],\n _LT_TAGDECL([], [hardcode_direct_absolute], [0],\n     [Set to \"yes\" if using DIR/libNAME$shared_ext during linking hardcodes\n     DIR into the resulting binary and the resulting library dependency is\n-    \"absolute\", i.e. impossible to change by setting $shlibpath_var if the\n+    \"absolute\", i.e impossible to change by setting $shlibpath_var if the\n     library is relocated])\n _LT_TAGDECL([], [hardcode_minus_L], [0],\n     [Set to \"yes\" if using the -LDIR flag during linking hardcodes DIR\n@@ -6382,7 +6213,7 @@ _LT_TAGVAR(objext, $1)=$objext\n lt_simple_compile_test_code=\"int some_variable = 0;\"\n \n # Code to be used in simple link tests\n-lt_simple_link_test_code='int main(void){return(0);}'\n+lt_simple_link_test_code='int main(){return(0);}'\n \n _LT_TAG_COMPILER\n # Save the default compiler, since it gets overwritten when the other\n@@ -6571,7 +6402,8 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n         wlarc='$wl'\n \n         # ancient GNU ld didn't support --whole-archive et. al.\n-        if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then\n+        if eval \"`$CC -print-prog-name=ld` --help 2>&1\" |\n+\t  $GREP 'no-whole-archive' > /dev/null; then\n           _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'\n         else\n           _LT_TAGVAR(whole_archive_flag_spec, $1)=\n@@ -6591,7 +6423,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n       # Commands to make compiler produce verbose output that lists\n       # what \"hidden\" libraries, object files and flags are used when\n       # linking a shared library.\n-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [[-]]L\"'\n+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \n     else\n       GXX=no\n@@ -6800,10 +6632,10 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n         esac\n         ;;\n \n-      cygwin* | mingw* | windows* | pw32* | cegcc*)\n+      cygwin* | mingw* | pw32* | cegcc*)\n \tcase $GXX,$cc_basename in\n-\t,cl* | no,cl* | ,icl* | no,icl*)\n-\t  # Native MSVC or ICC\n+\t,cl* | no,cl*)\n+\t  # Native MSVC\n \t  # hardcode_libdir_flag_spec is actually meaningless, as there is\n \t  # no search path for DLLs.\n \t  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '\n@@ -6853,7 +6685,6 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported\n \t  _LT_TAGVAR(always_export_symbols, $1)=no\n \t  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes\n-\t  _LT_TAGVAR(file_list_spec, $1)='@'\n \n \t  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then\n \t    _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'\n@@ -6900,9 +6731,8 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~\n \t  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~\n \t  emximp -o $lib $output_objdir/$libname.def'\n-\t_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n+\t_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'\n \t_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes\n-\t_LT_TAGVAR(file_list_spec, $1)='@'\n \t;;\n \n       dgux*)\n@@ -6933,7 +6763,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n         _LT_TAGVAR(archive_cmds_need_lc, $1)=no\n         ;;\n \n-      freebsd* | dragonfly* | midnightbsd*)\n+      freebsd* | dragonfly*)\n         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF\n         # conventions\n         _LT_TAGVAR(ld_shlibs, $1)=yes\n@@ -6941,7 +6771,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \n       haiku*)\n         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n-        _LT_TAGVAR(link_all_deplibs, $1)=no\n+        _LT_TAGVAR(link_all_deplibs, $1)=yes\n         ;;\n \n       hpux9*)\n@@ -6968,7 +6798,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n             # explicitly linking system object files so we need to strip them\n             # from the output so that they don't get included in the library\n             # dependencies.\n-            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\"'\n+            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\"'\n             ;;\n           *)\n             if test yes = \"$GXX\"; then\n@@ -7033,7 +6863,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t    # explicitly linking system object files so we need to strip them\n \t    # from the output so that they don't get included in the library\n \t    # dependencies.\n-\t    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\"'\n+\t    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\"'\n \t    ;;\n           *)\n \t    if test yes = \"$GXX\"; then\n@@ -7070,7 +6900,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link\n \t# time.  Moving up from 0x10000000 also allows more sbrk(2) space.\n \t_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'\n-\t_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'\n+\t_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'\n \t;;\n       irix5* | irix6*)\n         case $cc_basename in\n@@ -7210,13 +7040,13 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'\n \t    if test yes = \"$supports_anon_versioning\"; then\n \t      _LT_TAGVAR(archive_expsym_cmds, $1)='echo \"{ global:\" > $output_objdir/$libname.ver~\n-                cat $export_symbols | $SED -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n+                cat $export_symbols | sed -e \"s/\\(.*\\)/\\1;/\" >> $output_objdir/$libname.ver~\n                 echo \"local: *; };\" >> $output_objdir/$libname.ver~\n                 $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'\n \t    fi\n \t    ;;\n \t  *)\n-\t    case `$CC -V 2>&1 | $SED 5q` in\n+\t    case `$CC -V 2>&1 | sed 5q` in\n \t    *Sun\\ C*)\n \t      # Sun C++ 5.9\n \t      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'\n@@ -7265,10 +7095,6 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \tesac\n \t;;\n \n-      *-mlibc)\n-        _LT_TAGVAR(ld_shlibs, $1)=yes\n-\t;;\n-\n       netbsd*)\n         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then\n \t  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'\n@@ -7285,7 +7111,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n         _LT_TAGVAR(ld_shlibs, $1)=yes\n \t;;\n \n-      openbsd*)\n+      openbsd* | bitrig*)\n \tif test -f /usr/libexec/ld.so; then\n \t  _LT_TAGVAR(hardcode_direct, $1)=yes\n \t  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no\n@@ -7376,7 +7202,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t      # Commands to make compiler produce verbose output that lists\n \t      # what \"hidden\" libraries, object files and flags are used when\n \t      # linking a shared library.\n-\t      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [[-]]L\"'\n+\t      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \n \t    else\n \t      # FIXME: insert proper C++ library support\n@@ -7391,9 +7217,6 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n         _LT_TAGVAR(ld_shlibs, $1)=no\n         ;;\n \n-      serenity*)\n-        ;;\n-\n       sunos4*)\n         case $cc_basename in\n           CC*)\n@@ -7463,7 +7286,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t        # Commands to make compiler produce verbose output that lists\n \t        # what \"hidden\" libraries, object files and flags are used when\n \t        # linking a shared library.\n-\t        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [[-]]L\"'\n+\t        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \t      else\n \t        # g++ 2.7 appears to require '-G' NOT '-shared' on this\n \t        # platform.\n@@ -7474,7 +7297,7 @@ if test yes != \"$_lt_caught_CXX_error\"; then\n \t        # Commands to make compiler produce verbose output that lists\n \t        # what \"hidden\" libraries, object files and flags are used when\n \t        # linking a shared library.\n-\t        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \" [[-]]L\"'\n+\t        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v \"^Configured with:\" | $GREP \"\\-L\"'\n \t      fi\n \n \t      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'\n@@ -7712,11 +7535,10 @@ if AC_TRY_EVAL(ac_compile); then\n     case $prev$p in\n \n     -L* | -R* | -l*)\n-       # Some compilers place space between \"-{L,R,l}\" and the path.\n+       # Some compilers place space between \"-{L,R}\" and the path.\n        # Remove the space.\n-       if test x-L = x\"$p\" ||\n-          test x-R = x\"$p\" ||\n-          test x-l = x\"$p\"; then\n+       if test x-L = \"$p\" ||\n+          test x-R = \"$p\"; then\n \t prev=$p\n \t continue\n        fi\n@@ -8370,14 +8192,6 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program])\n AC_SUBST([DLLTOOL])\n ])\n \n-# _LT_DECL_FILECMD\n-# ----------------\n-# Check for a file(cmd) program that can be used to detect file type and magic\n-m4_defun([_LT_DECL_FILECMD],\n-[AC_CHECK_PROG([FILECMD], [file], [file], [:])\n-_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])\n-])# _LD_DECL_FILECMD\n-\n # _LT_DECL_SED\n # ------------\n # Check for a fully-functional sed program, that truncates\n@@ -8390,6 +8204,73 @@ _LT_DECL([], [SED], [1], [A sed program that does not truncate output])\n _LT_DECL([], [Xsed], [\"\\$SED -e 1s/^X//\"],\n     [Sed that helps us avoid accidentally triggering echo(1) options like -n])\n ])# _LT_DECL_SED\n+\n+m4_ifndef([AC_PROG_SED], [\n+############################################################\n+# NOTE: This macro has been submitted for inclusion into   #\n+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #\n+#  a released version of Autoconf we should remove this    #\n+#  macro and use it instead.                               #\n+############################################################\n+\n+m4_defun([AC_PROG_SED],\n+[AC_MSG_CHECKING([for a sed that does not truncate output])\n+AC_CACHE_VAL(lt_cv_path_SED,\n+[# Loop through the user's path and test for sed and gsed.\n+# Then use that list of sed's as ones to test for truncation.\n+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR\n+for as_dir in $PATH\n+do\n+  IFS=$as_save_IFS\n+  test -z \"$as_dir\" && as_dir=.\n+  for lt_ac_prog in sed gsed; do\n+    for ac_exec_ext in '' $ac_executable_extensions; do\n+      if $as_executable_p \"$as_dir/$lt_ac_prog$ac_exec_ext\"; then\n+        lt_ac_sed_list=\"$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext\"\n+      fi\n+    done\n+  done\n+done\n+IFS=$as_save_IFS\n+lt_ac_max=0\n+lt_ac_count=0\n+# Add /usr/xpg4/bin/sed as it is typically found on Solaris\n+# along with /bin/sed that truncates output.\n+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do\n+  test ! -f \"$lt_ac_sed\" && continue\n+  cat /dev/null > conftest.in\n+  lt_ac_count=0\n+  echo $ECHO_N \"0123456789$ECHO_C\" >conftest.in\n+  # Check for GNU sed and select it if it is found.\n+  if \"$lt_ac_sed\" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then\n+    lt_cv_path_SED=$lt_ac_sed\n+    break\n+  fi\n+  while true; do\n+    cat conftest.in conftest.in >conftest.tmp\n+    mv conftest.tmp conftest.in\n+    cp conftest.in conftest.nl\n+    echo >>conftest.nl\n+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break\n+    cmp -s conftest.out conftest.nl || break\n+    # 10000 chars as input seems more than enough\n+    test 10 -lt \"$lt_ac_count\" && break\n+    lt_ac_count=`expr $lt_ac_count + 1`\n+    if test \"$lt_ac_count\" -gt \"$lt_ac_max\"; then\n+      lt_ac_max=$lt_ac_count\n+      lt_cv_path_SED=$lt_ac_sed\n+    fi\n+  done\n+done\n+])\n+SED=$lt_cv_path_SED\n+AC_SUBST([SED])\n+AC_MSG_RESULT([$SED])\n+])#AC_PROG_SED\n+])#m4_ifndef\n+\n+# Old name:\n+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])\n dnl aclocal-1.4 backwards compatibility:\n dnl AC_DEFUN([LT_AC_PROG_SED], [])\n \n@@ -8436,7 +8317,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,\n [case $host in\n   *-*-mingw* )\n     case $build in\n-      *-*-mingw* | *-*-windows* ) # actually msys\n+      *-*-mingw* ) # actually msys\n         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32\n         ;;\n       *-*-cygwin* )\n@@ -8449,7 +8330,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,\n     ;;\n   *-*-cygwin* )\n     case $build in\n-      *-*-mingw* | *-*-windows* ) # actually msys\n+      *-*-mingw* ) # actually msys\n         lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin\n         ;;\n       *-*-cygwin* )\n@@ -8475,9 +8356,9 @@ AC_CACHE_VAL(lt_cv_to_tool_file_cmd,\n [#assume ordinary cross tools, or native build.\n lt_cv_to_tool_file_cmd=func_convert_file_noop\n case $host in\n-  *-*-mingw* | *-*-windows* )\n+  *-*-mingw* )\n     case $build in\n-      *-*-mingw* | *-*-windows* ) # actually msys\n+      *-*-mingw* ) # actually msys\n         lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32\n         ;;\n     esac\ndiff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4\nindex 25caa89..94b0829 100644\n--- a/m4/ltoptions.m4\n+++ b/m4/ltoptions.m4\n@@ -1,14 +1,14 @@\n # Helper functions for option handling.                    -*- Autoconf -*-\n #\n-#   Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2024 Free\n-#   Software Foundation, Inc.\n+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software\n+#   Foundation, Inc.\n #   Written by Gary V. Vaughan, 2004\n #\n # This file is free software; the Free Software Foundation gives\n # unlimited permission to copy and/or distribute it, with or without\n # modifications, as long as this notice is preserved.\n \n-# serial 10 ltoptions.m4\n+# serial 8 ltoptions.m4\n \n # This is to help aclocal find these macros, as it can't see m4_define.\n AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])\n@@ -128,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],\n [enable_win32_dll=yes\n \n case $host in\n-*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)\n+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)\n   AC_CHECK_TOOL(AS, as, false)\n   AC_CHECK_TOOL(DLLTOOL, dlltool, false)\n   AC_CHECK_TOOL(OBJDUMP, objdump, false)\n@@ -323,39 +323,29 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])\n \n # _LT_WITH_AIX_SONAME([DEFAULT])\n # ----------------------------------\n-# implement the --enable-aix-soname configure option, and support the\n-# `aix-soname=aix' and `aix-soname=both' and `aix-soname=svr4' LT_INIT options.\n-# DEFAULT is either `aix', `both', or `svr4'.  If omitted, it defaults to `aix'.\n+# implement the --with-aix-soname flag, and support the `aix-soname=aix'\n+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT\n+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.\n m4_define([_LT_WITH_AIX_SONAME],\n [m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl\n shared_archive_member_spec=\n case $host,$enable_shared in\n power*-*-aix[[5-9]]*,yes)\n   AC_MSG_CHECKING([which variant of shared library versioning to provide])\n-  AC_ARG_ENABLE([aix-soname],\n-    [AS_HELP_STRING([--enable-aix-soname=aix|svr4|both],\n+  AC_ARG_WITH([aix-soname],\n+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],\n       [shared library versioning (aka \"SONAME\") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],\n-    [case $enableval in\n-     aix|svr4|both)\n-       ;;\n-     *)\n-       AC_MSG_ERROR([Unknown argument to --enable-aix-soname])\n-       ;;\n-     esac\n-     lt_cv_with_aix_soname=$enable_aix_soname],\n-    [_AC_ENABLE_IF([with], [aix-soname],\n-        [case $withval in\n-         aix|svr4|both)\n-           ;;\n-         *)\n-           AC_MSG_ERROR([Unknown argument to --with-aix-soname])\n-           ;;\n-         esac\n-         lt_cv_with_aix_soname=$with_aix_soname],\n-        [AC_CACHE_VAL([lt_cv_with_aix_soname],\n-           [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)])\n-     enable_aix_soname=$lt_cv_with_aix_soname])\n-  with_aix_soname=$enable_aix_soname\n+    [case $withval in\n+    aix|svr4|both)\n+      ;;\n+    *)\n+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])\n+      ;;\n+    esac\n+    lt_cv_with_aix_soname=$with_aix_soname],\n+    [AC_CACHE_VAL([lt_cv_with_aix_soname],\n+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)\n+    with_aix_soname=$lt_cv_with_aix_soname])\n   AC_MSG_RESULT([$with_aix_soname])\n   if test aix != \"$with_aix_soname\"; then\n     # For the AIX way of multilib, we name the shared archive member\n@@ -386,50 +376,30 @@ LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])\n \n # _LT_WITH_PIC([MODE])\n # --------------------\n-# implement the --enable-pic flag, and support the 'pic-only' and 'no-pic'\n+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'\n # LT_INIT options.\n # MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.\n m4_define([_LT_WITH_PIC],\n-[AC_ARG_ENABLE([pic],\n-    [AS_HELP_STRING([--enable-pic@<:@=PKGS@:>@],\n+[AC_ARG_WITH([pic],\n+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],\n \t[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],\n     [lt_p=${PACKAGE-default}\n-     case $enableval in\n-     yes|no) pic_mode=$enableval ;;\n-     *)\n-       pic_mode=default\n-       # Look at the argument we got.  We use all the common list separators.\n-       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,\n-       for lt_pkg in $enableval; do\n-\t IFS=$lt_save_ifs\n-\t if test \"X$lt_pkg\" = \"X$lt_p\"; then\n-\t   pic_mode=yes\n-\t fi\n-       done\n-       IFS=$lt_save_ifs\n-       ;;\n-     esac],\n-    [dnl Continue to support --with-pic and --without-pic, for backward\n-     dnl compatibility.\n-     _AC_ENABLE_IF([with], [pic],\n-\t[lt_p=${PACKAGE-default}\n-\t case $withval in\n-\t yes|no) pic_mode=$withval ;;\n-\t *)\n-\t   pic_mode=default\n-\t   # Look at the argument we got.  We use all the common list separators.\n-\t   lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,\n-\t   for lt_pkg in $withval; do\n-\t     IFS=$lt_save_ifs\n-\t     if test \"X$lt_pkg\" = \"X$lt_p\"; then\n-\t       pic_mode=yes\n-\t     fi\n-\t   done\n-\t   IFS=$lt_save_ifs\n-\t   ;;\n-\t esac],\n-\t[pic_mode=m4_default([$1], [default])])]\n-    )\n+    case $withval in\n+    yes|no) pic_mode=$withval ;;\n+    *)\n+      pic_mode=default\n+      # Look at the argument we got.  We use all the common list separators.\n+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,\n+      for lt_pkg in $withval; do\n+\tIFS=$lt_save_ifs\n+\tif test \"X$lt_pkg\" = \"X$lt_p\"; then\n+\t  pic_mode=yes\n+\tfi\n+      done\n+      IFS=$lt_save_ifs\n+      ;;\n+    esac],\n+    [pic_mode=m4_default([$1], [default])])\n \n _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl\n ])# _LT_WITH_PIC\ndiff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4\nindex 5b5c80a..48bc934 100644\n--- a/m4/ltsugar.m4\n+++ b/m4/ltsugar.m4\n@@ -1,6 +1,6 @@\n # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-\n #\n-# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2024 Free Software\n+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software\n # Foundation, Inc.\n # Written by Gary V. Vaughan, 2004\n #\ndiff --git a/m4/ltversion.m4 b/m4/ltversion.m4\nindex 228df3f..fa04b52 100644\n--- a/m4/ltversion.m4\n+++ b/m4/ltversion.m4\n@@ -1,7 +1,6 @@\n # ltversion.m4 -- version numbers\t\t\t-*- Autoconf -*-\n #\n-#   Copyright (C) 2004, 2011-2019, 2021-2024 Free Software Foundation,\n-#   Inc.\n+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.\n #   Written by Scott James Remnant, 2004\n #\n # This file is free software; the Free Software Foundation gives\n@@ -10,15 +9,15 @@\n \n # @configure_input@\n \n-# serial 4441 ltversion.m4\n+# serial 4179 ltversion.m4\n # This file is part of GNU Libtool\n \n-m4_define([LT_PACKAGE_VERSION], [2.5.4])\n-m4_define([LT_PACKAGE_REVISION], [2.5.4])\n+m4_define([LT_PACKAGE_VERSION], [2.4.6])\n+m4_define([LT_PACKAGE_REVISION], [2.4.6])\n \n AC_DEFUN([LTVERSION_VERSION],\n-[macro_version='2.5.4'\n-macro_revision='2.5.4'\n+[macro_version='2.4.6'\n+macro_revision='2.4.6'\n _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])\n _LT_DECL(, macro_revision, 0)\n ])\ndiff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4\nindex 22b5346..c6b26f8 100644\n--- a/m4/lt~obsolete.m4\n+++ b/m4/lt~obsolete.m4\n@@ -1,7 +1,7 @@\n # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-\n #\n-#   Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2024 Free\n-#   Software Foundation, Inc.\n+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software\n+#   Foundation, Inc.\n #   Written by Scott James Remnant, 2004.\n #\n # This file is free software; the Free Software Foundation gives\ndiff --git a/missing b/missing\nindex 7e7d78e..c6e3795 100755\n--- a/missing\n+++ b/missing\n@@ -1,11 +1,9 @@\n #! /bin/sh\n-# Common wrapper for a few potentially missing GNU and other programs.\n+# Common wrapper for a few potentially missing GNU programs.\n \n-scriptversion=2024-06-07.14; # UTC\n+scriptversion=2016-01-11.22; # UTC\n \n-# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells\n-\n-# Copyright (C) 1996-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1996-2017 Free Software Foundation, Inc.\n # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.\n \n # This program is free software; you can redistribute it and/or modify\n@@ -19,7 +17,7 @@ scriptversion=2024-06-07.14; # UTC\n # GNU General Public License for more details.\n \n # You should have received a copy of the GNU General Public License\n-# along with this program.  If not, see <https://www.gnu.org/licenses/>.\n+# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n \n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n@@ -56,20 +54,18 @@ Options:\n   -v, --version   output version information and exit\n \n Supported PROGRAM values:\n-aclocal autoconf autogen  autoheader autom4te automake autoreconf\n-bison   flex     help2man lex        makeinfo perl     yacc\n+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo\n+  bison     yacc      flex         lex       help2man\n \n Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and\n 'g' are ignored when checking the name.\n \n-Report bugs to <bug-automake@gnu.org>.\n-GNU Automake home page: <https://www.gnu.org/software/automake/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\"\n+Send bug reports to <bug-automake@gnu.org>.\"\n     exit $?\n     ;;\n \n   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)\n-    echo \"missing (GNU Automake) $scriptversion\"\n+    echo \"missing $scriptversion (GNU Automake)\"\n     exit $?\n     ;;\n \n@@ -105,14 +101,14 @@ else\n   exit $st\n fi\n \n-perl_URL=https://www.perl.org/\n-flex_URL=https://github.com/westes/flex\n-gnu_software_URL=https://www.gnu.org/software\n+perl_URL=http://www.perl.org/\n+flex_URL=http://flex.sourceforge.net/\n+gnu_software_URL=http://www.gnu.org/software\n \n program_details ()\n {\n   case $1 in\n-    aclocal|automake|autoreconf)\n+    aclocal|automake)\n       echo \"The '$1' program is part of the GNU Automake package:\"\n       echo \"<$gnu_software_URL/automake>\"\n       echo \"It also requires GNU Autoconf, GNU m4 and Perl in order to run:\"\n@@ -127,9 +123,6 @@ program_details ()\n       echo \"<$gnu_software_URL/m4/>\"\n       echo \"<$perl_URL>\"\n       ;;\n-    *)\n-      :\n-      ;;\n   esac\n }\n \n@@ -144,55 +137,48 @@ give_advice ()\n   printf '%s\\n' \"'$1' is $msg.\"\n \n   configure_deps=\"'configure.ac' or m4 files included by 'configure.ac'\"\n-  autoheader_deps=\"'acconfig.h'\"\n-  automake_deps=\"'Makefile.am'\"\n-  aclocal_deps=\"'acinclude.m4'\"\n   case $normalized_program in\n-    aclocal*)\n-      echo \"You should only need it if you modified $aclocal_deps or\"\n-      echo \"$configure_deps.\"\n-      ;;\n     autoconf*)\n-      echo \"You should only need it if you modified $configure_deps.\"\n-      ;;\n-    autogen*)\n-      echo \"You should only need it if you modified a '.def' or '.tpl' file.\"\n-      echo \"You may want to install the GNU AutoGen package:\"\n-      echo \"<$gnu_software_URL/autogen/>\"\n+      echo \"You should only need it if you modified 'configure.ac',\"\n+      echo \"or m4 files included by it.\"\n+      program_details 'autoconf'\n       ;;\n     autoheader*)\n-      echo \"You should only need it if you modified $autoheader_deps or\"\n+      echo \"You should only need it if you modified 'acconfig.h' or\"\n       echo \"$configure_deps.\"\n+      program_details 'autoheader'\n       ;;\n     automake*)\n-      echo \"You should only need it if you modified $automake_deps or\"\n+      echo \"You should only need it if you modified 'Makefile.am' or\"\n+      echo \"$configure_deps.\"\n+      program_details 'automake'\n+      ;;\n+    aclocal*)\n+      echo \"You should only need it if you modified 'acinclude.m4' or\"\n       echo \"$configure_deps.\"\n+      program_details 'aclocal'\n       ;;\n-    autom4te*)\n+   autom4te*)\n       echo \"You might have modified some maintainer files that require\"\n       echo \"the 'autom4te' program to be rebuilt.\"\n-      ;;\n-    autoreconf*)\n-      echo \"You should only need it if you modified $aclocal_deps or\"\n-      echo \"$automake_deps or $autoheader_deps or $automake_deps or\"\n-      echo \"$configure_deps.\"\n+      program_details 'autom4te'\n       ;;\n     bison*|yacc*)\n       echo \"You should only need it if you modified a '.y' file.\"\n       echo \"You may want to install the GNU Bison package:\"\n       echo \"<$gnu_software_URL/bison/>\"\n       ;;\n+    lex*|flex*)\n+      echo \"You should only need it if you modified a '.l' file.\"\n+      echo \"You may want to install the Fast Lexical Analyzer package:\"\n+      echo \"<$flex_URL>\"\n+      ;;\n     help2man*)\n       echo \"You should only need it if you modified a dependency\" \\\n            \"of a man page.\"\n       echo \"You may want to install the GNU Help2man package:\"\n       echo \"<$gnu_software_URL/help2man/>\"\n     ;;\n-    lex*|flex*)\n-      echo \"You should only need it if you modified a '.l' file.\"\n-      echo \"You may want to install the Fast Lexical Analyzer package:\"\n-      echo \"<$flex_URL>\"\n-      ;;\n     makeinfo*)\n       echo \"You should only need it if you modified a '.texi' file, or\"\n       echo \"any other file indirectly affecting the aspect of the manual.\"\n@@ -203,12 +189,6 @@ give_advice ()\n       echo \"want to install GNU make:\"\n       echo \"<$gnu_software_URL/make/>\"\n       ;;\n-    perl*)\n-      echo \"You should only need it to run GNU Autoconf, GNU Automake, \"\n-      echo \"  assorted other tools, or if you modified a Perl source file.\"\n-      echo \"You may want to install the Perl 5 language interpreter:\"\n-      echo \"<$perl_URL>\"\n-      ;;\n     *)\n       echo \"You might have modified some files without having the proper\"\n       echo \"tools for further handling them.  Check the 'README' file, it\"\n@@ -217,7 +197,6 @@ give_advice ()\n       echo \"case some other package contains this missing '$1' program.\"\n       ;;\n   esac\n-  program_details \"$normalized_program\"\n }\n \n give_advice \"$1\" | sed -e '1s/^/WARNING: /' \\\n@@ -228,7 +207,7 @@ give_advice \"$1\" | sed -e '1s/^/WARNING: /' \\\n exit $st\n \n # Local variables:\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"scriptversion=\"\n # time-stamp-format: \"%:y-%02m-%02d.%02H\"\n # time-stamp-time-zone: \"UTC0\"\ndiff --git a/src/Makefile.in b/src/Makefile.in\nindex 0913eea..c5d818e 100644\n--- a/src/Makefile.in\n+++ b/src/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -141,7 +139,7 @@ am__recursive_targets = \\\n   $(RECURSIVE_CLEAN_TARGETS) \\\n   $(am__extra_recursive_targets)\n AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \\\n-\tdistdir distdir-am\n+\tdistdir\n am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)\n # Read a list of newline-separated strings from the standard input,\n # and print each of them once, without duplicates.  Input order is\n@@ -159,6 +157,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n DIST_SUBDIRS = lib conv fuzz test\n am__DIST_COMMON = $(srcdir)/Makefile.in\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -204,10 +204,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -232,10 +230,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -314,10 +310,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -350,7 +344,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -380,8 +373,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -497,10 +490,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -584,8 +575,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -677,10 +668,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/conv/Makefile.in b/src/conv/Makefile.in\nindex 5d11909..a475a2d 100644\n--- a/src/conv/Makefile.in\n+++ b/src/conv/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -138,7 +136,7 @@ am__recursive_targets = \\\n   $(RECURSIVE_CLEAN_TARGETS) \\\n   $(am__extra_recursive_targets)\n AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \\\n-\tdistdir distdir-am\n+\tdistdir\n am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)\n # Read a list of newline-separated strings from the standard input,\n # and print each of them once, without duplicates.  Input order is\n@@ -156,6 +154,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n DIST_SUBDIRS = $(SUBDIRS)\n am__DIST_COMMON = $(srcdir)/Makefile.in\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -201,10 +201,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -229,10 +227,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -311,10 +307,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -347,7 +341,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -377,8 +370,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -494,10 +487,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -581,8 +572,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -674,10 +665,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/conv/html/Makefile.in b/src/conv/html/Makefile.in\nindex 04058b9..0e8b07f 100644\n--- a/src/conv/html/Makefile.in\n+++ b/src/conv/html/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -129,8 +127,7 @@ am__v_at_0 = @\n am__v_at_1 = \n DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)\n depcomp = $(SHELL) $(top_srcdir)/depcomp\n-am__maybe_remake_depfiles = depfiles\n-am__depfiles_remade = ./$(DEPDIR)/ebook2html.Po\n+am__depfiles_maybe = depfiles\n am__mv = mv -f\n CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \\\n \t$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)\n@@ -174,6 +171,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ebook2html.rc.in \\\n \t$(top_srcdir)/depcomp\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -194,10 +193,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -222,10 +219,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -304,10 +299,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -340,7 +333,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -399,8 +391,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -452,11 +444,16 @@ uninstall-binPROGRAMS:\n \t`; \\\n \ttest -n \"$$list\" || exit 0; \\\n \techo \" ( cd '$(DESTDIR)$(bindir)' && rm -f\" $$files \")\"; \\\n-\tcd \"$(DESTDIR)$(bindir)\" && $(am__rm_f) $$files\n+\tcd \"$(DESTDIR)$(bindir)\" && rm -f $$files\n \n clean-binPROGRAMS:\n-\t$(am__rm_f) $(bin_PROGRAMS)\n-\ttest -z \"$(EXEEXT)\" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)\n+\t@list='$(bin_PROGRAMS)'; test -n \"$$list\" || exit 0; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list || exit $$?; \\\n+\ttest -n \"$(EXEEXT)\" || exit 0; \\\n+\tlist=`for p in $$list; do echo \"$$p\"; done | sed 's/$(EXEEXT)$$//'`; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list\n \n ebook2html$(EXEEXT): $(ebook2html_OBJECTS) $(ebook2html_DEPENDENCIES) $(EXTRA_ebook2html_DEPENDENCIES) \n \t@rm -f ebook2html$(EXEEXT)\n@@ -468,13 +465,7 @@ mostlyclean-compile:\n distclean-compile:\n \t-rm -f *.tab.c\n \n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ebook2html.Po@am__quote@ # am--include-marker\n-\n-$(am__depfiles_remade):\n-\t@$(MKDIR_P) $(@D)\n-\t@: >>$@\n-\n-am--depfiles: $(am__depfiles_remade)\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ebook2html.Po@am__quote@\n \n .cpp.o:\n @am__fastdepCXX_TRUE@\t$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<\n@@ -554,10 +545,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -618,8 +607,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -629,7 +618,7 @@ clean: clean-am\n clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am\n \n distclean: distclean-am\n-\t-rm -f ./$(DEPDIR)/ebook2html.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n distclean-am: clean-am distclean-compile distclean-generic \\\n \tdistclean-tags\n@@ -675,7 +664,7 @@ install-ps-am:\n installcheck-am:\n \n maintainer-clean: maintainer-clean-am\n-\t-rm -f ./$(DEPDIR)/ebook2html.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n maintainer-clean-am: distclean-am maintainer-clean-generic\n \n@@ -696,7 +685,7 @@ uninstall-am: uninstall-binPROGRAMS\n \n .MAKE: install-am install-strip\n \n-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \\\n+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \\\n \tclean-binPROGRAMS clean-generic clean-libtool cscopelist-am \\\n \tctags ctags-am distclean distclean-compile distclean-generic \\\n \tdistclean-libtool distclean-tags distdir dvi dvi-am html \\\n@@ -720,10 +709,3 @@ uninstall-am: uninstall-binPROGRAMS\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/conv/raw/Makefile.in b/src/conv/raw/Makefile.in\nindex 37b0593..857c1b3 100644\n--- a/src/conv/raw/Makefile.in\n+++ b/src/conv/raw/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -129,8 +127,7 @@ am__v_at_0 = @\n am__v_at_1 = \n DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)\n depcomp = $(SHELL) $(top_srcdir)/depcomp\n-am__maybe_remake_depfiles = depfiles\n-am__depfiles_remade = ./$(DEPDIR)/ebook2raw.Po\n+am__depfiles_maybe = depfiles\n am__mv = mv -f\n CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \\\n \t$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)\n@@ -174,6 +171,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ebook2raw.rc.in \\\n \t$(top_srcdir)/depcomp\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -194,10 +193,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -222,10 +219,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -304,10 +299,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -340,7 +333,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -399,8 +391,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -452,11 +444,16 @@ uninstall-binPROGRAMS:\n \t`; \\\n \ttest -n \"$$list\" || exit 0; \\\n \techo \" ( cd '$(DESTDIR)$(bindir)' && rm -f\" $$files \")\"; \\\n-\tcd \"$(DESTDIR)$(bindir)\" && $(am__rm_f) $$files\n+\tcd \"$(DESTDIR)$(bindir)\" && rm -f $$files\n \n clean-binPROGRAMS:\n-\t$(am__rm_f) $(bin_PROGRAMS)\n-\ttest -z \"$(EXEEXT)\" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)\n+\t@list='$(bin_PROGRAMS)'; test -n \"$$list\" || exit 0; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list || exit $$?; \\\n+\ttest -n \"$(EXEEXT)\" || exit 0; \\\n+\tlist=`for p in $$list; do echo \"$$p\"; done | sed 's/$(EXEEXT)$$//'`; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list\n \n ebook2raw$(EXEEXT): $(ebook2raw_OBJECTS) $(ebook2raw_DEPENDENCIES) $(EXTRA_ebook2raw_DEPENDENCIES) \n \t@rm -f ebook2raw$(EXEEXT)\n@@ -468,13 +465,7 @@ mostlyclean-compile:\n distclean-compile:\n \t-rm -f *.tab.c\n \n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ebook2raw.Po@am__quote@ # am--include-marker\n-\n-$(am__depfiles_remade):\n-\t@$(MKDIR_P) $(@D)\n-\t@: >>$@\n-\n-am--depfiles: $(am__depfiles_remade)\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ebook2raw.Po@am__quote@\n \n .cpp.o:\n @am__fastdepCXX_TRUE@\t$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<\n@@ -554,10 +545,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -618,8 +607,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -629,7 +618,7 @@ clean: clean-am\n clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am\n \n distclean: distclean-am\n-\t-rm -f ./$(DEPDIR)/ebook2raw.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n distclean-am: clean-am distclean-compile distclean-generic \\\n \tdistclean-tags\n@@ -675,7 +664,7 @@ install-ps-am:\n installcheck-am:\n \n maintainer-clean: maintainer-clean-am\n-\t-rm -f ./$(DEPDIR)/ebook2raw.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n maintainer-clean-am: distclean-am maintainer-clean-generic\n \n@@ -696,7 +685,7 @@ uninstall-am: uninstall-binPROGRAMS\n \n .MAKE: install-am install-strip\n \n-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \\\n+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \\\n \tclean-binPROGRAMS clean-generic clean-libtool cscopelist-am \\\n \tctags ctags-am distclean distclean-compile distclean-generic \\\n \tdistclean-libtool distclean-tags distdir dvi dvi-am html \\\n@@ -720,10 +709,3 @@ uninstall-am: uninstall-binPROGRAMS\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/conv/text/Makefile.in b/src/conv/text/Makefile.in\nindex 7e4e4f6..38805a8 100644\n--- a/src/conv/text/Makefile.in\n+++ b/src/conv/text/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -129,8 +127,7 @@ am__v_at_0 = @\n am__v_at_1 = \n DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)\n depcomp = $(SHELL) $(top_srcdir)/depcomp\n-am__maybe_remake_depfiles = depfiles\n-am__depfiles_remade = ./$(DEPDIR)/ebook2text.Po\n+am__depfiles_maybe = depfiles\n am__mv = mv -f\n CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \\\n \t$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)\n@@ -174,6 +171,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/ebook2text.rc.in \\\n \t$(top_srcdir)/depcomp\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -194,10 +193,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -222,10 +219,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -304,10 +299,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -340,7 +333,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -399,8 +391,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -452,11 +444,16 @@ uninstall-binPROGRAMS:\n \t`; \\\n \ttest -n \"$$list\" || exit 0; \\\n \techo \" ( cd '$(DESTDIR)$(bindir)' && rm -f\" $$files \")\"; \\\n-\tcd \"$(DESTDIR)$(bindir)\" && $(am__rm_f) $$files\n+\tcd \"$(DESTDIR)$(bindir)\" && rm -f $$files\n \n clean-binPROGRAMS:\n-\t$(am__rm_f) $(bin_PROGRAMS)\n-\ttest -z \"$(EXEEXT)\" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)\n+\t@list='$(bin_PROGRAMS)'; test -n \"$$list\" || exit 0; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list || exit $$?; \\\n+\ttest -n \"$(EXEEXT)\" || exit 0; \\\n+\tlist=`for p in $$list; do echo \"$$p\"; done | sed 's/$(EXEEXT)$$//'`; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list\n \n ebook2text$(EXEEXT): $(ebook2text_OBJECTS) $(ebook2text_DEPENDENCIES) $(EXTRA_ebook2text_DEPENDENCIES) \n \t@rm -f ebook2text$(EXEEXT)\n@@ -468,13 +465,7 @@ mostlyclean-compile:\n distclean-compile:\n \t-rm -f *.tab.c\n \n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ebook2text.Po@am__quote@ # am--include-marker\n-\n-$(am__depfiles_remade):\n-\t@$(MKDIR_P) $(@D)\n-\t@: >>$@\n-\n-am--depfiles: $(am__depfiles_remade)\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ebook2text.Po@am__quote@\n \n .cpp.o:\n @am__fastdepCXX_TRUE@\t$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<\n@@ -554,10 +545,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -618,8 +607,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -629,7 +618,7 @@ clean: clean-am\n clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am\n \n distclean: distclean-am\n-\t-rm -f ./$(DEPDIR)/ebook2text.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n distclean-am: clean-am distclean-compile distclean-generic \\\n \tdistclean-tags\n@@ -675,7 +664,7 @@ install-ps-am:\n installcheck-am:\n \n maintainer-clean: maintainer-clean-am\n-\t-rm -f ./$(DEPDIR)/ebook2text.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n maintainer-clean-am: distclean-am maintainer-clean-generic\n \n@@ -696,7 +685,7 @@ uninstall-am: uninstall-binPROGRAMS\n \n .MAKE: install-am install-strip\n \n-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \\\n+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \\\n \tclean-binPROGRAMS clean-generic clean-libtool cscopelist-am \\\n \tctags ctags-am distclean distclean-compile distclean-generic \\\n \tdistclean-libtool distclean-tags distdir dvi dvi-am html \\\n@@ -720,10 +709,3 @@ uninstall-am: uninstall-binPROGRAMS\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/fuzz/Makefile.am b/src/fuzz/Makefile.am\nindex c631a5c..940edbb 100644\n--- a/src/fuzz/Makefile.am\n+++ b/src/fuzz/Makefile.am\n@@ -1,4 +1,4 @@\n-noinst_PROGRAMS = lrffuzzer pdbfuzzer fb2fuzzer\n+noinst_PROGRAMS = lrffuzzer pdbfuzzer\n \n AM_CXXFLAGS = -I$(top_srcdir)/inc \\\n \t$(REVENGE_GENERATORS_CFLAGS) \\\n@@ -22,8 +22,3 @@ pdbfuzzer_LDADD = $(commonfuzzer_ldadd)\n \n pdbfuzzer_SOURCES = \\\n \tpdbfuzzer.cpp\n-\n-fb2fuzzer_LDADD = $(commonfuzzer_ldadd)\n-\n-fb2fuzzer_SOURCES = \\\n-\tfb2fuzzer.cpp\ndiff --git a/src/fuzz/Makefile.in b/src/fuzz/Makefile.in\nindex 6b36652..b5939fa 100644\n--- a/src/fuzz/Makefile.in\n+++ b/src/fuzz/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -90,8 +88,7 @@ PRE_UNINSTALL = :\n POST_UNINSTALL = :\n build_triplet = @build@\n host_triplet = @host@\n-noinst_PROGRAMS = lrffuzzer$(EXEEXT) pdbfuzzer$(EXEEXT) \\\n-\tfb2fuzzer$(EXEEXT)\n+noinst_PROGRAMS = lrffuzzer$(EXEEXT) pdbfuzzer$(EXEEXT)\n subdir = src/fuzz\n ACLOCAL_M4 = $(top_srcdir)/aclocal.m4\n am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \\\n@@ -108,20 +105,17 @@ CONFIG_HEADER = $(top_builddir)/config.h\n CONFIG_CLEAN_FILES =\n CONFIG_CLEAN_VPATH_FILES =\n PROGRAMS = $(noinst_PROGRAMS)\n-am_fb2fuzzer_OBJECTS = fb2fuzzer.$(OBJEXT)\n-fb2fuzzer_OBJECTS = $(am_fb2fuzzer_OBJECTS)\n+am_lrffuzzer_OBJECTS = lrffuzzer.$(OBJEXT)\n+lrffuzzer_OBJECTS = $(am_lrffuzzer_OBJECTS)\n am__DEPENDENCIES_1 =\n am__DEPENDENCIES_2 = $(top_builddir)/src/lib/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@.la \\\n \t$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \\\n \t$(am__DEPENDENCIES_1)\n-fb2fuzzer_DEPENDENCIES = $(am__DEPENDENCIES_2)\n+lrffuzzer_DEPENDENCIES = $(am__DEPENDENCIES_2)\n AM_V_lt = $(am__v_lt_@AM_V@)\n am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)\n am__v_lt_0 = --silent\n am__v_lt_1 = \n-am_lrffuzzer_OBJECTS = lrffuzzer.$(OBJEXT)\n-lrffuzzer_OBJECTS = $(am_lrffuzzer_OBJECTS)\n-lrffuzzer_DEPENDENCIES = $(am__DEPENDENCIES_2)\n am_pdbfuzzer_OBJECTS = pdbfuzzer.$(OBJEXT)\n pdbfuzzer_OBJECTS = $(am_pdbfuzzer_OBJECTS)\n pdbfuzzer_DEPENDENCIES = $(am__DEPENDENCIES_2)\n@@ -139,9 +133,7 @@ am__v_at_0 = @\n am__v_at_1 = \n DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)\n depcomp = $(SHELL) $(top_srcdir)/depcomp\n-am__maybe_remake_depfiles = depfiles\n-am__depfiles_remade = ./$(DEPDIR)/fb2fuzzer.Po \\\n-\t./$(DEPDIR)/lrffuzzer.Po ./$(DEPDIR)/pdbfuzzer.Po\n+am__depfiles_maybe = depfiles\n am__mv = mv -f\n CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \\\n \t$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)\n@@ -161,10 +153,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)\n am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)\n am__v_CXXLD_0 = @echo \"  CXXLD   \" $@;\n am__v_CXXLD_1 = \n-SOURCES = $(fb2fuzzer_SOURCES) $(lrffuzzer_SOURCES) \\\n-\t$(pdbfuzzer_SOURCES)\n-DIST_SOURCES = $(fb2fuzzer_SOURCES) $(lrffuzzer_SOURCES) \\\n-\t$(pdbfuzzer_SOURCES)\n+SOURCES = $(lrffuzzer_SOURCES) $(pdbfuzzer_SOURCES)\n+DIST_SOURCES = $(lrffuzzer_SOURCES) $(pdbfuzzer_SOURCES)\n am__can_run_installinfo = \\\n   case $$AM_UPDATE_INFO_DIR in \\\n     n|no|NO) false;; \\\n@@ -187,6 +177,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n ACLOCAL = @ACLOCAL@\n@@ -206,10 +198,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -234,10 +224,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -316,10 +304,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -352,7 +338,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -382,10 +367,6 @@ pdbfuzzer_LDADD = $(commonfuzzer_ldadd)\n pdbfuzzer_SOURCES = \\\n \tpdbfuzzer.cpp\n \n-fb2fuzzer_LDADD = $(commonfuzzer_ldadd)\n-fb2fuzzer_SOURCES = \\\n-\tfb2fuzzer.cpp\n-\n all: all-am\n \n .SUFFIXES:\n@@ -407,8 +388,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -421,12 +402,13 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)\n $(am__aclocal_m4_deps):\n \n clean-noinstPROGRAMS:\n-\t$(am__rm_f) $(noinst_PROGRAMS)\n-\ttest -z \"$(EXEEXT)\" || $(am__rm_f) $(noinst_PROGRAMS:$(EXEEXT)=)\n-\n-fb2fuzzer$(EXEEXT): $(fb2fuzzer_OBJECTS) $(fb2fuzzer_DEPENDENCIES) $(EXTRA_fb2fuzzer_DEPENDENCIES) \n-\t@rm -f fb2fuzzer$(EXEEXT)\n-\t$(AM_V_CXXLD)$(CXXLINK) $(fb2fuzzer_OBJECTS) $(fb2fuzzer_LDADD) $(LIBS)\n+\t@list='$(noinst_PROGRAMS)'; test -n \"$$list\" || exit 0; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list || exit $$?; \\\n+\ttest -n \"$(EXEEXT)\" || exit 0; \\\n+\tlist=`for p in $$list; do echo \"$$p\"; done | sed 's/$(EXEEXT)$$//'`; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list\n \n lrffuzzer$(EXEEXT): $(lrffuzzer_OBJECTS) $(lrffuzzer_DEPENDENCIES) $(EXTRA_lrffuzzer_DEPENDENCIES) \n \t@rm -f lrffuzzer$(EXEEXT)\n@@ -442,15 +424,8 @@ mostlyclean-compile:\n distclean-compile:\n \t-rm -f *.tab.c\n \n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fb2fuzzer.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lrffuzzer.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdbfuzzer.Po@am__quote@ # am--include-marker\n-\n-$(am__depfiles_remade):\n-\t@$(MKDIR_P) $(@D)\n-\t@: >>$@\n-\n-am--depfiles: $(am__depfiles_remade)\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lrffuzzer.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdbfuzzer.Po@am__quote@\n \n .cpp.o:\n @am__fastdepCXX_TRUE@\t$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<\n@@ -530,10 +505,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -591,8 +564,8 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -603,9 +576,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \\\n \tmostlyclean-am\n \n distclean: distclean-am\n-\t-rm -f ./$(DEPDIR)/fb2fuzzer.Po\n-\t-rm -f ./$(DEPDIR)/lrffuzzer.Po\n-\t-rm -f ./$(DEPDIR)/pdbfuzzer.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n distclean-am: clean-am distclean-compile distclean-generic \\\n \tdistclean-tags\n@@ -651,9 +622,7 @@ install-ps-am:\n installcheck-am:\n \n maintainer-clean: maintainer-clean-am\n-\t-rm -f ./$(DEPDIR)/fb2fuzzer.Po\n-\t-rm -f ./$(DEPDIR)/lrffuzzer.Po\n-\t-rm -f ./$(DEPDIR)/pdbfuzzer.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n maintainer-clean-am: distclean-am maintainer-clean-generic\n \n@@ -674,9 +643,9 @@ uninstall-am:\n \n .MAKE: install-am install-strip\n \n-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \\\n-\tclean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \\\n-\tctags ctags-am distclean distclean-compile distclean-generic \\\n+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \\\n+\tclean-libtool clean-noinstPROGRAMS cscopelist-am ctags \\\n+\tctags-am distclean distclean-compile distclean-generic \\\n \tdistclean-libtool distclean-tags distdir dvi dvi-am html \\\n \thtml-am info info-am install install-am install-data \\\n \tinstall-data-am install-dvi install-dvi-am install-exec \\\n@@ -694,10 +663,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/fuzz/fb2fuzzer.cpp b/src/fuzz/fb2fuzzer.cpp\ndeleted file mode 100644\nindex 8372195..0000000\n--- a/src/fuzz/fb2fuzzer.cpp\n+++ /dev/null\n@@ -1,27 +0,0 @@\n-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */\n-/*\n- * This file is part of the libe-book project.\n- *\n- * This Source Code Form is subject to the terms of the Mozilla Public\n- * License, v. 2.0. If a copy of the MPL was not distributed with this\n- * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n- */\n-\n-#include <cstddef>\n-#include <cstdint>\n-\n-#include <libe-book/libe-book.h>\n-\n-#include <librevenge-generators/RVNGDummyTextGenerator.h>\n-\n-#include <librevenge-stream/librevenge-stream.h>\n-\n-extern \"C\" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)\n-{\n-  librevenge::RVNGStringStream input(data, size);\n-  librevenge::RVNGDummyTextGenerator generator;\n-  libebook::EBOOKDocument::parse(&input, &generator, libebook::EBOOKDocument::TYPE_FICTIONBOOK2);\n-  return 0;\n-}\n-\n-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */\ndiff --git a/src/lib/BBeBCollector.cpp b/src/lib/BBeBCollector.cpp\nindex 2e44389..a32e2ee 100644\n--- a/src/lib/BBeBCollector.cpp\n+++ b/src/lib/BBeBCollector.cpp\n@@ -7,7 +7,6 @@\n  * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n  */\n \n-#include <algorithm>\n #include <unordered_map>\n \n #include <librevenge/librevenge.h>\ndiff --git a/src/lib/BBeBParser.cpp b/src/lib/BBeBParser.cpp\nindex c00b6bc..9ff088a 100644\n--- a/src/lib/BBeBParser.cpp\n+++ b/src/lib/BBeBParser.cpp\n@@ -272,7 +272,6 @@ BBeBParser::BBeBParser(librevenge::RVNGInputStream *const input, librevenge::RVN\n   , m_objectIndex()\n   , m_pageTree(0)\n   , m_toc()\n-  , m_objectNesting(0)\n {\n }\n \n@@ -380,35 +379,8 @@ void BBeBParser::readObjectIndex()\n   }\n }\n \n-namespace\n-{\n-\n-const unsigned BBEB_MAX_OBJECT_NESTING = 1 << 10;\n-\n-struct NestingGuard\n-{\n-  explicit NestingGuard(unsigned &nesting) : m_nesting(nesting)\n-  {\n-    ++m_nesting;\n-  }\n-  ~NestingGuard()\n-  {\n-    --m_nesting;\n-  }\n-  unsigned &m_nesting;\n-private:\n-  NestingGuard(const NestingGuard &);\n-  NestingGuard &operator=(const NestingGuard &);\n-};\n-\n-}\n-\n void BBeBParser::readObject(const unsigned id, const unsigned type)\n {\n-  if (m_objectNesting >= BBEB_MAX_OBJECT_NESTING)\n-    throw ParserException();\n-  const NestingGuard guard(m_objectNesting);\n-\n   auto it = m_objectIndex.find(id);\n   if (it == m_objectIndex.end())\n   {\ndiff --git a/src/lib/BBeBParser.h b/src/lib/BBeBParser.h\nindex a37e64c..3ccd177 100644\n--- a/src/lib/BBeBParser.h\n+++ b/src/lib/BBeBParser.h\n@@ -130,7 +130,6 @@ private:\n   ObjectIndex_t m_objectIndex;\n   unsigned m_pageTree;\n   ToC_t m_toc;\n-  unsigned m_objectNesting;\n };\n \n } // namespace libebook\ndiff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp\nindex c9f8be0..0d85fa3 100644\n--- a/src/lib/EBOOKCharsetConverter.cpp\n+++ b/src/lib/EBOOKCharsetConverter.cpp\n@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *const in, const unsigned le\n       m_converterToUTF8.get(), m_converterToUnicode.get(),\n       &outText, outText + out.size(), &inText, inText + length,\n       nullptr, nullptr, nullptr, nullptr,\n-      true, true, &status)\n+      TRUE, TRUE, &status)\n     ;\n     if (status==U_BUFFER_OVERFLOW_ERROR)\n     {\ndiff --git a/src/lib/EBOOKDocument.cpp b/src/lib/EBOOKDocument.cpp\nindex c2bf64b..7895321 100644\n--- a/src/lib/EBOOKDocument.cpp\n+++ b/src/lib/EBOOKDocument.cpp\n@@ -134,7 +134,7 @@ EBOOKDocument::Type detectXML(RVNGInputStream *const input) try\n \n   if (isXML(input))\n   {\n-    const auto reader = makeXmlReader(input);\n+    const shared_ptr<xmlTextReader> reader(xmlReaderForIO(ebookXMLReadFromStream, ebookXMLCloseStream, input, \"\", nullptr, 0), xmlFreeTextReader);\n \n     if (bool(reader))\n     {\n@@ -147,11 +147,11 @@ EBOOKDocument::Type detectXML(RVNGInputStream *const input) try\n         {\n           const char *const name = char_cast(xmlTextReaderConstLocalName(reader.get()));\n           const char *const uri = char_cast(xmlTextReaderConstNamespaceUri(reader.get()));\n-          if ((+EBOOKHTMLToken::html | EBOOKHTMLToken::NS_html) == getHTMLTokenId(name, uri))\n+          if ((EBOOKHTMLToken::html | EBOOKHTMLToken::NS_html) == getHTMLTokenId(name, uri))\n             type = EBOOKDocument::TYPE_XHTML;\n-          else if ((+EPubToken::container | EPubToken::NS_container) == getEPubTokenId(name, uri))\n+          else if ((EPubToken::container | EPubToken::NS_container) == getEPubTokenId(name, uri))\n             type = EBOOKDocument::TYPE_EPUB;\n-          else if ((+EBOOKOPFToken::package | EBOOKOPFToken::NS_opf) == getOPFTokenId(name, uri))\n+          else if ((EBOOKOPFToken::package | EBOOKOPFToken::NS_opf) == getOPFTokenId(name, uri))\n             type = EBOOKDocument::TYPE_EPUB;\n           else if (EBOOKOPFToken::package == getOPFTokenId(name, uri))\n             type = EBOOKDocument::TYPE_OPENEBOOK;\n@@ -570,8 +570,6 @@ EBOOKAPI EBOOKDocument::Result EBOOKDocument::parse(librevenge::RVNGInputStream\n       if (!findFB2Stream(input_, id))\n         return RESULT_PACKAGE_ERROR;\n       fb2Input.reset(input_->getSubStreamById(id));\n-      if (!fb2Input)\n-        return RESULT_PACKAGE_ERROR;\n     }\n     FictionBook2Parser parser(fb2Input.get());\n     return parser.parse(document) ? RESULT_OK : RESULT_UNKNOWN_ERROR;\ndiff --git a/src/lib/EBOOKMemoryStream.cpp b/src/lib/EBOOKMemoryStream.cpp\nindex 627027e..90fb7ba 100644\n--- a/src/lib/EBOOKMemoryStream.cpp\n+++ b/src/lib/EBOOKMemoryStream.cpp\n@@ -74,9 +74,8 @@ const unsigned char *EBOOKMemoryStream::read(unsigned long numBytes, unsigned lo\n   if ((0 == numBytes) || (0 == m_length))\n     return nullptr;\n \n-  const unsigned long remaining = static_cast<unsigned long>(m_length - m_pos);\n-  if (numBytes > remaining)\n-    numBytes = remaining;\n+  if ((static_cast<unsigned long>(m_pos) + numBytes) >= static_cast<unsigned long>(m_length))\n+    numBytes = static_cast<unsigned long>(m_length - m_pos);\n \n   const long oldPos = m_pos;\n   m_pos += numBytes;\ndiff --git a/src/lib/EBOOKOutputElements.cpp b/src/lib/EBOOKOutputElements.cpp\nindex 2ce6edb..4959a89 100644\n--- a/src/lib/EBOOKOutputElements.cpp\n+++ b/src/lib/EBOOKOutputElements.cpp\n@@ -9,32 +9,17 @@\n \n #include \"EBOOKOutputElements.h\"\n \n-#include \"libebook_utils.h\"\n-\n namespace libebook\n {\n \n-namespace\n-{\n-\n-typedef EBOOKOutputElements::OutputElementsMap_t OutputElementsMap_t;\n-\n-template<typename T, typename... Args>\n-std::unique_ptr<T> make_unique(Args &&... args)\n-{\n-  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));\n-}\n-\n-}\n-\n class EBOOKOutputElement\n {\n public:\n   EBOOKOutputElement() {}\n   virtual ~EBOOKOutputElement() {}\n   virtual void write(librevenge::RVNGTextInterface *iface,\n-                     const OutputElementsMap_t *footers,\n-                     const OutputElementsMap_t *headers) const = 0;\n+                     const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+                     const std::map<int, std::list<EBOOKOutputElement *> > *headers) const = 0;\n };\n \n namespace\n@@ -46,8 +31,8 @@ public:\n   CloseEndnoteElement() {}\n   ~CloseEndnoteElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n };\n \n class CloseFooterElement : public EBOOKOutputElement\n@@ -56,8 +41,8 @@ public:\n   CloseFooterElement() {}\n   ~CloseFooterElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n };\n \n class CloseFootnoteElement : public EBOOKOutputElement\n@@ -66,8 +51,8 @@ public:\n   CloseFootnoteElement() {}\n   ~CloseFootnoteElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n };\n \n class CloseFrameElement : public EBOOKOutputElement\n@@ -76,8 +61,8 @@ public:\n   CloseFrameElement() {}\n   ~CloseFrameElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n };\n \n class CloseHeaderElement : public EBOOKOutputElement\n@@ -86,8 +71,8 @@ public:\n   CloseHeaderElement() {}\n   ~CloseHeaderElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n };\n \n class CloseLinkElement : public EBOOKOutputElement\n@@ -96,8 +81,12 @@ public:\n   CloseLinkElement() {}\n   ~CloseLinkElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseLinkElement();\n+  }\n };\n \n class CloseListElementElement : public EBOOKOutputElement\n@@ -106,8 +95,12 @@ public:\n   CloseListElementElement() {}\n   ~CloseListElementElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseListElementElement();\n+  }\n };\n \n class CloseOrderedListLevelElement : public EBOOKOutputElement\n@@ -116,8 +109,12 @@ public:\n   CloseOrderedListLevelElement() {}\n   ~CloseOrderedListLevelElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseOrderedListLevelElement();\n+  }\n };\n \n class ClosePageSpanElement : public EBOOKOutputElement\n@@ -126,8 +123,12 @@ public:\n   ClosePageSpanElement() {}\n   ~ClosePageSpanElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new ClosePageSpanElement();\n+  }\n };\n \n class CloseParagraphElement : public EBOOKOutputElement\n@@ -136,8 +137,12 @@ public:\n   CloseParagraphElement() {}\n   ~CloseParagraphElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseParagraphElement();\n+  }\n };\n \n class CloseSectionElement : public EBOOKOutputElement\n@@ -146,8 +151,12 @@ public:\n   CloseSectionElement() {}\n   ~CloseSectionElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseSectionElement();\n+  }\n };\n \n class CloseSpanElement : public EBOOKOutputElement\n@@ -156,8 +165,12 @@ public:\n   CloseSpanElement() {}\n   ~CloseSpanElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseSpanElement();\n+  }\n };\n \n class CloseTableElement : public EBOOKOutputElement\n@@ -166,8 +179,12 @@ public:\n   CloseTableElement() {}\n   ~CloseTableElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseTableElement();\n+  }\n };\n \n class CloseTableCellElement : public EBOOKOutputElement\n@@ -176,8 +193,12 @@ public:\n   CloseTableCellElement() {}\n   ~CloseTableCellElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseTableCellElement();\n+  }\n };\n \n class CloseTableRowElement : public EBOOKOutputElement\n@@ -186,8 +207,12 @@ public:\n   CloseTableRowElement() {}\n   ~CloseTableRowElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseTableRowElement();\n+  }\n };\n \n class CloseUnorderedListLevelElement : public EBOOKOutputElement\n@@ -196,8 +221,12 @@ public:\n   CloseUnorderedListLevelElement() {}\n   ~CloseUnorderedListLevelElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new CloseUnorderedListLevelElement();\n+  }\n };\n \n class InsertBinaryObjectElement : public EBOOKOutputElement\n@@ -207,8 +236,12 @@ public:\n     m_propList(propList) {}\n   ~InsertBinaryObjectElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new InsertBinaryObjectElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -220,8 +253,12 @@ public:\n     m_propList(propList) {}\n   ~InsertCoveredTableCellElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new InsertCoveredTableCellElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -232,8 +269,12 @@ public:\n   InsertLineBreakElement() {}\n   ~InsertLineBreakElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new InsertLineBreakElement();\n+  }\n };\n \n class InsertSpaceElement : public EBOOKOutputElement\n@@ -242,8 +283,12 @@ public:\n   InsertSpaceElement() {}\n   ~InsertSpaceElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new InsertSpaceElement();\n+  }\n };\n \n class InsertTabElement : public EBOOKOutputElement\n@@ -252,8 +297,12 @@ public:\n   InsertTabElement() {}\n   ~InsertTabElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new InsertTabElement();\n+  }\n };\n \n class InsertTextElement : public EBOOKOutputElement\n@@ -263,8 +312,12 @@ public:\n     m_text(text) {}\n   ~InsertTextElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new InsertTextElement(m_text);\n+  }\n private:\n   librevenge::RVNGString m_text;\n };\n@@ -276,8 +329,12 @@ public:\n     m_propList(propList) {}\n   ~OpenEndnoteElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new OpenEndnoteElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -289,8 +346,12 @@ public:\n     m_propList(propList) {}\n   ~OpenFooterElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new OpenFooterElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -302,8 +363,12 @@ public:\n     m_propList(propList) {}\n   ~OpenFootnoteElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new OpenFootnoteElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -315,8 +380,12 @@ public:\n     m_propList(propList) {}\n   ~OpenFrameElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new OpenFrameElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -328,8 +397,12 @@ public:\n     m_propList(propList) {}\n   ~OpenHeaderElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n+  EBOOKOutputElement *clone()\n+  {\n+    return new OpenHeaderElement(m_propList);\n+  }\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -341,8 +414,8 @@ public:\n     m_propList(propList) {}\n   ~OpenLinkElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -354,8 +427,8 @@ public:\n     m_propList(propList) {}\n   ~OpenListElementElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -367,8 +440,8 @@ public:\n     m_propList(propList) {}\n   ~OpenOrderedListLevelElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -390,11 +463,11 @@ public:\n     m_headerLast(headerLast) {}\n   ~OpenPageSpanElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   void _writeElements(librevenge::RVNGTextInterface *iface, int id,\n-                      const OutputElementsMap_t *elements) const;\n+                      const std::map<int, std::list<EBOOKOutputElement *> > *elements) const;\n   librevenge::RVNGPropertyList m_propList;\n   int m_footer;\n   int m_footerLeft;\n@@ -413,8 +486,8 @@ public:\n     m_propList(propList) {}\n   ~OpenParagraphElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -426,8 +499,8 @@ public:\n     m_propList(propList) {}\n   ~OpenSectionElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -439,8 +512,8 @@ public:\n     m_propList(propList) {}\n   ~OpenSpanElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -452,8 +525,8 @@ public:\n     m_propList(propList) {}\n   ~OpenTableElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -465,8 +538,8 @@ public:\n     m_propList(propList) {}\n   ~OpenTableCellElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -478,8 +551,8 @@ public:\n     m_propList(propList) {}\n   ~OpenTableRowElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -491,8 +564,8 @@ public:\n     m_propList(propList) {}\n   ~OpenUnorderedListLevelElement() override {}\n   void write(librevenge::RVNGTextInterface *iface,\n-             const OutputElementsMap_t *footers,\n-             const OutputElementsMap_t *headers) const override;\n+             const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+             const std::map<int, std::list<EBOOKOutputElement *> > *headers) const override;\n private:\n   librevenge::RVNGPropertyList m_propList;\n };\n@@ -500,248 +573,248 @@ private:\n }\n \n void CloseEndnoteElement::write(librevenge::RVNGTextInterface *iface,\n-                                const OutputElementsMap_t *,\n-                                const OutputElementsMap_t *) const\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeEndnote();\n }\n \n void CloseFooterElement::write(librevenge::RVNGTextInterface *iface,\n-                               const OutputElementsMap_t *,\n-                               const OutputElementsMap_t *) const\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeFooter();\n }\n \n void CloseFootnoteElement::write(librevenge::RVNGTextInterface *iface,\n-                                 const OutputElementsMap_t *,\n-                                 const OutputElementsMap_t *) const\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeFootnote();\n }\n \n void CloseFrameElement::write(librevenge::RVNGTextInterface *iface,\n-                              const OutputElementsMap_t *,\n-                              const OutputElementsMap_t *) const\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeFrame();\n }\n \n void CloseHeaderElement::write(librevenge::RVNGTextInterface *iface,\n-                               const OutputElementsMap_t *,\n-                               const OutputElementsMap_t *) const\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeHeader();\n }\n \n void CloseLinkElement::write(librevenge::RVNGTextInterface *iface,\n-                             const OutputElementsMap_t *,\n-                             const OutputElementsMap_t *) const\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeLink();\n }\n \n void CloseListElementElement::write(librevenge::RVNGTextInterface *iface,\n-                                    const OutputElementsMap_t *,\n-                                    const OutputElementsMap_t *) const\n+                                    const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                    const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeListElement();\n }\n \n void CloseOrderedListLevelElement::write(librevenge::RVNGTextInterface *iface,\n-                                         const OutputElementsMap_t *,\n-                                         const OutputElementsMap_t *) const\n+                                         const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                         const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeOrderedListLevel();\n }\n \n void ClosePageSpanElement::write(librevenge::RVNGTextInterface *iface,\n-                                 const OutputElementsMap_t *,\n-                                 const OutputElementsMap_t *) const\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closePageSpan();\n }\n \n void CloseParagraphElement::write(librevenge::RVNGTextInterface *iface,\n-                                  const OutputElementsMap_t *,\n-                                  const OutputElementsMap_t *) const\n+                                  const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                  const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeParagraph();\n }\n \n void CloseSectionElement::write(librevenge::RVNGTextInterface *iface,\n-                                const OutputElementsMap_t *,\n-                                const OutputElementsMap_t *) const\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeSection();\n }\n \n void CloseSpanElement::write(librevenge::RVNGTextInterface *iface,\n-                             const OutputElementsMap_t *,\n-                             const OutputElementsMap_t *) const\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeSpan();\n }\n \n void CloseTableElement::write(librevenge::RVNGTextInterface *iface,\n-                              const OutputElementsMap_t *,\n-                              const OutputElementsMap_t *) const\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeTable();\n }\n \n void CloseTableCellElement::write(librevenge::RVNGTextInterface *iface,\n-                                  const OutputElementsMap_t *,\n-                                  const OutputElementsMap_t *) const\n+                                  const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                  const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeTableCell();\n }\n \n void CloseTableRowElement::write(librevenge::RVNGTextInterface *iface,\n-                                 const OutputElementsMap_t *,\n-                                 const OutputElementsMap_t *) const\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeTableRow();\n }\n \n void CloseUnorderedListLevelElement::write(librevenge::RVNGTextInterface *iface,\n-                                           const OutputElementsMap_t *,\n-                                           const OutputElementsMap_t *) const\n+                                           const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                           const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->closeUnorderedListLevel();\n }\n \n void InsertBinaryObjectElement::write(librevenge::RVNGTextInterface *iface,\n-                                      const OutputElementsMap_t *,\n-                                      const OutputElementsMap_t *) const\n+                                      const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                      const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->insertBinaryObject(m_propList);\n }\n \n void InsertCoveredTableCellElement::write(librevenge::RVNGTextInterface *iface,\n-                                          const OutputElementsMap_t *,\n-                                          const OutputElementsMap_t *) const\n+                                          const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                          const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->insertCoveredTableCell(m_propList);\n }\n \n void InsertLineBreakElement::write(librevenge::RVNGTextInterface *iface,\n-                                   const OutputElementsMap_t *,\n-                                   const OutputElementsMap_t *) const\n+                                   const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                   const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->insertLineBreak();\n }\n \n void InsertSpaceElement::write(librevenge::RVNGTextInterface *iface,\n-                               const OutputElementsMap_t *,\n-                               const OutputElementsMap_t *) const\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->insertSpace();\n }\n \n void InsertTabElement::write(librevenge::RVNGTextInterface *iface,\n-                             const OutputElementsMap_t *,\n-                             const OutputElementsMap_t *) const\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->insertTab();\n }\n \n void InsertTextElement::write(librevenge::RVNGTextInterface *iface,\n-                              const OutputElementsMap_t *,\n-                              const OutputElementsMap_t *) const\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->insertText(m_text);\n }\n \n void OpenEndnoteElement::write(librevenge::RVNGTextInterface *iface,\n-                               const OutputElementsMap_t *,\n-                               const OutputElementsMap_t *) const\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openEndnote(m_propList);\n }\n \n void OpenFooterElement::write(librevenge::RVNGTextInterface *iface,\n-                              const OutputElementsMap_t *,\n-                              const OutputElementsMap_t *) const\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openFooter(m_propList);\n }\n \n void OpenFootnoteElement::write(librevenge::RVNGTextInterface *iface,\n-                                const OutputElementsMap_t *,\n-                                const OutputElementsMap_t *) const\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openFootnote(m_propList);\n }\n \n void OpenFrameElement::write(librevenge::RVNGTextInterface *iface,\n-                             const OutputElementsMap_t *,\n-                             const OutputElementsMap_t *) const\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openFrame(m_propList);\n }\n \n void OpenHeaderElement::write(librevenge::RVNGTextInterface *iface,\n-                              const OutputElementsMap_t *,\n-                              const OutputElementsMap_t *) const\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                              const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openHeader(m_propList);\n }\n \n void OpenLinkElement::write(librevenge::RVNGTextInterface *iface,\n-                            const OutputElementsMap_t *,\n-                            const OutputElementsMap_t *) const\n+                            const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                            const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openLink(m_propList);\n }\n \n void OpenListElementElement::write(librevenge::RVNGTextInterface *iface,\n-                                   const OutputElementsMap_t *,\n-                                   const OutputElementsMap_t *) const\n+                                   const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                   const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openListElement(m_propList);\n }\n \n void OpenOrderedListLevelElement::write(librevenge::RVNGTextInterface *iface,\n-                                        const OutputElementsMap_t *,\n-                                        const OutputElementsMap_t *) const\n+                                        const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                        const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openOrderedListLevel(m_propList);\n }\n \n void OpenPageSpanElement::write(librevenge::RVNGTextInterface *iface,\n-                                const OutputElementsMap_t *footers,\n-                                const OutputElementsMap_t *headers) const\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *footers,\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *headers) const\n {\n   if (iface)\n   {\n@@ -763,7 +836,7 @@ void OpenPageSpanElement::write(librevenge::RVNGTextInterface *iface,\n }\n \n void OpenPageSpanElement::_writeElements(librevenge::RVNGTextInterface *iface, int id,\n-                                         const OutputElementsMap_t *elements) const\n+                                         const std::map<int, std::list<EBOOKOutputElement *> > *elements) const\n {\n   if (!elements || id < 0 || !iface)\n     return;\n@@ -772,61 +845,61 @@ void OpenPageSpanElement::_writeElements(librevenge::RVNGTextInterface *iface, i\n   if (iterMap == elements->end() || iterMap->second.empty())\n     return;\n \n-  for (const auto &iterVec : iterMap->second)\n+  for (auto iterVec : iterMap->second)\n     iterVec->write(iface, nullptr, nullptr);\n }\n \n void OpenParagraphElement::write(librevenge::RVNGTextInterface *iface,\n-                                 const OutputElementsMap_t *,\n-                                 const OutputElementsMap_t *) const\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openParagraph(m_propList);\n }\n \n void OpenSectionElement::write(librevenge::RVNGTextInterface *iface,\n-                               const OutputElementsMap_t *,\n-                               const OutputElementsMap_t *) const\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                               const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openSection(m_propList);\n }\n \n void OpenSpanElement::write(librevenge::RVNGTextInterface *iface,\n-                            const OutputElementsMap_t *,\n-                            const OutputElementsMap_t *) const\n+                            const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                            const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openSpan(m_propList);\n }\n \n void OpenTableElement::write(librevenge::RVNGTextInterface *iface,\n-                             const OutputElementsMap_t *,\n-                             const OutputElementsMap_t *) const\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                             const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openTable(m_propList);\n }\n \n void OpenTableCellElement::write(librevenge::RVNGTextInterface *iface,\n-                                 const OutputElementsMap_t *,\n-                                 const OutputElementsMap_t *) const\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                 const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openTableCell(m_propList);\n }\n \n void OpenTableRowElement::write(librevenge::RVNGTextInterface *iface,\n-                                const OutputElementsMap_t *,\n-                                const OutputElementsMap_t *) const\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openTableRow(m_propList);\n }\n \n void OpenUnorderedListLevelElement::write(librevenge::RVNGTextInterface *iface,\n-                                          const OutputElementsMap_t *,\n-                                          const OutputElementsMap_t *) const\n+                                          const std::map<int, std::list<EBOOKOutputElement *> > *,\n+                                          const std::map<int, std::list<EBOOKOutputElement *> > *) const\n {\n   if (iface)\n     iface->openUnorderedListLevel(m_propList);\n@@ -842,152 +915,168 @@ EBOOKOutputElements::EBOOKOutputElements()\n \n EBOOKOutputElements::~EBOOKOutputElements()\n {\n+  m_elements = nullptr;\n+  std::list<EBOOKOutputElement *>::iterator iterVec;\n+  for (iterVec = m_bodyElements.begin(); iterVec != m_bodyElements.end(); ++iterVec)\n+    delete (*iterVec);\n+  std::map<int, std::list<EBOOKOutputElement *> >::iterator iterMap;\n+  for (iterMap = m_headerElements.begin(); iterMap != m_headerElements.end(); ++iterMap)\n+  {\n+    for (iterVec = iterMap->second.begin(); iterVec != iterMap->second.end(); ++iterVec)\n+      delete (*iterVec);\n+  }\n+  for (iterMap = m_footerElements.begin(); iterMap != m_footerElements.end(); ++iterMap)\n+  {\n+    for (iterVec = iterMap->second.begin(); iterVec != iterMap->second.end(); ++iterVec)\n+      delete (*iterVec);\n+  }\n }\n \n void EBOOKOutputElements::write(librevenge::RVNGTextInterface *iface) const\n {\n-  for (const auto &element : m_bodyElements)\n-    element->write(iface, &m_footerElements, &m_headerElements);\n+  std::list<EBOOKOutputElement *>::const_iterator iter;\n+  for (iter = m_bodyElements.begin(); iter != m_bodyElements.end(); ++iter)\n+    (*iter)->write(iface, &m_footerElements, &m_headerElements);\n }\n \n void EBOOKOutputElements::addCloseEndnote()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseEndnoteElement>());\n+    m_elements->push_back(new CloseEndnoteElement());\n }\n \n void EBOOKOutputElements::addCloseFooter()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseFooterElement>());\n+    m_elements->push_back(new CloseFooterElement());\n   m_elements = &m_bodyElements;\n }\n \n void EBOOKOutputElements::addCloseFootnote()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseFootnoteElement>());\n+    m_elements->push_back(new CloseFootnoteElement());\n }\n \n void EBOOKOutputElements::addCloseFrame()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseFrameElement>());\n+    m_elements->push_back(new CloseFrameElement());\n }\n \n void EBOOKOutputElements::addCloseHeader()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseHeaderElement>());\n+    m_elements->push_back(new CloseHeaderElement());\n   m_elements = &m_bodyElements;\n }\n \n void EBOOKOutputElements::addCloseLink()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseLinkElement>());\n+    m_elements->push_back(new CloseLinkElement());\n }\n \n void EBOOKOutputElements::addCloseListElement()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseListElementElement>());\n+    m_elements->push_back(new CloseListElementElement());\n }\n \n void EBOOKOutputElements::addCloseOrderedListLevel()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseOrderedListLevelElement>());\n+    m_elements->push_back(new CloseOrderedListLevelElement());\n }\n \n void EBOOKOutputElements::addClosePageSpan()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<ClosePageSpanElement>());\n+    m_elements->push_back(new ClosePageSpanElement());\n }\n \n void EBOOKOutputElements::addCloseParagraph()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseParagraphElement>());\n+    m_elements->push_back(new CloseParagraphElement());\n }\n \n void EBOOKOutputElements::addCloseSection()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseSectionElement>());\n+    m_elements->push_back(new CloseSectionElement());\n }\n \n void EBOOKOutputElements::addCloseSpan()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseSpanElement>());\n+    m_elements->push_back(new CloseSpanElement());\n }\n \n void EBOOKOutputElements::addCloseTable()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseTableElement>());\n+    m_elements->push_back(new CloseTableElement());\n }\n \n void EBOOKOutputElements::addCloseTableCell()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseTableCellElement>());\n+    m_elements->push_back(new CloseTableCellElement());\n }\n \n void EBOOKOutputElements::addCloseTableRow()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseTableRowElement>());\n+    m_elements->push_back(new CloseTableRowElement());\n }\n \n void EBOOKOutputElements::addCloseUnorderedListLevel()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<CloseUnorderedListLevelElement>());\n+    m_elements->push_back(new CloseUnorderedListLevelElement());\n }\n \n void EBOOKOutputElements::addInsertBinaryObject(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<InsertBinaryObjectElement>(propList));\n+    m_elements->push_back(new InsertBinaryObjectElement(propList));\n }\n \n void EBOOKOutputElements::addInsertCoveredTableCell(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<InsertCoveredTableCellElement>(propList));\n+    m_elements->push_back(new InsertCoveredTableCellElement(propList));\n }\n \n void EBOOKOutputElements::addInsertLineBreak()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<InsertLineBreakElement>());\n+    m_elements->push_back(new InsertLineBreakElement());\n }\n \n void EBOOKOutputElements::addInsertSpace()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<InsertSpaceElement>());\n+    m_elements->push_back(new InsertSpaceElement());\n }\n \n void EBOOKOutputElements::addInsertTab()\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<InsertTabElement>());\n+    m_elements->push_back(new InsertTabElement());\n }\n \n void EBOOKOutputElements::addInsertText(const librevenge::RVNGString &text)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<InsertTextElement>(text));\n+    m_elements->push_back(new InsertTextElement(text));\n }\n \n void EBOOKOutputElements::addOpenEndnote(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenEndnoteElement>(propList));\n+    m_elements->push_back(new OpenEndnoteElement(propList));\n }\n \n void EBOOKOutputElements::addOpenFooter(const librevenge::RVNGPropertyList &propList, int id)\n@@ -998,19 +1087,19 @@ void EBOOKOutputElements::addOpenFooter(const librevenge::RVNGPropertyList &prop\n   // the existing one.\n   m_elements = &m_footerElements[id];\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenFooterElement>(propList));\n+    m_elements->push_back(new OpenFooterElement(propList));\n }\n \n void EBOOKOutputElements::addOpenFootnote(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenFootnoteElement>(propList));\n+    m_elements->push_back(new OpenFootnoteElement(propList));\n }\n \n void EBOOKOutputElements::addOpenFrame(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenFrameElement>(propList));\n+    m_elements->push_back(new OpenFrameElement(propList));\n }\n \n void EBOOKOutputElements::addOpenHeader(const librevenge::RVNGPropertyList &propList, int id)\n@@ -1018,25 +1107,25 @@ void EBOOKOutputElements::addOpenHeader(const librevenge::RVNGPropertyList &prop\n   // Check the comment in addOpenFooter to see what happens here\n   m_elements = &m_headerElements[id];\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenHeaderElement>(propList));\n+    m_elements->push_back(new OpenHeaderElement(propList));\n }\n \n void EBOOKOutputElements::addOpenLink(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenLinkElement>(propList));\n+    m_elements->push_back(new OpenLinkElement(propList));\n }\n \n void EBOOKOutputElements::addOpenListElement(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenListElementElement>(propList));\n+    m_elements->push_back(new OpenListElementElement(propList));\n }\n \n void EBOOKOutputElements::addOpenOrderedListLevel(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenOrderedListLevelElement>(propList));\n+    m_elements->push_back(new OpenOrderedListLevelElement(propList));\n }\n \n void EBOOKOutputElements::addOpenPageSpan(const librevenge::RVNGPropertyList &propList)\n@@ -1049,50 +1138,50 @@ void EBOOKOutputElements::addOpenPageSpan(const librevenge::RVNGPropertyList &pr\n                                           int header, int headerLeft, int headerFirst, int headerLast)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenPageSpanElement>(propList, footer, footerLeft, footerFirst, footerLast,\n-                                                           header, headerLeft, headerFirst, headerLast));\n+    m_elements->push_back(new OpenPageSpanElement(propList, footer, footerLeft, footerFirst, footerLast,\n+                                                  header, headerLeft, headerFirst, headerLast));\n }\n \n void EBOOKOutputElements::addOpenParagraph(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenParagraphElement>(propList));\n+    m_elements->push_back(new OpenParagraphElement(propList));\n }\n \n void EBOOKOutputElements::addOpenSection(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenSectionElement>(propList));\n+    m_elements->push_back(new OpenSectionElement(propList));\n }\n \n void EBOOKOutputElements::addOpenSpan(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenSpanElement>(propList));\n+    m_elements->push_back(new OpenSpanElement(propList));\n }\n \n void EBOOKOutputElements::addOpenTable(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenTableElement>(propList));\n+    m_elements->push_back(new OpenTableElement(propList));\n }\n \n void EBOOKOutputElements::addOpenTableCell(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenTableCellElement>(propList));\n+    m_elements->push_back(new OpenTableCellElement(propList));\n }\n \n void EBOOKOutputElements::addOpenTableRow(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenTableRowElement>(propList));\n+    m_elements->push_back(new OpenTableRowElement(propList));\n }\n \n void EBOOKOutputElements::addOpenUnorderedListLevel(const librevenge::RVNGPropertyList &propList)\n {\n   if (m_elements)\n-    m_elements->push_back(make_unique<OpenUnorderedListLevelElement>(propList));\n+    m_elements->push_back(new OpenUnorderedListLevelElement(propList));\n }\n \n }\ndiff --git a/src/lib/EBOOKOutputElements.h b/src/lib/EBOOKOutputElements.h\nindex dec419b..474e2f3 100644\n--- a/src/lib/EBOOKOutputElements.h\n+++ b/src/lib/EBOOKOutputElements.h\n@@ -12,7 +12,6 @@\n \n #include <list>\n #include <map>\n-#include <memory>\n \n #include <librevenge/librevenge.h>\n \n@@ -24,9 +23,6 @@ class EBOOKOutputElement;\n class EBOOKOutputElements\n {\n public:\n-  typedef std::list<std::unique_ptr<EBOOKOutputElement>> OutputElements_t;\n-  typedef std::map<int, OutputElements_t> OutputElementsMap_t;\n-\n   EBOOKOutputElements();\n   virtual ~EBOOKOutputElements();\n   void append(const EBOOKOutputElements &elements);\n@@ -80,10 +76,10 @@ public:\n private:\n   EBOOKOutputElements(const EBOOKOutputElements &);\n   EBOOKOutputElements &operator=(const EBOOKOutputElements &);\n-  OutputElements_t m_bodyElements;\n-  std::map<int, OutputElements_t> m_headerElements;\n-  std::map<int, OutputElements_t> m_footerElements;\n-  OutputElements_t *m_elements;\n+  std::list<EBOOKOutputElement *> m_bodyElements;\n+  std::map<int, std::list<EBOOKOutputElement *> > m_headerElements;\n+  std::map<int, std::list<EBOOKOutputElement *> > m_footerElements;\n+  std::list<EBOOKOutputElement *> *m_elements;\n };\n \n }\ndiff --git a/src/lib/EBOOKSAXParser.cpp b/src/lib/EBOOKSAXParser.cpp\nindex 967f691..2f3908a 100644\n--- a/src/lib/EBOOKSAXParser.cpp\n+++ b/src/lib/EBOOKSAXParser.cpp\n@@ -119,7 +119,8 @@ void EBOOKSAXParser::parse()\n {\n   m_input->seek(0, librevenge::RVNG_SEEK_SET);\n \n-  const auto reader = makeXmlReader(m_input.get());\n+  const std::shared_ptr<xmlTextReader> reader(xmlReaderForIO(ebookXMLReadFromStream, ebookXMLCloseStream, m_input.get(), \"\", 0, 0),\n+                                              xmlFreeTextReader);\n   if (!reader)\n     return;\n \ndiff --git a/src/lib/EBOOKStreamView.cpp b/src/lib/EBOOKStreamView.cpp\nindex 664e33c..eee73d1 100644\n--- a/src/lib/EBOOKStreamView.cpp\n+++ b/src/lib/EBOOKStreamView.cpp\n@@ -68,9 +68,8 @@ const unsigned char *EBOOKStreamView::read(unsigned long numBytes, unsigned long\n   const long pos = m_stream->tell();\n   assert((m_begin <= pos) && (pos <= m_end));\n \n-  const unsigned long remaining = static_cast<unsigned long>(m_end - pos);\n-  if (numBytes > remaining)\n-    numBytes = remaining;\n+  if ((pos + static_cast<long>(numBytes)) > m_end)\n+    numBytes = static_cast<unsigned long>(m_end - pos);\n \n   if (0 == numBytes)\n   {\ndiff --git a/src/lib/EBOOKXMLParser.cpp b/src/lib/EBOOKXMLParser.cpp\nindex f7ffdd7..7ce288f 100644\n--- a/src/lib/EBOOKXMLParser.cpp\n+++ b/src/lib/EBOOKXMLParser.cpp\n@@ -92,27 +92,26 @@ EBOOKXMLParser::~EBOOKXMLParser()\n \n bool EBOOKXMLParser::parse(const RVNGInputStreamPtr_t &input)\n {\n-  const auto reader = makeXmlReader(input.get());\n-  if (!reader)\n+  const shared_ptr<xmlTextReader> sharedReader(xmlReaderForIO(ebookXMLReadFromStream, ebookXMLCloseStream, input.get(), \"\", nullptr, 0), xmlFreeTextReader);\n+  if (!sharedReader)\n     return false;\n \n+  xmlTextReaderPtr reader = sharedReader.get();\n+\n   const EBOOKTokenizer &tokenizer = getTokenizer();\n   stack<shared_ptr<EBOOKXMLContext> > contextStack;\n \n   bool exited = false;\n-  int ret = xmlTextReaderRead(reader.get());\n+  int ret = xmlTextReaderRead(reader);\n   contextStack.push(createDocumentContext());\n \n   while (1 == ret)\n   {\n-    switch (xmlTextReaderNodeType(reader.get()))\n+    switch (xmlTextReaderNodeType(reader))\n     {\n     case XML_READER_TYPE_ELEMENT:\n     {\n-      const int id = tokenizer.getQualifiedId(\n-                       char_cast(xmlTextReaderConstLocalName(reader.get())),\n-                       char_cast(xmlTextReaderConstNamespaceUri(reader.get()))\n-                     );\n+      const int id = tokenizer.getQualifiedId(char_cast(xmlTextReaderConstLocalName(reader)), char_cast(xmlTextReaderConstNamespaceUri(reader)));\n \n       shared_ptr<EBOOKXMLContext> newContext = contextStack.top()->element(id);\n \n@@ -129,16 +128,16 @@ bool EBOOKXMLParser::parse(const RVNGInputStreamPtr_t &input)\n         }\n       }\n \n-      const bool isEmpty = xmlTextReaderIsEmptyElement(reader.get());\n+      const bool isEmpty = xmlTextReaderIsEmptyElement(reader);\n \n       newContext->startOfElement();\n-      if (xmlTextReaderHasAttributes(reader.get()))\n+      if (xmlTextReaderHasAttributes(reader))\n       {\n-        ret = xmlTextReaderMoveToFirstAttribute(reader.get());\n+        ret = xmlTextReaderMoveToFirstAttribute(reader);\n         while (1 == ret)\n         {\n-          processAttribute(reader.get(), newContext, tokenizer);\n-          ret = xmlTextReaderMoveToNextAttribute(reader.get());\n+          processAttribute(reader, newContext, tokenizer);\n+          ret = xmlTextReaderMoveToNextAttribute(reader);\n         }\n         newContext->endOfAttributes();\n       }\n@@ -158,8 +157,9 @@ bool EBOOKXMLParser::parse(const RVNGInputStreamPtr_t &input)\n     }\n     case XML_READER_TYPE_TEXT :\n     {\n-      std::unique_ptr<xmlChar, decltype(xmlFree)> text(xmlTextReaderReadString(reader.get()), xmlFree);\n-      contextStack.top()->text(char_cast(text.get()));\n+      xmlChar *const text = xmlTextReaderReadString(reader);\n+      contextStack.top()->text(char_cast(text));\n+      xmlFree(text);\n       break;\n     }\n     default:\n@@ -169,7 +169,7 @@ bool EBOOKXMLParser::parse(const RVNGInputStreamPtr_t &input)\n     if (exited)\n       ret = 0;\n     else\n-      ret = xmlTextReaderRead(reader.get());\n+      ret = xmlTextReaderRead(reader);\n   }\n \n   while (!contextStack.empty()) // finish parsing in case of broken XML\n@@ -177,7 +177,7 @@ bool EBOOKXMLParser::parse(const RVNGInputStreamPtr_t &input)\n     contextStack.top()->endOfElement();\n     contextStack.pop();\n   }\n-  xmlTextReaderClose(reader.get());\n+  xmlTextReaderClose(reader);\n \n   return !exited;\n }\ndiff --git a/src/lib/FictionBook2BinaryContext.cpp b/src/lib/FictionBook2BinaryContext.cpp\nindex c97a3f0..d21cac2 100644\n--- a/src/lib/FictionBook2BinaryContext.cpp\n+++ b/src/lib/FictionBook2BinaryContext.cpp\n@@ -16,14 +16,14 @@\n namespace libebook\n {\n \n-FictionBook2BinaryContext::FictionBook2BinaryContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *const collector)\n+FictionBook2BinaryContext::FictionBook2BinaryContext(FictionBook2ParserContext *const parentContext, FictionBook2Collector *const collector)\n   : FictionBook2NodeContextBase(parentContext, collector)\n   , m_id()\n   , m_contentType()\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2BinaryContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2BinaryContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\ndiff --git a/src/lib/FictionBook2BinaryContext.h b/src/lib/FictionBook2BinaryContext.h\nindex 151ed02..1abae4f 100644\n--- a/src/lib/FictionBook2BinaryContext.h\n+++ b/src/lib/FictionBook2BinaryContext.h\n@@ -20,10 +20,10 @@ namespace libebook\n class FictionBook2BinaryContext : public FictionBook2NodeContextBase\n {\n public:\n-  FictionBook2BinaryContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *collector);\n+  FictionBook2BinaryContext(FictionBook2ParserContext *parentContext, FictionBook2Collector *collector);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n   void text(const char *text) override;\ndiff --git a/src/lib/FictionBook2BlockContext.cpp b/src/lib/FictionBook2BlockContext.cpp\nindex b9704b0..384a473 100644\n--- a/src/lib/FictionBook2BlockContext.cpp\n+++ b/src/lib/FictionBook2BlockContext.cpp\n@@ -17,36 +17,36 @@\n namespace libebook\n {\n \n-FictionBook2BodyContext::FictionBook2BodyContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *const collector)\n+FictionBook2BodyContext::FictionBook2BodyContext(FictionBook2ParserContext *const parentContext, FictionBook2Collector *const collector)\n   : FictionBook2NodeContextBase(parentContext, collector)\n   , m_lang()\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2BodyContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2BodyContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::image :\n-      return std::make_shared<FictionBook2ImageContext>(shared_from_this());\n+      return new FictionBook2ImageContext(this);\n     case FictionBook2Token::title :\n     {\n       FictionBook2BlockFormat format;\n       format.headingLevel = 1;\n-      return std::make_shared<FictionBook2TitleContext>(shared_from_this(), format);\n+      return new FictionBook2TitleContext(this, format);\n     }\n     case FictionBook2Token::epigraph :\n-      return std::make_shared<FictionBook2EpigraphContext>(shared_from_this(), FictionBook2BlockFormat());\n+      return new FictionBook2EpigraphContext(this, FictionBook2BlockFormat());\n     case FictionBook2Token::section :\n-      return std::make_shared<FictionBook2SectionContext>(shared_from_this(), 1, m_lang);\n+      return new FictionBook2SectionContext(this, 1, m_lang);\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2BodyContext::startOfElement()\n@@ -65,33 +65,33 @@ void FictionBook2BodyContext::attribute(const FictionBook2TokenData &name, const\n     m_lang = value;\n }\n \n-FictionBook2CiteContext::FictionBook2CiteContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2CiteContext::FictionBook2CiteContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2CiteContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2CiteContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::p :\n-      return std::make_shared<FictionBook2PContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2PContext(this, getBlockFormat());\n     case FictionBook2Token::poem :\n-      return std::make_shared<FictionBook2PoemContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2PoemContext(this, getBlockFormat());\n     case FictionBook2Token::empty_line :\n-      return std::make_shared<FictionBook2EmptyLineContext>(shared_from_this());\n+      return new FictionBook2EmptyLineContext(this);\n     case FictionBook2Token::subtitle :\n-      return std::make_shared<FictionBook2SubtitleContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2SubtitleContext(this, getBlockFormat());\n     case FictionBook2Token::table :\n-      return std::make_shared<FictionBook2TableContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2TableContext(this, getBlockFormat());\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2CiteContext::endOfElement()\n@@ -106,7 +106,7 @@ void FictionBook2CiteContext::attribute(const FictionBook2TokenData &name, const\n     setLang(value);\n }\n \n-FictionBook2EmptyLineContext::FictionBook2EmptyLineContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2EmptyLineContext::FictionBook2EmptyLineContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2DataContextBase(parentContext)\n {\n }\n@@ -121,33 +121,33 @@ void FictionBook2EmptyLineContext::attribute(const FictionBook2TokenData &, cons\n {\n }\n \n-FictionBook2EpigraphContext::FictionBook2EpigraphContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2EpigraphContext::FictionBook2EpigraphContext(FictionBook2ParserContext *const parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2EpigraphContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2EpigraphContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::p :\n-      return std::make_shared<FictionBook2PContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2PContext(this, getBlockFormat());\n     case FictionBook2Token::poem :\n-      return std::make_shared<FictionBook2PoemContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2PoemContext(this, getBlockFormat());\n     case FictionBook2Token::cite :\n-      return std::make_shared<FictionBook2CiteContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2CiteContext(this, getBlockFormat());\n     case FictionBook2Token::empty_line :\n-      return std::make_shared<FictionBook2EmptyLineContext>(shared_from_this());\n+      return new FictionBook2EmptyLineContext(this);\n     case FictionBook2Token::text_author :\n-      return std::make_shared<FictionBook2TextAuthorContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2TextAuthorContext(this, getBlockFormat());\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2EpigraphContext::endOfElement()\n@@ -160,7 +160,7 @@ void FictionBook2EpigraphContext::attribute(const FictionBook2TokenData &name, c\n     getCollector()->defineID(value);\n }\n \n-FictionBook2ImageContext::FictionBook2ImageContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2ImageContext::FictionBook2ImageContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2NodeContextBase(parentContext)\n   , m_href()\n   , m_altText()\n@@ -168,7 +168,7 @@ FictionBook2ImageContext::FictionBook2ImageContext(std::shared_ptr<FictionBook2P\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2ImageContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2ImageContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -180,7 +180,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2ImageContext::element(\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2ImageContext::endOfElement()\n@@ -248,25 +248,25 @@ void FictionBook2ImageContext::attribute(const FictionBook2TokenData &name, cons\n   }\n }\n \n-FictionBook2PoemContext::FictionBook2PoemContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2PoemContext::FictionBook2PoemContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PoemContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2PoemContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::title :\n-      return std::make_shared<FictionBook2TitleContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2TitleContext(this, getBlockFormat());\n     case FictionBook2Token::epigraph :\n-      return std::make_shared<FictionBook2EpigraphContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2EpigraphContext(this, getBlockFormat());\n     case FictionBook2Token::stanza :\n-      return std::make_shared<FictionBook2StanzaContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2StanzaContext(this, getBlockFormat());\n     case FictionBook2Token::text_author :\n-      return std::make_shared<FictionBook2TextAuthorContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2TextAuthorContext(this, getBlockFormat());\n     case FictionBook2Token::date :\n       // ignore\n       break;\n@@ -275,7 +275,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PoemContext::element(c\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2PoemContext::startOfElement()\n@@ -296,21 +296,21 @@ void FictionBook2PoemContext::attribute(const FictionBook2TokenData &name, const\n     setLang(value);\n }\n \n-FictionBook2SectionContext::FictionBook2SectionContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const boost::optional<std::string> &lang)\n+FictionBook2SectionContext::FictionBook2SectionContext(FictionBook2ParserContext *const parentContext, const boost::optional<std::string> &lang)\n   : FictionBook2NodeContextBase(parentContext)\n   , m_level()\n   , m_lang(lang)\n {\n }\n \n-FictionBook2SectionContext::FictionBook2SectionContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const uint8_t level, const boost::optional<std::string> &lang)\n+FictionBook2SectionContext::FictionBook2SectionContext(FictionBook2ParserContext *const parentContext, const uint8_t level, const boost::optional<std::string> &lang)\n   : FictionBook2NodeContextBase(parentContext)\n   , m_level(level)\n   , m_lang(lang)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SectionContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2SectionContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n@@ -323,37 +323,37 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SectionContext::elemen\n         format.headingLevel = uint8_t(get(m_level) + 1);\n       if (bool(m_lang))\n         format.lang = get(m_lang);\n-      return std::make_shared<FictionBook2TitleContext>(shared_from_this(), format);\n+      return new FictionBook2TitleContext(this, format);\n     }\n     case FictionBook2Token::epigraph :\n-      return std::make_shared<FictionBook2EpigraphContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2EpigraphContext(this, makeBlockFormat());\n     case FictionBook2Token::image :\n-      return std::make_shared<FictionBook2ImageContext>(shared_from_this());\n+      return new FictionBook2ImageContext(this);\n     case FictionBook2Token::annotation :\n-      return std::make_shared<FictionBook2AnnotationContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2AnnotationContext(this, makeBlockFormat());\n     case FictionBook2Token::section :\n       if (bool(m_level))\n-        return std::make_shared<FictionBook2SectionContext>(shared_from_this(), uint8_t(get(m_level) + 1), m_lang);\n+        return new FictionBook2SectionContext(this, uint8_t(get(m_level) + 1), m_lang);\n       else\n-        return std::make_shared<FictionBook2SectionContext>(shared_from_this(), m_lang);\n+        return new FictionBook2SectionContext(this, m_lang);\n     case FictionBook2Token::p :\n-      return std::make_shared<FictionBook2PContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2PContext(this, makeBlockFormat());\n     case FictionBook2Token::poem :\n-      return std::make_shared<FictionBook2PoemContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2PoemContext(this, makeBlockFormat());\n     case FictionBook2Token::subtitle :\n-      return std::make_shared<FictionBook2SubtitleContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2SubtitleContext(this, makeBlockFormat());\n     case FictionBook2Token::cite :\n-      return std::make_shared<FictionBook2CiteContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2CiteContext(this, makeBlockFormat());\n     case FictionBook2Token::empty_line :\n-      return std::make_shared<FictionBook2EmptyLineContext>(shared_from_this());\n+      return new FictionBook2EmptyLineContext(this);\n     case FictionBook2Token::table :\n-      return std::make_shared<FictionBook2TableContext>(shared_from_this(), makeBlockFormat());\n+      return new FictionBook2TableContext(this, makeBlockFormat());\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2SectionContext::endOfElement()\n@@ -379,30 +379,30 @@ FictionBook2BlockFormat FictionBook2SectionContext::makeBlockFormat() const\n   return format;\n }\n \n-FictionBook2StanzaContext::FictionBook2StanzaContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2StanzaContext::FictionBook2StanzaContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n {\n   getBlockFormat().stanza = true;\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2StanzaContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2StanzaContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::title :\n-      return std::make_shared<FictionBook2TitleContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2TitleContext(this, getBlockFormat());\n     case FictionBook2Token::subtitle :\n-      return std::make_shared<FictionBook2SubtitleContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2SubtitleContext(this, getBlockFormat());\n     case FictionBook2Token::v :\n-      return std::make_shared<FictionBook2VContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2VContext(this, getBlockFormat());\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2StanzaContext::endOfElement()\n@@ -417,28 +417,28 @@ void FictionBook2StanzaContext::attribute(const FictionBook2TokenData &name, con\n     setLang(value);\n }\n \n-FictionBook2TitleContext::FictionBook2TitleContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2TitleContext::FictionBook2TitleContext(FictionBook2ParserContext *const parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n {\n   getBlockFormat().title = true;\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TitleContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2TitleContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::p :\n-      return std::make_shared<FictionBook2PContext>(shared_from_this(), getBlockFormat());\n+      return new FictionBook2PContext(this, getBlockFormat());\n     case FictionBook2Token::empty_line :\n-      return std::make_shared<FictionBook2EmptyLineContext>(shared_from_this());\n+      return new FictionBook2EmptyLineContext(this);\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2TitleContext::endOfElement()\ndiff --git a/src/lib/FictionBook2BlockContext.h b/src/lib/FictionBook2BlockContext.h\nindex 9f72cf1..7014bb0 100644\n--- a/src/lib/FictionBook2BlockContext.h\n+++ b/src/lib/FictionBook2BlockContext.h\n@@ -22,10 +22,10 @@ namespace libebook\n class FictionBook2BodyContext : public FictionBook2NodeContextBase\n {\n public:\n-  FictionBook2BodyContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *collector);\n+  FictionBook2BodyContext(FictionBook2ParserContext *parentContext, FictionBook2Collector *collector);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -37,10 +37,10 @@ private:\n class FictionBook2CiteContext : public FictionBook2BlockFormatContextBase\n {\n public:\n-  FictionBook2CiteContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2CiteContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n };\n@@ -48,7 +48,7 @@ private:\n class FictionBook2EmptyLineContext : public FictionBook2DataContextBase\n {\n public:\n-  explicit FictionBook2EmptyLineContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2EmptyLineContext(FictionBook2ParserContext *parentContext);\n \n private:\n   void endOfElement() override;\n@@ -58,10 +58,10 @@ private:\n class FictionBook2EpigraphContext : public FictionBook2BlockFormatContextBase\n {\n public:\n-  FictionBook2EpigraphContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2EpigraphContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n };\n@@ -69,10 +69,10 @@ private:\n class FictionBook2ImageContext : public FictionBook2NodeContextBase\n {\n public:\n-  FictionBook2ImageContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  FictionBook2ImageContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n \n@@ -85,10 +85,10 @@ private:\n class FictionBook2PoemContext : public FictionBook2BlockFormatContextBase\n {\n public:\n-  FictionBook2PoemContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2PoemContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -97,11 +97,11 @@ private:\n class FictionBook2SectionContext : public FictionBook2NodeContextBase\n {\n public:\n-  FictionBook2SectionContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const boost::optional<std::string> &lang);\n-  FictionBook2SectionContext(std::shared_ptr<FictionBook2ParserContext> parentContext, uint8_t level, const boost::optional<std::string> &lang);\n+  FictionBook2SectionContext(FictionBook2ParserContext *parentContext, const boost::optional<std::string> &lang);\n+  FictionBook2SectionContext(FictionBook2ParserContext *parentContext, uint8_t level, const boost::optional<std::string> &lang);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n \n@@ -116,10 +116,10 @@ private:\n class FictionBook2StanzaContext : public FictionBook2BlockFormatContextBase\n {\n public:\n-  FictionBook2StanzaContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2StanzaContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n };\n@@ -127,10 +127,10 @@ private:\n class FictionBook2TitleContext : public FictionBook2BlockFormatContextBase\n {\n public:\n-  FictionBook2TitleContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2TitleContext(FictionBook2ParserContext *const parentContext, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n };\ndiff --git a/src/lib/FictionBook2ContentCollector.cpp b/src/lib/FictionBook2ContentCollector.cpp\nindex bab1579..83c3a01 100644\n--- a/src/lib/FictionBook2ContentCollector.cpp\n+++ b/src/lib/FictionBook2ContentCollector.cpp\n@@ -228,15 +228,8 @@ void FictionBook2ContentCollector::insertBitmapData(const char *contentType, con\n   librevenge::RVNGPropertyList props;\n   props.insert(\"librevenge:mime-type\", librevenge::RVNGString(contentType));\n \n-  try\n-  {\n-    const librevenge::RVNGBinaryData data(base64Data);\n-    props.insert(\"office:binary-data\", data);\n-  }\n-  catch (...)\n-  {\n-    EBOOK_DEBUG_MSG((\"base64 decoding failed, skipping image\\n\"));\n-  }\n+  const librevenge::RVNGBinaryData data(base64Data);\n+  props.insert(\"office:binary-data\", data);\n \n   m_document->insertBinaryObject(props);\n }\ndiff --git a/src/lib/FictionBook2ExtrasCollector.cpp b/src/lib/FictionBook2ExtrasCollector.cpp\nindex 0ed70a1..27da35e 100644\n--- a/src/lib/FictionBook2ExtrasCollector.cpp\n+++ b/src/lib/FictionBook2ExtrasCollector.cpp\n@@ -31,7 +31,6 @@ FictionBook2ExtrasCollector::FictionBook2ExtrasCollector(NoteMap_t &notes, Binar\n   , m_ignored(false)\n   , m_title(false)\n   , m_currentText()\n-  , m_inPara(false)\n {\n }\n \n@@ -54,13 +53,8 @@ void FictionBook2ExtrasCollector::closeMetadataEntry()\n \n void FictionBook2ExtrasCollector::defineID(const char *id)\n {\n-  // We accept an ID defined on <p> (or even <t>) of a title paragraph\n-  // as note id, but only if one hasn't been set yet, as normally that's\n-  // done on the enclosing <section>.\n-  if (m_inPara && !m_currentID.empty())\n-    return;\n-  if (!m_inPara || m_title)\n-    flushCurrentNote();\n+  flushCurrentNote();\n+\n   m_currentID = id;\n }\n \n@@ -84,9 +78,6 @@ void FictionBook2ExtrasCollector::closeBlock()\n \n void FictionBook2ExtrasCollector::openParagraph(const FictionBook2BlockFormat &format)\n {\n-  if (m_inPara)\n-    return;\n-  m_inPara = true;\n   if (format.headingLevel == 1)\n     m_ignored = true;\n   if (format.headingLevel > 1)\n@@ -97,15 +88,12 @@ void FictionBook2ExtrasCollector::openParagraph(const FictionBook2BlockFormat &f\n \n void FictionBook2ExtrasCollector::closeParagraph()\n {\n-  m_inPara = false;\n   m_ignored = false;\n   m_title = false;\n }\n \n void FictionBook2ExtrasCollector::openSpan(const FictionBook2Style &style)\n {\n-  if (!m_inPara)\n-    return;\n   if (m_ignored || m_title)\n     return;\n   assert(!m_currentNote.m_paras.empty());\ndiff --git a/src/lib/FictionBook2ExtrasCollector.h b/src/lib/FictionBook2ExtrasCollector.h\nindex dd971aa..2aadd32 100644\n--- a/src/lib/FictionBook2ExtrasCollector.h\n+++ b/src/lib/FictionBook2ExtrasCollector.h\n@@ -74,7 +74,6 @@ private:\n   bool m_ignored;\n   bool m_title;\n   std::string m_currentText;\n-  bool m_inPara;\n };\n \n }\ndiff --git a/src/lib/FictionBook2MetadataContext.cpp b/src/lib/FictionBook2MetadataContext.cpp\nindex 23261f2..64d4f74 100644\n--- a/src/lib/FictionBook2MetadataContext.cpp\n+++ b/src/lib/FictionBook2MetadataContext.cpp\n@@ -101,12 +101,12 @@ const std::deque<FictionBook2Authors::Data> &FictionBook2Authors::getAuthors() c\n namespace libebook\n {\n \n-FictionBook2AnnotationContext::FictionBook2AnnotationContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2AnnotationContext::FictionBook2AnnotationContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2AnnotationContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2AnnotationContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -118,7 +118,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2AnnotationContext::ele\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2AnnotationContext::startOfElement()\n@@ -149,26 +149,26 @@ void FictionBook2AnnotationContext::text(const char *)\n {\n }\n \n-FictionBook2AuthorContext::FictionBook2AuthorContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors)\n+FictionBook2AuthorContext::FictionBook2AuthorContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(authors)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2AuthorContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2AuthorContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::first_name :\n-      return std::make_shared<FictionBook2FirstNameContext>(shared_from_this(), m_authors);\n+      return new FictionBook2FirstNameContext(this, m_authors);\n     case FictionBook2Token::middle_name :\n-      return std::make_shared<FictionBook2MiddleNameContext>(shared_from_this(), m_authors);\n+      return new FictionBook2MiddleNameContext(this, m_authors);\n     case FictionBook2Token::last_name :\n-      return std::make_shared<FictionBook2LastNameContext>(shared_from_this(), m_authors);\n+      return new FictionBook2LastNameContext(this, m_authors);\n     case FictionBook2Token::nickname :\n-      return std::make_shared<FictionBook2NicknameContext>(shared_from_this(), m_authors);\n+      return new FictionBook2NicknameContext(this, m_authors);\n     case FictionBook2Token::email :\n     case FictionBook2Token::home_page :\n       // ignore\n@@ -178,7 +178,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2AuthorContext::element\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2AuthorContext::startOfElement()\n@@ -198,12 +198,12 @@ void FictionBook2AuthorContext::text(const char *)\n {\n }\n \n-FictionBook2BookNameContext::FictionBook2BookNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2BookNameContext::FictionBook2BookNameContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2BookNameContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2BookNameContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -215,7 +215,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2BookNameContext::eleme\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2BookNameContext::startOfElement()\n@@ -249,12 +249,12 @@ void FictionBook2BookNameContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2BookTitleContext::FictionBook2BookTitleContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2BookTitleContext::FictionBook2BookTitleContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2BookTitleContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2BookTitleContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -276,12 +276,12 @@ void FictionBook2BookTitleContext::text(const char *value)\n   getCollector()->defineMetadataEntry(\"dc:subject\", value);\n }\n \n-FictionBook2CityContext::FictionBook2CityContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2CityContext::FictionBook2CityContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2CityContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2CityContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -293,7 +293,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2CityContext::element(c\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2CityContext::startOfElement()\n@@ -327,12 +327,12 @@ void FictionBook2CityContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2CoverpageContext::FictionBook2CoverpageContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2CoverpageContext::FictionBook2CoverpageContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2CoverpageContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2CoverpageContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -344,7 +344,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2CoverpageContext::elem\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2CoverpageContext::startOfElement()\n@@ -378,14 +378,14 @@ void FictionBook2CoverpageContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2CustomInfoContext::FictionBook2CustomInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2CustomInfoContext::FictionBook2CustomInfoContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n   , m_type()\n   , m_text()\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2CustomInfoContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2CustomInfoContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -422,13 +422,13 @@ void FictionBook2CustomInfoContext::text(const char *value)\n   m_text = value;\n }\n \n-FictionBook2DateContext::FictionBook2DateContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const char *const name)\n+FictionBook2DateContext::FictionBook2DateContext(FictionBook2ParserContext *const parentContext, const char *const name)\n   : FictionBook2ParserContext(parentContext)\n   , m_name(name)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2DateContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2DateContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -463,36 +463,36 @@ void FictionBook2DateContext::text(const char *value)\n   getCollector()->defineMetadataEntry(m_name, value);\n }\n \n-FictionBook2DescriptionContext::FictionBook2DescriptionContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *const collector)\n+FictionBook2DescriptionContext::FictionBook2DescriptionContext(FictionBook2ParserContext *const parentContext, FictionBook2Collector *const collector)\n   : FictionBook2ParserContext(parentContext, collector)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2DescriptionContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2DescriptionContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::title_info :\n-      return std::make_shared<FictionBook2TitleInfoContext>(shared_from_this());\n+      return new FictionBook2TitleInfoContext(this);\n     case FictionBook2Token::src_title_info :\n       // not interesting -> skip\n       break;\n     case FictionBook2Token::document_info :\n-      return std::make_shared<FictionBook2TextInfoContext>(shared_from_this());\n+      return new FictionBook2TextInfoContext(this);\n     case FictionBook2Token::publish_info :\n-      return std::make_shared<FictionBook2PublishInfoContext>(shared_from_this());\n+      return new FictionBook2PublishInfoContext(this);\n     case FictionBook2Token::custom_info :\n-      return std::make_shared<FictionBook2CustomInfoContext>(shared_from_this());\n+      return new FictionBook2CustomInfoContext(this);\n     case FictionBook2Token::output :\n-      return std::make_shared<FictionBook2OutputContext>(shared_from_this());\n+      return new FictionBook2OutputContext(this);\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2DescriptionContext::startOfElement()\n@@ -511,28 +511,32 @@ void FictionBook2DescriptionContext::text(const char *)\n {\n }\n \n-FictionBook2TextInfoContext::FictionBook2TextInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2TextInfoContext::FictionBook2TextInfoContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(new FictionBook2Authors())\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TextInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2TextInfoContext::~FictionBook2TextInfoContext()\n+{\n+}\n+\n+FictionBook2XMLParserContext *FictionBook2TextInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::author :\n-      return std::make_shared<FictionBook2AuthorContext>(shared_from_this(), *m_authors);\n+      return new FictionBook2AuthorContext(this, *m_authors);\n     case FictionBook2Token::date :\n-      return std::make_shared<FictionBook2DateContext>(shared_from_this(), \"dcterms:issued\");\n+      return new FictionBook2DateContext(this, \"dcterms:issued\");\n     case FictionBook2Token::src_url :\n-      return std::make_shared<FictionBook2SrcUrlContext>(shared_from_this());\n+      return new FictionBook2SrcUrlContext(this);\n     case FictionBook2Token::version :\n-      return std::make_shared<FictionBook2VersionContext>(shared_from_this());\n+      return new FictionBook2VersionContext(this);\n     case FictionBook2Token::history :\n-      return std::make_shared<FictionBook2HistoryContext>(shared_from_this());\n+      return new FictionBook2HistoryContext(this);\n     case FictionBook2Token::id :\n     case FictionBook2Token::program_used :\n     // ignore\n@@ -541,7 +545,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TextInfoContext::eleme\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2TextInfoContext::startOfElement()\n@@ -561,12 +565,12 @@ void FictionBook2TextInfoContext::text(const char *)\n {\n }\n \n-FictionBook2EmailContext::FictionBook2EmailContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2EmailContext::FictionBook2EmailContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2EmailContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2EmailContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -578,7 +582,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2EmailContext::element(\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2EmailContext::startOfElement()\n@@ -612,13 +616,13 @@ void FictionBook2EmailContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2FirstNameContext::FictionBook2FirstNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors)\n+FictionBook2FirstNameContext::FictionBook2FirstNameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(authors)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2FirstNameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2FirstNameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -641,12 +645,12 @@ void FictionBook2FirstNameContext::text(const char *value)\n   m_authors.setFirstName(str);\n }\n \n-FictionBook2GenreContext::FictionBook2GenreContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2GenreContext::FictionBook2GenreContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2GenreContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2GenreContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -658,7 +662,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2GenreContext::element(\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2GenreContext::startOfElement()\n@@ -692,12 +696,12 @@ void FictionBook2GenreContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2HistoryContext::FictionBook2HistoryContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2HistoryContext::FictionBook2HistoryContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2HistoryContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2HistoryContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -709,7 +713,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2HistoryContext::elemen\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2HistoryContext::startOfElement()\n@@ -743,12 +747,12 @@ void FictionBook2HistoryContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2HomePageContext::FictionBook2HomePageContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2HomePageContext::FictionBook2HomePageContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2HomePageContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2HomePageContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -760,7 +764,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2HomePageContext::eleme\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2HomePageContext::startOfElement()\n@@ -794,12 +798,12 @@ void FictionBook2HomePageContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2IdContext::FictionBook2IdContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2IdContext::FictionBook2IdContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2IdContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2IdContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -811,7 +815,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2IdContext::element(con\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2IdContext::startOfElement()\n@@ -845,12 +849,12 @@ void FictionBook2IdContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2IsbnContext::FictionBook2IsbnContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2IsbnContext::FictionBook2IsbnContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2IsbnContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2IsbnContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -862,7 +866,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2IsbnContext::element(c\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2IsbnContext::startOfElement()\n@@ -896,12 +900,12 @@ void FictionBook2IsbnContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2KeywordsContext::FictionBook2KeywordsContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2KeywordsContext::FictionBook2KeywordsContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2KeywordsContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2KeywordsContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -923,12 +927,12 @@ void FictionBook2KeywordsContext::text(const char *value)\n   getCollector()->defineMetadataEntry(\"meta:keyword\", value);\n }\n \n-FictionBook2LangContext::FictionBook2LangContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2LangContext::FictionBook2LangContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2LangContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2LangContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -950,13 +954,13 @@ void FictionBook2LangContext::text(const char *value)\n   getCollector()->defineMetadataEntry(\"dc:language\", value);\n }\n \n-FictionBook2LastNameContext::FictionBook2LastNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors)\n+FictionBook2LastNameContext::FictionBook2LastNameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(authors)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2LastNameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2LastNameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -979,13 +983,13 @@ void FictionBook2LastNameContext::text(const char *value)\n   m_authors.setLastName(str);\n }\n \n-FictionBook2MiddleNameContext::FictionBook2MiddleNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors)\n+FictionBook2MiddleNameContext::FictionBook2MiddleNameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(authors)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2MiddleNameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2MiddleNameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -1008,13 +1012,13 @@ void FictionBook2MiddleNameContext::text(const char *value)\n   m_authors.setMiddleName(str);\n }\n \n-FictionBook2NicknameContext::FictionBook2NicknameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors)\n+FictionBook2NicknameContext::FictionBook2NicknameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(authors)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2NicknameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2NicknameContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -1037,12 +1041,12 @@ void FictionBook2NicknameContext::text(const char *value)\n   m_authors.setNickname(str);\n }\n \n-FictionBook2OutputContext::FictionBook2OutputContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2OutputContext::FictionBook2OutputContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2OutputContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2OutputContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1054,7 +1058,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2OutputContext::element\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2OutputContext::startOfElement()\n@@ -1088,12 +1092,12 @@ void FictionBook2OutputContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2OutputDocumentClassContext::FictionBook2OutputDocumentClassContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2OutputDocumentClassContext::FictionBook2OutputDocumentClassContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2OutputDocumentClassContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2OutputDocumentClassContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1105,7 +1109,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2OutputDocumentClassCon\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2OutputDocumentClassContext::startOfElement()\n@@ -1139,12 +1143,12 @@ void FictionBook2OutputDocumentClassContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2PartContext::FictionBook2PartContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2PartContext::FictionBook2PartContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PartContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2PartContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1156,7 +1160,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PartContext::element(c\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2PartContext::startOfElement()\n@@ -1190,12 +1194,12 @@ void FictionBook2PartContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2ProgramUsedContext::FictionBook2ProgramUsedContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2ProgramUsedContext::FictionBook2ProgramUsedContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2ProgramUsedContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2ProgramUsedContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1207,7 +1211,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2ProgramUsedContext::el\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2ProgramUsedContext::startOfElement()\n@@ -1241,12 +1245,12 @@ void FictionBook2ProgramUsedContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2PublisherContext::FictionBook2PublisherContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2PublisherContext::FictionBook2PublisherContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PublisherContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2PublisherContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -1268,19 +1272,19 @@ void FictionBook2PublisherContext::text(const char *value)\n   getCollector()->defineMetadataEntry(\"dc:publisher\", value);\n }\n \n-FictionBook2PublishInfoContext::FictionBook2PublishInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2PublishInfoContext::FictionBook2PublishInfoContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PublishInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2PublishInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::publisher :\n-      return std::make_shared<FictionBook2PublisherContext>(shared_from_this());\n+      return new FictionBook2PublisherContext(this);\n     case FictionBook2Token::book_name :\n     case FictionBook2Token::city :\n     case FictionBook2Token::isbn :\n@@ -1293,7 +1297,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2PublishInfoContext::el\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2PublishInfoContext::startOfElement()\n@@ -1312,12 +1316,12 @@ void FictionBook2PublishInfoContext::text(const char *)\n {\n }\n \n-FictionBook2SequenceContext::FictionBook2SequenceContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2SequenceContext::FictionBook2SequenceContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SequenceContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2SequenceContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1329,7 +1333,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SequenceContext::eleme\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2SequenceContext::startOfElement()\n@@ -1363,12 +1367,12 @@ void FictionBook2SequenceContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2SrcLangContext::FictionBook2SrcLangContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2SrcLangContext::FictionBook2SrcLangContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcLangContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2SrcLangContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1380,7 +1384,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcLangContext::elemen\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2SrcLangContext::startOfElement()\n@@ -1414,12 +1418,12 @@ void FictionBook2SrcLangContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2SrcOcrContext::FictionBook2SrcOcrContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2SrcOcrContext::FictionBook2SrcOcrContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcOcrContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2SrcOcrContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1431,7 +1435,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcOcrContext::element\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2SrcOcrContext::startOfElement()\n@@ -1465,12 +1469,12 @@ void FictionBook2SrcOcrContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2SrcTitleInfoContext::FictionBook2SrcTitleInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2SrcTitleInfoContext::FictionBook2SrcTitleInfoContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcTitleInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2SrcTitleInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1482,7 +1486,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcTitleInfoContext::e\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2SrcTitleInfoContext::startOfElement()\n@@ -1516,12 +1520,12 @@ void FictionBook2SrcTitleInfoContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2SrcUrlContext::FictionBook2SrcUrlContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2SrcUrlContext::FictionBook2SrcUrlContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SrcUrlContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2SrcUrlContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -1543,13 +1547,17 @@ void FictionBook2SrcUrlContext::text(const char *value)\n   getCollector()->defineMetadataEntry(\"dc:source\", value);\n }\n \n-FictionBook2TitleInfoContext::FictionBook2TitleInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2TitleInfoContext::FictionBook2TitleInfoContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n   , m_authors(new FictionBook2Authors())\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TitleInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2TitleInfoContext::~FictionBook2TitleInfoContext()\n+{\n+}\n+\n+FictionBook2XMLParserContext *FictionBook2TitleInfoContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1557,17 +1565,17 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TitleInfoContext::elem\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::author :\n-      return std::make_shared<FictionBook2AuthorContext>(shared_from_this(), *m_authors);\n+      return new FictionBook2AuthorContext(this, *m_authors);\n     case FictionBook2Token::book_title :\n-      return std::make_shared<FictionBook2BookTitleContext>(shared_from_this());\n+      return new FictionBook2BookTitleContext(this);\n     case FictionBook2Token::keywords :\n-      return std::make_shared<FictionBook2KeywordsContext>(shared_from_this());\n+      return new FictionBook2KeywordsContext(this);\n     case FictionBook2Token::date :\n-      return std::make_shared<FictionBook2DateContext>(shared_from_this(), \"meta:creation-date\");\n+      return new FictionBook2DateContext(this, \"meta:creation-date\");\n     case FictionBook2Token::coverpage :\n-      return std::make_shared<FictionBook2CoverpageContext>(shared_from_this());\n+      return new FictionBook2CoverpageContext(this);\n     case FictionBook2Token::lang :\n-      return std::make_shared<FictionBook2LangContext>(shared_from_this());\n+      return new FictionBook2LangContext(this);\n     case FictionBook2Token::annotation :\n     case FictionBook2Token::genre :\n     case FictionBook2Token::sequence :\n@@ -1580,7 +1588,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TitleInfoContext::elem\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2TitleInfoContext::startOfElement()\n@@ -1633,12 +1641,12 @@ void FictionBook2TitleInfoContext::text(const char *)\n {\n }\n \n-FictionBook2TranslatorContext::FictionBook2TranslatorContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2TranslatorContext::FictionBook2TranslatorContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TranslatorContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2TranslatorContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1650,7 +1658,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TranslatorContext::ele\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2TranslatorContext::startOfElement()\n@@ -1684,12 +1692,12 @@ void FictionBook2TranslatorContext::text(const char *value)\n   (void) str;\n }\n \n-FictionBook2VersionContext::FictionBook2VersionContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2VersionContext::FictionBook2VersionContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2VersionContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2VersionContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -1711,12 +1719,12 @@ void FictionBook2VersionContext::text(const char *value)\n   getCollector()->defineMetadataEntry(\"librevenge:version-number\", value);\n }\n \n-FictionBook2YearContext::FictionBook2YearContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2YearContext::FictionBook2YearContext(FictionBook2ParserContext *parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2YearContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2YearContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   // TODO: implement me\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n@@ -1728,7 +1736,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2YearContext::element(c\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2YearContext::startOfElement()\ndiff --git a/src/lib/FictionBook2MetadataContext.h b/src/lib/FictionBook2MetadataContext.h\nindex 15d715f..e79e67f 100644\n--- a/src/lib/FictionBook2MetadataContext.h\n+++ b/src/lib/FictionBook2MetadataContext.h\n@@ -22,10 +22,10 @@ class FictionBook2Authors;\n class FictionBook2AnnotationContext : public FictionBook2BlockFormatContextBase\n {\n public:\n-  FictionBook2AnnotationContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2AnnotationContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -35,10 +35,10 @@ private:\n class FictionBook2AuthorContext : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2AuthorContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors);\n+  FictionBook2AuthorContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -52,10 +52,10 @@ private:\n class FictionBook2BookNameContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2BookNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2BookNameContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -66,10 +66,10 @@ private:\n class FictionBook2BookTitleContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2BookTitleContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2BookTitleContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -80,10 +80,10 @@ private:\n class FictionBook2CityContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2CityContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2CityContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -94,10 +94,10 @@ private:\n class FictionBook2CoverpageContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2CoverpageContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2CoverpageContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -108,10 +108,10 @@ private:\n class FictionBook2CustomInfoContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2CustomInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2CustomInfoContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -130,10 +130,10 @@ class FictionBook2DateContext : public FictionBook2ParserContext\n   FictionBook2DateContext &operator=(const FictionBook2DateContext &);\n \n public:\n-  FictionBook2DateContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const char *name);\n+  FictionBook2DateContext(FictionBook2ParserContext *parentContext, const char *name);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -147,10 +147,10 @@ private:\n class FictionBook2DescriptionContext : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2DescriptionContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *collector);\n+  FictionBook2DescriptionContext(FictionBook2ParserContext *parentContext, FictionBook2Collector *collector);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -165,10 +165,12 @@ class FictionBook2TextInfoContext : public FictionBook2ParserContext\n   FictionBook2TextInfoContext &operator=(const FictionBook2TextInfoContext &other);\n \n public:\n-  FictionBook2TextInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  FictionBook2TextInfoContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  ~FictionBook2TextInfoContext() override;\n+\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -182,10 +184,10 @@ private:\n class FictionBook2EmailContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2EmailContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2EmailContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -196,10 +198,10 @@ private:\n class FictionBook2FirstNameContext : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2FirstNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors);\n+  FictionBook2FirstNameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -213,10 +215,10 @@ private:\n class FictionBook2GenreContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2GenreContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2GenreContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -227,10 +229,10 @@ private:\n class FictionBook2HistoryContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2HistoryContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2HistoryContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -241,10 +243,10 @@ private:\n class FictionBook2HomePageContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2HomePageContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2HomePageContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -255,10 +257,10 @@ private:\n class FictionBook2IdContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2IdContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2IdContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -269,10 +271,10 @@ private:\n class FictionBook2IsbnContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2IsbnContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2IsbnContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -283,10 +285,10 @@ private:\n class FictionBook2KeywordsContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2KeywordsContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2KeywordsContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -297,10 +299,10 @@ private:\n class FictionBook2LangContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2LangContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2LangContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -311,10 +313,10 @@ private:\n class FictionBook2LastNameContext : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2LastNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors);\n+  FictionBook2LastNameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -328,10 +330,10 @@ private:\n class FictionBook2MiddleNameContext : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2MiddleNameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors);\n+  FictionBook2MiddleNameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -345,10 +347,10 @@ private:\n class FictionBook2NicknameContext : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2NicknameContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Authors &authors);\n+  FictionBook2NicknameContext(FictionBook2ParserContext *parentContext, FictionBook2Authors &authors);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -362,10 +364,10 @@ private:\n class FictionBook2OutputContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2OutputContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2OutputContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -376,10 +378,10 @@ private:\n class FictionBook2OutputDocumentClassContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2OutputDocumentClassContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2OutputDocumentClassContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -390,10 +392,10 @@ private:\n class FictionBook2PartContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2PartContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2PartContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -404,10 +406,10 @@ private:\n class FictionBook2ProgramUsedContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2ProgramUsedContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2ProgramUsedContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -418,10 +420,10 @@ private:\n class FictionBook2PublisherContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2PublisherContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2PublisherContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -432,10 +434,10 @@ private:\n class FictionBook2PublishInfoContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2PublishInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2PublishInfoContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -446,10 +448,10 @@ private:\n class FictionBook2SequenceContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2SequenceContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2SequenceContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -460,10 +462,10 @@ private:\n class FictionBook2SrcLangContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2SrcLangContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2SrcLangContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -474,10 +476,10 @@ private:\n class FictionBook2SrcOcrContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2SrcOcrContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2SrcOcrContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -488,10 +490,10 @@ private:\n class FictionBook2SrcTitleInfoContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2SrcTitleInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2SrcTitleInfoContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -502,10 +504,10 @@ private:\n class FictionBook2SrcUrlContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2SrcUrlContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2SrcUrlContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -520,10 +522,12 @@ class FictionBook2TitleInfoContext : public FictionBook2ParserContext\n   FictionBook2TitleInfoContext &operator=(const FictionBook2TitleInfoContext &other);\n \n public:\n-  explicit FictionBook2TitleInfoContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2TitleInfoContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  ~FictionBook2TitleInfoContext() override;\n+\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -537,10 +541,10 @@ private:\n class FictionBook2TranslatorContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2TranslatorContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2TranslatorContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -551,10 +555,10 @@ private:\n class FictionBook2VersionContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2VersionContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2VersionContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\n@@ -565,10 +569,10 @@ private:\n class FictionBook2YearContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2YearContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2YearContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override {}\ndiff --git a/src/lib/FictionBook2Parser.cpp b/src/lib/FictionBook2Parser.cpp\nindex 92e6780..9147757 100644\n--- a/src/lib/FictionBook2Parser.cpp\n+++ b/src/lib/FictionBook2Parser.cpp\n@@ -9,6 +9,8 @@\n \n #include <cassert>\n \n+#include <libxml/xmlreader.h>\n+\n #include \"libebook_utils.h\"\n #include \"libebook_xml.h\"\n \n@@ -40,9 +42,9 @@ public:\n   DocumentContext(FictionBook2Collector::NoteMap_t &notes, FictionBook2Collector::BinaryMap_t &bitmaps, librevenge::RVNGTextInterface *document = nullptr);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> leaveContext() const override;\n+  FictionBook2XMLParserContext *leaveContext() const override;\n \n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -63,10 +65,10 @@ class FictionBookGeneratorContext : public FictionBook2NodeContextBase\n   FictionBookGeneratorContext &operator=(const FictionBookGeneratorContext &other);\n \n public:\n-  FictionBookGeneratorContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Collector::NoteMap_t &notes, const FictionBook2Collector::BinaryMap_t &bitmaps, librevenge::RVNGTextInterface *document);\n+  FictionBookGeneratorContext(FictionBook2ParserContext *parentContext, const FictionBook2Collector::NoteMap_t &notes, const FictionBook2Collector::BinaryMap_t &bitmaps, librevenge::RVNGTextInterface *document);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -86,10 +88,10 @@ class FictionBookGathererContext : public FictionBook2NodeContextBase\n   FictionBookGathererContext &operator=(const FictionBookGathererContext &other);\n \n public:\n-  FictionBookGathererContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector::NoteMap_t &notes, FictionBook2Collector::BinaryMap_t &bitmaps);\n+  FictionBookGathererContext(FictionBook2ParserContext *parentContext, FictionBook2Collector::NoteMap_t &notes, FictionBook2Collector::BinaryMap_t &bitmaps);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n \n@@ -110,7 +112,7 @@ namespace\n {\n \n FictionBookGeneratorContext::FictionBookGeneratorContext(\n-  std::shared_ptr<FictionBook2ParserContext> parentContext,\n+  FictionBook2ParserContext *const parentContext,\n   const FictionBook2Collector::NoteMap_t &notes, const FictionBook2Collector::BinaryMap_t &bitmaps,\n   librevenge::RVNGTextInterface *const document)\n   : FictionBook2NodeContextBase(parentContext)\n@@ -122,7 +124,7 @@ FictionBookGeneratorContext::FictionBookGeneratorContext(\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBookGeneratorContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBookGeneratorContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n@@ -132,7 +134,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBookGeneratorContext::eleme\n       // ignore\n       break;\n     case FictionBook2Token::description :\n-      return std::make_shared<FictionBook2DescriptionContext>(shared_from_this(), &m_metadataCollector);\n+      return new FictionBook2DescriptionContext(this, &m_metadataCollector);\n     case FictionBook2Token::body :\n     {\n       if (!m_bodyRead)\n@@ -140,7 +142,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBookGeneratorContext::eleme\n         m_document->startDocument(librevenge::RVNGPropertyList());\n         m_document->setDocumentMetaData(m_metadata);\n         m_bodyRead = true;\n-        return std::make_shared<FictionBook2BodyContext>(shared_from_this(), &m_contentCollector);\n+        return new FictionBook2BodyContext(this, &m_contentCollector);\n       }\n     }\n     break;\n@@ -149,7 +151,7 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBookGeneratorContext::eleme\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBookGeneratorContext::startOfElement()\n@@ -165,7 +167,7 @@ void FictionBookGeneratorContext::attribute(const FictionBook2TokenData &, const\n {\n }\n \n-FictionBookGathererContext::FictionBookGathererContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector::NoteMap_t &notes, FictionBook2Collector::BinaryMap_t &bitmaps)\n+FictionBookGathererContext::FictionBookGathererContext(FictionBook2ParserContext *const parentContext, FictionBook2Collector::NoteMap_t &notes, FictionBook2Collector::BinaryMap_t &bitmaps)\n   : FictionBook2NodeContextBase(parentContext)\n   , m_notes(notes)\n   , m_bitmaps(bitmaps)\n@@ -174,7 +176,7 @@ FictionBookGathererContext::FictionBookGathererContext(std::shared_ptr<FictionBo\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBookGathererContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBookGathererContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n@@ -185,17 +187,17 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBookGathererContext::elemen\n       if (m_firstBody)\n         m_firstBody = false;\n       else\n-        return std::make_shared<FictionBook2BodyContext>(shared_from_this(), &m_collector);\n+        return new FictionBook2BodyContext(this, &m_collector);\n     }\n     break;\n     case FictionBook2Token::binary :\n-      return std::make_shared<FictionBook2BinaryContext>(shared_from_this(), &m_collector);\n+      return new FictionBook2BinaryContext(this, &m_collector);\n     default:\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBookGathererContext::endOfElement()\n@@ -215,20 +217,20 @@ DocumentContext::DocumentContext(FictionBook2Collector::NoteMap_t &notes, Fictio\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> DocumentContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *DocumentContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if ((FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns)) && (FictionBook2Token::FictionBook == getFictionBook2TokenID(name)))\n   {\n     if (m_generating)\n-      return std::make_shared<FictionBookGeneratorContext>(shared_from_this(), m_notes, m_bitmaps, m_document);\n+      return new FictionBookGeneratorContext(this, m_notes, m_bitmaps, m_document);\n     else\n-      return std::make_shared<FictionBookGathererContext>(shared_from_this(), m_notes, m_bitmaps);\n+      return new FictionBookGathererContext(this, m_notes, m_bitmaps);\n   }\n \n   return nullptr;\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> DocumentContext::leaveContext() const\n+FictionBook2XMLParserContext *DocumentContext::leaveContext() const\n {\n   return nullptr;\n }\n@@ -258,7 +260,7 @@ void DocumentContext::text(const char *)\n namespace\n {\n \n-void processAttribute(std::shared_ptr<FictionBook2XMLParserContext> const context, const xmlTextReaderPtr reader)\n+void processAttribute(FictionBook2XMLParserContext *const context, const xmlTextReaderPtr reader)\n {\n   const FictionBook2TokenData *const name = getFictionBook2Token(xmlTextReaderConstLocalName(reader));\n   const xmlChar *const nsUri = xmlTextReaderConstNamespaceUri(reader);\n@@ -267,9 +269,9 @@ void processAttribute(std::shared_ptr<FictionBook2XMLParserContext> const contex\n     context->attribute(*name, ns, reinterpret_cast<const char *>(xmlTextReaderConstValue(reader)));\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> processNode(std::shared_ptr<FictionBook2XMLParserContext> context, const xmlTextReaderPtr reader)\n+FictionBook2XMLParserContext *processNode(FictionBook2XMLParserContext *const context, const xmlTextReaderPtr reader)\n {\n-  std::shared_ptr<FictionBook2XMLParserContext> newContext = context;\n+  FictionBook2XMLParserContext *newContext = context;\n   switch (xmlTextReaderNodeType(reader))\n   {\n   case XML_READER_TYPE_ELEMENT :\n@@ -285,7 +287,7 @@ std::shared_ptr<FictionBook2XMLParserContext> processNode(std::shared_ptr<Fictio\n       // their content should be processed as if they did not exist.\n       // Unfortunately this would be quite hard (if not impossible) to\n       // do in the current parser framework\n-      newContext = std::make_shared<FictionBook2SkipElementContext>(std::dynamic_pointer_cast<FictionBook2ParserContext>(context));\n+      newContext = new FictionBook2SkipElementContext(dynamic_cast<FictionBook2ParserContext *>(context));\n     else\n       newContext = context->element(*name, *ns);\n \n@@ -303,7 +305,10 @@ std::shared_ptr<FictionBook2XMLParserContext> processNode(std::shared_ptr<Fictio\n           ret = xmlTextReaderMoveToNextAttribute(reader);\n         }\n         if (0 > ret) // some error while reading\n+        {\n+          delete newContext;\n           newContext = nullptr;\n+        }\n       }\n       if (newContext)\n         newContext->endOfAttributes();\n@@ -329,8 +334,9 @@ std::shared_ptr<FictionBook2XMLParserContext> processNode(std::shared_ptr<Fictio\n   }\n   case XML_READER_TYPE_TEXT :\n   {\n-    std::unique_ptr<xmlChar, decltype(xmlFree)> text(xmlTextReaderReadString(reader), xmlFree);\n-    context->text(reinterpret_cast<char *>(text.get()));\n+    xmlChar *const text = xmlTextReaderReadString(reader);\n+    context->text(reinterpret_cast<char *>(text));\n+    xmlFree(text);\n     break;\n   }\n   default :\n@@ -349,24 +355,25 @@ FictionBook2Parser::FictionBook2Parser(librevenge::RVNGInputStream *input)\n   assert(m_input);\n }\n \n-bool FictionBook2Parser::parse(std::shared_ptr<FictionBook2XMLParserContext> const context) const\n+bool FictionBook2Parser::parse(FictionBook2XMLParserContext *const context) const\n {\n   m_input->seek(0, librevenge::RVNG_SEEK_SET);\n \n-  const auto reader = makeXmlReader(m_input);\n+  const xmlTextReaderPtr reader = xmlReaderForIO(ebookXMLReadFromStream, ebookXMLCloseStream, m_input, \"\", nullptr, 0);\n   if (!reader)\n     return false;\n \n-  int ret = xmlTextReaderRead(reader.get());\n-  std::shared_ptr<FictionBook2XMLParserContext> currentContext = context;\n+  int ret = xmlTextReaderRead(reader);\n+  FictionBook2XMLParserContext *currentContext = context;\n   while ((1 == ret) && currentContext)\n   {\n-    currentContext = processNode(currentContext, reader.get());\n+    currentContext = processNode(currentContext, reader);\n     if (currentContext)\n-      ret = xmlTextReaderRead(reader.get());\n+      ret = xmlTextReaderRead(reader);\n   }\n \n-  xmlTextReaderClose(reader.get());\n+  xmlTextReaderClose(reader);\n+  xmlFreeTextReader(reader);\n \n   // we processed all input and it was valid\n   return (!currentContext || (currentContext == context)) && m_input->isEnd();\n@@ -380,12 +387,12 @@ bool FictionBook2Parser::parse(librevenge::RVNGTextInterface *const document) co\n   {\n     // in the 1st pass we gather notes and bitmaps\n     DocumentContext context(notes, bitmaps);\n-    if (!parse(std::shared_ptr<DocumentContext>(&context, EBOOKDummyDeleter())))\n+    if (!parse(&context))\n       return false;\n   }\n \n   DocumentContext context(notes, bitmaps, document);\n-  return parse(std::shared_ptr<DocumentContext>(&context, EBOOKDummyDeleter()));\n+  return parse(&context);\n }\n \n }\ndiff --git a/src/lib/FictionBook2Parser.h b/src/lib/FictionBook2Parser.h\nindex c3db0ef..1f32a55 100644\n--- a/src/lib/FictionBook2Parser.h\n+++ b/src/lib/FictionBook2Parser.h\n@@ -25,7 +25,7 @@ class FictionBook2Parser\n public:\n   explicit FictionBook2Parser(librevenge::RVNGInputStream *input);\n \n-  bool parse(std::shared_ptr<FictionBook2XMLParserContext> context) const;\n+  bool parse(FictionBook2XMLParserContext *context) const;\n   bool parse(librevenge::RVNGTextInterface *document) const;\n \n private:\ndiff --git a/src/lib/FictionBook2ParserContext.cpp b/src/lib/FictionBook2ParserContext.cpp\nindex a963c0f..62b3987 100644\n--- a/src/lib/FictionBook2ParserContext.cpp\n+++ b/src/lib/FictionBook2ParserContext.cpp\n@@ -15,19 +15,17 @@\n namespace libebook\n {\n \n-FictionBook2ParserContext::FictionBook2ParserContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *const collector)\n+FictionBook2ParserContext::FictionBook2ParserContext(FictionBook2ParserContext *const parentContext, FictionBook2Collector *const collector)\n   : m_collector(collector ? collector : (parentContext ? parentContext->m_collector : nullptr))\n   , m_parentContext(parentContext)\n {\n }\n \n-FictionBook2ParserContext::~FictionBook2ParserContext()\n+FictionBook2XMLParserContext *FictionBook2ParserContext::leaveContext() const\n {\n-}\n-\n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2ParserContext::leaveContext() const\n-{\n-  return m_parentContext;\n+  FictionBook2ParserContext *const parentContext = m_parentContext;\n+  delete this;\n+  return parentContext;\n }\n \n FictionBook2Collector *FictionBook2ParserContext::getCollector() const\n@@ -35,12 +33,12 @@ FictionBook2Collector *FictionBook2ParserContext::getCollector() const\n   return m_collector;\n }\n \n-std::shared_ptr<FictionBook2ParserContext> FictionBook2ParserContext::getParentContext() const\n+FictionBook2ParserContext *FictionBook2ParserContext::getParentContext() const\n {\n   return m_parentContext;\n }\n \n-FictionBook2NodeContextBase::FictionBook2NodeContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *const collector)\n+FictionBook2NodeContextBase::FictionBook2NodeContextBase(FictionBook2ParserContext *const parentContext, FictionBook2Collector *const collector)\n   : FictionBook2ParserContext(parentContext, collector)\n {\n }\n@@ -57,12 +55,12 @@ void FictionBook2NodeContextBase::text(const char *)\n {\n }\n \n-FictionBook2DataContextBase::FictionBook2DataContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2DataContextBase::FictionBook2DataContextBase(FictionBook2ParserContext *const parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2DataContextBase::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2DataContextBase::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -79,12 +77,12 @@ void FictionBook2DataContextBase::text(const char *)\n {\n }\n \n-FictionBook2TextContextBase::FictionBook2TextContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2TextContextBase::FictionBook2TextContextBase(FictionBook2ParserContext *const parentContext)\n   : FictionBook2ParserContext(parentContext)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TextContextBase::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2TextContextBase::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   return nullptr;\n }\n@@ -105,23 +103,26 @@ void FictionBook2TextContextBase::endOfAttributes()\n {\n }\n \n-FictionBook2SkipElementContext::FictionBook2SkipElementContext(std::shared_ptr<FictionBook2ParserContext> parentContext)\n+FictionBook2SkipElementContext::FictionBook2SkipElementContext(FictionBook2ParserContext *const parentContext)\n   : FictionBook2ParserContext(parentContext)\n   , m_level(1)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SkipElementContext::leaveContext() const\n+FictionBook2XMLParserContext *FictionBook2SkipElementContext::leaveContext() const\n {\n   if (m_level)\n-    return const_cast<FictionBook2SkipElementContext *>(this)->shared_from_this();\n-  return getParentContext();\n+    return const_cast<FictionBook2SkipElementContext *>(this);\n+\n+  FictionBook2ParserContext *const parentContext = getParentContext();\n+  delete this;\n+  return parentContext;\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2SkipElementContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n+FictionBook2XMLParserContext *FictionBook2SkipElementContext::element(const FictionBook2TokenData &, const FictionBook2TokenData &)\n {\n   ++m_level;\n-  return shared_from_this();\n+  return this;\n }\n \n void FictionBook2SkipElementContext::startOfElement()\n@@ -145,7 +146,7 @@ void FictionBook2SkipElementContext::text(const char *)\n {\n }\n \n-FictionBook2StyleContextBase::FictionBook2StyleContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Style &style)\n+FictionBook2StyleContextBase::FictionBook2StyleContextBase(FictionBook2ParserContext *parentContext, const FictionBook2Style &style)\n   : FictionBook2ParserContext(parentContext)\n   , m_style(style)\n {\n@@ -161,36 +162,36 @@ FictionBook2TextFormat &FictionBook2StyleContextBase::getTextFormat()\n   return m_style.getTextFormat();\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2StyleContextBase::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2StyleContextBase::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::strong :\n-      return std::make_shared<FictionBook2StrongContext>(shared_from_this(), getStyle());\n+      return new FictionBook2StrongContext(this, getStyle());\n     case FictionBook2Token::emphasis :\n-      return std::make_shared<FictionBook2EmphasisContext>(shared_from_this(), getStyle());\n+      return new FictionBook2EmphasisContext(this, getStyle());\n     case FictionBook2Token::style :\n-      return std::make_shared<FictionBook2StyleContext>(shared_from_this(), getStyle());\n+      return new FictionBook2StyleContext(this, getStyle());\n     case FictionBook2Token::a :\n-      return std::make_shared<FictionBook2AContext>(shared_from_this(), getStyle());\n+      return new FictionBook2AContext(this, getStyle());\n     case FictionBook2Token::strikethrough :\n-      return std::make_shared<FictionBook2StrikethroughContext>(shared_from_this(), getStyle());\n+      return new FictionBook2StrikethroughContext(this, getStyle());\n     case FictionBook2Token::sub :\n-      return std::make_shared<FictionBook2SubContext>(shared_from_this(), getStyle());\n+      return new FictionBook2SubContext(this, getStyle());\n     case FictionBook2Token::sup :\n-      return std::make_shared<FictionBook2SupContext>(shared_from_this(), getStyle());\n+      return new FictionBook2SupContext(this, getStyle());\n     case FictionBook2Token::code :\n-      return std::make_shared<FictionBook2CodeContext>(shared_from_this(), getStyle());\n+      return new FictionBook2CodeContext(this, getStyle());\n     case FictionBook2Token::image :\n-      return std::make_shared<FictionBook2InlineImageContext>(shared_from_this(), getStyle());\n+      return new FictionBook2InlineImageContext(this, getStyle());\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2StyleContextBase::endOfElement()\n@@ -214,7 +215,7 @@ void FictionBook2StyleContextBase::text(const char *value)\n   getCollector()->closeSpan();\n }\n \n-FictionBook2BlockFormatContextBase::FictionBook2BlockFormatContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2BlockFormatContextBase::FictionBook2BlockFormatContextBase(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2NodeContextBase(parentContext)\n   , m_format(format)\n {\ndiff --git a/src/lib/FictionBook2ParserContext.h b/src/lib/FictionBook2ParserContext.h\nindex 45b3b51..a13203b 100644\n--- a/src/lib/FictionBook2ParserContext.h\n+++ b/src/lib/FictionBook2ParserContext.h\n@@ -20,7 +20,7 @@ class FictionBook2Collector;\n \n /** Base class for all contexts.\n   */\n-class FictionBook2ParserContext : public FictionBook2XMLParserContext, public std::enable_shared_from_this<FictionBook2ParserContext>\n+class FictionBook2ParserContext : public FictionBook2XMLParserContext\n {\n   // no copying\n   FictionBook2ParserContext(const FictionBook2ParserContext &other);\n@@ -32,11 +32,9 @@ public:\n     * @param[in] parentContext A parent context.\n     * @param[in] collector A collector for the context's content.\n     */\n-  explicit FictionBook2ParserContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *collector = nullptr);\n+  explicit FictionBook2ParserContext(FictionBook2ParserContext *parentContext, FictionBook2Collector *collector = nullptr);\n \n-  virtual ~FictionBook2ParserContext();\n-\n-  std::shared_ptr<FictionBook2XMLParserContext> leaveContext() const override;\n+  FictionBook2XMLParserContext *leaveContext() const override;\n \n   /** Get the collector.\n     *\n@@ -48,11 +46,11 @@ public:\n     *\n     * @return The parent context.\n     */\n-  std::shared_ptr<FictionBook2ParserContext> getParentContext() const;\n+  FictionBook2ParserContext *getParentContext() const;\n \n private:\n   FictionBook2Collector *const m_collector;\n-  std::shared_ptr<FictionBook2ParserContext> const m_parentContext;\n+  FictionBook2ParserContext *const m_parentContext;\n };\n \n /** Base class for non-leaf element contexts.\n@@ -63,7 +61,7 @@ private:\n class FictionBook2NodeContextBase : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2NodeContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Collector *collector = nullptr);\n+  explicit FictionBook2NodeContextBase(FictionBook2ParserContext *parentContext, FictionBook2Collector *collector = nullptr);\n \n private:\n   void startOfElement() override;\n@@ -83,10 +81,10 @@ private:\n class FictionBook2DataContextBase : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2DataContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2DataContextBase(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfAttributes() override;\n   void text(const char *value) override;\n@@ -100,10 +98,10 @@ private:\n class FictionBook2TextContextBase : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2TextContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2TextContextBase(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -115,12 +113,12 @@ private:\n class FictionBook2SkipElementContext : public FictionBook2ParserContext\n {\n public:\n-  explicit FictionBook2SkipElementContext(std::shared_ptr<FictionBook2ParserContext> parentContext);\n+  explicit FictionBook2SkipElementContext(FictionBook2ParserContext *parentContext);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> leaveContext() const override;\n+  FictionBook2XMLParserContext *leaveContext() const override;\n \n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -134,13 +132,13 @@ private:\n class FictionBook2StyleContextBase : public FictionBook2ParserContext\n {\n public:\n-  FictionBook2StyleContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Style &style);\n+  FictionBook2StyleContextBase(FictionBook2ParserContext *parentContext, const FictionBook2Style &style);\n \n protected:\n   FictionBook2Style &getStyle();\n   FictionBook2TextFormat &getTextFormat();\n \n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n   void endOfAttributes() override;\n@@ -153,7 +151,7 @@ private:\n class FictionBook2BlockFormatContextBase : public FictionBook2NodeContextBase\n {\n public:\n-  FictionBook2BlockFormatContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2BlockFormatContextBase(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n   FictionBook2BlockFormat &getBlockFormat();\n   const FictionBook2BlockFormat &getBlockFormat() const;\ndiff --git a/src/lib/FictionBook2TableContext.cpp b/src/lib/FictionBook2TableContext.cpp\nindex ba9628d..9b42232 100644\n--- a/src/lib/FictionBook2TableContext.cpp\n+++ b/src/lib/FictionBook2TableContext.cpp\n@@ -18,22 +18,6 @@\n namespace libebook\n {\n \n-namespace\n-{\n-\n-const int FB2_MAX_TABLE_SPAN = 1 << 12;\n-\n-int clampTableSpan(const int span)\n-{\n-  if (span < 0)\n-    return 0;\n-  if (span > FB2_MAX_TABLE_SPAN)\n-    return FB2_MAX_TABLE_SPAN;\n-  return span;\n-}\n-\n-}\n-\n class FictionBook2TableModel\n {\n   typedef std::deque<bool> Row_t;\n@@ -139,7 +123,7 @@ void FictionBook2TableModel::ensureColumns(Row_t &row)\n     row.insert(row.end(), m_columns - row.size(), false);\n }\n \n-FictionBook2TableContext::FictionBook2TableContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2TableContext::FictionBook2TableContext(FictionBook2ParserContext *const parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n   , m_model(new FictionBook2TableModel())\n {\n@@ -149,20 +133,20 @@ FictionBook2TableContext::~FictionBook2TableContext()\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TableContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2TableContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::tr :\n-      return std::make_shared<FictionBook2TrContext>(shared_from_this(), m_model, getBlockFormat());\n+      return new FictionBook2TrContext(this, m_model, getBlockFormat());\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2TableContext::startOfElement()\n@@ -193,7 +177,7 @@ void FictionBook2TableContext::attribute(const FictionBook2TokenData &name, cons\n   }\n }\n \n-FictionBook2CellContext::FictionBook2CellContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format, const bool header)\n+FictionBook2CellContext::FictionBook2CellContext(FictionBook2ParserContext *const parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format, const bool header)\n   : FictionBook2StyleContextBase(parentContext, FictionBook2Style(format))\n   , m_model(model)\n   , m_header(header)\n@@ -226,10 +210,10 @@ void FictionBook2CellContext::attribute(const FictionBook2TokenData &name, const\n     switch (getFictionBook2TokenID(name))\n     {\n     case FictionBook2Token::colspan :\n-      m_columnSpan = clampTableSpan(std::atoi(value));\n+      m_columnSpan = std::atoi(value);\n       break;\n     case FictionBook2Token::rowspan :\n-      m_rowSpan = clampTableSpan(std::atoi(value));\n+      m_rowSpan = std::atoi(value);\n       break;\n     case FictionBook2Token::align :\n       // TODO: handle this\n@@ -259,14 +243,14 @@ void FictionBook2CellContext::openCell()\n   m_opened = true;\n }\n \n-FictionBook2TrContext::FictionBook2TrContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format)\n+FictionBook2TrContext::FictionBook2TrContext(FictionBook2ParserContext *const parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format)\n   : FictionBook2BlockFormatContextBase(parentContext, format)\n   , m_model(model)\n   , m_opened(false)\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TrContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2TrContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (FictionBook2Token::NS_FICTIONBOOK == getFictionBook2TokenID(ns))\n   {\n@@ -275,17 +259,17 @@ std::shared_ptr<FictionBook2XMLParserContext> FictionBook2TrContext::element(con\n     case FictionBook2Token::th :\n       if (!m_opened)\n         openRow(true);\n-      return std::make_shared<FictionBook2CellContext>(shared_from_this(), m_model, getBlockFormat(), true);\n+      return new FictionBook2CellContext(this, m_model, getBlockFormat(), true);\n     case FictionBook2Token::td :\n       if (!m_opened)\n         openRow(false);\n-      return std::make_shared<FictionBook2CellContext>(shared_from_this(), m_model, getBlockFormat(), false);\n+      return new FictionBook2CellContext(this, m_model, getBlockFormat(), false);\n     default :\n       break;\n     }\n   }\n \n-  return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+  return new FictionBook2SkipElementContext(this);\n }\n \n void FictionBook2TrContext::endOfElement()\ndiff --git a/src/lib/FictionBook2TableContext.h b/src/lib/FictionBook2TableContext.h\nindex 1352af2..72a0c2a 100644\n--- a/src/lib/FictionBook2TableContext.h\n+++ b/src/lib/FictionBook2TableContext.h\n@@ -26,11 +26,11 @@ class FictionBook2TableContext : public FictionBook2BlockFormatContextBase\n   FictionBook2TableContext &operator=(const FictionBook2TableContext &other);\n \n public:\n-  FictionBook2TableContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2TableContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n   ~FictionBook2TableContext() override;\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n@@ -46,7 +46,7 @@ class FictionBook2CellContext : public FictionBook2StyleContextBase\n   FictionBook2CellContext &operator=(const FictionBook2CellContext &other);\n \n public:\n-  FictionBook2CellContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format, bool header);\n+  FictionBook2CellContext(FictionBook2ParserContext *parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format, bool header);\n \n private:\n   void startOfElement() override;\n@@ -72,10 +72,10 @@ class FictionBook2TrContext : public FictionBook2BlockFormatContextBase\n   FictionBook2TrContext &operator=(const FictionBook2TrContext &);\n \n public:\n-  FictionBook2TrContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format);\n+  FictionBook2TrContext(FictionBook2ParserContext *parentContext, const std::shared_ptr<FictionBook2TableModel> &model, const FictionBook2BlockFormat &format);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void endOfElement() override;\n   void attribute(const FictionBook2TokenData &name, const FictionBook2TokenData *ns, const char *value) override;\n \ndiff --git a/src/lib/FictionBook2TextContext.cpp b/src/lib/FictionBook2TextContext.cpp\nindex 07d04a8..5fd6705 100644\n--- a/src/lib/FictionBook2TextContext.cpp\n+++ b/src/lib/FictionBook2TextContext.cpp\n@@ -14,7 +14,7 @@\n namespace libebook\n {\n \n-FictionBook2ParaContextBase::FictionBook2ParaContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2ParaContextBase::FictionBook2ParaContextBase(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2StyleContextBase(parentContext, FictionBook2Style(format))\n {\n }\n@@ -49,7 +49,7 @@ void FictionBook2ParaContextBase::attribute(const FictionBook2TokenData &name, c\n   }\n }\n \n-FictionBook2AContext::FictionBook2AContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Style &style)\n+FictionBook2AContext::FictionBook2AContext(FictionBook2ParserContext *parentContext, const FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n   , m_href()\n   , m_valid(true)\n@@ -57,10 +57,10 @@ FictionBook2AContext::FictionBook2AContext(std::shared_ptr<FictionBook2ParserCon\n {\n }\n \n-std::shared_ptr<FictionBook2XMLParserContext> FictionBook2AContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n+FictionBook2XMLParserContext *FictionBook2AContext::element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns)\n {\n   if (m_note)\n-    return std::make_shared<FictionBook2SkipElementContext>(shared_from_this());\n+    return new FictionBook2SkipElementContext(this);\n   else\n     return FictionBook2StyleContextBase::element(name, ns);\n }\n@@ -119,7 +119,7 @@ void FictionBook2AContext::text(const char *value)\n   }\n }\n \n-FictionBook2CodeContext::FictionBook2CodeContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2CodeContext::FictionBook2CodeContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -129,7 +129,7 @@ void FictionBook2CodeContext::startOfElement()\n   getTextFormat().code = true;\n }\n \n-FictionBook2EmphasisContext::FictionBook2EmphasisContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2EmphasisContext::FictionBook2EmphasisContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -139,7 +139,7 @@ void FictionBook2EmphasisContext::startOfElement()\n   getTextFormat().emphasis = true;\n }\n \n-FictionBook2InlineImageContext::FictionBook2InlineImageContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Style &style)\n+FictionBook2InlineImageContext::FictionBook2InlineImageContext(FictionBook2ParserContext *parentContext, const FictionBook2Style &style)\n   : FictionBook2DataContextBase(parentContext)\n   , m_style(style)\n   , m_href()\n@@ -192,7 +192,7 @@ void FictionBook2InlineImageContext::attribute(const FictionBook2TokenData &name\n   }\n }\n \n-FictionBook2PContext::FictionBook2PContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2PContext::FictionBook2PContext(FictionBook2ParserContext *const parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2ParaContextBase(parentContext, makeBlockFormat(format))\n {\n }\n@@ -204,7 +204,7 @@ FictionBook2BlockFormat FictionBook2PContext::makeBlockFormat(const FictionBook2\n   return outFormat;\n }\n \n-FictionBook2StrikethroughContext::FictionBook2StrikethroughContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2StrikethroughContext::FictionBook2StrikethroughContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -214,7 +214,7 @@ void FictionBook2StrikethroughContext::startOfElement()\n   getTextFormat().strikethrough = true;\n }\n \n-FictionBook2StrongContext::FictionBook2StrongContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2StrongContext::FictionBook2StrongContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -224,7 +224,7 @@ void FictionBook2StrongContext::startOfElement()\n   getTextFormat().strong = true;\n }\n \n-FictionBook2StyleContext::FictionBook2StyleContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2StyleContext::FictionBook2StyleContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -234,7 +234,7 @@ void FictionBook2StyleContext::startOfElement()\n   // TODO: implement me\n }\n \n-FictionBook2SubContext::FictionBook2SubContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2SubContext::FictionBook2SubContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -244,7 +244,7 @@ void FictionBook2SubContext::startOfElement()\n   getTextFormat().sub = true;\n }\n \n-FictionBook2SubtitleContext::FictionBook2SubtitleContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2SubtitleContext::FictionBook2SubtitleContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2ParaContextBase(parentContext, makeBlockFormat(format))\n {\n }\n@@ -256,7 +256,7 @@ FictionBook2BlockFormat FictionBook2SubtitleContext::makeBlockFormat(const Ficti\n   return outFormat;\n }\n \n-FictionBook2SupContext::FictionBook2SupContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style)\n+FictionBook2SupContext::FictionBook2SupContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style)\n   : FictionBook2StyleContextBase(parentContext, style)\n {\n }\n@@ -266,7 +266,7 @@ void FictionBook2SupContext::startOfElement()\n   getTextFormat().sup = true;\n }\n \n-FictionBook2TextAuthorContext::FictionBook2TextAuthorContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2TextAuthorContext::FictionBook2TextAuthorContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2PContext(parentContext, makeBlockFormat(format))\n {\n }\n@@ -278,7 +278,7 @@ FictionBook2BlockFormat FictionBook2TextAuthorContext::makeBlockFormat(const Fic\n   return outFormat;\n }\n \n-FictionBook2VContext::FictionBook2VContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format)\n+FictionBook2VContext::FictionBook2VContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format)\n   : FictionBook2ParaContextBase(parentContext, makeBlockFormat(format))\n {\n }\ndiff --git a/src/lib/FictionBook2TextContext.h b/src/lib/FictionBook2TextContext.h\nindex 175f812..7dba940 100644\n--- a/src/lib/FictionBook2TextContext.h\n+++ b/src/lib/FictionBook2TextContext.h\n@@ -20,7 +20,7 @@ namespace libebook\n class FictionBook2ParaContextBase : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2ParaContextBase(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2ParaContextBase(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n   void startOfElement() override;\n@@ -31,10 +31,10 @@ private:\n class FictionBook2AContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2AContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Style &style);\n+  FictionBook2AContext(FictionBook2ParserContext *parentContext, const FictionBook2Style &style);\n \n private:\n-  std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n+  FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) override;\n   void startOfElement() override;\n   void endOfElement() override;\n   void endOfAttributes() override;\n@@ -50,7 +50,7 @@ private:\n class FictionBook2CodeContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2CodeContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2CodeContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -59,7 +59,7 @@ private:\n class FictionBook2EmphasisContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2EmphasisContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2EmphasisContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -68,7 +68,7 @@ private:\n class FictionBook2InlineImageContext : public FictionBook2DataContextBase\n {\n public:\n-  FictionBook2InlineImageContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2Style &style);\n+  FictionBook2InlineImageContext(FictionBook2ParserContext *parentContext, const FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -86,7 +86,7 @@ private:\n class FictionBook2PContext : public FictionBook2ParaContextBase\n {\n public:\n-  FictionBook2PContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  FictionBook2PContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n   static FictionBook2BlockFormat makeBlockFormat(const FictionBook2BlockFormat &format);\n@@ -95,7 +95,7 @@ private:\n class FictionBook2StrikethroughContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2StrikethroughContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2StrikethroughContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -104,7 +104,7 @@ private:\n class FictionBook2StrongContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2StrongContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2StrongContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -113,7 +113,7 @@ private:\n class FictionBook2StyleContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2StyleContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2StyleContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -122,7 +122,7 @@ private:\n class FictionBook2SubContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2SubContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2SubContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -131,7 +131,7 @@ private:\n class FictionBook2SubtitleContext : public FictionBook2ParaContextBase\n {\n public:\n-  explicit FictionBook2SubtitleContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  explicit FictionBook2SubtitleContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n   static FictionBook2BlockFormat makeBlockFormat(const FictionBook2BlockFormat &format);\n@@ -140,7 +140,7 @@ private:\n class FictionBook2SupContext : public FictionBook2StyleContextBase\n {\n public:\n-  FictionBook2SupContext(std::shared_ptr<FictionBook2ParserContext> parentContext, FictionBook2Style &style);\n+  FictionBook2SupContext(FictionBook2ParserContext *parentContext, FictionBook2Style &style);\n \n private:\n   void startOfElement() override;\n@@ -149,7 +149,7 @@ private:\n class FictionBook2TextAuthorContext : public FictionBook2PContext\n {\n public:\n-  explicit FictionBook2TextAuthorContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  explicit FictionBook2TextAuthorContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n   static FictionBook2BlockFormat makeBlockFormat(const FictionBook2BlockFormat &format);\n@@ -158,7 +158,7 @@ private:\n class FictionBook2VContext : public FictionBook2ParaContextBase\n {\n public:\n-  explicit FictionBook2VContext(std::shared_ptr<FictionBook2ParserContext> parentContext, const FictionBook2BlockFormat &format);\n+  explicit FictionBook2VContext(FictionBook2ParserContext *parentContext, const FictionBook2BlockFormat &format);\n \n private:\n   static FictionBook2BlockFormat makeBlockFormat(const FictionBook2BlockFormat &format);\ndiff --git a/src/lib/FictionBook2XMLParserContext.h b/src/lib/FictionBook2XMLParserContext.h\nindex af7286a..e6b1a56 100644\n--- a/src/lib/FictionBook2XMLParserContext.h\n+++ b/src/lib/FictionBook2XMLParserContext.h\n@@ -10,8 +10,6 @@\n #ifndef FICTIONBOOK2XMLPARSERCONTEXT_H_INCLUDED\n #define FICTIONBOOK2XMLPARSERCONTEXT_H_INCLUDED\n \n-#include <memory>\n-\n namespace libebook\n {\n \n@@ -29,13 +27,13 @@ public:\n     *\n     * @return The parent context.\n     */\n-  virtual std::shared_ptr<FictionBook2XMLParserContext> leaveContext() const = 0;\n+  virtual FictionBook2XMLParserContext *leaveContext() const = 0;\n \n   /** Create a context for parsing a child element.\n     *\n     * @return A new context or @c 0 if the child element cannot be handled.\n     */\n-  virtual std::shared_ptr<FictionBook2XMLParserContext> element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) = 0;\n+  virtual FictionBook2XMLParserContext *element(const FictionBook2TokenData &name, const FictionBook2TokenData &ns) = 0;\n \n   /** Signalize the start of an element.\n     *\ndiff --git a/src/lib/Makefile.in b/src/lib/Makefile.in\nindex 979ca0d..896281f 100644\n--- a/src/lib/Makefile.in\n+++ b/src/lib/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -70,8 +70,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -181,9 +179,10 @@ am__base_list = \\\n   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\\n/ /g' | \\\n   sed '$$!N;$$!N;$$!N;$$!N;s/\\n/ /g'\n am__uninstall_files_from_dir = { \\\n-  { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n-  || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n-       $(am__cd) \"$$dir\" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \\\n+  test -z \"$$files\" \\\n+    || { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n+    || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n+         $(am__cd) \"$$dir\" && rm -f $$files; }; \\\n   }\n am__installdirs = \"$(DESTDIR)$(libdir)\"\n LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)\n@@ -357,86 +356,7 @@ am__v_at_0 = @\n am__v_at_1 = \n DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)\n depcomp = $(SHELL) $(top_srcdir)/depcomp\n-am__maybe_remake_depfiles = depfiles\n-am__depfiles_remade = ./$(DEPDIR)/libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la-EBOOKDocument.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-BBeBCollector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-BBeBMetadataParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-BBeBParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-BBeBTypes.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKBitStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKCharsetConverter.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLToken.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLTypes.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKLanguageManager.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKMemoryStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKOPFParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKOPFToken.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKOutputElements.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKSAXParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKStreamView.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKSubDocument.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKTokenizer.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKUTF8Stream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContextBase.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKXMLParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EBOOKZlibStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EPubParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-EPubToken.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2BinaryContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2BlockContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2Collector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2ContentCollector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2ExtrasCollector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataCollector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2Parser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2ParserContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2Style.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2TableContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2TextContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2Token.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook2XMLParserContext.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook3Parser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-FictionBook3Token.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-HTMLHelpParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-HTMLHelpStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-HTMLParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-LITParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-LITStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-MobiPocketParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-OpenEBookParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-PDBLZ77Stream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-PDBParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-PalmDocParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-PeanutPressParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-PeanutPressTypes.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-PluckerParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-QiOOParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-RocketEBookHeader.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-RocketEBookParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-RocketEBookStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-RocketEBookToken.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookCollector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookHeader.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookLZSSStream.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookResourceDir.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookText.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-SoftBookTypes.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-TCRParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-TealDocParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-XMLCollector.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-XMLStylesheet.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-XMLTreeNode.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-XMLTreeWalker.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-ZTXTParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-ZVRParser.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-libebook_hubbub.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-libebook_libcss.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-libebook_utils.Plo \\\n-\t./$(DEPDIR)/libe_book_internal_la-libebook_xml.Plo\n+am__depfiles_maybe = depfiles\n am__mv = mv -f\n CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \\\n \t$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)\n@@ -500,6 +420,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libe-book.rc.in \\\n \t$(top_srcdir)/depcomp\n DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)\n@@ -520,10 +442,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -548,10 +468,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -630,10 +548,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -666,7 +582,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -780,8 +695,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -820,22 +735,26 @@ uninstall-libLTLIBRARIES:\n \tdone\n \n clean-libLTLIBRARIES:\n-\t-$(am__rm_f) $(lib_LTLIBRARIES)\n+\t-test -z \"$(lib_LTLIBRARIES)\" || rm -f $(lib_LTLIBRARIES)\n \t@list='$(lib_LTLIBRARIES)'; \\\n \tlocs=`for p in $$list; do echo $$p; done | \\\n \t      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \\\n \t      sort -u`; \\\n-\techo rm -f $${locs}; \\\n-\t$(am__rm_f) $${locs}\n+\ttest -z \"$$locs\" || { \\\n+\t  echo rm -f $${locs}; \\\n+\t  rm -f $${locs}; \\\n+\t}\n \n clean-noinstLTLIBRARIES:\n-\t-$(am__rm_f) $(noinst_LTLIBRARIES)\n+\t-test -z \"$(noinst_LTLIBRARIES)\" || rm -f $(noinst_LTLIBRARIES)\n \t@list='$(noinst_LTLIBRARIES)'; \\\n \tlocs=`for p in $$list; do echo $$p; done | \\\n \t      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \\\n \t      sort -u`; \\\n-\techo rm -f $${locs}; \\\n-\t$(am__rm_f) $${locs}\n+\ttest -z \"$$locs\" || { \\\n+\t  echo rm -f $${locs}; \\\n+\t  rm -f $${locs}; \\\n+\t}\n \n libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@.la: $(libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_OBJECTS) $(libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_DEPENDENCIES) $(EXTRA_libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_DEPENDENCIES) \n \t$(AM_V_CXXLD)$(libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_LINK) -rpath $(libdir) $(libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_OBJECTS) $(libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_LIBADD) $(LIBS)\n@@ -849,91 +768,85 @@ mostlyclean-compile:\n distclean-compile:\n \t-rm -f *.tab.c\n \n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la-EBOOKDocument.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBCollector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBMetadataParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBTypes.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKBitStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKCharsetConverter.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLToken.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLTypes.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKLanguageManager.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKMemoryStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKOPFParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKOPFToken.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKOutputElements.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKSAXParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKStreamView.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKSubDocument.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKTokenizer.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKUTF8Stream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContextBase.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKXMLParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKZlibStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EPubParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EPubToken.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2BinaryContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2BlockContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Collector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2ContentCollector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2ExtrasCollector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataCollector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Parser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2ParserContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Style.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2TableContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2TextContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Token.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2XMLParserContext.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook3Parser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook3Token.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-HTMLHelpParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-HTMLHelpStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-HTMLParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-LITParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-LITStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-MobiPocketParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-OpenEBookParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PDBLZ77Stream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PDBParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PalmDocParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PeanutPressParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PeanutPressTypes.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PluckerParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-QiOOParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookHeader.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookToken.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookCollector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookHeader.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookLZSSStream.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookResourceDir.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookText.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookTypes.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-TCRParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-TealDocParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLCollector.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLStylesheet.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLTreeNode.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLTreeWalker.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-ZTXTParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-ZVRParser.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_hubbub.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_libcss.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_utils.Plo@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_xml.Plo@am__quote@ # am--include-marker\n-\n-$(am__depfiles_remade):\n-\t@$(MKDIR_P) $(@D)\n-\t@: >>$@\n-\n-am--depfiles: $(am__depfiles_remade)\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la-EBOOKDocument.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBCollector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBMetadataParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-BBeBTypes.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKBitStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKCharsetConverter.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLToken.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLTypes.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKLanguageManager.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKMemoryStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKOPFParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKOPFToken.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKOutputElements.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKSAXParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKStreamView.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKSubDocument.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKTokenizer.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKUTF8Stream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContextBase.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKXMLParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EBOOKZlibStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EPubParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-EPubToken.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2BinaryContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2BlockContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Collector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2ContentCollector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2ExtrasCollector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataCollector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Parser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2ParserContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Style.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2TableContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2TextContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2Token.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook2XMLParserContext.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook3Parser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-FictionBook3Token.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-HTMLHelpParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-HTMLHelpStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-HTMLParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-LITParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-LITStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-MobiPocketParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-OpenEBookParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PDBLZ77Stream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PDBParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PalmDocParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PeanutPressParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PeanutPressTypes.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-PluckerParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-QiOOParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookHeader.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-RocketEBookToken.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookCollector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookHeader.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookLZSSStream.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookResourceDir.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookText.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-SoftBookTypes.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-TCRParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-TealDocParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLCollector.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLStylesheet.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLTreeNode.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-XMLTreeWalker.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-ZTXTParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-ZVRParser.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_hubbub.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_libcss.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_utils.Plo@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libe_book_internal_la-libebook_xml.Plo@am__quote@\n \n .cpp.o:\n @am__fastdepCXX_TRUE@\t$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<\n@@ -1566,10 +1479,8 @@ cscopelist-am: $(am__tagged_files)\n \n distclean-tags:\n \t-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -1609,8 +1520,7 @@ installdirs:\n \tdone\n install: $(BUILT_SOURCES)\n \t$(MAKE) $(AM_MAKEFLAGS) install-am\n-install-exec: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) install-exec-am\n+install-exec: install-exec-am\n install-data: install-data-am\n uninstall: uninstall-am\n \n@@ -1633,98 +1543,20 @@ mostlyclean-generic:\n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n \t@echo \"it deletes files that may require special tools to rebuild.\"\n-\t-$(am__rm_f) $(BUILT_SOURCES)\n+\t-test -z \"$(BUILT_SOURCES)\" || rm -f $(BUILT_SOURCES)\n clean: clean-am\n \n clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \\\n \tclean-noinstLTLIBRARIES mostlyclean-am\n \n distclean: distclean-am\n-\t-rm -f ./$(DEPDIR)/libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la-EBOOKDocument.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBMetadataParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKBitStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKCharsetConverter.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKLanguageManager.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKMemoryStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKOPFParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKOPFToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKOutputElements.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKSAXParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKStreamView.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKSubDocument.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKTokenizer.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKUTF8Stream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContextBase.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKXMLParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKZlibStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EPubParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EPubToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2BinaryContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2BlockContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Collector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2ContentCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2ExtrasCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Parser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2ParserContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Style.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2TableContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2TextContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Token.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2XMLParserContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook3Parser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook3Token.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-HTMLHelpParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-HTMLHelpStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-HTMLParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-LITParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-LITStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-MobiPocketParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-OpenEBookParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PDBLZ77Stream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PDBParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PalmDocParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PeanutPressParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PeanutPressTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PluckerParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-QiOOParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookHeader.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookHeader.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookLZSSStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookResourceDir.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookText.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-TCRParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-TealDocParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLStylesheet.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLTreeNode.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLTreeWalker.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-ZTXTParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-ZVRParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_hubbub.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_libcss.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_utils.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_xml.Plo\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n distclean-am: clean-am distclean-compile distclean-generic \\\n \tdistclean-local distclean-tags\n@@ -1770,85 +1602,7 @@ install-ps-am:\n installcheck-am:\n \n maintainer-clean: maintainer-clean-am\n-\t-rm -f ./$(DEPDIR)/libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la-EBOOKDocument.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBMetadataParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-BBeBTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKBitStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKCharsetConverter.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKHTMLTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKLanguageManager.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKMemoryStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKOPFParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKOPFToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKOutputElements.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKSAXParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKStreamView.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKSubDocument.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKTokenizer.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKUTF8Stream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKXMLContextBase.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKXMLParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EBOOKZlibStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EPubParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-EPubToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2BinaryContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2BlockContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Collector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2ContentCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2ExtrasCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2MetadataContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Parser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2ParserContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Style.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2TableContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2TextContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2Token.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook2XMLParserContext.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook3Parser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-FictionBook3Token.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-HTMLHelpParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-HTMLHelpStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-HTMLParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-LITParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-LITStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-MobiPocketParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-OpenEBookParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PDBLZ77Stream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PDBParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PalmDocParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PeanutPressParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PeanutPressTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-PluckerParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-QiOOParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookHeader.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-RocketEBookToken.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookHeader.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookLZSSStream.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookResourceDir.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookText.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-SoftBookTypes.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-TCRParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-TealDocParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLCollector.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLStylesheet.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLTreeNode.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-XMLTreeWalker.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-ZTXTParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-ZVRParser.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_hubbub.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_libcss.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_utils.Plo\n-\t-rm -f ./$(DEPDIR)/libe_book_internal_la-libebook_xml.Plo\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n maintainer-clean-am: distclean-am maintainer-clean-generic\n \n@@ -1867,16 +1621,16 @@ ps-am:\n \n uninstall-am: uninstall-libLTLIBRARIES\n \n-.MAKE: all check install install-am install-exec install-strip\n+.MAKE: all check install install-am install-strip\n \n-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \\\n-\tclean-generic clean-libLTLIBRARIES clean-libtool \\\n-\tclean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \\\n-\tdistclean-compile distclean-generic distclean-libtool \\\n-\tdistclean-local distclean-tags distdir dvi dvi-am html html-am \\\n-\tinfo info-am install install-am install-data install-data-am \\\n-\tinstall-dvi install-dvi-am install-exec install-exec-am \\\n-\tinstall-html install-html-am install-info install-info-am \\\n+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \\\n+\tclean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \\\n+\tcscopelist-am ctags ctags-am distclean distclean-compile \\\n+\tdistclean-generic distclean-libtool distclean-local \\\n+\tdistclean-tags distdir dvi dvi-am html html-am info info-am \\\n+\tinstall install-am install-data install-data-am install-dvi \\\n+\tinstall-dvi-am install-exec install-exec-am install-html \\\n+\tinstall-html-am install-info install-info-am \\\n \tinstall-libLTLIBRARIES install-man install-pdf install-pdf-am \\\n \tinstall-ps install-ps-am install-strip installcheck \\\n \tinstallcheck-am installdirs maintainer-clean \\\n@@ -1909,10 +1663,3 @@ distclean-local :\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/src/lib/SoftBookLZSSStream.cpp b/src/lib/SoftBookLZSSStream.cpp\nindex a8e11da..891c727 100644\n--- a/src/lib/SoftBookLZSSStream.cpp\n+++ b/src/lib/SoftBookLZSSStream.cpp\n@@ -137,8 +137,7 @@ struct LZSSException {};\n void unpack(librevenge::RVNGInputStream *const stream, const SoftBookLZSSStream::Configuration &configuration, vector<unsigned char> &buffer)\n {\n   // the window size can normally be represented in 16 bits or less\n-  if (configuration.offsetBits >= 24)\n-    throw LZSSException();\n+  assert(24 > configuration.offsetBits);\n \n   EBOOKBitStream bitStream(stream);\n \ndiff --git a/src/lib/libe-book.rc b/src/lib/libe-book.rc\nindex 4deb6f6..09ca89b 100644\n--- a/src/lib/libe-book.rc\n+++ b/src/lib/libe-book.rc\n@@ -1,8 +1,8 @@\n #include <winver.h>\n \n VS_VERSION_INFO VERSIONINFO\n-  FILEVERSION 0,1,4,BUILDNUMBER\n-  PRODUCTVERSION 0,1,4,0\n+  FILEVERSION 0,1,3,BUILDNUMBER\n+  PRODUCTVERSION 0,1,3,0\n   FILEFLAGSMASK 0\n   FILEFLAGS 0\n   FILEOS VOS__WINDOWS32\n@@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO\n       BEGIN\n \tVALUE \"CompanyName\", \"The libe-book developer community\"\n \tVALUE \"FileDescription\", \"libe-book\"\n-\tVALUE \"FileVersion\", \"0.1.4.BUILDNUMBER\"\n+\tVALUE \"FileVersion\", \"0.1.3.BUILDNUMBER\"\n \tVALUE \"InternalName\", \"libe-book-0.0\"\n \tVALUE \"LegalCopyright\", \"Copyright (C) 2013 David Tardon, other contributors\"\n \tVALUE \"OriginalFilename\", \"libe-book-0.0.dll\"\n \tVALUE \"ProductName\", \"libe-book\"\n-\tVALUE \"ProductVersion\", \"0.1.4\"\n+\tVALUE \"ProductVersion\", \"0.1.3\"\n       END\n     END\n     BLOCK \"VarFileInfo\"\ndiff --git a/src/lib/libebook_xml.cpp b/src/lib/libebook_xml.cpp\nindex 17dbc22..2838057 100644\n--- a/src/lib/libebook_xml.cpp\n+++ b/src/lib/libebook_xml.cpp\n@@ -7,16 +7,16 @@\n  * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n  */\n \n-#include \"libebook_xml.h\"\n-\n #include <cstring>\n \n #include <librevenge-stream/librevenge-stream.h>\n \n+#include \"libebook_xml.h\"\n+\n extern \"C\"\n {\n \n-  static int ebookXMLReadFromStream(void *context, char *buffer, int len)\n+  int ebookXMLReadFromStream(void *context, char *buffer, int len)\n   {\n     if (len<0)\n       return -1;\n@@ -40,7 +40,7 @@ extern \"C\"\n     return -1;\n   }\n \n-  static int ebookXMLCloseStream(void *)\n+  int ebookXMLCloseStream(void *)\n   {\n     return 0;\n   }\n@@ -50,15 +50,6 @@ extern \"C\"\n namespace libebook\n {\n \n-std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> makeXmlReader(librevenge::RVNGInputStream *input)\n-{\n-  return std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)>(\n-           xmlReaderForIO(ebookXMLReadFromStream, ebookXMLCloseStream, input, \"\", nullptr,\n-                          XML_PARSE_NOBLANKS | XML_PARSE_NONET | XML_PARSE_RECOVER),\n-           xmlFreeTextReader\n-         );\n-}\n-\n const char *char_cast(const char *const c)\n {\n   return c;\ndiff --git a/src/lib/libebook_xml.h b/src/lib/libebook_xml.h\nindex 14a476c..5254362 100644\n--- a/src/lib/libebook_xml.h\n+++ b/src/lib/libebook_xml.h\n@@ -10,17 +10,17 @@\n #ifndef LIBEBOOK_XML_H_INCLUDED\n #define LIBEBOOK_XML_H_INCLUDED\n \n-#include <memory>\n+extern \"C\"\n+{\n \n-#include <librevenge-stream/librevenge-stream.h>\n+  int ebookXMLReadFromStream(void *context, char *buffer, int len);\n+  int ebookXMLCloseStream(void *context);\n \n-#include <libxml/xmlreader.h>\n+}\n \n namespace libebook\n {\n \n-std::unique_ptr<xmlTextReader, void(*)(xmlTextReaderPtr)> makeXmlReader(librevenge::RVNGInputStream *input);\n-\n const char *char_cast(const char *c);\n const char *char_cast(const signed char *c);\n const char *char_cast(const unsigned char *c);\ndiff --git a/src/test/Makefile.in b/src/test/Makefile.in\nindex d09b815..a37c9dc 100644\n--- a/src/test/Makefile.in\n+++ b/src/test/Makefile.in\n@@ -1,7 +1,7 @@\n-# Makefile.in generated by automake 1.17 from Makefile.am.\n+# Makefile.in generated by automake 1.15.1 from Makefile.am.\n # @configure_input@\n \n-# Copyright (C) 1994-2024 Free Software Foundation, Inc.\n+# Copyright (C) 1994-2017 Free Software Foundation, Inc.\n \n # This Makefile.in is free software; the Free Software Foundation\n # gives unlimited permission to copy and/or distribute it,\n@@ -69,8 +69,6 @@ am__make_running_with_option = \\\n   test $$has_opt = yes\n am__make_dryrun = (target_option=n; $(am__make_running_with_option))\n am__make_keepgoing = (target_option=k; $(am__make_running_with_option))\n-am__rm_f = rm -f $(am__rm_f_notfound)\n-am__rm_rf = rm -rf $(am__rm_f_notfound)\n pkgdatadir = $(datadir)/@PACKAGE@\n pkgincludedir = $(includedir)/@PACKAGE@\n pkglibdir = $(libdir)/@PACKAGE@\n@@ -167,14 +165,7 @@ am__v_at_0 = @\n am__v_at_1 = \n DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)\n depcomp = $(SHELL) $(top_srcdir)/depcomp\n-am__maybe_remake_depfiles = depfiles\n-am__depfiles_remade = ./$(DEPDIR)/EBOOKBitStreamTest.Po \\\n-\t./$(DEPDIR)/EBOOKLanguageManagerTest.Po \\\n-\t./$(DEPDIR)/EBOOKMemoryStreamTest.Po \\\n-\t./$(DEPDIR)/PDBLZ77StreamTest.Po \\\n-\t./$(DEPDIR)/SoftBookLZSSStreamTest.Po \\\n-\t./$(DEPDIR)/XMLCollectorTest.Po \\\n-\t./$(DEPDIR)/XMLTreeWalkerTest.Po ./$(DEPDIR)/test.Po\n+am__depfiles_maybe = depfiles\n am__mv = mv -f\n CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \\\n \t$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)\n@@ -218,6 +209,8 @@ am__define_uniq_tagged_files = \\\n   unique=`for i in $$list; do \\\n     if test -f \"$$i\"; then echo $$i; else echo $(srcdir)/$$i; fi; \\\n   done | $(am__uniquify_input)`\n+ETAGS = etags\n+CTAGS = ctags\n am__tty_colors_dummy = \\\n   mgn= red= grn= lgn= blu= brg= std=; \\\n   am__color_tests=no\n@@ -262,9 +255,10 @@ am__base_list = \\\n   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\\n/ /g' | \\\n   sed '$$!N;$$!N;$$!N;$$!N;s/\\n/ /g'\n am__uninstall_files_from_dir = { \\\n-  { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n-  || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n-       $(am__cd) \"$$dir\" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \\\n+  test -z \"$$files\" \\\n+    || { test ! -d \"$$dir\" && test ! -f \"$$dir\" && test ! -r \"$$dir\"; } \\\n+    || { echo \" ( cd '$$dir' && rm -f\" $$files \")\"; \\\n+         $(am__cd) \"$$dir\" && rm -f $$files; }; \\\n   }\n am__recheck_rx = ^[ \t]*:recheck:[ \t]*\n am__global_test_result_rx = ^[ \t]*:global-test-result:[ \t]*\n@@ -352,7 +346,6 @@ am__sh_e_setup = case $$- in *e*) set +e;; esac\n # Default flags passed to test drivers.\n am__common_driver_flags = \\\n   --color-tests \"$$am__color_tests\" \\\n-  $$am__collect_skipped_logs \\\n   --enable-hard-errors \"$$am__enable_hard_errors\" \\\n   --expect-failure \"$$am__expect_failure\"\n # To be inserted before the command running the test.  Creates the\n@@ -377,11 +370,6 @@ if test -f \"./$$f\"; then dir=./;\t\t\t\\\n elif test -f \"$$f\"; then dir=;\t\t\t\t\\\n else dir=\"$(srcdir)/\"; fi;\t\t\t\t\\\n tst=$$dir$$f; log='$@'; \t\t\t\t\\\n-if test -n '$(IGNORE_SKIPPED_LOGS)'; then\t\t\\\n-  am__collect_skipped_logs='--collect-skipped-logs no';\t\\\n-else\t\t\t\t\t\t\t\\\n-  am__collect_skipped_logs='';\t\t\t\t\\\n-fi;\t\t\t\t\t\t\t\\\n if test -n '$(DISABLE_HARD_ERRORS)'; then\t\t\\\n   am__enable_hard_errors=no; \t\t\t\t\\\n else\t\t\t\t\t\t\t\\\n@@ -405,7 +393,6 @@ am__set_TESTS_bases = \\\n   bases='$(TEST_LOGS)'; \\\n   bases=`for i in $$bases; do echo $$i; done | sed 's/\\.log$$//'`; \\\n   bases=`echo $$bases`\n-AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'\n RECHECK_LOGS = $(TEST_LOGS)\n AM_RECURSIVE_TARGETS = check recheck\n TEST_SUITE_LOG = test-suite.log\n@@ -448,10 +435,8 @@ CPP = @CPP@\n CPPFLAGS = @CPPFLAGS@\n CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@\n CPPUNIT_LIBS = @CPPUNIT_LIBS@\n-CSCOPE = @CSCOPE@\n CSS_CFLAGS = @CSS_CFLAGS@\n CSS_LIBS = @CSS_LIBS@\n-CTAGS = @CTAGS@\n CXX = @CXX@\n CXXCPP = @CXXCPP@\n CXXDEPMODE = @CXXDEPMODE@\n@@ -476,10 +461,8 @@ ECHO_N = @ECHO_N@\n ECHO_T = @ECHO_T@\n EGREP = @EGREP@\n ENABLE_EXPERIMENTAL = @ENABLE_EXPERIMENTAL@\n-ETAGS = @ETAGS@\n EXEEXT = @EXEEXT@\n FGREP = @FGREP@\n-FILECMD = @FILECMD@\n GPERF = @GPERF@\n GREP = @GREP@\n HAVE_CXX11 = @HAVE_CXX11@\n@@ -558,10 +541,8 @@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@\n am__include = @am__include@\n am__leading_dot = @am__leading_dot@\n am__quote = @am__quote@\n-am__rm_f_notfound = @am__rm_f_notfound@\n am__tar = @am__tar@\n am__untar = @am__untar@\n-am__xargs_n = @am__xargs_n@\n bindir = @bindir@\n build = @build@\n build_alias = @build_alias@\n@@ -594,7 +575,6 @@ pdfdir = @pdfdir@\n prefix = @prefix@\n program_transform_name = @program_transform_name@\n psdir = @psdir@\n-runstatedir = @runstatedir@\n sbindir = @sbindir@\n sharedstatedir = @sharedstatedir@\n srcdir = @srcdir@\n@@ -636,8 +616,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status\n \t  *config.status*) \\\n \t    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \\\n \t  *) \\\n-\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \\\n-\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \\\n+\t    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \\\n+\t    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \\\n \tesac;\n \n $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)\n@@ -650,8 +630,13 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)\n $(am__aclocal_m4_deps):\n \n clean-checkPROGRAMS:\n-\t$(am__rm_f) $(check_PROGRAMS)\n-\ttest -z \"$(EXEEXT)\" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)\n+\t@list='$(check_PROGRAMS)'; test -n \"$$list\" || exit 0; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list || exit $$?; \\\n+\ttest -n \"$(EXEEXT)\" || exit 0; \\\n+\tlist=`for p in $$list; do echo \"$$p\"; done | sed 's/$(EXEEXT)$$//'`; \\\n+\techo \" rm -f\" $$list; \\\n+\trm -f $$list\n \n test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) \n \t@rm -f test$(EXEEXT)\n@@ -663,20 +648,14 @@ mostlyclean-compile:\n distclean-compile:\n \t-rm -f *.tab.c\n \n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EBOOKBitStreamTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EBOOKLanguageManagerTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EBOOKMemoryStreamTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDBLZ77StreamTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoftBookLZSSStreamTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLCollectorTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLTreeWalkerTest.Po@am__quote@ # am--include-marker\n-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@ # am--include-marker\n-\n-$(am__depfiles_remade):\n-\t@$(MKDIR_P) $(@D)\n-\t@: >>$@\n-\n-am--depfiles: $(am__depfiles_remade)\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EBOOKBitStreamTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EBOOKLanguageManagerTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EBOOKMemoryStreamTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PDBLZ77StreamTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoftBookLZSSStreamTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLCollectorTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XMLTreeWalkerTest.Po@am__quote@\n+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@\n \n .cpp.o:\n @am__fastdepCXX_TRUE@\t$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<\n@@ -770,6 +749,7 @@ distclean-tags:\n am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)\n am--force-recheck:\n \t@:\n+\n $(TEST_SUITE_LOG): $(TEST_LOGS)\n \t@$(am__set_TESTS_bases); \\\n \tam__f_ok () { test -f \"$$1\" && test -r \"$$1\"; }; \\\n@@ -845,37 +825,10 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)\n \t  result_count $$1 \"XPASS:\" $$xpass \"$$red\"; \\\n \t  result_count $$1 \"ERROR:\" $$error \"$$mgn\"; \\\n \t}; \\\n-\toutput_system_information () \\\n-\t{ \\\n-          echo;                                     \\\n-\t  { uname -a | $(AWK) '{                    \\\n-  printf \"System information (uname -a):\";          \\\n-  for (i = 1; i < NF; ++i)                          \\\n-    {                                               \\\n-      if (i != 2)                                   \\\n-        printf \" %s\", $$i;                          \\\n-    }                                               \\\n-  printf \"\\n\";                                      \\\n-}'; } 2>&1;                                         \\\n-\t  if test -r /etc/os-release; then          \\\n-\t    echo \"Distribution information (/etc/os-release):\"; \\\n-\t    sed 8q /etc/os-release;                 \\\n-\t  elif test -r /etc/issue; then             \\\n-\t    echo \"Distribution information (/etc/issue):\";      \\\n-\t    cat /etc/issue;                         \\\n-\t  fi;                                       \\\n-\t}; \\\n-\tplease_report () \\\n-\t{ \\\n-echo \"Some test(s) failed.  Please report this to $(PACKAGE_BUGREPORT),\";    \\\n-echo \"together with the test-suite.log file (gzipped) and your system\";      \\\n-echo \"information.  Thanks.\";                                                \\\n-\t}; \\\n \t{\t\t\t\t\t\t\t\t\\\n \t  echo \"$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)\" |\t\\\n \t    $(am__rst_title);\t\t\t\t\t\t\\\n \t  create_testsuite_report --no-color;\t\t\t\t\\\n-\t  output_system_information;                                    \\\n \t  echo;\t\t\t\t\t\t\t\t\\\n \t  echo \".. contents:: :depth: 2\";\t\t\t\t\\\n \t  echo;\t\t\t\t\t\t\t\t\\\n@@ -890,30 +843,31 @@ echo \"information.  Thanks.\";                                                \\\n \t  test x\"$$VERBOSE\" = x || cat $(TEST_SUITE_LOG);\t\t\\\n \tfi;\t\t\t\t\t\t\t\t\\\n \techo \"$${col}$$br$${std}\"; \t\t\t\t\t\\\n-\techo \"$${col}Testsuite summary\"$(AM_TESTSUITE_SUMMARY_HEADER)\"$${std}\";\t\\\n+\techo \"$${col}Testsuite summary for $(PACKAGE_STRING)$${std}\";\t\\\n \techo \"$${col}$$br$${std}\"; \t\t\t\t\t\\\n \tcreate_testsuite_report --maybe-color;\t\t\t\t\\\n \techo \"$$col$$br$$std\";\t\t\t\t\t\t\\\n \tif $$success; then :; else\t\t\t\t\t\\\n-\t  echo \"$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}\";\\\n+\t  echo \"$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}\";\t\t\\\n \t  if test -n \"$(PACKAGE_BUGREPORT)\"; then\t\t\t\\\n-\t    please_report | sed -e \"s/^/$${col}/\" -e s/'$$'/\"$${std}\"/; \\\n+\t    echo \"$${col}Please report to $(PACKAGE_BUGREPORT)$${std}\";\t\\\n \t  fi;\t\t\t\t\t\t\t\t\\\n \t  echo \"$$col$$br$$std\";\t\t\t\t\t\\\n \tfi;\t\t\t\t\t\t\t\t\\\n \t$$success || exit 1\n \n-check-TESTS: $(check_PROGRAMS)\n-\t@$(am__rm_f) $(RECHECK_LOGS)\n-\t@$(am__rm_f) $(RECHECK_LOGS:.log=.trs)\n-\t@$(am__rm_f) $(TEST_SUITE_LOG)\n+check-TESTS:\n+\t@list='$(RECHECK_LOGS)';           test -z \"$$list\" || rm -f $$list\n+\t@list='$(RECHECK_LOGS:.log=.trs)'; test -z \"$$list\" || rm -f $$list\n+\t@test -z \"$(TEST_SUITE_LOG)\" || rm -f $(TEST_SUITE_LOG)\n \t@set +e; $(am__set_TESTS_bases); \\\n \tlog_list=`for i in $$bases; do echo $$i.log; done`; \\\n-\tlog_list=`echo $$log_list`; \\\n+\ttrs_list=`for i in $$bases; do echo $$i.trs; done`; \\\n+\tlog_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \\\n \t$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS=\"$$log_list\"; \\\n \texit $$?;\n recheck: all $(check_PROGRAMS)\n-\t@$(am__rm_f) $(TEST_SUITE_LOG)\n+\t@test -z \"$(TEST_SUITE_LOG)\" || rm -f $(TEST_SUITE_LOG)\n \t@set +e; $(am__set_TESTS_bases); \\\n \tbases=`for i in $$bases; do echo $$i; done \\\n \t         | $(am__list_recheck_tests)` || exit 1; \\\n@@ -944,10 +898,8 @@ test.log: test$(EXEEXT)\n @am__EXEEXT_TRUE@\t--log-file $$b.log --trs-file $$b.trs \\\n @am__EXEEXT_TRUE@\t$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \\\n @am__EXEEXT_TRUE@\t\"$$tst\" $(AM_TESTS_FD_REDIRECT)\n-distdir: $(BUILT_SOURCES)\n-\t$(MAKE) $(AM_MAKEFLAGS) distdir-am\n \n-distdir-am: $(DISTFILES)\n+distdir: $(DISTFILES)\n \t@srcdirstrip=`echo \"$(srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \ttopsrcdirstrip=`echo \"$(top_srcdir)\" | sed 's/[].[^$$\\\\*]/\\\\\\\\&/g'`; \\\n \tlist='$(DISTFILES)'; \\\n@@ -1003,15 +955,15 @@ install-strip:\n \t    \"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'\" install; \\\n \tfi\n mostlyclean-generic:\n-\t-$(am__rm_f) $(TEST_LOGS)\n-\t-$(am__rm_f) $(TEST_LOGS:.log=.trs)\n-\t-$(am__rm_f) $(TEST_SUITE_LOG)\n+\t-test -z \"$(TEST_LOGS)\" || rm -f $(TEST_LOGS)\n+\t-test -z \"$(TEST_LOGS:.log=.trs)\" || rm -f $(TEST_LOGS:.log=.trs)\n+\t-test -z \"$(TEST_SUITE_LOG)\" || rm -f $(TEST_SUITE_LOG)\n \n clean-generic:\n \n distclean-generic:\n-\t-$(am__rm_f) $(CONFIG_CLEAN_FILES)\n-\t-test . = \"$(srcdir)\" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)\n+\t-test -z \"$(CONFIG_CLEAN_FILES)\" || rm -f $(CONFIG_CLEAN_FILES)\n+\t-test . = \"$(srcdir)\" || test -z \"$(CONFIG_CLEAN_VPATH_FILES)\" || rm -f $(CONFIG_CLEAN_VPATH_FILES)\n \n maintainer-clean-generic:\n \t@echo \"This command is intended for maintainers to use\"\n@@ -1022,14 +974,7 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \\\n \tmostlyclean-am\n \n distclean: distclean-am\n-\t-rm -f ./$(DEPDIR)/EBOOKBitStreamTest.Po\n-\t-rm -f ./$(DEPDIR)/EBOOKLanguageManagerTest.Po\n-\t-rm -f ./$(DEPDIR)/EBOOKMemoryStreamTest.Po\n-\t-rm -f ./$(DEPDIR)/PDBLZ77StreamTest.Po\n-\t-rm -f ./$(DEPDIR)/SoftBookLZSSStreamTest.Po\n-\t-rm -f ./$(DEPDIR)/XMLCollectorTest.Po\n-\t-rm -f ./$(DEPDIR)/XMLTreeWalkerTest.Po\n-\t-rm -f ./$(DEPDIR)/test.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n distclean-am: clean-am distclean-compile distclean-generic \\\n \tdistclean-tags\n@@ -1075,14 +1020,7 @@ install-ps-am:\n installcheck-am:\n \n maintainer-clean: maintainer-clean-am\n-\t-rm -f ./$(DEPDIR)/EBOOKBitStreamTest.Po\n-\t-rm -f ./$(DEPDIR)/EBOOKLanguageManagerTest.Po\n-\t-rm -f ./$(DEPDIR)/EBOOKMemoryStreamTest.Po\n-\t-rm -f ./$(DEPDIR)/PDBLZ77StreamTest.Po\n-\t-rm -f ./$(DEPDIR)/SoftBookLZSSStreamTest.Po\n-\t-rm -f ./$(DEPDIR)/XMLCollectorTest.Po\n-\t-rm -f ./$(DEPDIR)/XMLTreeWalkerTest.Po\n-\t-rm -f ./$(DEPDIR)/test.Po\n+\t-rm -rf ./$(DEPDIR)\n \t-rm -f Makefile\n maintainer-clean-am: distclean-am maintainer-clean-generic\n \n@@ -1103,16 +1041,16 @@ uninstall-am:\n \n .MAKE: check-am install-am install-strip\n \n-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \\\n-\tcheck-am clean clean-checkPROGRAMS clean-generic clean-libtool \\\n-\tcscopelist-am ctags ctags-am distclean distclean-compile \\\n-\tdistclean-generic distclean-libtool distclean-tags distdir dvi \\\n-\tdvi-am html html-am info info-am install install-am \\\n-\tinstall-data install-data-am install-dvi install-dvi-am \\\n-\tinstall-exec install-exec-am install-html install-html-am \\\n-\tinstall-info install-info-am install-man install-pdf \\\n-\tinstall-pdf-am install-ps install-ps-am install-strip \\\n-\tinstallcheck installcheck-am installdirs maintainer-clean \\\n+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \\\n+\tclean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \\\n+\tctags ctags-am distclean distclean-compile distclean-generic \\\n+\tdistclean-libtool distclean-tags distdir dvi dvi-am html \\\n+\thtml-am info info-am install install-am install-data \\\n+\tinstall-data-am install-dvi install-dvi-am install-exec \\\n+\tinstall-exec-am install-html install-html-am install-info \\\n+\tinstall-info-am install-man install-pdf install-pdf-am \\\n+\tinstall-ps install-ps-am install-strip installcheck \\\n+\tinstallcheck-am installdirs maintainer-clean \\\n \tmaintainer-clean-generic mostlyclean mostlyclean-compile \\\n \tmostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \\\n \trecheck tags tags-am uninstall uninstall-am\n@@ -1123,10 +1061,3 @@ uninstall-am:\n # Tell versions [3.59,3.63) of GNU make to not export all variables.\n # Otherwise a system limit (for SysV at least) may be exceeded.\n .NOEXPORT:\n-\n-# Tell GNU make to disable its built-in pattern rules.\n-%:: %,v\n-%:: RCS/%,v\n-%:: RCS/%\n-%:: s.%\n-%:: SCCS/s.%\ndiff --git a/test-driver b/test-driver\nindex dc38f62..32bf39e 100755\n--- a/test-driver\n+++ b/test-driver\n@@ -1,9 +1,9 @@\n #! /bin/sh\n # test-driver - basic testsuite driver script.\n \n-scriptversion=2024-06-19.01; # UTC\n+scriptversion=2012-06-27.10; # UTC\n \n-# Copyright (C) 2011-2024 Free Software Foundation, Inc.\n+# Copyright (C) 2011-2013 Free Software Foundation, Inc.\n #\n # This program is free software; you can redistribute it and/or modify\n # it under the terms of the GNU General Public License as published by\n@@ -16,7 +16,7 @@ scriptversion=2024-06-19.01; # UTC\n # GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program.  If not, see <https://www.gnu.org/licenses/>.\n+# along with this program.  If not, see <http://www.gnu.org/licenses/>.\n \n # As a special exception to the GNU General Public License, if you\n # distribute this file as part of a program that contains a\n@@ -42,58 +42,37 @@ print_usage ()\n {\n   cat <<END\n Usage:\n-  test-driver --test-name NAME --log-file PATH --trs-file PATH\n-              [--expect-failure {yes|no}] [--color-tests {yes|no}]\n-              [--collect-skipped-logs {yes|no}]\n-              [--enable-hard-errors {yes|no}] [--]\n-              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]\n-\n+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH\n+              [--expect-failure={yes|no}] [--color-tests={yes|no}]\n+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT\n The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n-See the GNU Automake documentation for information.\n-\n-Report bugs to <bug-automake@gnu.org>.\n-GNU Automake home page: <https://www.gnu.org/software/automake/>.\n-General help using GNU software: <https://www.gnu.org/gethelp/>.\n END\n }\n \n+# TODO: better error handling in option parsing (in particular, ensure\n+# TODO: $log_file, $trs_file and $test_name are defined).\n test_name= # Used for reporting.\n log_file=  # Where to save the output of the test script.\n trs_file=  # Where to save the metadata of the test run.\n expect_failure=no\n color_tests=no\n-collect_skipped_logs=yes\n enable_hard_errors=yes\n while test $# -gt 0; do\n   case $1 in\n   --help) print_usage; exit $?;;\n-  --version) echo \"test-driver (GNU Automake) $scriptversion\"; exit $?;;\n+  --version) echo \"test-driver $scriptversion\"; exit $?;;\n   --test-name) test_name=$2; shift;;\n   --log-file) log_file=$2; shift;;\n   --trs-file) trs_file=$2; shift;;\n   --color-tests) color_tests=$2; shift;;\n-  --collect-skipped-logs) collect_skipped_logs=$2; shift;;\n   --expect-failure) expect_failure=$2; shift;;\n   --enable-hard-errors) enable_hard_errors=$2; shift;;\n   --) shift; break;;\n   -*) usage_error \"invalid option: '$1'\";;\n-   *) break;;\n   esac\n   shift\n done\n \n-missing_opts=\n-test x\"$test_name\" = x && missing_opts=\"$missing_opts --test-name\"\n-test x\"$log_file\"  = x && missing_opts=\"$missing_opts --log-file\"\n-test x\"$trs_file\"  = x && missing_opts=\"$missing_opts --trs-file\"\n-if test x\"$missing_opts\" != x; then\n-  usage_error \"the following mandatory options are missing:$missing_opts\"\n-fi\n-\n-if test $# -eq 0; then\n-  usage_error \"missing argument\"\n-fi\n-\n if test $color_tests = yes; then\n   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.\n   red='\u001b[0;31m' # Red.\n@@ -112,34 +91,22 @@ trap \"st=130; $do_exit\" 2\n trap \"st=141; $do_exit\" 13\n trap \"st=143; $do_exit\" 15\n \n-# Test script is run here. We create the file first, then append to it,\n-# to ameliorate tests themselves also writing to the log file. Our tests\n-# don't, but others can (automake bug#35762).\n-: >\"$log_file\"\n-\"$@\" >>\"$log_file\" 2>&1\n+# Test script is run here.\n+\"$@\" >$log_file 2>&1\n estatus=$?\n-\n if test $enable_hard_errors = no && test $estatus -eq 99; then\n-  tweaked_estatus=1\n-else\n-  tweaked_estatus=$estatus\n+  estatus=1\n fi\n \n-case $tweaked_estatus:$expect_failure in\n+case $estatus:$expect_failure in\n   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;\n   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;\n-  77:*)  col=$blu res=SKIP  recheck=no  gcopy=$collect_skipped_logs;;\n+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;\n   99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;\n   *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;\n   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;\n esac\n \n-# Report the test outcome and exit status in the logs, so that one can\n-# know whether the test passed or failed simply by looking at the '.log'\n-# file, without the need of also peaking into the corresponding '.trs'\n-# file (automake bug#11814).\n-echo \"$res $test_name (exit status: $estatus)\" >>\"$log_file\"\n-\n # Report outcome to console.\n echo \"${col}${res}${std}: $test_name\"\n \n@@ -152,9 +119,9 @@ echo \":copy-in-global-log: $gcopy\" >> $trs_file\n # Local Variables:\n # mode: shell-script\n # sh-indentation: 2\n-# eval: (add-hook 'before-save-hook 'time-stamp)\n+# eval: (add-hook 'write-file-hooks 'time-stamp)\n # time-stamp-start: \"scriptversion=\"\n # time-stamp-format: \"%:y-%02m-%02d.%02H\"\n-# time-stamp-time-zone: \"UTC0\"\n+# time-stamp-time-zone: \"UTC\"\n # time-stamp-end: \"; # UTC\"\n # End:\n","remote_name":"master","revision":"git-v1:5f2518d906a160b2ad5603b804ec78bd298b7741","role":"main"}],"result_code":"success","result_tags":[],"revision":"git-v1:5f2518d906a160b2ad5603b804ec78bd298b7741","start_time":"2026-11-08T02:52:59.849176Z","subpath":"","suite":"control","target_branch_url":null,"vcs_type":"git","worker":"tyr"},"run_id":"e85279e8-401e-42fb-8057-05328e6ded23","success_probability":1.0,"suite":"control","total_previous_runs":1,"utcnow":"2026-11-09T03:19:22.175975893+00:00","vcs_type":"git","vcs_url":"git+ssh://git@salsa.debian.org/libreoffice-team/document-liberation/libe-book.git","version":"0.0.0","worker_log_name":"worker.log","worker_name":"tyr"}