Imported Upstream version 0.28 74/227874/1 upstream upstream/0.28
authorDoHyun Pyun <dh79.pyun@samsung.com>
Tue, 17 Mar 2020 03:33:22 +0000 (12:33 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Tue, 17 Mar 2020 03:37:58 +0000 (12:37 +0900)
Change-Id: I70dbc49b5589b9078fe98039e56dc6e2e3a7f4ca
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
198 files changed:
AUTHORS [new file with mode: 0644]
COPYING [new file with mode: 0644]
ChangeLog [new file with mode: 0644]
INSTALL [new file with mode: 0644]
Makefile.am [new file with mode: 0644]
Makefile.in [new file with mode: 0644]
README [new file with mode: 0644]
TODO [new file with mode: 0644]
acinclude.m4 [new file with mode: 0644]
aclocal.m4 [new file with mode: 0644]
build-aux/compile [new file with mode: 0755]
build-aux/config.guess [new file with mode: 0755]
build-aux/config.sub [new file with mode: 0755]
build-aux/depcomp [new file with mode: 0755]
build-aux/install-sh [new file with mode: 0755]
build-aux/libtool.m4 [new file with mode: 0644]
build-aux/ltmain.sh [new file with mode: 0644]
build-aux/ltoptions.m4 [new file with mode: 0644]
build-aux/ltsugar.m4 [new file with mode: 0644]
build-aux/ltversion.m4 [new file with mode: 0644]
build-aux/lt~obsolete.m4 [new file with mode: 0644]
build-aux/missing [new file with mode: 0755]
build-aux/test-driver [new file with mode: 0755]
config.h.in [new file with mode: 0644]
configure [new file with mode: 0755]
configure.ac [new file with mode: 0644]
ell/asn1-private.h [new file with mode: 0644]
ell/base64.c [new file with mode: 0644]
ell/base64.h [new file with mode: 0644]
ell/cert-private.h [new file with mode: 0644]
ell/cert.c [new file with mode: 0644]
ell/cert.h [new file with mode: 0644]
ell/checksum.c [new file with mode: 0644]
ell/checksum.h [new file with mode: 0644]
ell/cipher.c [new file with mode: 0644]
ell/cipher.h [new file with mode: 0644]
ell/dbus-client.c [new file with mode: 0644]
ell/dbus-client.h [new file with mode: 0644]
ell/dbus-filter.c [new file with mode: 0644]
ell/dbus-message.c [new file with mode: 0644]
ell/dbus-name-cache.c [new file with mode: 0644]
ell/dbus-private.h [new file with mode: 0644]
ell/dbus-service.c [new file with mode: 0644]
ell/dbus-service.h [new file with mode: 0644]
ell/dbus-util.c [new file with mode: 0644]
ell/dbus.c [new file with mode: 0644]
ell/dbus.h [new file with mode: 0644]
ell/dhcp-lease.c [new file with mode: 0644]
ell/dhcp-private.h [new file with mode: 0644]
ell/dhcp-transport.c [new file with mode: 0644]
ell/dhcp.c [new file with mode: 0644]
ell/dhcp.h [new file with mode: 0644]
ell/dir.c [new file with mode: 0644]
ell/dir.h [new file with mode: 0644]
ell/ecc-external.c [new file with mode: 0644]
ell/ecc-private.h [new file with mode: 0644]
ell/ecc.c [new file with mode: 0644]
ell/ecc.h [new file with mode: 0644]
ell/ecdh.c [new file with mode: 0644]
ell/ecdh.h [new file with mode: 0644]
ell/ell.h [new file with mode: 0644]
ell/ell.pc.in [new file with mode: 0644]
ell/ell.sym [new file with mode: 0644]
ell/file.c [new file with mode: 0644]
ell/file.h [new file with mode: 0644]
ell/genl-private.h [new file with mode: 0644]
ell/genl.c [new file with mode: 0644]
ell/genl.h [new file with mode: 0644]
ell/gpio.c [new file with mode: 0644]
ell/gpio.h [new file with mode: 0644]
ell/gvariant-private.h [new file with mode: 0644]
ell/gvariant-util.c [new file with mode: 0644]
ell/hashmap.c [new file with mode: 0644]
ell/hashmap.h [new file with mode: 0644]
ell/hwdb.c [new file with mode: 0644]
ell/hwdb.h [new file with mode: 0644]
ell/idle.c [new file with mode: 0644]
ell/idle.h [new file with mode: 0644]
ell/io.c [new file with mode: 0644]
ell/io.h [new file with mode: 0644]
ell/key.c [new file with mode: 0644]
ell/key.h [new file with mode: 0644]
ell/log.c [new file with mode: 0644]
ell/log.h [new file with mode: 0644]
ell/main.c [new file with mode: 0644]
ell/main.h [new file with mode: 0644]
ell/missing.h [new file with mode: 0644]
ell/net.c [new file with mode: 0644]
ell/net.h [new file with mode: 0644]
ell/netlink-private.h [new file with mode: 0644]
ell/netlink.c [new file with mode: 0644]
ell/netlink.h [new file with mode: 0644]
ell/path.c [new file with mode: 0644]
ell/path.h [new file with mode: 0644]
ell/pem-private.h [new file with mode: 0644]
ell/pem.c [new file with mode: 0644]
ell/pem.h [new file with mode: 0644]
ell/pkcs5-private.h [new file with mode: 0644]
ell/pkcs5.c [new file with mode: 0644]
ell/pkcs5.h [new file with mode: 0644]
ell/plugin.c [new file with mode: 0644]
ell/plugin.h [new file with mode: 0644]
ell/private.h [new file with mode: 0644]
ell/queue.c [new file with mode: 0644]
ell/queue.h [new file with mode: 0644]
ell/random.c [new file with mode: 0644]
ell/random.h [new file with mode: 0644]
ell/ringbuf.c [new file with mode: 0644]
ell/ringbuf.h [new file with mode: 0644]
ell/settings.c [new file with mode: 0644]
ell/settings.h [new file with mode: 0644]
ell/signal.c [new file with mode: 0644]
ell/signal.h [new file with mode: 0644]
ell/siphash-private.h [new file with mode: 0644]
ell/siphash.c [new file with mode: 0644]
ell/string.c [new file with mode: 0644]
ell/string.h [new file with mode: 0644]
ell/strv.c [new file with mode: 0644]
ell/strv.h [new file with mode: 0644]
ell/test.c [new file with mode: 0644]
ell/test.h [new file with mode: 0644]
ell/time.c [new file with mode: 0644]
ell/time.h [new file with mode: 0644]
ell/timeout.c [new file with mode: 0644]
ell/timeout.h [new file with mode: 0644]
ell/tls-extensions.c [new file with mode: 0644]
ell/tls-private.h [new file with mode: 0644]
ell/tls-record.c [new file with mode: 0644]
ell/tls-suites.c [new file with mode: 0644]
ell/tls.c [new file with mode: 0644]
ell/tls.h [new file with mode: 0644]
ell/uintset.c [new file with mode: 0644]
ell/uintset.h [new file with mode: 0644]
ell/utf8.c [new file with mode: 0644]
ell/utf8.h [new file with mode: 0644]
ell/util.c [new file with mode: 0644]
ell/util.h [new file with mode: 0644]
ell/uuid.c [new file with mode: 0644]
ell/uuid.h [new file with mode: 0644]
examples/dbus-client.c [new file with mode: 0644]
examples/dbus-service.c [new file with mode: 0644]
examples/dhcp-client.c [new file with mode: 0644]
examples/glib-eventloop.c [new file with mode: 0644]
examples/https-client-test.c [new file with mode: 0644]
examples/https-server-test.c [new file with mode: 0644]
linux/gpio.h [new file with mode: 0644]
tools/certchain-verify.c [new file with mode: 0644]
tools/genl-discover.c [new file with mode: 0644]
tools/genl-request.c [new file with mode: 0644]
tools/genl-watch.c [new file with mode: 0644]
tools/gpio.c [new file with mode: 0644]
unit/dbus.conf [new file with mode: 0644]
unit/example-plugin.c [new file with mode: 0644]
unit/gencerts.cnf [new file with mode: 0644]
unit/plaintext.txt [new file with mode: 0644]
unit/settings.test [new file with mode: 0644]
unit/test-base64.c [new file with mode: 0644]
unit/test-checksum.c [new file with mode: 0644]
unit/test-cipher.c [new file with mode: 0644]
unit/test-dbus-message-fds.c [new file with mode: 0644]
unit/test-dbus-message.c [new file with mode: 0644]
unit/test-dbus-properties.c [new file with mode: 0644]
unit/test-dbus-service.c [new file with mode: 0644]
unit/test-dbus-util.c [new file with mode: 0644]
unit/test-dbus-watch.c [new file with mode: 0644]
unit/test-dbus.c [new file with mode: 0644]
unit/test-dhcp.c [new file with mode: 0644]
unit/test-dir-watch.c [new file with mode: 0644]
unit/test-ecc.c [new file with mode: 0644]
unit/test-ecdh.c [new file with mode: 0644]
unit/test-endian.c [new file with mode: 0644]
unit/test-genl-msg.c [new file with mode: 0644]
unit/test-gvariant-message.c [new file with mode: 0644]
unit/test-gvariant-util.c [new file with mode: 0644]
unit/test-hashmap.c [new file with mode: 0644]
unit/test-hwdb.c [new file with mode: 0644]
unit/test-io.c [new file with mode: 0644]
unit/test-key.c [new file with mode: 0644]
unit/test-main.c [new file with mode: 0644]
unit/test-net.c [new file with mode: 0644]
unit/test-netlink.c [new file with mode: 0644]
unit/test-path.c [new file with mode: 0644]
unit/test-pbkdf2.c [new file with mode: 0644]
unit/test-pem.c [new file with mode: 0644]
unit/test-plugin.c [new file with mode: 0644]
unit/test-queue.c [new file with mode: 0644]
unit/test-random.c [new file with mode: 0644]
unit/test-ringbuf.c [new file with mode: 0644]
unit/test-settings.c [new file with mode: 0644]
unit/test-siphash.c [new file with mode: 0644]
unit/test-string.c [new file with mode: 0644]
unit/test-time.c [new file with mode: 0644]
unit/test-tls.c [new file with mode: 0644]
unit/test-uintset.c [new file with mode: 0644]
unit/test-unit.c [new file with mode: 0644]
unit/test-utf8.c [new file with mode: 0644]
unit/test-util.c [new file with mode: 0644]
unit/test-uuid.c [new file with mode: 0644]

diff --git a/AUTHORS b/AUTHORS
new file mode 100644 (file)
index 0000000..9b6e5dc
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,23 @@
+Marcel Holtmann <marcel@holtmann.org>
+Denis Kenzior <denkenz@gmail.com>
+Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
+Daniel Wagner <daniel.wagner@bmw-carit.de>
+Lucas De Marchi <lucas.de.marchi@gmail.com>
+Patrik Flykt <patrik.flykt@linux.intel.com>
+Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com>
+Andrew Zaborowski <andrew.zaborowski@intel.com>
+Szymon Janc <szymon.janc@codecoup.pl>
+Mat Martineau <mathew.j.martineau@linux.intel.com>
+Markus Ongyerth <ell@ongy.net>
+Tim Kourt <tim.a.kourt@linux.intel.com>
+Ossama Othman <ossama.othman@intel.com>
+Lukas Rusak <lorusak@gmail.com>
+Claudio Takahasi <ckt@cesar.org.br>
+Maxin B. John <maxin.john@intel.com>
+John Zimmermann <johnz@posteo.net>
+MichaÅ‚ Lowas-Rzechonek <michal.lowas-rzechonek@silvair.com>
+Michael Tretter <michael.tretter@posteo.net>
+Brian Gix <brian.gix@intel.com>
+Martin Hundebøll <martin@geanix.com>
+Jonas Witschel <diabonas@gmx.de>
+Will Dietz <w@wdtz.org>
diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..1f7c8cc
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,504 @@
+                 GNU LESSER GENERAL PUBLIC LICENSE
+                      Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                           Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                 GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                           NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                    END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..bf966af
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,122 @@
+ver 0.28:
+       Fix issue with NULL check of D-Bus proxy for method calls.
+       Add support for emitting D-Bus property changes on demand.
+       Add support for reporting file attribute changes.
+
+ver 0.27:
+       Fix issue with data overflow and multiple PEMs.
+       Fix issue with handling DHCP lease expiration.
+
+ver 0.26:
+       Fix issue with memory leak and TLS certificates.
+       Fix issue with buffer size and TLS PRF handling.
+       Add support for D-Bus non-root ObjectManager.
+
+ver 0.25:
+       Fix issue with stopping DHCP client and owner notification.
+       Fix issue with time calculation overflow and DHCP.
+
+ver 0.24:
+       Add support for extended groups in settings files.
+
+ver 0.23:
+       Add support for checking if uintset is empty.
+
+ver 0.22:
+       Fix issue with DHCP and T1 timeout handling.
+       Fix issue with escape characters in peer identity string.
+       Add support for setting peer certificate's subject CN mask.
+
+ver 0.21:
+       Fix issue with resetting DHCP lease on client stop.
+       Add support for GPIO helper functionality.
+
+ver 0.20:
+       Fix issue with DHCP client and handling renewing state.
+       Fix issue with DHCP client and handling rebinding state.
+       Fix issue with DHCP client and recommended retry timeouts.
+       Fix issue with Generic Netlink and family discovery.
+
+ver 0.19:
+       Fix issue with termination of Generic Netlink names.
+       Fix issue with handling ECC scalar initialization.
+
+ver 0.18:
+       Fix issue with handling revocation of keys.
+       Add support for TLS Signature Algorithms extension.
+       Add support for TLS version range configuration.
+       Add support for time utility functions.
+
+ver 0.17:
+       Add support for TLS Supported Groups extension.
+       Add support for TLS Hello extension feature.
+       Add support for ECC and ECDH functionality.
+
+ver 0.16:
+       Add support for watchdog notification handling from systemd.
+       Add support for generic X.509 certificate utilities.
+       Add support for using AEAD ciphers for TLS.
+
+ver 0.15:
+       Fix issue with signals not being registered properly.
+
+ver 0.14:
+       Fix issue with supporting l_genl_family_set_unicast_handler.
+       Fix issue with utilizing single shared signalfd file descriptor.
+
+ver 0.13:
+       Fix issue with using -std=c99 compiler option.
+       Fix issue with return value of l_getrandom_is_supported.
+
+ver 0.12:
+       Fix issue with unexported public API symbols.
+       Fix issue with handling netlink error return values.
+       Fix issue with handling hashmap removing of last entry.
+       Fix issue with handling zero-length secret for PRF.
+       Add support for directory watch interface.
+
+ver 0.11:
+       Fix issue with handling EPOLLHUP and EPOLLERR in IO watch.
+       Fix issue with closing of the fd inside IO watch handlers.
+       Fix issue with initialization of struct keyctl_dh_params.
+
+ver 0.10:
+       Fix issue with verifying total length of certificates.
+       Fix issue with loading v2 and v3 formatted hwdb.bin files.
+
+ver 0.9:
+       Fix issue with D-Bus subpath comparisons in object tree walk.
+       Fix issue with D-Bus InterfacesAdded on new ObjectManager addition.
+
+ver 0.8:
+       Fix issue with missing filesystem watch notifications.
+       Fix issue with buffer overrun and PBKDF2 support.
+       Add support for string argument parsing.
+
+ver 0.7:
+       Fix issue with generic netlink message sizes.
+       Add support for filesystem watch functionality.
+
+ver 0.6:
+       Fix issue with TLS failure handling.
+       Fix issue with loading empty settings file.
+
+ver 0.5:
+       Fix issue with missing exported debug symbols.
+       Add support for DHCP client library.
+
+ver 0.4:
+       Fix issue with propagate AEAD cipher failures.
+       Fix issue with AAD length and AEAD result reads.
+
+ver 0.3:
+       Fix issue with IO handling and re-entrancy.
+       Add support for D-Bus client proxy interface.
+
+ver 0.2:
+       Add support for mainloop integration functions.
+       Add support for PKCS#5 key derivation functions.
+       Add support for additional checksum and cipher types.
+
+ver 0.1:
+       Initial public release.
diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..56b077d
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..3ead678
--- /dev/null
@@ -0,0 +1,525 @@
+
+AM_MAKEFLAGS = --no-print-directory
+
+ACLOCAL_AMFLAGS = -I build-aux
+
+# Library code modified:       REVISION++
+# Interfaces changed:          CURRENT++ REVISION=0
+# Interfaces added:            CURRENT++ REVISION=0 AGE++
+# Interfaces removed:          CURRENT++ REVISION=0 AGE=0
+
+ELL_CURRENT = 0
+ELL_REVISION = 2
+ELL_AGE = 0
+
+linux_headers = linux/gpio.h
+
+pkginclude_HEADERS = ell/ell.h \
+                       ell/util.h \
+                       ell/test.h \
+                       ell/strv.h \
+                       ell/utf8.h \
+                       ell/queue.h \
+                       ell/hashmap.h \
+                       ell/string.h \
+                       ell/settings.h \
+                       ell/main.h \
+                       ell/idle.h \
+                       ell/signal.h \
+                       ell/timeout.h \
+                       ell/io.h \
+                       ell/ringbuf.h \
+                       ell/log.h \
+                       ell/plugin.h \
+                       ell/checksum.h \
+                       ell/netlink.h \
+                       ell/genl.h \
+                       ell/dbus.h \
+                       ell/dbus-service.h \
+                       ell/dbus-client.h \
+                       ell/hwdb.h \
+                       ell/cipher.h \
+                       ell/random.h \
+                       ell/uintset.h \
+                       ell/base64.h \
+                       ell/pem.h \
+                       ell/tls.h \
+                       ell/uuid.h \
+                       ell/key.h \
+                       ell/pkcs5.h \
+                       ell/file.h \
+                       ell/dir.h \
+                       ell/net.h \
+                       ell/dhcp.h \
+                       ell/cert.h \
+                       ell/ecc.h \
+                       ell/ecdh.h \
+                       ell/time.h \
+                       ell/gpio.h \
+                       ell/path.h
+
+lib_LTLIBRARIES = ell/libell.la
+
+ell_libell_la_SOURCES = $(linux_headers) \
+                       $(pkginclude_HEADERS) \
+                       ell/private.h \
+                       ell/missing.h \
+                       ell/util.c \
+                       ell/test.c \
+                       ell/strv.c \
+                       ell/utf8.c \
+                       ell/queue.c \
+                       ell/hashmap.c \
+                       ell/string.c \
+                       ell/settings.c \
+                       ell/main.c \
+                       ell/idle.c \
+                       ell/signal.c \
+                       ell/timeout.c \
+                       ell/io.c \
+                       ell/ringbuf.c \
+                       ell/log.c \
+                       ell/plugin.c \
+                       ell/checksum.c \
+                       ell/netlink-private.h \
+                       ell/netlink.c \
+                       ell/genl-private.h \
+                       ell/genl.c \
+                       ell/dbus-private.h \
+                       ell/dbus.c \
+                       ell/dbus-message.c \
+                       ell/dbus-util.c \
+                       ell/dbus-service.c \
+                       ell/dbus-client.c \
+                       ell/dbus-name-cache.c \
+                       ell/dbus-filter.c \
+                       ell/gvariant-private.h \
+                       ell/gvariant-util.c \
+                       ell/siphash-private.h \
+                       ell/siphash.c \
+                       ell/hwdb.c \
+                       ell/cipher.c \
+                       ell/random.c \
+                       ell/uintset.c \
+                       ell/base64.c \
+                       ell/asn1-private.h \
+                       ell/pem-private.h \
+                       ell/pem.c \
+                       ell/tls-private.h \
+                       ell/tls.c \
+                       ell/tls-record.c \
+                       ell/tls-extensions.c \
+                       ell/tls-suites.c \
+                       ell/uuid.c \
+                       ell/key.c \
+                       ell/pkcs5-private.h \
+                       ell/pkcs5.c \
+                       ell/file.c \
+                       ell/dir.c \
+                       ell/net.c \
+                       ell/dhcp-private.h \
+                       ell/dhcp.c \
+                       ell/dhcp-transport.c \
+                       ell/dhcp-lease.c \
+                       ell/cert.c \
+                       ell/cert-private.h \
+                       ell/ecc-private.h \
+                       ell/ecc.h \
+                       ell/ecc-external.c \
+                       ell/ecc.c \
+                       ell/ecdh.c \
+                       ell/time.c \
+                       ell/gpio.c \
+                       ell/path.c
+
+ell_libell_la_LDFLAGS = -no-undefined \
+                       -Wl,--version-script=$(top_srcdir)/ell/ell.sym \
+                       -version-info $(ELL_CURRENT):$(ELL_REVISION):$(ELL_AGE)
+
+ell_libell_la_DEPENDENCIES = ell/ell.sym
+
+noinst_LTLIBRARIES = ell/libell-private.la
+
+ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES)
+
+AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \
+                               -DCERTDIR=\""$(top_builddir)/unit/"\"
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+pkgconfig_DATA = ell/ell.pc
+
+noinst_PROGRAMS =
+
+unit_tests = unit/test-unit \
+                       unit/test-queue \
+                       unit/test-hashmap \
+                       unit/test-endian \
+                       unit/test-string \
+                       unit/test-utf8 \
+                       unit/test-main \
+                       unit/test-io \
+                       unit/test-ringbuf \
+                       unit/test-plugin \
+                       unit/test-checksum \
+                       unit/test-settings \
+                       unit/test-netlink \
+                       unit/test-genl-msg \
+                       unit/test-siphash \
+                       unit/test-cipher \
+                       unit/test-random \
+                       unit/test-util \
+                       unit/test-uintset \
+                       unit/test-base64 \
+                       unit/test-uuid \
+                       unit/test-pbkdf2 \
+                       unit/test-dhcp \
+                       unit/test-dir-watch \
+                       unit/test-ecc \
+                       unit/test-ecdh \
+                       unit/test-time \
+                       unit/test-path \
+                       unit/test-net
+
+dbus_tests = unit/test-hwdb \
+                       unit/test-dbus \
+                       unit/test-dbus-util \
+                       unit/test-dbus-message \
+                       unit/test-dbus-message-fds \
+                       unit/test-dbus-service \
+                       unit/test-dbus-watch \
+                       unit/test-dbus-properties \
+                       unit/test-gvariant-util \
+                       unit/test-gvariant-message
+
+cert_tests = unit/test-pem \
+                       unit/test-tls \
+                       unit/test-key
+
+cert_files = unit/cert-chain.pem \
+                       unit/cert-entity-int.pem \
+                       unit/cert-server.pem \
+                       unit/cert-client.pem \
+                       unit/cert-server-key-pkcs8.pem \
+                       unit/cert-client-key-pkcs8.pem \
+                       unit/cert-client-key-md5-des.pem \
+                       unit/cert-client-key-sha1-des.pem \
+                       unit/cert-client-key-v2-des.pem \
+                       unit/cert-client-key-v2-des-ede3.pem \
+                       unit/cert-client-key-v2-aes128.pem \
+                       unit/cert-client-key-v2-aes256.pem
+
+cert_checks = unit/cert-intca \
+                       unit/cert-entity-int \
+                       unit/cert-server \
+                       unit/cert-client
+
+if MAINTAINER_MODE
+noinst_PROGRAMS += $(unit_tests) $(dbus_tests) $(cert_tests)
+endif
+
+unit_test_unit_LDADD = ell/libell-private.la
+
+unit_test_queue_LDADD = ell/libell-private.la
+
+unit_test_hashmap_LDADD = ell/libell-private.la
+
+unit_test_endian_LDADD = ell/libell-private.la
+
+unit_test_string_LDADD = ell/libell-private.la
+
+unit_test_utf8_LDADD = ell/libell-private.la
+
+unit_test_main_LDADD = ell/libell-private.la
+
+unit_test_io_LDADD = ell/libell-private.la
+
+unit_test_ringbuf_LDADD = ell/libell-private.la
+
+unit_test_plugin_LDFLAGS = -Wl,-export-dynamic
+unit_test_plugin_LDADD = ell/libell-private.la -ldl
+
+unit_test_checksum_LDADD = ell/libell-private.la
+
+unit_test_settings_LDADD = ell/libell-private.la
+
+unit_test_netlink_LDADD = ell/libell-private.la
+
+unit_test_genl_msg_LDADD = ell/libell-private.la
+
+unit_test_dbus_LDADD = ell/libell-private.la
+
+unit_test_dbus_message_LDADD = ell/libell-private.la
+
+unit_test_dbus_message_fds_LDADD = ell/libell-private.la
+
+unit_test_dbus_util_LDADD = ell/libell-private.la
+
+unit_test_dbus_service_LDADD = ell/libell-private.la
+
+unit_test_dbus_watch_LDADD = ell/libell-private.la
+
+unit_test_dbus_properties_LDADD = ell/libell-private.la
+
+unit_test_gvariant_util_LDADD = ell/libell-private.la
+
+unit_test_gvariant_message_LDADD = ell/libell-private.la
+
+unit_test_siphash_LDADD = ell/libell-private.la
+
+unit_test_hwdb_LDADD = ell/libell-private.la
+
+unit_test_cipher_LDADD = ell/libell-private.la
+
+unit_test_random_LDADD = ell/libell-private.la
+
+unit_test_util_LDADD = ell/libell-private.la
+
+unit_test_uintset_LDADD = ell/libell-private.la
+
+unit_test_base64_LDADD = ell/libell-private.la
+
+unit_test_pbkdf2_LDADD = ell/libell-private.la
+
+unit_test_pem_LDADD = ell/libell-private.la
+unit_test_pem_DEPENDENCIES = $(cert_files) ell/libell-private.la
+
+unit_test_tls_LDADD = ell/libell-private.la
+unit_test_tls_DEPENDENCIES = $(cert_files) ell/libell-private.la
+
+unit_test_key_LDADD = ell/libell-private.la
+unit_test_key_DEPENDENCIES = $(cert_files) ell/libell-private.la
+
+unit_test_uuid_LDADD = ell/libell-private.la
+
+unit_test_dhcp_LDADD = ell/libell-private.la
+
+unit_test_dir_watch_LDADD = ell/libell-private.la
+
+unit_test_ecc_LDADD = ell/libell-private.la
+
+unit_test_ecdh_LDADD = ell/libell-private.la
+unit_test_ecdh_LDFLAGS = -Wl,-wrap,l_getrandom
+
+unit_test_time_LDADD = ell/libell-private.la
+
+unit_test_path_LDADD = ell/libell-private.la
+
+unit_test_net_LDADD = ell/libell-private.la
+
+if MAINTAINER_MODE
+noinst_LTLIBRARIES += unit/example-plugin.la
+endif
+
+unit_example_plugin_la_LDFLAGS = -no-undefined -module -avoid-version \
+                                                       -rpath /dummy
+
+unit_test_data_files = unit/settings.test unit/dbus.conf
+
+examples = examples/dbus-service examples/https-client-test \
+               examples/https-server-test examples/dbus-client \
+               examples/dhcp-client
+
+if GLIB
+examples += examples/glib-eventloop
+endif
+
+if MAINTAINER_MODE
+noinst_PROGRAMS += $(examples)
+endif
+
+examples_dbus_service_LDADD = ell/libell-private.la
+examples_https_client_test_LDADD = ell/libell-private.la
+examples_https_server_test_LDADD = ell/libell-private.la
+examples_dbus_client_LDADD = ell/libell-private.la
+examples_glib_eventloop_CFLAGS = @GLIB_CFLAGS@
+examples_glib_eventloop_LDADD = ell/libell-private.la @GLIB_LIBS@
+examples_dhcp_client_LDADD = ell/libell-private.la
+
+noinst_PROGRAMS += tools/certchain-verify tools/genl-discover \
+                  tools/genl-watch tools/genl-request tools/gpio
+tools_certchain_verify_SOURCES = tools/certchain-verify.c
+tools_certchain_verify_LDADD = ell/libell-private.la
+
+tools_genl_discover_SOURCES = tools/genl-discover.c
+tools_genl_discover_LDADD = ell/libell-private.la
+
+tools_genl_watch_SOURCES = tools/genl-watch.c
+tools_genl_watch_LDADD = ell/libell-private.la
+
+tools_genl_request_SOURCES = tools/genl-request.c
+tools_genl_request_LDADD = ell/libell-private.la
+
+tools_gpio_SOURCES = tools/gpio.c
+tools_gpio_LDADD = ell/libell-private.la
+
+EXTRA_DIST = ell/ell.sym \
+               $(unit_test_data_files) unit/gencerts.cnf unit/plaintext.txt
+
+TESTS = $(unit_tests)
+
+if DBUS_TESTS
+TESTS += $(dbus_tests)
+endif
+
+if CERT_TESTS
+TESTS += $(cert_tests)
+endif
+
+DISTCLEANFILES = $(unit_tests) $(dbus_tests) $(cert_tests)
+
+MAINTAINERCLEANFILES = Makefile.in configure config.h.in aclocal.m4
+
+true_redirect_openssl = 2>&1
+false_redirect_openssl = 2>/dev/null
+
+unit/cert-ca-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ 2048 $($(AM_V_P)_redirect_openssl)
+
+unit/cert-ca.pem: unit/cert-ca-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -x509 -new -nodes -extensions ca_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=International Union of Example Organizations/CN=Certificate issuer guy/emailAddress=ca@mail.example' \
+                       -key $< -sha256 -days 10000 -out $@
+
+unit/cert-server-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-server-key-pkcs8.pem: unit/cert-server-key.pem
+       $(AM_V_GEN)openssl pkcs8 -topk8 -nocrypt -in $< -out $@
+
+unit/cert-server.csr: unit/cert-server-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions cert_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=Foo Example Organization/CN=Foo Example Organization/emailAddress=foo@mail.example' \
+                       -key $< -out $@
+
+unit/cert-server.pem: unit/cert-server.csr unit/cert-ca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions server_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-ca.pem \
+                       -CAkey $(builddir)/unit/cert-ca-key.pem \
+                       -CAserial $(builddir)/unit/cert-ca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-server: unit/cert-server.pem unit/cert-ca.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-ca.pem $<
+
+unit/cert-client-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-client-key-pkcs8.pem: unit/cert-client-key.pem
+       $(AM_V_GEN)openssl pkcs8 -topk8 -nocrypt -in $< -out $@
+
+unit/cert-client-key-md5-des.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v1 PBE-MD5-DES -passout pass:abc
+
+unit/cert-client-key-sha1-des.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v1 PBE-SHA1-DES -passout pass:abc
+
+unit/cert-client-key-v2-des.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 des-cbc -v2prf hmacWithSHA1 -passout pass:abc
+
+unit/cert-client-key-v2-des-ede3.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 des-ede3-cbc -v2prf hmacWithSHA224 -passout pass:abc
+
+unit/cert-client-key-v2-aes128.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 aes128 -v2prf hmacWithSHA256 -passout pass:abc
+
+unit/cert-client-key-v2-aes256.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 aes256 -v2prf hmacWithSHA512 -passout pass:abc
+
+unit/cert-client.csr: unit/cert-client-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions cert_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=Bar Example Organization/CN=Bar Example Organization/emailAddress=bar@mail.example' \
+                       -key $< -out $@
+
+unit/cert-client.pem: unit/cert-client.csr unit/cert-ca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions cert_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-ca.pem \
+                       -CAkey $(builddir)/unit/cert-ca-key.pem \
+                       -CAserial $(builddir)/unit/cert-ca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-client: unit/cert-client.pem unit/cert-ca.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-ca.pem $<
+
+unit/cert-intca-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-intca.csr: unit/cert-intca-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions int_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=International Union of Example Organizations/CN=Certificate issuer guy/emailAddress=ca@mail.example' \
+                       -key $< -out $@
+
+unit/cert-intca.pem: unit/cert-intca.csr unit/cert-ca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions int_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-ca.pem \
+                       -CAkey $(builddir)/unit/cert-ca-key.pem \
+                       -CAserial $(builddir)/unit/cert-ca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-intca: unit/cert-intca.pem unit/cert-ca.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-ca.pem $<
+
+unit/cert-chain.pem: unit/cert-intca.pem unit/cert-ca.pem
+       $(AM_V_GEN)cat $^ > $@
+
+unit/cert-entity-int-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-entity-int.csr: unit/cert-entity-int-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions cert_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=Baz Example Organization/CN=Baz Example Organization/emailAddress=baz@mail.example' \
+                       -key $< -out $@
+
+unit/cert-entity-int.pem: unit/cert-entity-int.csr unit/cert-intca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions cert_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-intca.pem \
+                       -CAkey $(builddir)/unit/cert-intca-key.pem \
+                       -CAserial $(builddir)/unit/cert-intca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-entity-int: unit/cert-entity-int.pem unit/cert-chain.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-chain.pem $<
+
+unit/key-plaintext.h: unit/plaintext.txt
+       $(AM_V_GEN)xxd -i < $< > $@
+
+unit/key-ciphertext.dat: unit/plaintext.txt unit/cert-client.pem
+       $(AM_V_GEN)openssl rsautl -encrypt -pkcs -in $< -certin \
+                       -inkey $(builddir)/unit/cert-client.pem -out $@
+
+unit/key-ciphertext.h: unit/key-ciphertext.dat
+       $(AM_V_GEN)xxd -i < $< > $@
+
+unit/key-signature.dat: unit/plaintext.txt unit/cert-client-key.pem
+       $(AM_V_GEN)openssl rsautl -sign -pkcs -in $< \
+                       -inkey $(builddir)/unit/cert-client-key.pem -out $@
+
+unit/key-signature.h: unit/key-signature.dat
+       $(AM_V_GEN)xxd -i < $< > $@
+
+if MAINTAINER_MODE
+BUILT_SOURCES = unit/key-plaintext.h unit/key-ciphertext.h unit/key-signature.h
+
+check-local: $(cert_checks)
+endif
+
+clean-local:
+       -rm -f unit/cert-*.pem unit/cert-*.csr unit/cert-*.srl unit/key-*.dat
+
+maintainer-clean-local:
+       -rm -rf build-aux
diff --git a/Makefile.in b/Makefile.in
new file mode 100644 (file)
index 0000000..ff1441b
--- /dev/null
@@ -0,0 +1,3136 @@
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \  ]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+noinst_PROGRAMS = $(am__EXEEXT_6) tools/certchain-verify$(EXEEXT) \
+       tools/genl-discover$(EXEEXT) tools/genl-watch$(EXEEXT) \
+       tools/genl-request$(EXEEXT) tools/gpio$(EXEEXT)
+@MAINTAINER_MODE_TRUE@am__append_1 = $(unit_tests) $(dbus_tests) \
+@MAINTAINER_MODE_TRUE@ $(cert_tests) $(examples)
+@MAINTAINER_MODE_TRUE@am__append_2 = unit/example-plugin.la
+@GLIB_TRUE@am__append_3 = examples/glib-eventloop
+TESTS = $(am__EXEEXT_1) $(am__EXEEXT_7) $(am__EXEEXT_8)
+@DBUS_TESTS_TRUE@am__append_4 = $(dbus_tests)
+@CERT_TESTS_TRUE@am__append_5 = $(cert_tests)
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build-aux/libtool.m4 \
+       $(top_srcdir)/build-aux/ltoptions.m4 \
+       $(top_srcdir)/build-aux/ltsugar.m4 \
+       $(top_srcdir)/build-aux/ltversion.m4 \
+       $(top_srcdir)/build-aux/lt~obsolete.m4 \
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+       $(am__configure_deps) $(pkginclude_HEADERS) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = ell/ell.pc
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = unit/test-unit$(EXEEXT) unit/test-queue$(EXEEXT) \
+       unit/test-hashmap$(EXEEXT) unit/test-endian$(EXEEXT) \
+       unit/test-string$(EXEEXT) unit/test-utf8$(EXEEXT) \
+       unit/test-main$(EXEEXT) unit/test-io$(EXEEXT) \
+       unit/test-ringbuf$(EXEEXT) unit/test-plugin$(EXEEXT) \
+       unit/test-checksum$(EXEEXT) unit/test-settings$(EXEEXT) \
+       unit/test-netlink$(EXEEXT) unit/test-genl-msg$(EXEEXT) \
+       unit/test-siphash$(EXEEXT) unit/test-cipher$(EXEEXT) \
+       unit/test-random$(EXEEXT) unit/test-util$(EXEEXT) \
+       unit/test-uintset$(EXEEXT) unit/test-base64$(EXEEXT) \
+       unit/test-uuid$(EXEEXT) unit/test-pbkdf2$(EXEEXT) \
+       unit/test-dhcp$(EXEEXT) unit/test-dir-watch$(EXEEXT) \
+       unit/test-ecc$(EXEEXT) unit/test-ecdh$(EXEEXT) \
+       unit/test-time$(EXEEXT) unit/test-path$(EXEEXT) \
+       unit/test-net$(EXEEXT)
+am__EXEEXT_2 = unit/test-hwdb$(EXEEXT) unit/test-dbus$(EXEEXT) \
+       unit/test-dbus-util$(EXEEXT) unit/test-dbus-message$(EXEEXT) \
+       unit/test-dbus-message-fds$(EXEEXT) \
+       unit/test-dbus-service$(EXEEXT) unit/test-dbus-watch$(EXEEXT) \
+       unit/test-dbus-properties$(EXEEXT) \
+       unit/test-gvariant-util$(EXEEXT) \
+       unit/test-gvariant-message$(EXEEXT)
+am__EXEEXT_3 = unit/test-pem$(EXEEXT) unit/test-tls$(EXEEXT) \
+       unit/test-key$(EXEEXT)
+@GLIB_TRUE@am__EXEEXT_4 = examples/glib-eventloop$(EXEEXT)
+am__EXEEXT_5 = examples/dbus-service$(EXEEXT) \
+       examples/https-client-test$(EXEEXT) \
+       examples/https-server-test$(EXEEXT) \
+       examples/dbus-client$(EXEEXT) examples/dhcp-client$(EXEEXT) \
+       $(am__EXEEXT_4)
+@MAINTAINER_MODE_TRUE@am__EXEEXT_6 = $(am__EXEEXT_1) $(am__EXEEXT_2) \
+@MAINTAINER_MODE_TRUE@ $(am__EXEEXT_3) $(am__EXEEXT_5)
+PROGRAMS = $(noinst_PROGRAMS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+       "$(DESTDIR)$(pkgincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ell_libell_private_la_LIBADD =
+am__objects_1 =
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_2 = $(am__objects_1) $(am__objects_1) ell/util.lo \
+       ell/test.lo ell/strv.lo ell/utf8.lo ell/queue.lo \
+       ell/hashmap.lo ell/string.lo ell/settings.lo ell/main.lo \
+       ell/idle.lo ell/signal.lo ell/timeout.lo ell/io.lo \
+       ell/ringbuf.lo ell/log.lo ell/plugin.lo ell/checksum.lo \
+       ell/netlink.lo ell/genl.lo ell/dbus.lo ell/dbus-message.lo \
+       ell/dbus-util.lo ell/dbus-service.lo ell/dbus-client.lo \
+       ell/dbus-name-cache.lo ell/dbus-filter.lo ell/gvariant-util.lo \
+       ell/siphash.lo ell/hwdb.lo ell/cipher.lo ell/random.lo \
+       ell/uintset.lo ell/base64.lo ell/pem.lo ell/tls.lo \
+       ell/tls-record.lo ell/tls-extensions.lo ell/tls-suites.lo \
+       ell/uuid.lo ell/key.lo ell/pkcs5.lo ell/file.lo ell/dir.lo \
+       ell/net.lo ell/dhcp.lo ell/dhcp-transport.lo ell/dhcp-lease.lo \
+       ell/cert.lo ell/ecc-external.lo ell/ecc.lo ell/ecdh.lo \
+       ell/time.lo ell/gpio.lo ell/path.lo
+am_ell_libell_private_la_OBJECTS = $(am__objects_2)
+ell_libell_private_la_OBJECTS = $(am_ell_libell_private_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ell_libell_la_LIBADD =
+am_ell_libell_la_OBJECTS = $(am__objects_1) $(am__objects_1) \
+       ell/util.lo ell/test.lo ell/strv.lo ell/utf8.lo ell/queue.lo \
+       ell/hashmap.lo ell/string.lo ell/settings.lo ell/main.lo \
+       ell/idle.lo ell/signal.lo ell/timeout.lo ell/io.lo \
+       ell/ringbuf.lo ell/log.lo ell/plugin.lo ell/checksum.lo \
+       ell/netlink.lo ell/genl.lo ell/dbus.lo ell/dbus-message.lo \
+       ell/dbus-util.lo ell/dbus-service.lo ell/dbus-client.lo \
+       ell/dbus-name-cache.lo ell/dbus-filter.lo ell/gvariant-util.lo \
+       ell/siphash.lo ell/hwdb.lo ell/cipher.lo ell/random.lo \
+       ell/uintset.lo ell/base64.lo ell/pem.lo ell/tls.lo \
+       ell/tls-record.lo ell/tls-extensions.lo ell/tls-suites.lo \
+       ell/uuid.lo ell/key.lo ell/pkcs5.lo ell/file.lo ell/dir.lo \
+       ell/net.lo ell/dhcp.lo ell/dhcp-transport.lo ell/dhcp-lease.lo \
+       ell/cert.lo ell/ecc-external.lo ell/ecc.lo ell/ecdh.lo \
+       ell/time.lo ell/gpio.lo ell/path.lo
+ell_libell_la_OBJECTS = $(am_ell_libell_la_OBJECTS)
+ell_libell_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(ell_libell_la_LDFLAGS) $(LDFLAGS) -o $@
+unit_example_plugin_la_LIBADD =
+unit_example_plugin_la_SOURCES = unit/example-plugin.c
+unit_example_plugin_la_OBJECTS = unit/example-plugin.lo
+unit_example_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(unit_example_plugin_la_LDFLAGS) \
+       $(LDFLAGS) -o $@
+@MAINTAINER_MODE_TRUE@am_unit_example_plugin_la_rpath =
+examples_dbus_client_SOURCES = examples/dbus-client.c
+examples_dbus_client_OBJECTS = examples/dbus-client.$(OBJEXT)
+examples_dbus_client_DEPENDENCIES = ell/libell-private.la
+examples_dbus_service_SOURCES = examples/dbus-service.c
+examples_dbus_service_OBJECTS = examples/dbus-service.$(OBJEXT)
+examples_dbus_service_DEPENDENCIES = ell/libell-private.la
+examples_dhcp_client_SOURCES = examples/dhcp-client.c
+examples_dhcp_client_OBJECTS = examples/dhcp-client.$(OBJEXT)
+examples_dhcp_client_DEPENDENCIES = ell/libell-private.la
+examples_glib_eventloop_SOURCES = examples/glib-eventloop.c
+examples_glib_eventloop_OBJECTS =  \
+       examples/glib_eventloop-glib-eventloop.$(OBJEXT)
+examples_glib_eventloop_DEPENDENCIES = ell/libell-private.la
+examples_glib_eventloop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(examples_glib_eventloop_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+       $(LDFLAGS) -o $@
+examples_https_client_test_SOURCES = examples/https-client-test.c
+examples_https_client_test_OBJECTS =  \
+       examples/https-client-test.$(OBJEXT)
+examples_https_client_test_DEPENDENCIES = ell/libell-private.la
+examples_https_server_test_SOURCES = examples/https-server-test.c
+examples_https_server_test_OBJECTS =  \
+       examples/https-server-test.$(OBJEXT)
+examples_https_server_test_DEPENDENCIES = ell/libell-private.la
+am_tools_certchain_verify_OBJECTS = tools/certchain-verify.$(OBJEXT)
+tools_certchain_verify_OBJECTS = $(am_tools_certchain_verify_OBJECTS)
+tools_certchain_verify_DEPENDENCIES = ell/libell-private.la
+am_tools_genl_discover_OBJECTS = tools/genl-discover.$(OBJEXT)
+tools_genl_discover_OBJECTS = $(am_tools_genl_discover_OBJECTS)
+tools_genl_discover_DEPENDENCIES = ell/libell-private.la
+am_tools_genl_request_OBJECTS = tools/genl-request.$(OBJEXT)
+tools_genl_request_OBJECTS = $(am_tools_genl_request_OBJECTS)
+tools_genl_request_DEPENDENCIES = ell/libell-private.la
+am_tools_genl_watch_OBJECTS = tools/genl-watch.$(OBJEXT)
+tools_genl_watch_OBJECTS = $(am_tools_genl_watch_OBJECTS)
+tools_genl_watch_DEPENDENCIES = ell/libell-private.la
+am_tools_gpio_OBJECTS = tools/gpio.$(OBJEXT)
+tools_gpio_OBJECTS = $(am_tools_gpio_OBJECTS)
+tools_gpio_DEPENDENCIES = ell/libell-private.la
+unit_test_base64_SOURCES = unit/test-base64.c
+unit_test_base64_OBJECTS = unit/test-base64.$(OBJEXT)
+unit_test_base64_DEPENDENCIES = ell/libell-private.la
+unit_test_checksum_SOURCES = unit/test-checksum.c
+unit_test_checksum_OBJECTS = unit/test-checksum.$(OBJEXT)
+unit_test_checksum_DEPENDENCIES = ell/libell-private.la
+unit_test_cipher_SOURCES = unit/test-cipher.c
+unit_test_cipher_OBJECTS = unit/test-cipher.$(OBJEXT)
+unit_test_cipher_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_SOURCES = unit/test-dbus.c
+unit_test_dbus_OBJECTS = unit/test-dbus.$(OBJEXT)
+unit_test_dbus_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_message_SOURCES = unit/test-dbus-message.c
+unit_test_dbus_message_OBJECTS = unit/test-dbus-message.$(OBJEXT)
+unit_test_dbus_message_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_message_fds_SOURCES = unit/test-dbus-message-fds.c
+unit_test_dbus_message_fds_OBJECTS =  \
+       unit/test-dbus-message-fds.$(OBJEXT)
+unit_test_dbus_message_fds_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_properties_SOURCES = unit/test-dbus-properties.c
+unit_test_dbus_properties_OBJECTS =  \
+       unit/test-dbus-properties.$(OBJEXT)
+unit_test_dbus_properties_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_service_SOURCES = unit/test-dbus-service.c
+unit_test_dbus_service_OBJECTS = unit/test-dbus-service.$(OBJEXT)
+unit_test_dbus_service_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_util_SOURCES = unit/test-dbus-util.c
+unit_test_dbus_util_OBJECTS = unit/test-dbus-util.$(OBJEXT)
+unit_test_dbus_util_DEPENDENCIES = ell/libell-private.la
+unit_test_dbus_watch_SOURCES = unit/test-dbus-watch.c
+unit_test_dbus_watch_OBJECTS = unit/test-dbus-watch.$(OBJEXT)
+unit_test_dbus_watch_DEPENDENCIES = ell/libell-private.la
+unit_test_dhcp_SOURCES = unit/test-dhcp.c
+unit_test_dhcp_OBJECTS = unit/test-dhcp.$(OBJEXT)
+unit_test_dhcp_DEPENDENCIES = ell/libell-private.la
+unit_test_dir_watch_SOURCES = unit/test-dir-watch.c
+unit_test_dir_watch_OBJECTS = unit/test-dir-watch.$(OBJEXT)
+unit_test_dir_watch_DEPENDENCIES = ell/libell-private.la
+unit_test_ecc_SOURCES = unit/test-ecc.c
+unit_test_ecc_OBJECTS = unit/test-ecc.$(OBJEXT)
+unit_test_ecc_DEPENDENCIES = ell/libell-private.la
+unit_test_ecdh_SOURCES = unit/test-ecdh.c
+unit_test_ecdh_OBJECTS = unit/test-ecdh.$(OBJEXT)
+unit_test_ecdh_DEPENDENCIES = ell/libell-private.la
+unit_test_ecdh_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(unit_test_ecdh_LDFLAGS) $(LDFLAGS) -o \
+       $@
+unit_test_endian_SOURCES = unit/test-endian.c
+unit_test_endian_OBJECTS = unit/test-endian.$(OBJEXT)
+unit_test_endian_DEPENDENCIES = ell/libell-private.la
+unit_test_genl_msg_SOURCES = unit/test-genl-msg.c
+unit_test_genl_msg_OBJECTS = unit/test-genl-msg.$(OBJEXT)
+unit_test_genl_msg_DEPENDENCIES = ell/libell-private.la
+unit_test_gvariant_message_SOURCES = unit/test-gvariant-message.c
+unit_test_gvariant_message_OBJECTS =  \
+       unit/test-gvariant-message.$(OBJEXT)
+unit_test_gvariant_message_DEPENDENCIES = ell/libell-private.la
+unit_test_gvariant_util_SOURCES = unit/test-gvariant-util.c
+unit_test_gvariant_util_OBJECTS = unit/test-gvariant-util.$(OBJEXT)
+unit_test_gvariant_util_DEPENDENCIES = ell/libell-private.la
+unit_test_hashmap_SOURCES = unit/test-hashmap.c
+unit_test_hashmap_OBJECTS = unit/test-hashmap.$(OBJEXT)
+unit_test_hashmap_DEPENDENCIES = ell/libell-private.la
+unit_test_hwdb_SOURCES = unit/test-hwdb.c
+unit_test_hwdb_OBJECTS = unit/test-hwdb.$(OBJEXT)
+unit_test_hwdb_DEPENDENCIES = ell/libell-private.la
+unit_test_io_SOURCES = unit/test-io.c
+unit_test_io_OBJECTS = unit/test-io.$(OBJEXT)
+unit_test_io_DEPENDENCIES = ell/libell-private.la
+unit_test_key_SOURCES = unit/test-key.c
+unit_test_key_OBJECTS = unit/test-key.$(OBJEXT)
+unit_test_main_SOURCES = unit/test-main.c
+unit_test_main_OBJECTS = unit/test-main.$(OBJEXT)
+unit_test_main_DEPENDENCIES = ell/libell-private.la
+unit_test_net_SOURCES = unit/test-net.c
+unit_test_net_OBJECTS = unit/test-net.$(OBJEXT)
+unit_test_net_DEPENDENCIES = ell/libell-private.la
+unit_test_netlink_SOURCES = unit/test-netlink.c
+unit_test_netlink_OBJECTS = unit/test-netlink.$(OBJEXT)
+unit_test_netlink_DEPENDENCIES = ell/libell-private.la
+unit_test_path_SOURCES = unit/test-path.c
+unit_test_path_OBJECTS = unit/test-path.$(OBJEXT)
+unit_test_path_DEPENDENCIES = ell/libell-private.la
+unit_test_pbkdf2_SOURCES = unit/test-pbkdf2.c
+unit_test_pbkdf2_OBJECTS = unit/test-pbkdf2.$(OBJEXT)
+unit_test_pbkdf2_DEPENDENCIES = ell/libell-private.la
+unit_test_pem_SOURCES = unit/test-pem.c
+unit_test_pem_OBJECTS = unit/test-pem.$(OBJEXT)
+unit_test_plugin_SOURCES = unit/test-plugin.c
+unit_test_plugin_OBJECTS = unit/test-plugin.$(OBJEXT)
+unit_test_plugin_DEPENDENCIES = ell/libell-private.la
+unit_test_plugin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(unit_test_plugin_LDFLAGS) $(LDFLAGS) \
+       -o $@
+unit_test_queue_SOURCES = unit/test-queue.c
+unit_test_queue_OBJECTS = unit/test-queue.$(OBJEXT)
+unit_test_queue_DEPENDENCIES = ell/libell-private.la
+unit_test_random_SOURCES = unit/test-random.c
+unit_test_random_OBJECTS = unit/test-random.$(OBJEXT)
+unit_test_random_DEPENDENCIES = ell/libell-private.la
+unit_test_ringbuf_SOURCES = unit/test-ringbuf.c
+unit_test_ringbuf_OBJECTS = unit/test-ringbuf.$(OBJEXT)
+unit_test_ringbuf_DEPENDENCIES = ell/libell-private.la
+unit_test_settings_SOURCES = unit/test-settings.c
+unit_test_settings_OBJECTS = unit/test-settings.$(OBJEXT)
+unit_test_settings_DEPENDENCIES = ell/libell-private.la
+unit_test_siphash_SOURCES = unit/test-siphash.c
+unit_test_siphash_OBJECTS = unit/test-siphash.$(OBJEXT)
+unit_test_siphash_DEPENDENCIES = ell/libell-private.la
+unit_test_string_SOURCES = unit/test-string.c
+unit_test_string_OBJECTS = unit/test-string.$(OBJEXT)
+unit_test_string_DEPENDENCIES = ell/libell-private.la
+unit_test_time_SOURCES = unit/test-time.c
+unit_test_time_OBJECTS = unit/test-time.$(OBJEXT)
+unit_test_time_DEPENDENCIES = ell/libell-private.la
+unit_test_tls_SOURCES = unit/test-tls.c
+unit_test_tls_OBJECTS = unit/test-tls.$(OBJEXT)
+unit_test_uintset_SOURCES = unit/test-uintset.c
+unit_test_uintset_OBJECTS = unit/test-uintset.$(OBJEXT)
+unit_test_uintset_DEPENDENCIES = ell/libell-private.la
+unit_test_unit_SOURCES = unit/test-unit.c
+unit_test_unit_OBJECTS = unit/test-unit.$(OBJEXT)
+unit_test_unit_DEPENDENCIES = ell/libell-private.la
+unit_test_utf8_SOURCES = unit/test-utf8.c
+unit_test_utf8_OBJECTS = unit/test-utf8.$(OBJEXT)
+unit_test_utf8_DEPENDENCIES = ell/libell-private.la
+unit_test_util_SOURCES = unit/test-util.c
+unit_test_util_OBJECTS = unit/test-util.$(OBJEXT)
+unit_test_util_DEPENDENCIES = ell/libell-private.la
+unit_test_uuid_SOURCES = unit/test-uuid.c
+unit_test_uuid_OBJECTS = unit/test-uuid.$(OBJEXT)
+unit_test_uuid_DEPENDENCIES = ell/libell-private.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ell/$(DEPDIR)/base64.Plo ell/$(DEPDIR)/cert.Plo \
+       ell/$(DEPDIR)/checksum.Plo ell/$(DEPDIR)/cipher.Plo \
+       ell/$(DEPDIR)/dbus-client.Plo ell/$(DEPDIR)/dbus-filter.Plo \
+       ell/$(DEPDIR)/dbus-message.Plo \
+       ell/$(DEPDIR)/dbus-name-cache.Plo \
+       ell/$(DEPDIR)/dbus-service.Plo ell/$(DEPDIR)/dbus-util.Plo \
+       ell/$(DEPDIR)/dbus.Plo ell/$(DEPDIR)/dhcp-lease.Plo \
+       ell/$(DEPDIR)/dhcp-transport.Plo ell/$(DEPDIR)/dhcp.Plo \
+       ell/$(DEPDIR)/dir.Plo ell/$(DEPDIR)/ecc-external.Plo \
+       ell/$(DEPDIR)/ecc.Plo ell/$(DEPDIR)/ecdh.Plo \
+       ell/$(DEPDIR)/file.Plo ell/$(DEPDIR)/genl.Plo \
+       ell/$(DEPDIR)/gpio.Plo ell/$(DEPDIR)/gvariant-util.Plo \
+       ell/$(DEPDIR)/hashmap.Plo ell/$(DEPDIR)/hwdb.Plo \
+       ell/$(DEPDIR)/idle.Plo ell/$(DEPDIR)/io.Plo \
+       ell/$(DEPDIR)/key.Plo ell/$(DEPDIR)/log.Plo \
+       ell/$(DEPDIR)/main.Plo ell/$(DEPDIR)/net.Plo \
+       ell/$(DEPDIR)/netlink.Plo ell/$(DEPDIR)/path.Plo \
+       ell/$(DEPDIR)/pem.Plo ell/$(DEPDIR)/pkcs5.Plo \
+       ell/$(DEPDIR)/plugin.Plo ell/$(DEPDIR)/queue.Plo \
+       ell/$(DEPDIR)/random.Plo ell/$(DEPDIR)/ringbuf.Plo \
+       ell/$(DEPDIR)/settings.Plo ell/$(DEPDIR)/signal.Plo \
+       ell/$(DEPDIR)/siphash.Plo ell/$(DEPDIR)/string.Plo \
+       ell/$(DEPDIR)/strv.Plo ell/$(DEPDIR)/test.Plo \
+       ell/$(DEPDIR)/time.Plo ell/$(DEPDIR)/timeout.Plo \
+       ell/$(DEPDIR)/tls-extensions.Plo ell/$(DEPDIR)/tls-record.Plo \
+       ell/$(DEPDIR)/tls-suites.Plo ell/$(DEPDIR)/tls.Plo \
+       ell/$(DEPDIR)/uintset.Plo ell/$(DEPDIR)/utf8.Plo \
+       ell/$(DEPDIR)/util.Plo ell/$(DEPDIR)/uuid.Plo \
+       examples/$(DEPDIR)/dbus-client.Po \
+       examples/$(DEPDIR)/dbus-service.Po \
+       examples/$(DEPDIR)/dhcp-client.Po \
+       examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Po \
+       examples/$(DEPDIR)/https-client-test.Po \
+       examples/$(DEPDIR)/https-server-test.Po \
+       tools/$(DEPDIR)/certchain-verify.Po \
+       tools/$(DEPDIR)/genl-discover.Po \
+       tools/$(DEPDIR)/genl-request.Po tools/$(DEPDIR)/genl-watch.Po \
+       tools/$(DEPDIR)/gpio.Po unit/$(DEPDIR)/example-plugin.Plo \
+       unit/$(DEPDIR)/test-base64.Po unit/$(DEPDIR)/test-checksum.Po \
+       unit/$(DEPDIR)/test-cipher.Po \
+       unit/$(DEPDIR)/test-dbus-message-fds.Po \
+       unit/$(DEPDIR)/test-dbus-message.Po \
+       unit/$(DEPDIR)/test-dbus-properties.Po \
+       unit/$(DEPDIR)/test-dbus-service.Po \
+       unit/$(DEPDIR)/test-dbus-util.Po \
+       unit/$(DEPDIR)/test-dbus-watch.Po unit/$(DEPDIR)/test-dbus.Po \
+       unit/$(DEPDIR)/test-dhcp.Po unit/$(DEPDIR)/test-dir-watch.Po \
+       unit/$(DEPDIR)/test-ecc.Po unit/$(DEPDIR)/test-ecdh.Po \
+       unit/$(DEPDIR)/test-endian.Po unit/$(DEPDIR)/test-genl-msg.Po \
+       unit/$(DEPDIR)/test-gvariant-message.Po \
+       unit/$(DEPDIR)/test-gvariant-util.Po \
+       unit/$(DEPDIR)/test-hashmap.Po unit/$(DEPDIR)/test-hwdb.Po \
+       unit/$(DEPDIR)/test-io.Po unit/$(DEPDIR)/test-key.Po \
+       unit/$(DEPDIR)/test-main.Po unit/$(DEPDIR)/test-net.Po \
+       unit/$(DEPDIR)/test-netlink.Po unit/$(DEPDIR)/test-path.Po \
+       unit/$(DEPDIR)/test-pbkdf2.Po unit/$(DEPDIR)/test-pem.Po \
+       unit/$(DEPDIR)/test-plugin.Po unit/$(DEPDIR)/test-queue.Po \
+       unit/$(DEPDIR)/test-random.Po unit/$(DEPDIR)/test-ringbuf.Po \
+       unit/$(DEPDIR)/test-settings.Po unit/$(DEPDIR)/test-siphash.Po \
+       unit/$(DEPDIR)/test-string.Po unit/$(DEPDIR)/test-time.Po \
+       unit/$(DEPDIR)/test-tls.Po unit/$(DEPDIR)/test-uintset.Po \
+       unit/$(DEPDIR)/test-unit.Po unit/$(DEPDIR)/test-utf8.Po \
+       unit/$(DEPDIR)/test-util.Po unit/$(DEPDIR)/test-uuid.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+       $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(ell_libell_private_la_SOURCES) $(ell_libell_la_SOURCES) \
+       unit/example-plugin.c examples/dbus-client.c \
+       examples/dbus-service.c examples/dhcp-client.c \
+       examples/glib-eventloop.c examples/https-client-test.c \
+       examples/https-server-test.c $(tools_certchain_verify_SOURCES) \
+       $(tools_genl_discover_SOURCES) $(tools_genl_request_SOURCES) \
+       $(tools_genl_watch_SOURCES) $(tools_gpio_SOURCES) \
+       unit/test-base64.c unit/test-checksum.c unit/test-cipher.c \
+       unit/test-dbus.c unit/test-dbus-message.c \
+       unit/test-dbus-message-fds.c unit/test-dbus-properties.c \
+       unit/test-dbus-service.c unit/test-dbus-util.c \
+       unit/test-dbus-watch.c unit/test-dhcp.c unit/test-dir-watch.c \
+       unit/test-ecc.c unit/test-ecdh.c unit/test-endian.c \
+       unit/test-genl-msg.c unit/test-gvariant-message.c \
+       unit/test-gvariant-util.c unit/test-hashmap.c unit/test-hwdb.c \
+       unit/test-io.c unit/test-key.c unit/test-main.c \
+       unit/test-net.c unit/test-netlink.c unit/test-path.c \
+       unit/test-pbkdf2.c unit/test-pem.c unit/test-plugin.c \
+       unit/test-queue.c unit/test-random.c unit/test-ringbuf.c \
+       unit/test-settings.c unit/test-siphash.c unit/test-string.c \
+       unit/test-time.c unit/test-tls.c unit/test-uintset.c \
+       unit/test-unit.c unit/test-utf8.c unit/test-util.c \
+       unit/test-uuid.c
+DIST_SOURCES = $(ell_libell_private_la_SOURCES) \
+       $(ell_libell_la_SOURCES) unit/example-plugin.c \
+       examples/dbus-client.c examples/dbus-service.c \
+       examples/dhcp-client.c examples/glib-eventloop.c \
+       examples/https-client-test.c examples/https-server-test.c \
+       $(tools_certchain_verify_SOURCES) \
+       $(tools_genl_discover_SOURCES) $(tools_genl_request_SOURCES) \
+       $(tools_genl_watch_SOURCES) $(tools_gpio_SOURCES) \
+       unit/test-base64.c unit/test-checksum.c unit/test-cipher.c \
+       unit/test-dbus.c unit/test-dbus-message.c \
+       unit/test-dbus-message-fds.c unit/test-dbus-properties.c \
+       unit/test-dbus-service.c unit/test-dbus-util.c \
+       unit/test-dbus-watch.c unit/test-dhcp.c unit/test-dir-watch.c \
+       unit/test-ecc.c unit/test-ecdh.c unit/test-endian.c \
+       unit/test-genl-msg.c unit/test-gvariant-message.c \
+       unit/test-gvariant-util.c unit/test-hashmap.c unit/test-hwdb.c \
+       unit/test-io.c unit/test-key.c unit/test-main.c \
+       unit/test-net.c unit/test-netlink.c unit/test-path.c \
+       unit/test-pbkdf2.c unit/test-pem.c unit/test-plugin.c \
+       unit/test-queue.c unit/test-random.c unit/test-ringbuf.c \
+       unit/test-settings.c unit/test-siphash.c unit/test-string.c \
+       unit/test-time.c unit/test-tls.c unit/test-uintset.c \
+       unit/test-unit.c unit/test-utf8.c unit/test-util.c \
+       unit/test-uuid.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(pkgconfig_DATA)
+HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+       $(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope check recheck
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red='\e[0;31m'; \
+    grn='\e[0;32m'; \
+    lgn='\e[1;32m'; \
+    blu='\e[1;34m'; \
+    mgn='\e[0;35m'; \
+    brg='\e[1m'; \
+    std='\e[m'; \
+  fi; \
+}
+am__recheck_rx = ^[    ]*:recheck:[    ]*
+am__global_test_result_rx = ^[         ]*:global-test-result:[         ]*
+am__copy_in_global_log_rx = ^[         ]*:copy-in-global-log:[         ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+           recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[       ]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);                                     \
+$(am__vpath_adj_setup) $(am__vpath_adj)                        \
+$(am__tty_colors);                                     \
+srcdir=$(srcdir); export srcdir;                       \
+case "$@" in                                           \
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;   \
+    *) am__odir=.;;                                    \
+esac;                                                  \
+test "x$$am__odir" = x"." || test -d "$$am__odir"      \
+  || $(MKDIR_P) "$$am__odir" || exit $$?;              \
+if test -f "./$$f"; then dir=./;                       \
+elif test -f "$$f"; then dir=;                         \
+else dir="$(srcdir)/"; fi;                             \
+tst=$$dir$$f; log='$@';                                \
+if test -n '$(DISABLE_HARD_ERRORS)'; then              \
+  am__enable_hard_errors=no;                           \
+else                                                   \
+  am__enable_hard_errors=yes;                          \
+fi;                                                    \
+case " $(XFAIL_TESTS) " in                             \
+  *[\ \        ]$$f[\ \        ]* | *[\ \      ]$$dir$$f[\ \   ]*) \
+    am__expect_failure=yes;;                           \
+  *)                                                   \
+    am__expect_failure=no;;                            \
+esac;                                                  \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+@DBUS_TESTS_TRUE@am__EXEEXT_7 = $(am__EXEEXT_2)
+@CERT_TESTS_TRUE@am__EXEEXT_8 = $(am__EXEEXT_3)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+       $(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(top_srcdir)/build-aux/compile \
+       $(top_srcdir)/build-aux/config.guess \
+       $(top_srcdir)/build-aux/config.sub \
+       $(top_srcdir)/build-aux/depcomp \
+       $(top_srcdir)/build-aux/install-sh \
+       $(top_srcdir)/build-aux/ltmain.sh \
+       $(top_srcdir)/build-aux/missing \
+       $(top_srcdir)/build-aux/test-driver \
+       $(top_srcdir)/ell/ell.pc.in AUTHORS COPYING ChangeLog INSTALL \
+       README TODO build-aux/compile build-aux/config.guess \
+       build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+       build-aux/ltmain.sh build-aux/missing
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+have_openssl = @have_openssl@
+have_xxd = @have_xxd@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_MAKEFLAGS = --no-print-directory
+ACLOCAL_AMFLAGS = -I build-aux
+
+# Library code modified:       REVISION++
+# Interfaces changed:          CURRENT++ REVISION=0
+# Interfaces added:            CURRENT++ REVISION=0 AGE++
+# Interfaces removed:          CURRENT++ REVISION=0 AGE=0
+ELL_CURRENT = 0
+ELL_REVISION = 2
+ELL_AGE = 0
+linux_headers = linux/gpio.h
+pkginclude_HEADERS = ell/ell.h \
+                       ell/util.h \
+                       ell/test.h \
+                       ell/strv.h \
+                       ell/utf8.h \
+                       ell/queue.h \
+                       ell/hashmap.h \
+                       ell/string.h \
+                       ell/settings.h \
+                       ell/main.h \
+                       ell/idle.h \
+                       ell/signal.h \
+                       ell/timeout.h \
+                       ell/io.h \
+                       ell/ringbuf.h \
+                       ell/log.h \
+                       ell/plugin.h \
+                       ell/checksum.h \
+                       ell/netlink.h \
+                       ell/genl.h \
+                       ell/dbus.h \
+                       ell/dbus-service.h \
+                       ell/dbus-client.h \
+                       ell/hwdb.h \
+                       ell/cipher.h \
+                       ell/random.h \
+                       ell/uintset.h \
+                       ell/base64.h \
+                       ell/pem.h \
+                       ell/tls.h \
+                       ell/uuid.h \
+                       ell/key.h \
+                       ell/pkcs5.h \
+                       ell/file.h \
+                       ell/dir.h \
+                       ell/net.h \
+                       ell/dhcp.h \
+                       ell/cert.h \
+                       ell/ecc.h \
+                       ell/ecdh.h \
+                       ell/time.h \
+                       ell/gpio.h \
+                       ell/path.h
+
+lib_LTLIBRARIES = ell/libell.la
+ell_libell_la_SOURCES = $(linux_headers) \
+                       $(pkginclude_HEADERS) \
+                       ell/private.h \
+                       ell/missing.h \
+                       ell/util.c \
+                       ell/test.c \
+                       ell/strv.c \
+                       ell/utf8.c \
+                       ell/queue.c \
+                       ell/hashmap.c \
+                       ell/string.c \
+                       ell/settings.c \
+                       ell/main.c \
+                       ell/idle.c \
+                       ell/signal.c \
+                       ell/timeout.c \
+                       ell/io.c \
+                       ell/ringbuf.c \
+                       ell/log.c \
+                       ell/plugin.c \
+                       ell/checksum.c \
+                       ell/netlink-private.h \
+                       ell/netlink.c \
+                       ell/genl-private.h \
+                       ell/genl.c \
+                       ell/dbus-private.h \
+                       ell/dbus.c \
+                       ell/dbus-message.c \
+                       ell/dbus-util.c \
+                       ell/dbus-service.c \
+                       ell/dbus-client.c \
+                       ell/dbus-name-cache.c \
+                       ell/dbus-filter.c \
+                       ell/gvariant-private.h \
+                       ell/gvariant-util.c \
+                       ell/siphash-private.h \
+                       ell/siphash.c \
+                       ell/hwdb.c \
+                       ell/cipher.c \
+                       ell/random.c \
+                       ell/uintset.c \
+                       ell/base64.c \
+                       ell/asn1-private.h \
+                       ell/pem-private.h \
+                       ell/pem.c \
+                       ell/tls-private.h \
+                       ell/tls.c \
+                       ell/tls-record.c \
+                       ell/tls-extensions.c \
+                       ell/tls-suites.c \
+                       ell/uuid.c \
+                       ell/key.c \
+                       ell/pkcs5-private.h \
+                       ell/pkcs5.c \
+                       ell/file.c \
+                       ell/dir.c \
+                       ell/net.c \
+                       ell/dhcp-private.h \
+                       ell/dhcp.c \
+                       ell/dhcp-transport.c \
+                       ell/dhcp-lease.c \
+                       ell/cert.c \
+                       ell/cert-private.h \
+                       ell/ecc-private.h \
+                       ell/ecc.h \
+                       ell/ecc-external.c \
+                       ell/ecc.c \
+                       ell/ecdh.c \
+                       ell/time.c \
+                       ell/gpio.c \
+                       ell/path.c
+
+ell_libell_la_LDFLAGS = -no-undefined \
+                       -Wl,--version-script=$(top_srcdir)/ell/ell.sym \
+                       -version-info $(ELL_CURRENT):$(ELL_REVISION):$(ELL_AGE)
+
+ell_libell_la_DEPENDENCIES = ell/ell.sym
+noinst_LTLIBRARIES = ell/libell-private.la $(am__append_2)
+ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES)
+AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \
+                               -DCERTDIR=\""$(top_builddir)/unit/"\"
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ell/ell.pc
+unit_tests = unit/test-unit \
+                       unit/test-queue \
+                       unit/test-hashmap \
+                       unit/test-endian \
+                       unit/test-string \
+                       unit/test-utf8 \
+                       unit/test-main \
+                       unit/test-io \
+                       unit/test-ringbuf \
+                       unit/test-plugin \
+                       unit/test-checksum \
+                       unit/test-settings \
+                       unit/test-netlink \
+                       unit/test-genl-msg \
+                       unit/test-siphash \
+                       unit/test-cipher \
+                       unit/test-random \
+                       unit/test-util \
+                       unit/test-uintset \
+                       unit/test-base64 \
+                       unit/test-uuid \
+                       unit/test-pbkdf2 \
+                       unit/test-dhcp \
+                       unit/test-dir-watch \
+                       unit/test-ecc \
+                       unit/test-ecdh \
+                       unit/test-time \
+                       unit/test-path \
+                       unit/test-net
+
+dbus_tests = unit/test-hwdb \
+                       unit/test-dbus \
+                       unit/test-dbus-util \
+                       unit/test-dbus-message \
+                       unit/test-dbus-message-fds \
+                       unit/test-dbus-service \
+                       unit/test-dbus-watch \
+                       unit/test-dbus-properties \
+                       unit/test-gvariant-util \
+                       unit/test-gvariant-message
+
+cert_tests = unit/test-pem \
+                       unit/test-tls \
+                       unit/test-key
+
+cert_files = unit/cert-chain.pem \
+                       unit/cert-entity-int.pem \
+                       unit/cert-server.pem \
+                       unit/cert-client.pem \
+                       unit/cert-server-key-pkcs8.pem \
+                       unit/cert-client-key-pkcs8.pem \
+                       unit/cert-client-key-md5-des.pem \
+                       unit/cert-client-key-sha1-des.pem \
+                       unit/cert-client-key-v2-des.pem \
+                       unit/cert-client-key-v2-des-ede3.pem \
+                       unit/cert-client-key-v2-aes128.pem \
+                       unit/cert-client-key-v2-aes256.pem
+
+cert_checks = unit/cert-intca \
+                       unit/cert-entity-int \
+                       unit/cert-server \
+                       unit/cert-client
+
+unit_test_unit_LDADD = ell/libell-private.la
+unit_test_queue_LDADD = ell/libell-private.la
+unit_test_hashmap_LDADD = ell/libell-private.la
+unit_test_endian_LDADD = ell/libell-private.la
+unit_test_string_LDADD = ell/libell-private.la
+unit_test_utf8_LDADD = ell/libell-private.la
+unit_test_main_LDADD = ell/libell-private.la
+unit_test_io_LDADD = ell/libell-private.la
+unit_test_ringbuf_LDADD = ell/libell-private.la
+unit_test_plugin_LDFLAGS = -Wl,-export-dynamic
+unit_test_plugin_LDADD = ell/libell-private.la -ldl
+unit_test_checksum_LDADD = ell/libell-private.la
+unit_test_settings_LDADD = ell/libell-private.la
+unit_test_netlink_LDADD = ell/libell-private.la
+unit_test_genl_msg_LDADD = ell/libell-private.la
+unit_test_dbus_LDADD = ell/libell-private.la
+unit_test_dbus_message_LDADD = ell/libell-private.la
+unit_test_dbus_message_fds_LDADD = ell/libell-private.la
+unit_test_dbus_util_LDADD = ell/libell-private.la
+unit_test_dbus_service_LDADD = ell/libell-private.la
+unit_test_dbus_watch_LDADD = ell/libell-private.la
+unit_test_dbus_properties_LDADD = ell/libell-private.la
+unit_test_gvariant_util_LDADD = ell/libell-private.la
+unit_test_gvariant_message_LDADD = ell/libell-private.la
+unit_test_siphash_LDADD = ell/libell-private.la
+unit_test_hwdb_LDADD = ell/libell-private.la
+unit_test_cipher_LDADD = ell/libell-private.la
+unit_test_random_LDADD = ell/libell-private.la
+unit_test_util_LDADD = ell/libell-private.la
+unit_test_uintset_LDADD = ell/libell-private.la
+unit_test_base64_LDADD = ell/libell-private.la
+unit_test_pbkdf2_LDADD = ell/libell-private.la
+unit_test_pem_LDADD = ell/libell-private.la
+unit_test_pem_DEPENDENCIES = $(cert_files) ell/libell-private.la
+unit_test_tls_LDADD = ell/libell-private.la
+unit_test_tls_DEPENDENCIES = $(cert_files) ell/libell-private.la
+unit_test_key_LDADD = ell/libell-private.la
+unit_test_key_DEPENDENCIES = $(cert_files) ell/libell-private.la
+unit_test_uuid_LDADD = ell/libell-private.la
+unit_test_dhcp_LDADD = ell/libell-private.la
+unit_test_dir_watch_LDADD = ell/libell-private.la
+unit_test_ecc_LDADD = ell/libell-private.la
+unit_test_ecdh_LDADD = ell/libell-private.la
+unit_test_ecdh_LDFLAGS = -Wl,-wrap,l_getrandom
+unit_test_time_LDADD = ell/libell-private.la
+unit_test_path_LDADD = ell/libell-private.la
+unit_test_net_LDADD = ell/libell-private.la
+unit_example_plugin_la_LDFLAGS = -no-undefined -module -avoid-version \
+                                                       -rpath /dummy
+
+unit_test_data_files = unit/settings.test unit/dbus.conf
+examples = examples/dbus-service examples/https-client-test \
+       examples/https-server-test examples/dbus-client \
+       examples/dhcp-client $(am__append_3)
+examples_dbus_service_LDADD = ell/libell-private.la
+examples_https_client_test_LDADD = ell/libell-private.la
+examples_https_server_test_LDADD = ell/libell-private.la
+examples_dbus_client_LDADD = ell/libell-private.la
+examples_glib_eventloop_CFLAGS = @GLIB_CFLAGS@
+examples_glib_eventloop_LDADD = ell/libell-private.la @GLIB_LIBS@
+examples_dhcp_client_LDADD = ell/libell-private.la
+tools_certchain_verify_SOURCES = tools/certchain-verify.c
+tools_certchain_verify_LDADD = ell/libell-private.la
+tools_genl_discover_SOURCES = tools/genl-discover.c
+tools_genl_discover_LDADD = ell/libell-private.la
+tools_genl_watch_SOURCES = tools/genl-watch.c
+tools_genl_watch_LDADD = ell/libell-private.la
+tools_genl_request_SOURCES = tools/genl-request.c
+tools_genl_request_LDADD = ell/libell-private.la
+tools_gpio_SOURCES = tools/gpio.c
+tools_gpio_LDADD = ell/libell-private.la
+EXTRA_DIST = ell/ell.sym \
+               $(unit_test_data_files) unit/gencerts.cnf unit/plaintext.txt
+
+DISTCLEANFILES = $(unit_tests) $(dbus_tests) $(cert_tests)
+MAINTAINERCLEANFILES = Makefile.in configure config.h.in aclocal.m4
+true_redirect_openssl = 2>&1
+false_redirect_openssl = 2>/dev/null
+@MAINTAINER_MODE_TRUE@BUILT_SOURCES = unit/key-plaintext.h unit/key-ciphertext.h unit/key-signature.h
+all: $(BUILT_SOURCES) config.h
+       $(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+am--refresh: Makefile
+       @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+             $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           echo ' $(SHELL) ./config.status'; \
+           $(SHELL) ./config.status;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       $(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       $(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+       @test -f $@ || rm -f stamp-h1
+       @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+       @rm -f stamp-h1
+       cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+       ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+       rm -f stamp-h1
+       touch $@
+
+distclean-hdr:
+       -rm -f config.h stamp-h1
+ell/ell.pc: $(top_builddir)/config.status $(top_srcdir)/ell/ell.pc.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
+
+clean-noinstPROGRAMS:
+       @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+       echo " rm -f" $$list; \
+       rm -f $$list || exit $$?; \
+       test -n "$(EXEEXT)" || exit 0; \
+       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+       echo " rm -f" $$list; \
+       rm -f $$list
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+       list2=; for p in $$list; do \
+         if test -f $$p; then \
+           list2="$$list2 $$p"; \
+         else :; fi; \
+       done; \
+       test -z "$$list2" || { \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+       }
+
+uninstall-libLTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+       for p in $$list; do \
+         $(am__strip_dir) \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+       done
+
+clean-libLTLIBRARIES:
+       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+       @list='$(lib_LTLIBRARIES)'; \
+       locs=`for p in $$list; do echo $$p; done | \
+             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+             sort -u`; \
+       test -z "$$locs" || { \
+         echo rm -f $${locs}; \
+         rm -f $${locs}; \
+       }
+
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; \
+       locs=`for p in $$list; do echo $$p; done | \
+             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+             sort -u`; \
+       test -z "$$locs" || { \
+         echo rm -f $${locs}; \
+         rm -f $${locs}; \
+       }
+ell/$(am__dirstamp):
+       @$(MKDIR_P) ell
+       @: > ell/$(am__dirstamp)
+ell/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) ell/$(DEPDIR)
+       @: > ell/$(DEPDIR)/$(am__dirstamp)
+ell/util.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/test.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/strv.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/utf8.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/queue.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/hashmap.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/string.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/settings.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/main.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/idle.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/signal.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/timeout.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/io.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/ringbuf.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/log.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/plugin.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/checksum.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/netlink.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/genl.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus-message.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus-util.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus-service.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus-client.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus-name-cache.lo: ell/$(am__dirstamp) \
+       ell/$(DEPDIR)/$(am__dirstamp)
+ell/dbus-filter.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/gvariant-util.lo: ell/$(am__dirstamp) \
+       ell/$(DEPDIR)/$(am__dirstamp)
+ell/siphash.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/hwdb.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/cipher.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/random.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/uintset.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/base64.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/pem.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/tls.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/tls-record.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/tls-extensions.lo: ell/$(am__dirstamp) \
+       ell/$(DEPDIR)/$(am__dirstamp)
+ell/tls-suites.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/uuid.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/key.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/pkcs5.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/file.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dir.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/net.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dhcp.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/dhcp-transport.lo: ell/$(am__dirstamp) \
+       ell/$(DEPDIR)/$(am__dirstamp)
+ell/dhcp-lease.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/cert.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/ecc-external.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/ecc.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/ecdh.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/time.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/gpio.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+ell/path.lo: ell/$(am__dirstamp) ell/$(DEPDIR)/$(am__dirstamp)
+
+ell/libell-private.la: $(ell_libell_private_la_OBJECTS) $(ell_libell_private_la_DEPENDENCIES) $(EXTRA_ell_libell_private_la_DEPENDENCIES) ell/$(am__dirstamp)
+       $(AM_V_CCLD)$(LINK)  $(ell_libell_private_la_OBJECTS) $(ell_libell_private_la_LIBADD) $(LIBS)
+
+ell/libell.la: $(ell_libell_la_OBJECTS) $(ell_libell_la_DEPENDENCIES) $(EXTRA_ell_libell_la_DEPENDENCIES) ell/$(am__dirstamp)
+       $(AM_V_CCLD)$(ell_libell_la_LINK) -rpath $(libdir) $(ell_libell_la_OBJECTS) $(ell_libell_la_LIBADD) $(LIBS)
+unit/$(am__dirstamp):
+       @$(MKDIR_P) unit
+       @: > unit/$(am__dirstamp)
+unit/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) unit/$(DEPDIR)
+       @: > unit/$(DEPDIR)/$(am__dirstamp)
+unit/example-plugin.lo: unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/example-plugin.la: $(unit_example_plugin_la_OBJECTS) $(unit_example_plugin_la_DEPENDENCIES) $(EXTRA_unit_example_plugin_la_DEPENDENCIES) unit/$(am__dirstamp)
+       $(AM_V_CCLD)$(unit_example_plugin_la_LINK) $(am_unit_example_plugin_la_rpath) $(unit_example_plugin_la_OBJECTS) $(unit_example_plugin_la_LIBADD) $(LIBS)
+examples/$(am__dirstamp):
+       @$(MKDIR_P) examples
+       @: > examples/$(am__dirstamp)
+examples/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) examples/$(DEPDIR)
+       @: > examples/$(DEPDIR)/$(am__dirstamp)
+examples/dbus-client.$(OBJEXT): examples/$(am__dirstamp) \
+       examples/$(DEPDIR)/$(am__dirstamp)
+
+examples/dbus-client$(EXEEXT): $(examples_dbus_client_OBJECTS) $(examples_dbus_client_DEPENDENCIES) $(EXTRA_examples_dbus_client_DEPENDENCIES) examples/$(am__dirstamp)
+       @rm -f examples/dbus-client$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(examples_dbus_client_OBJECTS) $(examples_dbus_client_LDADD) $(LIBS)
+examples/dbus-service.$(OBJEXT): examples/$(am__dirstamp) \
+       examples/$(DEPDIR)/$(am__dirstamp)
+
+examples/dbus-service$(EXEEXT): $(examples_dbus_service_OBJECTS) $(examples_dbus_service_DEPENDENCIES) $(EXTRA_examples_dbus_service_DEPENDENCIES) examples/$(am__dirstamp)
+       @rm -f examples/dbus-service$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(examples_dbus_service_OBJECTS) $(examples_dbus_service_LDADD) $(LIBS)
+examples/dhcp-client.$(OBJEXT): examples/$(am__dirstamp) \
+       examples/$(DEPDIR)/$(am__dirstamp)
+
+examples/dhcp-client$(EXEEXT): $(examples_dhcp_client_OBJECTS) $(examples_dhcp_client_DEPENDENCIES) $(EXTRA_examples_dhcp_client_DEPENDENCIES) examples/$(am__dirstamp)
+       @rm -f examples/dhcp-client$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(examples_dhcp_client_OBJECTS) $(examples_dhcp_client_LDADD) $(LIBS)
+examples/glib_eventloop-glib-eventloop.$(OBJEXT):  \
+       examples/$(am__dirstamp) examples/$(DEPDIR)/$(am__dirstamp)
+
+examples/glib-eventloop$(EXEEXT): $(examples_glib_eventloop_OBJECTS) $(examples_glib_eventloop_DEPENDENCIES) $(EXTRA_examples_glib_eventloop_DEPENDENCIES) examples/$(am__dirstamp)
+       @rm -f examples/glib-eventloop$(EXEEXT)
+       $(AM_V_CCLD)$(examples_glib_eventloop_LINK) $(examples_glib_eventloop_OBJECTS) $(examples_glib_eventloop_LDADD) $(LIBS)
+examples/https-client-test.$(OBJEXT): examples/$(am__dirstamp) \
+       examples/$(DEPDIR)/$(am__dirstamp)
+
+examples/https-client-test$(EXEEXT): $(examples_https_client_test_OBJECTS) $(examples_https_client_test_DEPENDENCIES) $(EXTRA_examples_https_client_test_DEPENDENCIES) examples/$(am__dirstamp)
+       @rm -f examples/https-client-test$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(examples_https_client_test_OBJECTS) $(examples_https_client_test_LDADD) $(LIBS)
+examples/https-server-test.$(OBJEXT): examples/$(am__dirstamp) \
+       examples/$(DEPDIR)/$(am__dirstamp)
+
+examples/https-server-test$(EXEEXT): $(examples_https_server_test_OBJECTS) $(examples_https_server_test_DEPENDENCIES) $(EXTRA_examples_https_server_test_DEPENDENCIES) examples/$(am__dirstamp)
+       @rm -f examples/https-server-test$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(examples_https_server_test_OBJECTS) $(examples_https_server_test_LDADD) $(LIBS)
+tools/$(am__dirstamp):
+       @$(MKDIR_P) tools
+       @: > tools/$(am__dirstamp)
+tools/$(DEPDIR)/$(am__dirstamp):
+       @$(MKDIR_P) tools/$(DEPDIR)
+       @: > tools/$(DEPDIR)/$(am__dirstamp)
+tools/certchain-verify.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
+
+tools/certchain-verify$(EXEEXT): $(tools_certchain_verify_OBJECTS) $(tools_certchain_verify_DEPENDENCIES) $(EXTRA_tools_certchain_verify_DEPENDENCIES) tools/$(am__dirstamp)
+       @rm -f tools/certchain-verify$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(tools_certchain_verify_OBJECTS) $(tools_certchain_verify_LDADD) $(LIBS)
+tools/genl-discover.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
+
+tools/genl-discover$(EXEEXT): $(tools_genl_discover_OBJECTS) $(tools_genl_discover_DEPENDENCIES) $(EXTRA_tools_genl_discover_DEPENDENCIES) tools/$(am__dirstamp)
+       @rm -f tools/genl-discover$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(tools_genl_discover_OBJECTS) $(tools_genl_discover_LDADD) $(LIBS)
+tools/genl-request.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
+
+tools/genl-request$(EXEEXT): $(tools_genl_request_OBJECTS) $(tools_genl_request_DEPENDENCIES) $(EXTRA_tools_genl_request_DEPENDENCIES) tools/$(am__dirstamp)
+       @rm -f tools/genl-request$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(tools_genl_request_OBJECTS) $(tools_genl_request_LDADD) $(LIBS)
+tools/genl-watch.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
+
+tools/genl-watch$(EXEEXT): $(tools_genl_watch_OBJECTS) $(tools_genl_watch_DEPENDENCIES) $(EXTRA_tools_genl_watch_DEPENDENCIES) tools/$(am__dirstamp)
+       @rm -f tools/genl-watch$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(tools_genl_watch_OBJECTS) $(tools_genl_watch_LDADD) $(LIBS)
+tools/gpio.$(OBJEXT): tools/$(am__dirstamp) \
+       tools/$(DEPDIR)/$(am__dirstamp)
+
+tools/gpio$(EXEEXT): $(tools_gpio_OBJECTS) $(tools_gpio_DEPENDENCIES) $(EXTRA_tools_gpio_DEPENDENCIES) tools/$(am__dirstamp)
+       @rm -f tools/gpio$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(tools_gpio_OBJECTS) $(tools_gpio_LDADD) $(LIBS)
+unit/test-base64.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-base64$(EXEEXT): $(unit_test_base64_OBJECTS) $(unit_test_base64_DEPENDENCIES) $(EXTRA_unit_test_base64_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-base64$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_base64_OBJECTS) $(unit_test_base64_LDADD) $(LIBS)
+unit/test-checksum.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-checksum$(EXEEXT): $(unit_test_checksum_OBJECTS) $(unit_test_checksum_DEPENDENCIES) $(EXTRA_unit_test_checksum_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-checksum$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_checksum_OBJECTS) $(unit_test_checksum_LDADD) $(LIBS)
+unit/test-cipher.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-cipher$(EXEEXT): $(unit_test_cipher_OBJECTS) $(unit_test_cipher_DEPENDENCIES) $(EXTRA_unit_test_cipher_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-cipher$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_cipher_OBJECTS) $(unit_test_cipher_LDADD) $(LIBS)
+unit/test-dbus.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus$(EXEEXT): $(unit_test_dbus_OBJECTS) $(unit_test_dbus_DEPENDENCIES) $(EXTRA_unit_test_dbus_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_OBJECTS) $(unit_test_dbus_LDADD) $(LIBS)
+unit/test-dbus-message.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus-message$(EXEEXT): $(unit_test_dbus_message_OBJECTS) $(unit_test_dbus_message_DEPENDENCIES) $(EXTRA_unit_test_dbus_message_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus-message$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_message_OBJECTS) $(unit_test_dbus_message_LDADD) $(LIBS)
+unit/test-dbus-message-fds.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus-message-fds$(EXEEXT): $(unit_test_dbus_message_fds_OBJECTS) $(unit_test_dbus_message_fds_DEPENDENCIES) $(EXTRA_unit_test_dbus_message_fds_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus-message-fds$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_message_fds_OBJECTS) $(unit_test_dbus_message_fds_LDADD) $(LIBS)
+unit/test-dbus-properties.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus-properties$(EXEEXT): $(unit_test_dbus_properties_OBJECTS) $(unit_test_dbus_properties_DEPENDENCIES) $(EXTRA_unit_test_dbus_properties_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus-properties$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_properties_OBJECTS) $(unit_test_dbus_properties_LDADD) $(LIBS)
+unit/test-dbus-service.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus-service$(EXEEXT): $(unit_test_dbus_service_OBJECTS) $(unit_test_dbus_service_DEPENDENCIES) $(EXTRA_unit_test_dbus_service_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus-service$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_service_OBJECTS) $(unit_test_dbus_service_LDADD) $(LIBS)
+unit/test-dbus-util.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus-util$(EXEEXT): $(unit_test_dbus_util_OBJECTS) $(unit_test_dbus_util_DEPENDENCIES) $(EXTRA_unit_test_dbus_util_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus-util$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_util_OBJECTS) $(unit_test_dbus_util_LDADD) $(LIBS)
+unit/test-dbus-watch.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dbus-watch$(EXEEXT): $(unit_test_dbus_watch_OBJECTS) $(unit_test_dbus_watch_DEPENDENCIES) $(EXTRA_unit_test_dbus_watch_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dbus-watch$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dbus_watch_OBJECTS) $(unit_test_dbus_watch_LDADD) $(LIBS)
+unit/test-dhcp.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dhcp$(EXEEXT): $(unit_test_dhcp_OBJECTS) $(unit_test_dhcp_DEPENDENCIES) $(EXTRA_unit_test_dhcp_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dhcp$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dhcp_OBJECTS) $(unit_test_dhcp_LDADD) $(LIBS)
+unit/test-dir-watch.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-dir-watch$(EXEEXT): $(unit_test_dir_watch_OBJECTS) $(unit_test_dir_watch_DEPENDENCIES) $(EXTRA_unit_test_dir_watch_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-dir-watch$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_dir_watch_OBJECTS) $(unit_test_dir_watch_LDADD) $(LIBS)
+unit/test-ecc.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-ecc$(EXEEXT): $(unit_test_ecc_OBJECTS) $(unit_test_ecc_DEPENDENCIES) $(EXTRA_unit_test_ecc_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-ecc$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_ecc_OBJECTS) $(unit_test_ecc_LDADD) $(LIBS)
+unit/test-ecdh.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-ecdh$(EXEEXT): $(unit_test_ecdh_OBJECTS) $(unit_test_ecdh_DEPENDENCIES) $(EXTRA_unit_test_ecdh_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-ecdh$(EXEEXT)
+       $(AM_V_CCLD)$(unit_test_ecdh_LINK) $(unit_test_ecdh_OBJECTS) $(unit_test_ecdh_LDADD) $(LIBS)
+unit/test-endian.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-endian$(EXEEXT): $(unit_test_endian_OBJECTS) $(unit_test_endian_DEPENDENCIES) $(EXTRA_unit_test_endian_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-endian$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_endian_OBJECTS) $(unit_test_endian_LDADD) $(LIBS)
+unit/test-genl-msg.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-genl-msg$(EXEEXT): $(unit_test_genl_msg_OBJECTS) $(unit_test_genl_msg_DEPENDENCIES) $(EXTRA_unit_test_genl_msg_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-genl-msg$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_genl_msg_OBJECTS) $(unit_test_genl_msg_LDADD) $(LIBS)
+unit/test-gvariant-message.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-gvariant-message$(EXEEXT): $(unit_test_gvariant_message_OBJECTS) $(unit_test_gvariant_message_DEPENDENCIES) $(EXTRA_unit_test_gvariant_message_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-gvariant-message$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_gvariant_message_OBJECTS) $(unit_test_gvariant_message_LDADD) $(LIBS)
+unit/test-gvariant-util.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-gvariant-util$(EXEEXT): $(unit_test_gvariant_util_OBJECTS) $(unit_test_gvariant_util_DEPENDENCIES) $(EXTRA_unit_test_gvariant_util_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-gvariant-util$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_gvariant_util_OBJECTS) $(unit_test_gvariant_util_LDADD) $(LIBS)
+unit/test-hashmap.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-hashmap$(EXEEXT): $(unit_test_hashmap_OBJECTS) $(unit_test_hashmap_DEPENDENCIES) $(EXTRA_unit_test_hashmap_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-hashmap$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_hashmap_OBJECTS) $(unit_test_hashmap_LDADD) $(LIBS)
+unit/test-hwdb.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-hwdb$(EXEEXT): $(unit_test_hwdb_OBJECTS) $(unit_test_hwdb_DEPENDENCIES) $(EXTRA_unit_test_hwdb_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-hwdb$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_hwdb_OBJECTS) $(unit_test_hwdb_LDADD) $(LIBS)
+unit/test-io.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-io$(EXEEXT): $(unit_test_io_OBJECTS) $(unit_test_io_DEPENDENCIES) $(EXTRA_unit_test_io_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-io$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_io_OBJECTS) $(unit_test_io_LDADD) $(LIBS)
+unit/test-key.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-key$(EXEEXT): $(unit_test_key_OBJECTS) $(unit_test_key_DEPENDENCIES) $(EXTRA_unit_test_key_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-key$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_key_OBJECTS) $(unit_test_key_LDADD) $(LIBS)
+unit/test-main.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-main$(EXEEXT): $(unit_test_main_OBJECTS) $(unit_test_main_DEPENDENCIES) $(EXTRA_unit_test_main_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-main$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_main_OBJECTS) $(unit_test_main_LDADD) $(LIBS)
+unit/test-net.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-net$(EXEEXT): $(unit_test_net_OBJECTS) $(unit_test_net_DEPENDENCIES) $(EXTRA_unit_test_net_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-net$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_net_OBJECTS) $(unit_test_net_LDADD) $(LIBS)
+unit/test-netlink.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-netlink$(EXEEXT): $(unit_test_netlink_OBJECTS) $(unit_test_netlink_DEPENDENCIES) $(EXTRA_unit_test_netlink_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-netlink$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_netlink_OBJECTS) $(unit_test_netlink_LDADD) $(LIBS)
+unit/test-path.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-path$(EXEEXT): $(unit_test_path_OBJECTS) $(unit_test_path_DEPENDENCIES) $(EXTRA_unit_test_path_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-path$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_path_OBJECTS) $(unit_test_path_LDADD) $(LIBS)
+unit/test-pbkdf2.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-pbkdf2$(EXEEXT): $(unit_test_pbkdf2_OBJECTS) $(unit_test_pbkdf2_DEPENDENCIES) $(EXTRA_unit_test_pbkdf2_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-pbkdf2$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_pbkdf2_OBJECTS) $(unit_test_pbkdf2_LDADD) $(LIBS)
+unit/test-pem.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-pem$(EXEEXT): $(unit_test_pem_OBJECTS) $(unit_test_pem_DEPENDENCIES) $(EXTRA_unit_test_pem_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-pem$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_pem_OBJECTS) $(unit_test_pem_LDADD) $(LIBS)
+unit/test-plugin.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-plugin$(EXEEXT): $(unit_test_plugin_OBJECTS) $(unit_test_plugin_DEPENDENCIES) $(EXTRA_unit_test_plugin_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-plugin$(EXEEXT)
+       $(AM_V_CCLD)$(unit_test_plugin_LINK) $(unit_test_plugin_OBJECTS) $(unit_test_plugin_LDADD) $(LIBS)
+unit/test-queue.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-queue$(EXEEXT): $(unit_test_queue_OBJECTS) $(unit_test_queue_DEPENDENCIES) $(EXTRA_unit_test_queue_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-queue$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_queue_OBJECTS) $(unit_test_queue_LDADD) $(LIBS)
+unit/test-random.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-random$(EXEEXT): $(unit_test_random_OBJECTS) $(unit_test_random_DEPENDENCIES) $(EXTRA_unit_test_random_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-random$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_random_OBJECTS) $(unit_test_random_LDADD) $(LIBS)
+unit/test-ringbuf.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-ringbuf$(EXEEXT): $(unit_test_ringbuf_OBJECTS) $(unit_test_ringbuf_DEPENDENCIES) $(EXTRA_unit_test_ringbuf_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-ringbuf$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_ringbuf_OBJECTS) $(unit_test_ringbuf_LDADD) $(LIBS)
+unit/test-settings.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-settings$(EXEEXT): $(unit_test_settings_OBJECTS) $(unit_test_settings_DEPENDENCIES) $(EXTRA_unit_test_settings_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-settings$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_settings_OBJECTS) $(unit_test_settings_LDADD) $(LIBS)
+unit/test-siphash.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-siphash$(EXEEXT): $(unit_test_siphash_OBJECTS) $(unit_test_siphash_DEPENDENCIES) $(EXTRA_unit_test_siphash_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-siphash$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_siphash_OBJECTS) $(unit_test_siphash_LDADD) $(LIBS)
+unit/test-string.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-string$(EXEEXT): $(unit_test_string_OBJECTS) $(unit_test_string_DEPENDENCIES) $(EXTRA_unit_test_string_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-string$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_string_OBJECTS) $(unit_test_string_LDADD) $(LIBS)
+unit/test-time.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-time$(EXEEXT): $(unit_test_time_OBJECTS) $(unit_test_time_DEPENDENCIES) $(EXTRA_unit_test_time_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-time$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_time_OBJECTS) $(unit_test_time_LDADD) $(LIBS)
+unit/test-tls.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-tls$(EXEEXT): $(unit_test_tls_OBJECTS) $(unit_test_tls_DEPENDENCIES) $(EXTRA_unit_test_tls_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-tls$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_tls_OBJECTS) $(unit_test_tls_LDADD) $(LIBS)
+unit/test-uintset.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-uintset$(EXEEXT): $(unit_test_uintset_OBJECTS) $(unit_test_uintset_DEPENDENCIES) $(EXTRA_unit_test_uintset_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-uintset$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_uintset_OBJECTS) $(unit_test_uintset_LDADD) $(LIBS)
+unit/test-unit.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-unit$(EXEEXT): $(unit_test_unit_OBJECTS) $(unit_test_unit_DEPENDENCIES) $(EXTRA_unit_test_unit_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-unit$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_unit_OBJECTS) $(unit_test_unit_LDADD) $(LIBS)
+unit/test-utf8.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-utf8$(EXEEXT): $(unit_test_utf8_OBJECTS) $(unit_test_utf8_DEPENDENCIES) $(EXTRA_unit_test_utf8_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-utf8$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_utf8_OBJECTS) $(unit_test_utf8_LDADD) $(LIBS)
+unit/test-util.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-util$(EXEEXT): $(unit_test_util_OBJECTS) $(unit_test_util_DEPENDENCIES) $(EXTRA_unit_test_util_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-util$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_util_OBJECTS) $(unit_test_util_LDADD) $(LIBS)
+unit/test-uuid.$(OBJEXT): unit/$(am__dirstamp) \
+       unit/$(DEPDIR)/$(am__dirstamp)
+
+unit/test-uuid$(EXEEXT): $(unit_test_uuid_OBJECTS) $(unit_test_uuid_DEPENDENCIES) $(EXTRA_unit_test_uuid_DEPENDENCIES) unit/$(am__dirstamp)
+       @rm -f unit/test-uuid$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(unit_test_uuid_OBJECTS) $(unit_test_uuid_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+       -rm -f ell/*.$(OBJEXT)
+       -rm -f ell/*.lo
+       -rm -f examples/*.$(OBJEXT)
+       -rm -f tools/*.$(OBJEXT)
+       -rm -f unit/*.$(OBJEXT)
+       -rm -f unit/*.lo
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/base64.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/cert.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/checksum.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/cipher.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus-client.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus-filter.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus-message.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus-name-cache.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus-service.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dbus.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dhcp-lease.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dhcp-transport.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dhcp.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/dir.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/ecc-external.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/ecc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/ecdh.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/file.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/genl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/gpio.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/gvariant-util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/hashmap.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/hwdb.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/idle.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/io.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/key.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/log.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/main.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/net.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/netlink.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/path.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/pem.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/pkcs5.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/queue.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/random.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/ringbuf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/settings.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/signal.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/siphash.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/string.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/strv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/test.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/time.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/timeout.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/tls-extensions.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/tls-record.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/tls-suites.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/tls.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/uintset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/utf8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/util.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@ell/$(DEPDIR)/uuid.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/dbus-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/dbus-service.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/dhcp-client.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/https-client-test.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/https-server-test.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/certchain-verify.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/genl-discover.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/genl-request.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/genl-watch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/gpio.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/example-plugin.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-base64.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-checksum.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-cipher.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus-message-fds.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus-message.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus-properties.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus-service.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus-util.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus-watch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dbus.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dhcp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-dir-watch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-ecc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-ecdh.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-endian.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-genl-msg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-gvariant-message.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-gvariant-util.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-hashmap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-hwdb.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-io.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-key.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-net.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-netlink.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-path.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-pbkdf2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-pem.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-plugin.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-queue.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-random.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-ringbuf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-settings.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-siphash.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-string.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-time.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-tls.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-uintset.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-unit.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-utf8.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-util.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-uuid.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+       @$(MKDIR_P) $(@D)
+       @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+examples/glib_eventloop-glib-eventloop.o: examples/glib-eventloop.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_glib_eventloop_CFLAGS) $(CFLAGS) -MT examples/glib_eventloop-glib-eventloop.o -MD -MP -MF examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Tpo -c -o examples/glib_eventloop-glib-eventloop.o `test -f 'examples/glib-eventloop.c' || echo '$(srcdir)/'`examples/glib-eventloop.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Tpo examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='examples/glib-eventloop.c' object='examples/glib_eventloop-glib-eventloop.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_glib_eventloop_CFLAGS) $(CFLAGS) -c -o examples/glib_eventloop-glib-eventloop.o `test -f 'examples/glib-eventloop.c' || echo '$(srcdir)/'`examples/glib-eventloop.c
+
+examples/glib_eventloop-glib-eventloop.obj: examples/glib-eventloop.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_glib_eventloop_CFLAGS) $(CFLAGS) -MT examples/glib_eventloop-glib-eventloop.obj -MD -MP -MF examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Tpo -c -o examples/glib_eventloop-glib-eventloop.obj `if test -f 'examples/glib-eventloop.c'; then $(CYGPATH_W) 'examples/glib-eventloop.c'; else $(CYGPATH_W) '$(srcdir)/examples/glib-eventloop.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Tpo examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='examples/glib-eventloop.c' object='examples/glib_eventloop-glib-eventloop.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(examples_glib_eventloop_CFLAGS) $(CFLAGS) -c -o examples/glib_eventloop-glib-eventloop.obj `if test -f 'examples/glib-eventloop.c'; then $(CYGPATH_W) 'examples/glib-eventloop.c'; else $(CYGPATH_W) '$(srcdir)/examples/glib-eventloop.c'; fi`
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+       -rm -rf ell/.libs ell/_libs
+       -rm -rf examples/.libs examples/_libs
+       -rm -rf tools/.libs tools/_libs
+       -rm -rf unit/.libs unit/_libs
+
+distclean-libtool:
+       -rm -f libtool config.lt
+install-pkgconfigDATA: $(pkgconfig_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+       done
+
+uninstall-pkgconfigDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+       done
+
+uninstall-pkgincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+       $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       set x; \
+       here=`pwd`; \
+       $(am__define_uniq_tagged_files); \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$unique; \
+         fi; \
+       fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+       $(am__define_uniq_tagged_files); \
+       test -z "$(CTAGS_ARGS)$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+       test ! -s cscope.files \
+         || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+       -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+       list='$(am__tagged_files)'; \
+       case "$(srcdir)" in \
+         [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+         *) sdir=$(subdir)/$(srcdir) ;; \
+       esac; \
+       for i in $$list; do \
+         if test -f "$$i"; then \
+           echo "$(subdir)/$$i"; \
+         else \
+           echo "$$sdir/$$i"; \
+         fi; \
+       done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+       -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+       rm -f $< $@
+       $(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+       @:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+       @$(am__set_TESTS_bases); \
+       am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+       redo_bases=`for i in $$bases; do \
+                     am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+                   done`; \
+       if test -n "$$redo_bases"; then \
+         redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+         redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+         if $(am__make_dryrun); then :; else \
+           rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+         fi; \
+       fi; \
+       if test -n "$$am__remaking_logs"; then \
+         echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+              "recursion detected" >&2; \
+       elif test -n "$$redo_logs"; then \
+         am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+       fi; \
+       if $(am__make_dryrun); then :; else \
+         st=0;  \
+         errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+         for i in $$redo_bases; do \
+           test -f $$i.trs && test -r $$i.trs \
+             || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+           test -f $$i.log && test -r $$i.log \
+             || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+         done; \
+         test $$st -eq 0 || exit 1; \
+       fi
+       @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+       ws='[   ]'; \
+       results=`for b in $$bases; do echo $$b.trs; done`; \
+       test -n "$$results" || results=/dev/null; \
+       all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+       pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+       fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+       skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+       xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+       xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+       error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+       if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+         success=true; \
+       else \
+         success=false; \
+       fi; \
+       br='==================='; br=$$br$$br$$br$$br; \
+       result_count () \
+       { \
+           if test x"$$1" = x"--maybe-color"; then \
+             maybe_colorize=yes; \
+           elif test x"$$1" = x"--no-color"; then \
+             maybe_colorize=no; \
+           else \
+             echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+           fi; \
+           shift; \
+           desc=$$1 count=$$2; \
+           if test $$maybe_colorize = yes && test $$count -gt 0; then \
+             color_start=$$3 color_end=$$std; \
+           else \
+             color_start= color_end=; \
+           fi; \
+           echo "$${color_start}# $$desc $$count$${color_end}"; \
+       }; \
+       create_testsuite_report () \
+       { \
+         result_count $$1 "TOTAL:" $$all   "$$brg"; \
+         result_count $$1 "PASS: " $$pass  "$$grn"; \
+         result_count $$1 "SKIP: " $$skip  "$$blu"; \
+         result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+         result_count $$1 "FAIL: " $$fail  "$$red"; \
+         result_count $$1 "XPASS:" $$xpass "$$red"; \
+         result_count $$1 "ERROR:" $$error "$$mgn"; \
+       }; \
+       {                                                               \
+         echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |       \
+           $(am__rst_title);                                           \
+         create_testsuite_report --no-color;                           \
+         echo;                                                         \
+         echo ".. contents:: :depth: 2";                               \
+         echo;                                                         \
+         for b in $$bases; do echo $$b; done                           \
+           | $(am__create_global_log);                                 \
+       } >$(TEST_SUITE_LOG).tmp || exit 1;                             \
+       mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);                     \
+       if $$success; then                                              \
+         col="$$grn";                                                  \
+        else                                                           \
+         col="$$red";                                                  \
+         test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);               \
+       fi;                                                             \
+       echo "$${col}$$br$${std}";                                      \
+       echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";   \
+       echo "$${col}$$br$${std}";                                      \
+       create_testsuite_report --maybe-color;                          \
+       echo "$$col$$br$$std";                                          \
+       if $$success; then :; else                                      \
+         echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";         \
+         if test -n "$(PACKAGE_BUGREPORT)"; then                       \
+           echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+         fi;                                                           \
+         echo "$$col$$br$$std";                                        \
+       fi;                                                             \
+       $$success || exit 1
+
+check-TESTS: 
+       @list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+       @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+       @set +e; $(am__set_TESTS_bases); \
+       log_list=`for i in $$bases; do echo $$i.log; done`; \
+       trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+       log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+       exit $$?;
+recheck: all 
+       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+       @set +e; $(am__set_TESTS_bases); \
+       bases=`for i in $$bases; do echo $$i; done \
+                | $(am__list_recheck_tests)` || exit 1; \
+       log_list=`for i in $$bases; do echo $$i.log; done`; \
+       log_list=`echo $$log_list`; \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+               am__force_recheck=am--force-recheck \
+               TEST_LOGS="$$log_list"; \
+       exit $$?
+unit/test-unit.log: unit/test-unit$(EXEEXT)
+       @p='unit/test-unit$(EXEEXT)'; \
+       b='unit/test-unit'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-queue.log: unit/test-queue$(EXEEXT)
+       @p='unit/test-queue$(EXEEXT)'; \
+       b='unit/test-queue'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-hashmap.log: unit/test-hashmap$(EXEEXT)
+       @p='unit/test-hashmap$(EXEEXT)'; \
+       b='unit/test-hashmap'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-endian.log: unit/test-endian$(EXEEXT)
+       @p='unit/test-endian$(EXEEXT)'; \
+       b='unit/test-endian'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-string.log: unit/test-string$(EXEEXT)
+       @p='unit/test-string$(EXEEXT)'; \
+       b='unit/test-string'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-utf8.log: unit/test-utf8$(EXEEXT)
+       @p='unit/test-utf8$(EXEEXT)'; \
+       b='unit/test-utf8'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-main.log: unit/test-main$(EXEEXT)
+       @p='unit/test-main$(EXEEXT)'; \
+       b='unit/test-main'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-io.log: unit/test-io$(EXEEXT)
+       @p='unit/test-io$(EXEEXT)'; \
+       b='unit/test-io'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-ringbuf.log: unit/test-ringbuf$(EXEEXT)
+       @p='unit/test-ringbuf$(EXEEXT)'; \
+       b='unit/test-ringbuf'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-plugin.log: unit/test-plugin$(EXEEXT)
+       @p='unit/test-plugin$(EXEEXT)'; \
+       b='unit/test-plugin'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-checksum.log: unit/test-checksum$(EXEEXT)
+       @p='unit/test-checksum$(EXEEXT)'; \
+       b='unit/test-checksum'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-settings.log: unit/test-settings$(EXEEXT)
+       @p='unit/test-settings$(EXEEXT)'; \
+       b='unit/test-settings'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-netlink.log: unit/test-netlink$(EXEEXT)
+       @p='unit/test-netlink$(EXEEXT)'; \
+       b='unit/test-netlink'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-genl-msg.log: unit/test-genl-msg$(EXEEXT)
+       @p='unit/test-genl-msg$(EXEEXT)'; \
+       b='unit/test-genl-msg'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-siphash.log: unit/test-siphash$(EXEEXT)
+       @p='unit/test-siphash$(EXEEXT)'; \
+       b='unit/test-siphash'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-cipher.log: unit/test-cipher$(EXEEXT)
+       @p='unit/test-cipher$(EXEEXT)'; \
+       b='unit/test-cipher'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-random.log: unit/test-random$(EXEEXT)
+       @p='unit/test-random$(EXEEXT)'; \
+       b='unit/test-random'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-util.log: unit/test-util$(EXEEXT)
+       @p='unit/test-util$(EXEEXT)'; \
+       b='unit/test-util'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-uintset.log: unit/test-uintset$(EXEEXT)
+       @p='unit/test-uintset$(EXEEXT)'; \
+       b='unit/test-uintset'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-base64.log: unit/test-base64$(EXEEXT)
+       @p='unit/test-base64$(EXEEXT)'; \
+       b='unit/test-base64'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-uuid.log: unit/test-uuid$(EXEEXT)
+       @p='unit/test-uuid$(EXEEXT)'; \
+       b='unit/test-uuid'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-pbkdf2.log: unit/test-pbkdf2$(EXEEXT)
+       @p='unit/test-pbkdf2$(EXEEXT)'; \
+       b='unit/test-pbkdf2'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dhcp.log: unit/test-dhcp$(EXEEXT)
+       @p='unit/test-dhcp$(EXEEXT)'; \
+       b='unit/test-dhcp'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dir-watch.log: unit/test-dir-watch$(EXEEXT)
+       @p='unit/test-dir-watch$(EXEEXT)'; \
+       b='unit/test-dir-watch'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-ecc.log: unit/test-ecc$(EXEEXT)
+       @p='unit/test-ecc$(EXEEXT)'; \
+       b='unit/test-ecc'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-ecdh.log: unit/test-ecdh$(EXEEXT)
+       @p='unit/test-ecdh$(EXEEXT)'; \
+       b='unit/test-ecdh'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-time.log: unit/test-time$(EXEEXT)
+       @p='unit/test-time$(EXEEXT)'; \
+       b='unit/test-time'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-path.log: unit/test-path$(EXEEXT)
+       @p='unit/test-path$(EXEEXT)'; \
+       b='unit/test-path'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-net.log: unit/test-net$(EXEEXT)
+       @p='unit/test-net$(EXEEXT)'; \
+       b='unit/test-net'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-hwdb.log: unit/test-hwdb$(EXEEXT)
+       @p='unit/test-hwdb$(EXEEXT)'; \
+       b='unit/test-hwdb'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus.log: unit/test-dbus$(EXEEXT)
+       @p='unit/test-dbus$(EXEEXT)'; \
+       b='unit/test-dbus'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus-util.log: unit/test-dbus-util$(EXEEXT)
+       @p='unit/test-dbus-util$(EXEEXT)'; \
+       b='unit/test-dbus-util'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus-message.log: unit/test-dbus-message$(EXEEXT)
+       @p='unit/test-dbus-message$(EXEEXT)'; \
+       b='unit/test-dbus-message'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus-message-fds.log: unit/test-dbus-message-fds$(EXEEXT)
+       @p='unit/test-dbus-message-fds$(EXEEXT)'; \
+       b='unit/test-dbus-message-fds'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus-service.log: unit/test-dbus-service$(EXEEXT)
+       @p='unit/test-dbus-service$(EXEEXT)'; \
+       b='unit/test-dbus-service'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus-watch.log: unit/test-dbus-watch$(EXEEXT)
+       @p='unit/test-dbus-watch$(EXEEXT)'; \
+       b='unit/test-dbus-watch'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-dbus-properties.log: unit/test-dbus-properties$(EXEEXT)
+       @p='unit/test-dbus-properties$(EXEEXT)'; \
+       b='unit/test-dbus-properties'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-gvariant-util.log: unit/test-gvariant-util$(EXEEXT)
+       @p='unit/test-gvariant-util$(EXEEXT)'; \
+       b='unit/test-gvariant-util'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-gvariant-message.log: unit/test-gvariant-message$(EXEEXT)
+       @p='unit/test-gvariant-message$(EXEEXT)'; \
+       b='unit/test-gvariant-message'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-pem.log: unit/test-pem$(EXEEXT)
+       @p='unit/test-pem$(EXEEXT)'; \
+       b='unit/test-pem'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-tls.log: unit/test-tls$(EXEEXT)
+       @p='unit/test-tls$(EXEEXT)'; \
+       b='unit/test-tls'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+unit/test-key.log: unit/test-key$(EXEEXT)
+       @p='unit/test-key$(EXEEXT)'; \
+       b='unit/test-key'; \
+       $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+       @p='$<'; \
+       $(am__set_b); \
+       $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+       --log-file $$b.log --trs-file $$b.trs \
+       $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+       "$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@      @p='$<'; \
+@am__EXEEXT_TRUE@      $(am__set_b); \
+@am__EXEEXT_TRUE@      $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@      --log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@      $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@      "$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+       $(am__remove_distdir)
+       test -d "$(distdir)" || mkdir "$(distdir)"
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+         else \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
+         fi; \
+       done
+       -test -n "$(am__skip_mode_fix)" \
+       || find "$(distdir)" -type d ! -perm -755 \
+               -exec chmod u+rwx,go+rx {} \; -o \
+         ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+         ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+       || chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+       tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+       $(am__post_remove_distdir)
+
+dist-bzip2: distdir
+       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+       $(am__post_remove_distdir)
+
+dist-lzip: distdir
+       tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+       $(am__post_remove_distdir)
+dist-xz: distdir
+       tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+       $(am__post_remove_distdir)
+
+dist-tarZ: distdir
+       @echo WARNING: "Support for distribution archives compressed with" \
+                      "legacy program 'compress' is deprecated." >&2
+       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+       $(am__post_remove_distdir)
+
+dist-shar: distdir
+       @echo WARNING: "Support for shar distribution archives is" \
+                      "deprecated." >&2
+       @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+       shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+       $(am__post_remove_distdir)
+
+dist-zip: distdir
+       -rm -f $(distdir).zip
+       zip -rq $(distdir).zip $(distdir)
+       $(am__post_remove_distdir)
+
+dist dist-all:
+       $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+       $(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+       case '$(DIST_ARCHIVES)' in \
+       *.tar.gz*) \
+         eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+       *.tar.bz2*) \
+         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+       *.tar.lz*) \
+         lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+       *.tar.xz*) \
+         xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+       *.tar.Z*) \
+         uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+       *.shar.gz*) \
+         eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+       *.zip*) \
+         unzip $(distdir).zip ;;\
+       esac
+       chmod -R a-w $(distdir)
+       chmod u+w $(distdir)
+       mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+       chmod a-w $(distdir)
+       test -d $(distdir)/_build || exit 0; \
+       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+         && am__cwd=`pwd` \
+         && $(am__cd) $(distdir)/_build/sub \
+         && ../../configure \
+           $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+           $(DISTCHECK_CONFIGURE_FLAGS) \
+           --srcdir=../.. --prefix="$$dc_install_base" \
+         && $(MAKE) $(AM_MAKEFLAGS) \
+         && $(MAKE) $(AM_MAKEFLAGS) dvi \
+         && $(MAKE) $(AM_MAKEFLAGS) check \
+         && $(MAKE) $(AM_MAKEFLAGS) install \
+         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+               distuninstallcheck \
+         && chmod -R a-w "$$dc_install_base" \
+         && ({ \
+              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+             } || { rm -rf "$$dc_destdir"; exit 1; }) \
+         && rm -rf "$$dc_destdir" \
+         && $(MAKE) $(AM_MAKEFLAGS) dist \
+         && rm -rf $(DIST_ARCHIVES) \
+         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+         && cd "$$am__cwd" \
+         || exit 1
+       $(am__post_remove_distdir)
+       @(echo "$(distdir) archives ready for distribution: "; \
+         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+       @test -n '$(distuninstallcheck_dir)' || { \
+         echo 'ERROR: trying to run $@ with an empty' \
+              '$$(distuninstallcheck_dir)' >&2; \
+         exit 1; \
+       }; \
+       $(am__cd) '$(distuninstallcheck_dir)' || { \
+         echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+         exit 1; \
+       }; \
+       test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+          || { echo "ERROR: files left after uninstall:" ; \
+               if test -n "$(DESTDIR)"; then \
+                 echo "  (check DESTDIR support)"; \
+               fi ; \
+               $(distuninstallcheck_listfiles) ; \
+               exit 1; } >&2
+distcleancheck: distclean
+       @if test '$(srcdir)' = . ; then \
+         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+         exit 1 ; \
+       fi
+       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+         || { echo "ERROR: files left in build directory after distclean:" ; \
+              $(distcleancheck_listfiles) ; \
+              exit 1; } >&2
+@MAINTAINER_MODE_FALSE@check-local:
+check-am: all-am
+       $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+check: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS) \
+               config.h
+installdirs:
+       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: $(BUILT_SOURCES)
+       $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       if test -z '$(STRIP)'; then \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+             install; \
+       else \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+       fi
+mostlyclean-generic:
+       -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+       -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+       -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+       -rm -f ell/$(DEPDIR)/$(am__dirstamp)
+       -rm -f ell/$(am__dirstamp)
+       -rm -f examples/$(DEPDIR)/$(am__dirstamp)
+       -rm -f examples/$(am__dirstamp)
+       -rm -f tools/$(DEPDIR)/$(am__dirstamp)
+       -rm -f tools/$(am__dirstamp)
+       -rm -f unit/$(DEPDIR)/$(am__dirstamp)
+       -rm -f unit/$(am__dirstamp)
+       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+       -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
+       clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+       -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+               -rm -f ell/$(DEPDIR)/base64.Plo
+       -rm -f ell/$(DEPDIR)/cert.Plo
+       -rm -f ell/$(DEPDIR)/checksum.Plo
+       -rm -f ell/$(DEPDIR)/cipher.Plo
+       -rm -f ell/$(DEPDIR)/dbus-client.Plo
+       -rm -f ell/$(DEPDIR)/dbus-filter.Plo
+       -rm -f ell/$(DEPDIR)/dbus-message.Plo
+       -rm -f ell/$(DEPDIR)/dbus-name-cache.Plo
+       -rm -f ell/$(DEPDIR)/dbus-service.Plo
+       -rm -f ell/$(DEPDIR)/dbus-util.Plo
+       -rm -f ell/$(DEPDIR)/dbus.Plo
+       -rm -f ell/$(DEPDIR)/dhcp-lease.Plo
+       -rm -f ell/$(DEPDIR)/dhcp-transport.Plo
+       -rm -f ell/$(DEPDIR)/dhcp.Plo
+       -rm -f ell/$(DEPDIR)/dir.Plo
+       -rm -f ell/$(DEPDIR)/ecc-external.Plo
+       -rm -f ell/$(DEPDIR)/ecc.Plo
+       -rm -f ell/$(DEPDIR)/ecdh.Plo
+       -rm -f ell/$(DEPDIR)/file.Plo
+       -rm -f ell/$(DEPDIR)/genl.Plo
+       -rm -f ell/$(DEPDIR)/gpio.Plo
+       -rm -f ell/$(DEPDIR)/gvariant-util.Plo
+       -rm -f ell/$(DEPDIR)/hashmap.Plo
+       -rm -f ell/$(DEPDIR)/hwdb.Plo
+       -rm -f ell/$(DEPDIR)/idle.Plo
+       -rm -f ell/$(DEPDIR)/io.Plo
+       -rm -f ell/$(DEPDIR)/key.Plo
+       -rm -f ell/$(DEPDIR)/log.Plo
+       -rm -f ell/$(DEPDIR)/main.Plo
+       -rm -f ell/$(DEPDIR)/net.Plo
+       -rm -f ell/$(DEPDIR)/netlink.Plo
+       -rm -f ell/$(DEPDIR)/path.Plo
+       -rm -f ell/$(DEPDIR)/pem.Plo
+       -rm -f ell/$(DEPDIR)/pkcs5.Plo
+       -rm -f ell/$(DEPDIR)/plugin.Plo
+       -rm -f ell/$(DEPDIR)/queue.Plo
+       -rm -f ell/$(DEPDIR)/random.Plo
+       -rm -f ell/$(DEPDIR)/ringbuf.Plo
+       -rm -f ell/$(DEPDIR)/settings.Plo
+       -rm -f ell/$(DEPDIR)/signal.Plo
+       -rm -f ell/$(DEPDIR)/siphash.Plo
+       -rm -f ell/$(DEPDIR)/string.Plo
+       -rm -f ell/$(DEPDIR)/strv.Plo
+       -rm -f ell/$(DEPDIR)/test.Plo
+       -rm -f ell/$(DEPDIR)/time.Plo
+       -rm -f ell/$(DEPDIR)/timeout.Plo
+       -rm -f ell/$(DEPDIR)/tls-extensions.Plo
+       -rm -f ell/$(DEPDIR)/tls-record.Plo
+       -rm -f ell/$(DEPDIR)/tls-suites.Plo
+       -rm -f ell/$(DEPDIR)/tls.Plo
+       -rm -f ell/$(DEPDIR)/uintset.Plo
+       -rm -f ell/$(DEPDIR)/utf8.Plo
+       -rm -f ell/$(DEPDIR)/util.Plo
+       -rm -f ell/$(DEPDIR)/uuid.Plo
+       -rm -f examples/$(DEPDIR)/dbus-client.Po
+       -rm -f examples/$(DEPDIR)/dbus-service.Po
+       -rm -f examples/$(DEPDIR)/dhcp-client.Po
+       -rm -f examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Po
+       -rm -f examples/$(DEPDIR)/https-client-test.Po
+       -rm -f examples/$(DEPDIR)/https-server-test.Po
+       -rm -f tools/$(DEPDIR)/certchain-verify.Po
+       -rm -f tools/$(DEPDIR)/genl-discover.Po
+       -rm -f tools/$(DEPDIR)/genl-request.Po
+       -rm -f tools/$(DEPDIR)/genl-watch.Po
+       -rm -f tools/$(DEPDIR)/gpio.Po
+       -rm -f unit/$(DEPDIR)/example-plugin.Plo
+       -rm -f unit/$(DEPDIR)/test-base64.Po
+       -rm -f unit/$(DEPDIR)/test-checksum.Po
+       -rm -f unit/$(DEPDIR)/test-cipher.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-message-fds.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-message.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-properties.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-service.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-util.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-watch.Po
+       -rm -f unit/$(DEPDIR)/test-dbus.Po
+       -rm -f unit/$(DEPDIR)/test-dhcp.Po
+       -rm -f unit/$(DEPDIR)/test-dir-watch.Po
+       -rm -f unit/$(DEPDIR)/test-ecc.Po
+       -rm -f unit/$(DEPDIR)/test-ecdh.Po
+       -rm -f unit/$(DEPDIR)/test-endian.Po
+       -rm -f unit/$(DEPDIR)/test-genl-msg.Po
+       -rm -f unit/$(DEPDIR)/test-gvariant-message.Po
+       -rm -f unit/$(DEPDIR)/test-gvariant-util.Po
+       -rm -f unit/$(DEPDIR)/test-hashmap.Po
+       -rm -f unit/$(DEPDIR)/test-hwdb.Po
+       -rm -f unit/$(DEPDIR)/test-io.Po
+       -rm -f unit/$(DEPDIR)/test-key.Po
+       -rm -f unit/$(DEPDIR)/test-main.Po
+       -rm -f unit/$(DEPDIR)/test-net.Po
+       -rm -f unit/$(DEPDIR)/test-netlink.Po
+       -rm -f unit/$(DEPDIR)/test-path.Po
+       -rm -f unit/$(DEPDIR)/test-pbkdf2.Po
+       -rm -f unit/$(DEPDIR)/test-pem.Po
+       -rm -f unit/$(DEPDIR)/test-plugin.Po
+       -rm -f unit/$(DEPDIR)/test-queue.Po
+       -rm -f unit/$(DEPDIR)/test-random.Po
+       -rm -f unit/$(DEPDIR)/test-ringbuf.Po
+       -rm -f unit/$(DEPDIR)/test-settings.Po
+       -rm -f unit/$(DEPDIR)/test-siphash.Po
+       -rm -f unit/$(DEPDIR)/test-string.Po
+       -rm -f unit/$(DEPDIR)/test-time.Po
+       -rm -f unit/$(DEPDIR)/test-tls.Po
+       -rm -f unit/$(DEPDIR)/test-uintset.Po
+       -rm -f unit/$(DEPDIR)/test-unit.Po
+       -rm -f unit/$(DEPDIR)/test-utf8.Po
+       -rm -f unit/$(DEPDIR)/test-util.Po
+       -rm -f unit/$(DEPDIR)/test-uuid.Po
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-hdr distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgconfigDATA install-pkgincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+       -rm -rf $(top_srcdir)/autom4te.cache
+               -rm -f ell/$(DEPDIR)/base64.Plo
+       -rm -f ell/$(DEPDIR)/cert.Plo
+       -rm -f ell/$(DEPDIR)/checksum.Plo
+       -rm -f ell/$(DEPDIR)/cipher.Plo
+       -rm -f ell/$(DEPDIR)/dbus-client.Plo
+       -rm -f ell/$(DEPDIR)/dbus-filter.Plo
+       -rm -f ell/$(DEPDIR)/dbus-message.Plo
+       -rm -f ell/$(DEPDIR)/dbus-name-cache.Plo
+       -rm -f ell/$(DEPDIR)/dbus-service.Plo
+       -rm -f ell/$(DEPDIR)/dbus-util.Plo
+       -rm -f ell/$(DEPDIR)/dbus.Plo
+       -rm -f ell/$(DEPDIR)/dhcp-lease.Plo
+       -rm -f ell/$(DEPDIR)/dhcp-transport.Plo
+       -rm -f ell/$(DEPDIR)/dhcp.Plo
+       -rm -f ell/$(DEPDIR)/dir.Plo
+       -rm -f ell/$(DEPDIR)/ecc-external.Plo
+       -rm -f ell/$(DEPDIR)/ecc.Plo
+       -rm -f ell/$(DEPDIR)/ecdh.Plo
+       -rm -f ell/$(DEPDIR)/file.Plo
+       -rm -f ell/$(DEPDIR)/genl.Plo
+       -rm -f ell/$(DEPDIR)/gpio.Plo
+       -rm -f ell/$(DEPDIR)/gvariant-util.Plo
+       -rm -f ell/$(DEPDIR)/hashmap.Plo
+       -rm -f ell/$(DEPDIR)/hwdb.Plo
+       -rm -f ell/$(DEPDIR)/idle.Plo
+       -rm -f ell/$(DEPDIR)/io.Plo
+       -rm -f ell/$(DEPDIR)/key.Plo
+       -rm -f ell/$(DEPDIR)/log.Plo
+       -rm -f ell/$(DEPDIR)/main.Plo
+       -rm -f ell/$(DEPDIR)/net.Plo
+       -rm -f ell/$(DEPDIR)/netlink.Plo
+       -rm -f ell/$(DEPDIR)/path.Plo
+       -rm -f ell/$(DEPDIR)/pem.Plo
+       -rm -f ell/$(DEPDIR)/pkcs5.Plo
+       -rm -f ell/$(DEPDIR)/plugin.Plo
+       -rm -f ell/$(DEPDIR)/queue.Plo
+       -rm -f ell/$(DEPDIR)/random.Plo
+       -rm -f ell/$(DEPDIR)/ringbuf.Plo
+       -rm -f ell/$(DEPDIR)/settings.Plo
+       -rm -f ell/$(DEPDIR)/signal.Plo
+       -rm -f ell/$(DEPDIR)/siphash.Plo
+       -rm -f ell/$(DEPDIR)/string.Plo
+       -rm -f ell/$(DEPDIR)/strv.Plo
+       -rm -f ell/$(DEPDIR)/test.Plo
+       -rm -f ell/$(DEPDIR)/time.Plo
+       -rm -f ell/$(DEPDIR)/timeout.Plo
+       -rm -f ell/$(DEPDIR)/tls-extensions.Plo
+       -rm -f ell/$(DEPDIR)/tls-record.Plo
+       -rm -f ell/$(DEPDIR)/tls-suites.Plo
+       -rm -f ell/$(DEPDIR)/tls.Plo
+       -rm -f ell/$(DEPDIR)/uintset.Plo
+       -rm -f ell/$(DEPDIR)/utf8.Plo
+       -rm -f ell/$(DEPDIR)/util.Plo
+       -rm -f ell/$(DEPDIR)/uuid.Plo
+       -rm -f examples/$(DEPDIR)/dbus-client.Po
+       -rm -f examples/$(DEPDIR)/dbus-service.Po
+       -rm -f examples/$(DEPDIR)/dhcp-client.Po
+       -rm -f examples/$(DEPDIR)/glib_eventloop-glib-eventloop.Po
+       -rm -f examples/$(DEPDIR)/https-client-test.Po
+       -rm -f examples/$(DEPDIR)/https-server-test.Po
+       -rm -f tools/$(DEPDIR)/certchain-verify.Po
+       -rm -f tools/$(DEPDIR)/genl-discover.Po
+       -rm -f tools/$(DEPDIR)/genl-request.Po
+       -rm -f tools/$(DEPDIR)/genl-watch.Po
+       -rm -f tools/$(DEPDIR)/gpio.Po
+       -rm -f unit/$(DEPDIR)/example-plugin.Plo
+       -rm -f unit/$(DEPDIR)/test-base64.Po
+       -rm -f unit/$(DEPDIR)/test-checksum.Po
+       -rm -f unit/$(DEPDIR)/test-cipher.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-message-fds.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-message.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-properties.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-service.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-util.Po
+       -rm -f unit/$(DEPDIR)/test-dbus-watch.Po
+       -rm -f unit/$(DEPDIR)/test-dbus.Po
+       -rm -f unit/$(DEPDIR)/test-dhcp.Po
+       -rm -f unit/$(DEPDIR)/test-dir-watch.Po
+       -rm -f unit/$(DEPDIR)/test-ecc.Po
+       -rm -f unit/$(DEPDIR)/test-ecdh.Po
+       -rm -f unit/$(DEPDIR)/test-endian.Po
+       -rm -f unit/$(DEPDIR)/test-genl-msg.Po
+       -rm -f unit/$(DEPDIR)/test-gvariant-message.Po
+       -rm -f unit/$(DEPDIR)/test-gvariant-util.Po
+       -rm -f unit/$(DEPDIR)/test-hashmap.Po
+       -rm -f unit/$(DEPDIR)/test-hwdb.Po
+       -rm -f unit/$(DEPDIR)/test-io.Po
+       -rm -f unit/$(DEPDIR)/test-key.Po
+       -rm -f unit/$(DEPDIR)/test-main.Po
+       -rm -f unit/$(DEPDIR)/test-net.Po
+       -rm -f unit/$(DEPDIR)/test-netlink.Po
+       -rm -f unit/$(DEPDIR)/test-path.Po
+       -rm -f unit/$(DEPDIR)/test-pbkdf2.Po
+       -rm -f unit/$(DEPDIR)/test-pem.Po
+       -rm -f unit/$(DEPDIR)/test-plugin.Po
+       -rm -f unit/$(DEPDIR)/test-queue.Po
+       -rm -f unit/$(DEPDIR)/test-random.Po
+       -rm -f unit/$(DEPDIR)/test-ringbuf.Po
+       -rm -f unit/$(DEPDIR)/test-settings.Po
+       -rm -f unit/$(DEPDIR)/test-siphash.Po
+       -rm -f unit/$(DEPDIR)/test-string.Po
+       -rm -f unit/$(DEPDIR)/test-time.Po
+       -rm -f unit/$(DEPDIR)/test-tls.Po
+       -rm -f unit/$(DEPDIR)/test-uintset.Po
+       -rm -f unit/$(DEPDIR)/test-unit.Po
+       -rm -f unit/$(DEPDIR)/test-utf8.Po
+       -rm -f unit/$(DEPDIR)/test-util.Po
+       -rm -f unit/$(DEPDIR)/test-uuid.Po
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic \
+       maintainer-clean-local
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+       uninstall-pkgincludeHEADERS
+
+.MAKE: all check check-am install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
+       check-TESTS check-am check-local clean clean-cscope \
+       clean-generic clean-libLTLIBRARIES clean-libtool clean-local \
+       clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscope \
+       cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+       dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+       distcheck distclean distclean-compile distclean-generic \
+       distclean-hdr distclean-libtool distclean-tags distcleancheck \
+       distdir distuninstallcheck dvi dvi-am html html-am info \
+       info-am install install-am install-data install-data-am \
+       install-dvi install-dvi-am install-exec install-exec-am \
+       install-html install-html-am install-info install-info-am \
+       install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+       install-pkgconfigDATA install-pkgincludeHEADERS install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       maintainer-clean-local mostlyclean mostlyclean-compile \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+       recheck tags tags-am uninstall uninstall-am \
+       uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
+       uninstall-pkgincludeHEADERS
+
+.PRECIOUS: Makefile
+
+
+unit/cert-ca-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ 2048 $($(AM_V_P)_redirect_openssl)
+
+unit/cert-ca.pem: unit/cert-ca-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -x509 -new -nodes -extensions ca_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=International Union of Example Organizations/CN=Certificate issuer guy/emailAddress=ca@mail.example' \
+                       -key $< -sha256 -days 10000 -out $@
+
+unit/cert-server-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-server-key-pkcs8.pem: unit/cert-server-key.pem
+       $(AM_V_GEN)openssl pkcs8 -topk8 -nocrypt -in $< -out $@
+
+unit/cert-server.csr: unit/cert-server-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions cert_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=Foo Example Organization/CN=Foo Example Organization/emailAddress=foo@mail.example' \
+                       -key $< -out $@
+
+unit/cert-server.pem: unit/cert-server.csr unit/cert-ca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions server_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-ca.pem \
+                       -CAkey $(builddir)/unit/cert-ca-key.pem \
+                       -CAserial $(builddir)/unit/cert-ca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-server: unit/cert-server.pem unit/cert-ca.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-ca.pem $<
+
+unit/cert-client-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-client-key-pkcs8.pem: unit/cert-client-key.pem
+       $(AM_V_GEN)openssl pkcs8 -topk8 -nocrypt -in $< -out $@
+
+unit/cert-client-key-md5-des.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v1 PBE-MD5-DES -passout pass:abc
+
+unit/cert-client-key-sha1-des.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v1 PBE-SHA1-DES -passout pass:abc
+
+unit/cert-client-key-v2-des.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 des-cbc -v2prf hmacWithSHA1 -passout pass:abc
+
+unit/cert-client-key-v2-des-ede3.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 des-ede3-cbc -v2prf hmacWithSHA224 -passout pass:abc
+
+unit/cert-client-key-v2-aes128.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 aes128 -v2prf hmacWithSHA256 -passout pass:abc
+
+unit/cert-client-key-v2-aes256.pem: unit/cert-client-key-pkcs8.pem
+       $(AM_V_GEN)openssl pkcs8 -in $< -out $@ \
+                       -topk8 -v2 aes256 -v2prf hmacWithSHA512 -passout pass:abc
+
+unit/cert-client.csr: unit/cert-client-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions cert_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=Bar Example Organization/CN=Bar Example Organization/emailAddress=bar@mail.example' \
+                       -key $< -out $@
+
+unit/cert-client.pem: unit/cert-client.csr unit/cert-ca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions cert_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-ca.pem \
+                       -CAkey $(builddir)/unit/cert-ca-key.pem \
+                       -CAserial $(builddir)/unit/cert-ca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-client: unit/cert-client.pem unit/cert-ca.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-ca.pem $<
+
+unit/cert-intca-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-intca.csr: unit/cert-intca-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions int_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=International Union of Example Organizations/CN=Certificate issuer guy/emailAddress=ca@mail.example' \
+                       -key $< -out $@
+
+unit/cert-intca.pem: unit/cert-intca.csr unit/cert-ca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions int_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-ca.pem \
+                       -CAkey $(builddir)/unit/cert-ca-key.pem \
+                       -CAserial $(builddir)/unit/cert-ca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-intca: unit/cert-intca.pem unit/cert-ca.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-ca.pem $<
+
+unit/cert-chain.pem: unit/cert-intca.pem unit/cert-ca.pem
+       $(AM_V_GEN)cat $^ > $@
+
+unit/cert-entity-int-key.pem:
+       $(AM_V_GEN)openssl genrsa -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-entity-int.csr: unit/cert-entity-int-key.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl req -new -extensions cert_ext \
+                       -config $(srcdir)/unit/gencerts.cnf \
+                       -subj '/O=Baz Example Organization/CN=Baz Example Organization/emailAddress=baz@mail.example' \
+                       -key $< -out $@
+
+unit/cert-entity-int.pem: unit/cert-entity-int.csr unit/cert-intca.pem unit/gencerts.cnf
+       $(AM_V_GEN)openssl x509 -req -extensions cert_ext \
+                       -extfile $(srcdir)/unit/gencerts.cnf \
+                       -in $< -CA $(builddir)/unit/cert-intca.pem \
+                       -CAkey $(builddir)/unit/cert-intca-key.pem \
+                       -CAserial $(builddir)/unit/cert-intca.srl \
+                       -CAcreateserial -sha256 -days 10000 -out $@ $($(AM_V_P)_redirect_openssl)
+
+unit/cert-entity-int: unit/cert-entity-int.pem unit/cert-chain.pem
+       $(AM_V_GEN)openssl verify -CAfile $(builddir)/unit/cert-chain.pem $<
+
+unit/key-plaintext.h: unit/plaintext.txt
+       $(AM_V_GEN)xxd -i < $< > $@
+
+unit/key-ciphertext.dat: unit/plaintext.txt unit/cert-client.pem
+       $(AM_V_GEN)openssl rsautl -encrypt -pkcs -in $< -certin \
+                       -inkey $(builddir)/unit/cert-client.pem -out $@
+
+unit/key-ciphertext.h: unit/key-ciphertext.dat
+       $(AM_V_GEN)xxd -i < $< > $@
+
+unit/key-signature.dat: unit/plaintext.txt unit/cert-client-key.pem
+       $(AM_V_GEN)openssl rsautl -sign -pkcs -in $< \
+                       -inkey $(builddir)/unit/cert-client-key.pem -out $@
+
+unit/key-signature.h: unit/key-signature.dat
+       $(AM_V_GEN)xxd -i < $< > $@
+
+@MAINTAINER_MODE_TRUE@check-local: $(cert_checks)
+
+clean-local:
+       -rm -f unit/cert-*.pem unit/cert-*.csr unit/cert-*.srl unit/key-*.dat
+
+maintainer-clean-local:
+       -rm -rf build-aux
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/README b/README
new file mode 100644 (file)
index 0000000..3d24881
--- /dev/null
+++ b/README
@@ -0,0 +1,58 @@
+ELL - Embedded Linux library
+****************************
+
+Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+
+
+Compilation and installation
+============================
+
+In order to compile the source code you need following software packages:
+       - GCC compiler
+       - GNU C library
+
+To configure run:
+       ./configure --prefix=/usr
+
+Configure automatically searches for all required components and packages.
+
+To compile and install run:
+       make && make install
+
+
+Kernel dependencies
+===================
+
+In order to use this library you need a Linux kernel with support for
+epoll and timerfd.
+
+For checksum usage you need if_alg (crypto user-space API) with MD5
+and SHA-1 algorithms enabled.
+
+For Diffie-Hellman usage the KEYCTL_DH_COMPUTE command for the
+keyctl() syscall is required.
+
+Kernel configuration checklist:
+
+       CONFIG_TIMERFD=y
+       CONFIG_EVENTFD=y
+
+       CONFIG_CRYPTO_USER_API=y
+       CONFIG_CRYPTO_USER_API_HASH=y
+       CONFIG_CRYPTO_MD5=y
+       CONFIG_CRYPTO_SHA1=y
+
+       CONFIG_KEY_DH_OPERATIONS=y
+
+
+Information
+===========
+
+Mailing list:
+       ell@lists.01.org
+
+IRC:
+       irc://irc.freenode.net/#ell
+
+For additional information about the project visit the ELL web site:
+       https://01.org/ell
diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..acd0d6d
--- /dev/null
+++ b/TODO
@@ -0,0 +1,69 @@
+Background
+==========
+
+- Priority scale: High, Medium and Low
+
+- Complexity scale: C1, C2, C4 and C8.  The complexity scale is exponential,
+  with complexity 1 being the lowest complexity.  Complexity is a function
+  of both task 'complexity' and task 'scope'.
+
+  The general rule of thumb is that a complexity 1 task should take 1-2 weeks
+  for a person very familiar with the codebase.  Higher complexity tasks
+  require more time and have higher uncertainty.
+
+  Higher complexity tasks should be refined into several lower complexity tasks
+  once the task is better understood.
+
+
+DBus API
+========
+
+- Add builder APIs for appending fixed-size array data.  Currently arrays are
+  built one element at a time which can get pretty expensive for large arrays.
+  A function that appends multiple fixed elements at once to the gvariant and
+  dbus1 builders is needed.
+
+  Priority: Medium
+  Complexity: C4
+
+
+Kernel Crypto
+=============
+
+- Add support for getsockname (getname) in the Linux kernel for sockets of
+  type AF_ALG.  Currently this is not implemented and the kernel returns
+  EOPNOTSUPP.
+
+  Priority: Low
+  Complexity: C2
+
+
+TLS Support
+===========
+
+- Implement tls_cert_find_certchain
+
+  When the server sends its certificate, it should be sending the full
+  certificate chain, where each certificate directly verifies the preceding one
+  in the list.  The root CA certificate can be optionally omitted.
+
+  Since we are given a server certificate and a location with all CA
+  certificates we need to find a cert chain path to satisfy the above
+  condition.  The location can either be a directory (e.g. /etc/ssl/certs),
+  or a PEM file with all CA certificates concatenated inside.
+
+  Alternatively, we can assume that the user would be providing a certchain
+  file with the entire server certchain in some file format (e.g. PEM) which
+  contains all the required certificates concatenated into a single file.
+
+  The client certificate might require similar handling.
+
+  Priority: Medium
+  Complexity: C2
+
+- Implement Suite B Profile for TLS
+
+  Described in RFC 6460
+
+  Priority: Medium
+  Complexity: C8
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644 (file)
index 0000000..1bd01d0
--- /dev/null
@@ -0,0 +1,69 @@
+AC_DEFUN([AC_PROG_CC_PIE], [
+       AC_CACHE_CHECK([whether ${CC-cc} accepts -fPIE], ac_cv_prog_cc_pie, [
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fPIE -pie -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_pie=yes
+               else
+                       ac_cv_prog_cc_pie=no
+               fi
+               rm -rf conftest*
+       ])
+])
+
+AC_DEFUN([AC_PROG_CC_ASAN], [
+       AC_CACHE_CHECK([whether ${CC-cc} accepts -fsanitize=address], ac_cv_prog_cc_asan, [
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fsanitize=address -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_asan=yes
+               else
+                       ac_cv_prog_cc_asan=no
+               fi
+               rm -rf conftest*
+       ])
+])
+
+AC_DEFUN([AC_PROG_CC_LSAN], [
+       AC_CACHE_CHECK([whether ${CC-cc} accepts -fsanitize=leak], ac_cv_prog_cc_lsan, [
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fsanitize=leak -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_lsan=yes
+               else
+                       ac_cv_prog_cc_lsan=no
+               fi
+               rm -rf conftest*
+       ])
+])
+
+AC_DEFUN([AC_PROG_CC_UBSAN], [
+       AC_CACHE_CHECK([whether ${CC-cc} accepts -fsanitize=undefined], ac_cv_prog_cc_ubsan, [
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fsanitize=undefined -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_ubsan=yes
+               else
+                       ac_cv_prog_cc_ubsan=no
+               fi
+               rm -rf conftest*
+       ])
+])
+
+AC_DEFUN([COMPILER_FLAGS], [
+       if (test "${CFLAGS}" = ""); then
+               CFLAGS="-Wall -O2 -fsigned-char -fno-exceptions"
+               CFLAGS+=" -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
+       fi
+       if (test "$USE_MAINTAINER_MODE" = "yes"); then
+               CFLAGS+=" -Werror -Wextra"
+               CFLAGS+=" -Wno-unused-parameter"
+               CFLAGS+=" -Wno-missing-field-initializers"
+               CFLAGS+=" -Wdeclaration-after-statement"
+               CFLAGS+=" -Wmissing-declarations"
+               CFLAGS+=" -Wredundant-decls"
+               CFLAGS+=" -Wswitch-enum"
+               CFLAGS+=" -Wtype-limits"
+               CFLAGS+=" -Wvariadic-macros"
+               CFLAGS+=" -Wformat -Wformat-security"
+               if ( $CC -v 2>/dev/null | grep "gcc version" ); then
+                       CFLAGS+=" -Wcast-align"
+               fi
+       fi
+])
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644 (file)
index 0000000..41b04f9
--- /dev/null
@@ -0,0 +1,1453 @@
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright Â© 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright Â© 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+       AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=m4_default([$1], [0.9.0])
+       AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+               PKG_CONFIG=""
+       fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes ],
+                    [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+       AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+               $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+               $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+       m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+       AC_MSG_RESULT([no])
+       m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+       $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+       $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+       $3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR
+
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.16'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.16.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+       continue
+      else
+       break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
+  shift
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
+  do
+    # Strip MF so we end up with the name of the file.
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
+  done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+             [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+                            [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                 [_AM_DEPENDENCIES([CC])],
+                 [m4_define([AC_PROG_CC],
+                            m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                 [_AM_DEPENDENCIES([CXX])],
+                 [m4_define([AC_PROG_CXX],
+                            m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                 [_AM_DEPENDENCIES([OBJC])],
+                 [m4_define([AC_PROG_OBJC],
+                            m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+                 [_AM_DEPENDENCIES([OBJCXX])],
+                 [m4_define([AC_PROG_OBJCXX],
+                            m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+# Check to see how 'make' treats includes.                 -*- Autoconf -*-
+
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
+am__doit:
+       @echo this is the am__doit target >confinc.out
+.PHONY: am__doit
+END
+am__include="#"
+am__quote=
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \   ]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+       # -L didn't work.
+       set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+       && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+       # If neither matched, then we have a broken ls.  This can happen
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+       AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+       @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([build-aux/libtool.m4])
+m4_include([build-aux/ltoptions.m4])
+m4_include([build-aux/ltsugar.m4])
+m4_include([build-aux/ltversion.m4])
+m4_include([build-aux/lt~obsolete.m4])
+m4_include([acinclude.m4])
diff --git a/build-aux/compile b/build-aux/compile
new file mode 100755 (executable)
index 0000000..99e5052
--- /dev/null
@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""       $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+       # lazily determine how to convert abs files
+       case `uname -s` in
+         MINGW*)
+           file_conv=mingw
+           ;;
+         CYGWIN*)
+           file_conv=cygwin
+           ;;
+         *)
+           file_conv=wine
+           ;;
+       esac
+      fi
+      case $file_conv/,$2, in
+       *,$file_conv,*)
+         ;;
+       mingw/*)
+         file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+         ;;
+       cygwin/*)
+         file=`cygpath -m "$file" || echo "$file"`
+         ;;
+       wine/*)
+         file=`winepath -w "$file" || echo "$file"`
+         ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+       -o)
+         # configure might choose to run compile as 'compile cc -o foo foo.c'.
+         eat=1
+         case $2 in
+           *.o | *.[oO][bB][jJ])
+             func_file_conv "$2"
+             set x "$@" -Fo"$file"
+             shift
+             ;;
+           *)
+             func_file_conv "$2"
+             set x "$@" -Fe"$file"
+             shift
+             ;;
+         esac
+         ;;
+       -I)
+         eat=1
+         func_file_conv "$2" mingw
+         set x "$@" -I"$file"
+         shift
+         ;;
+       -I*)
+         func_file_conv "${1#-I}" mingw
+         set x "$@" -I"$file"
+         shift
+         ;;
+       -l)
+         eat=1
+         func_cl_dashl "$2"
+         set x "$@" "$lib"
+         shift
+         ;;
+       -l*)
+         func_cl_dashl "${1#-l}"
+         set x "$@" "$lib"
+         shift
+         ;;
+       -L)
+         eat=1
+         func_cl_dashL "$2"
+         ;;
+       -L*)
+         func_cl_dashL "${1#-L}"
+         ;;
+       -static)
+         shared=false
+         ;;
+       -Wl,*)
+         arg=${1#-Wl,}
+         save_ifs="$IFS"; IFS=','
+         for flag in $arg; do
+           IFS="$save_ifs"
+           linker_opts="$linker_opts $flag"
+         done
+         IFS="$save_ifs"
+         ;;
+       -Xlinker)
+         eat=1
+         linker_opts="$linker_opts $2"
+         ;;
+       -*)
+         set x "$@" "$1"
+         shift
+         ;;
+       *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+         func_file_conv "$1"
+         set x "$@" -Tp"$file"
+         shift
+         ;;
+       *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+         func_file_conv "$1" mingw
+         set x "$@" "$file"
+         shift
+         ;;
+       *)
+         set x "$@" "$1"
+         shift
+         ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+       # configure might choose to run compile as 'compile cc -o foo foo.c'.
+       # So we strip '-o arg' only if arg is an object.
+       eat=1
+       case $2 in
+         *.o | *.obj)
+           ofile=$2
+           ;;
+         *)
+           set x "$@" -o "$2"
+           shift
+           ;;
+       esac
+       ;;
+      *.c)
+       cfile=$1
+       set x "$@" "$1"
+       shift
+       ;;
+      *)
+       set x "$@" "$1"
+       shift
+       ;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/config.guess b/build-aux/config.guess
new file mode 100755 (executable)
index 0000000..f50dcdb
--- /dev/null
@@ -0,0 +1,1480 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
+
+timestamp='2018-02-24'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Options:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2018 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > "$dummy.c" ;
+       for c in cc gcc c89 c99 ; do
+         if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+            CC_FOR_BUILD="$c"; break ;
+         fi ;
+       done ;
+       if test x"$CC_FOR_BUILD" = x ; then
+         CC_FOR_BUILD=no_compiler_found ;
+       fi
+       ;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+       PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "$UNAME_SYSTEM" in
+Linux|GNU|GNU/*)
+       # If the system lacks a compiler, then just pick glibc.
+       # We could probably try harder.
+       LIBC=gnu
+
+       eval "$set_cc_for_build"
+       cat <<-EOF > "$dummy.c"
+       #include <features.h>
+       #if defined(__UCLIBC__)
+       LIBC=uclibc
+       #elif defined(__dietlibc__)
+       LIBC=dietlibc
+       #else
+       LIBC=gnu
+       #endif
+       EOF
+       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+       # If ldd exists, use it to detect musl libc.
+       if command -v ldd >/dev/null && \
+               ldd --version 2>&1 | grep -q ^musl
+       then
+           LIBC=musl
+       fi
+       ;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+    *:NetBSD:*:*)
+       # NetBSD (nbsd) targets should (where applicable) match one or
+       # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+       # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+       # switched to ELF, *-*-netbsd* would select the old
+       # object file format.  This provides both forward
+       # compatibility and a consistent mechanism for selecting the
+       # object file format.
+       #
+       # Note: NetBSD doesn't particularly care about the vendor
+       # portion of the name.  We always set it to "unknown".
+       sysctl="sysctl -n hw.machine_arch"
+       UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+           "/sbin/$sysctl" 2>/dev/null || \
+           "/usr/sbin/$sysctl" 2>/dev/null || \
+           echo unknown)`
+       case "$UNAME_MACHINE_ARCH" in
+           armeb) machine=armeb-unknown ;;
+           arm*) machine=arm-unknown ;;
+           sh3el) machine=shl-unknown ;;
+           sh3eb) machine=sh-unknown ;;
+           sh5el) machine=sh5le-unknown ;;
+           earmv*)
+               arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+               endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+               machine="${arch}${endian}"-unknown
+               ;;
+           *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+       esac
+       # The Operating System including object format, if it has switched
+       # to ELF recently (or will in the future) and ABI.
+       case "$UNAME_MACHINE_ARCH" in
+           earm*)
+               os=netbsdelf
+               ;;
+           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+               eval "$set_cc_for_build"
+               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+                       | grep -q __ELF__
+               then
+                   # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+                   # Return netbsd for either.  FIX?
+                   os=netbsd
+               else
+                   os=netbsdelf
+               fi
+               ;;
+           *)
+               os=netbsd
+               ;;
+       esac
+       # Determine ABI tags.
+       case "$UNAME_MACHINE_ARCH" in
+           earm*)
+               expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+               abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+               ;;
+       esac
+       # The OS release
+       # Debian GNU/NetBSD machines have a different userland, and
+       # thus, need a distinct triplet. However, they do not need
+       # kernel version information, so it can be replaced with a
+       # suitable tag, in the style of linux-gnu.
+       case "$UNAME_VERSION" in
+           Debian*)
+               release='-gnu'
+               ;;
+           *)
+               release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+               ;;
+       esac
+       # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+       # contains redundant information, the shorter form:
+       # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+       echo "$machine-${os}${release}${abi}"
+       exit ;;
+    *:Bitrig:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+       echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+       exit ;;
+    *:OpenBSD:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+       echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+       exit ;;
+    *:LibertyBSD:*:*)
+       UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+       echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+       exit ;;
+    *:MidnightBSD:*:*)
+       echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+       exit ;;
+    *:ekkoBSD:*:*)
+       echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+       exit ;;
+    *:SolidBSD:*:*)
+       echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+       exit ;;
+    macppc:MirBSD:*:*)
+       echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+       exit ;;
+    *:MirBSD:*:*)
+       echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+       exit ;;
+    *:Sortix:*:*)
+       echo "$UNAME_MACHINE"-unknown-sortix
+       exit ;;
+    *:Redox:*:*)
+       echo "$UNAME_MACHINE"-unknown-redox
+       exit ;;
+    mips:OSF1:*.*)
+        echo mips-dec-osf1
+        exit ;;
+    alpha:OSF1:*:*)
+       case $UNAME_RELEASE in
+       *4.0)
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+               ;;
+       *5.*)
+               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+               ;;
+       esac
+       # According to Compaq, /usr/sbin/psrinfo has been available on
+       # OSF/1 and Tru64 systems produced since 1995.  I hope that
+       # covers most systems running today.  This code pipes the CPU
+       # types through head -n 1, so we only detect the type of CPU 0.
+       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+       case "$ALPHA_CPU_TYPE" in
+           "EV4 (21064)")
+               UNAME_MACHINE=alpha ;;
+           "EV4.5 (21064)")
+               UNAME_MACHINE=alpha ;;
+           "LCA4 (21066/21068)")
+               UNAME_MACHINE=alpha ;;
+           "EV5 (21164)")
+               UNAME_MACHINE=alphaev5 ;;
+           "EV5.6 (21164A)")
+               UNAME_MACHINE=alphaev56 ;;
+           "EV5.6 (21164PC)")
+               UNAME_MACHINE=alphapca56 ;;
+           "EV5.7 (21164PC)")
+               UNAME_MACHINE=alphapca57 ;;
+           "EV6 (21264)")
+               UNAME_MACHINE=alphaev6 ;;
+           "EV6.7 (21264A)")
+               UNAME_MACHINE=alphaev67 ;;
+           "EV6.8CB (21264C)")
+               UNAME_MACHINE=alphaev68 ;;
+           "EV6.8AL (21264B)")
+               UNAME_MACHINE=alphaev68 ;;
+           "EV6.8CX (21264D)")
+               UNAME_MACHINE=alphaev68 ;;
+           "EV6.9A (21264/EV69A)")
+               UNAME_MACHINE=alphaev69 ;;
+           "EV7 (21364)")
+               UNAME_MACHINE=alphaev7 ;;
+           "EV7.9 (21364A)")
+               UNAME_MACHINE=alphaev79 ;;
+       esac
+       # A Pn.n version is a patched version.
+       # A Vn.n version is a released version.
+       # A Tn.n version is a released field test version.
+       # A Xn.n version is an unreleased experimental baselevel.
+       # 1.2 uses "1.2" for uname -r.
+       echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+       # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+       exitcode=$?
+       trap '' 0
+       exit $exitcode ;;
+    Amiga*:UNIX_System_V:4.0:*)
+       echo m68k-unknown-sysv4
+       exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+       echo "$UNAME_MACHINE"-unknown-amigaos
+       exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+       echo "$UNAME_MACHINE"-unknown-morphos
+       exit ;;
+    *:OS/390:*:*)
+       echo i370-ibm-openedition
+       exit ;;
+    *:z/VM:*:*)
+       echo s390-ibm-zvmoe
+       exit ;;
+    *:OS400:*:*)
+       echo powerpc-ibm-os400
+       exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+       echo arm-acorn-riscix"$UNAME_RELEASE"
+       exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+       echo arm-unknown-riscos
+       exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+       echo hppa1.1-hitachi-hiuxmpp
+       exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+       # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+       if test "`(/bin/universe) 2>/dev/null`" = att ; then
+               echo pyramid-pyramid-sysv3
+       else
+               echo pyramid-pyramid-bsd
+       fi
+       exit ;;
+    NILE*:*:*:dcosx)
+       echo pyramid-pyramid-svr4
+       exit ;;
+    DRS?6000:unix:4.0:6*)
+       echo sparc-icl-nx6
+       exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+       case `/usr/bin/uname -p` in
+           sparc) echo sparc-icl-nx7; exit ;;
+       esac ;;
+    s390x:SunOS:*:*)
+       echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+       exit ;;
+    sun4H:SunOS:5.*:*)
+       echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+       echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+       exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+       echo i386-pc-auroraux"$UNAME_RELEASE"
+       exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+       eval "$set_cc_for_build"
+       SUN_ARCH=i386
+       # If there is a compiler, see if it is configured for 64-bit objects.
+       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+       # This test works for both compilers.
+       if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+               (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+               grep IS_64BIT_ARCH >/dev/null
+           then
+               SUN_ARCH=x86_64
+           fi
+       fi
+       echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+    sun4*:SunOS:6*:*)
+       # According to config.sub, this is the proper way to canonicalize
+       # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+       # it's likely to be more like Solaris than SunOS4.
+       echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+    sun4*:SunOS:*:*)
+       case "`/usr/bin/arch -k`" in
+           Series*|S4*)
+               UNAME_RELEASE=`uname -v`
+               ;;
+       esac
+       # Japanese Language versions have a version number like `4.1.3-JL'.
+       echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+       exit ;;
+    sun3*:SunOS:*:*)
+       echo m68k-sun-sunos"$UNAME_RELEASE"
+       exit ;;
+    sun*:*:4.2BSD:*)
+       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+       test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+       case "`/bin/arch`" in
+           sun3)
+               echo m68k-sun-sunos"$UNAME_RELEASE"
+               ;;
+           sun4)
+               echo sparc-sun-sunos"$UNAME_RELEASE"
+               ;;
+       esac
+       exit ;;
+    aushp:SunOS:*:*)
+       echo sparc-auspex-sunos"$UNAME_RELEASE"
+       exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+       echo m68k-atari-mint"$UNAME_RELEASE"
+       exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+       echo m68k-atari-mint"$UNAME_RELEASE"
+       exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+       echo m68k-atari-mint"$UNAME_RELEASE"
+       exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+       echo m68k-milan-mint"$UNAME_RELEASE"
+       exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+       echo m68k-hades-mint"$UNAME_RELEASE"
+       exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+       echo m68k-unknown-mint"$UNAME_RELEASE"
+       exit ;;
+    m68k:machten:*:*)
+       echo m68k-apple-machten"$UNAME_RELEASE"
+       exit ;;
+    powerpc:machten:*:*)
+       echo powerpc-apple-machten"$UNAME_RELEASE"
+       exit ;;
+    RISC*:Mach:*:*)
+       echo mips-dec-mach_bsd4.3
+       exit ;;
+    RISC*:ULTRIX:*:*)
+       echo mips-dec-ultrix"$UNAME_RELEASE"
+       exit ;;
+    VAX*:ULTRIX*:*:*)
+       echo vax-dec-ultrix"$UNAME_RELEASE"
+       exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+       echo clipper-intergraph-clix"$UNAME_RELEASE"
+       exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+       eval "$set_cc_for_build"
+       sed 's/^        //' << EOF > "$dummy.c"
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+       int main (int argc, char *argv[]) {
+#else
+       int main (argc, argv) int argc; char *argv[]; {
+#endif
+       #if defined (host_mips) && defined (MIPSEB)
+       #if defined (SYSTYPE_SYSV)
+         printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+       #endif
+       #if defined (SYSTYPE_SVR4)
+         printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+       #endif
+       #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+         printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+       #endif
+       #endif
+         exit (-1);
+       }
+EOF
+       $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+         dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+         SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+           { echo "$SYSTEM_NAME"; exit; }
+       echo mips-mips-riscos"$UNAME_RELEASE"
+       exit ;;
+    Motorola:PowerMAX_OS:*:*)
+       echo powerpc-motorola-powermax
+       exit ;;
+    Motorola:*:4.3:PL8-*)
+       echo powerpc-harris-powermax
+       exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+       echo powerpc-harris-powermax
+       exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+       echo powerpc-harris-powerunix
+       exit ;;
+    m88k:CX/UX:7*:*)
+       echo m88k-harris-cxux7
+       exit ;;
+    m88k:*:4*:R4*)
+       echo m88k-motorola-sysv4
+       exit ;;
+    m88k:*:3*:R3*)
+       echo m88k-motorola-sysv3
+       exit ;;
+    AViiON:dgux:*:*)
+       # DG/UX returns AViiON for all architectures
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
+       if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+       then
+           if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+              [ "$TARGET_BINARY_INTERFACE"x = x ]
+           then
+               echo m88k-dg-dgux"$UNAME_RELEASE"
+           else
+               echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+           fi
+       else
+           echo i586-dg-dgux"$UNAME_RELEASE"
+       fi
+       exit ;;
+    M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
+       echo m88k-dolphin-sysv3
+       exit ;;
+    M88*:*:R3*:*)
+       # Delta 88k system running SVR3
+       echo m88k-motorola-sysv3
+       exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+       echo m88k-tektronix-sysv3
+       exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+       echo m68k-tektronix-bsd
+       exit ;;
+    *:IRIX*:*:*)
+       echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+       exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+       echo i386-ibm-aix
+       exit ;;
+    ia64:AIX:*:*)
+       if [ -x /usr/bin/oslevel ] ; then
+               IBM_REV=`/usr/bin/oslevel`
+       else
+               IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+       fi
+       echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+       exit ;;
+    *:AIX:2:3)
+       if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+               eval "$set_cc_for_build"
+               sed 's/^                //' << EOF > "$dummy.c"
+               #include <sys/systemcfg.h>
+
+               main()
+                       {
+                       if (!__power_pc())
+                               exit(1);
+                       puts("powerpc-ibm-aix3.2.5");
+                       exit(0);
+                       }
+EOF
+               if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+               then
+                       echo "$SYSTEM_NAME"
+               else
+                       echo rs6000-ibm-aix3.2.5
+               fi
+       elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+               echo rs6000-ibm-aix3.2.4
+       else
+               echo rs6000-ibm-aix3.2
+       fi
+       exit ;;
+    *:AIX:*:[4567])
+       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+       if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+               IBM_ARCH=rs6000
+       else
+               IBM_ARCH=powerpc
+       fi
+       if [ -x /usr/bin/lslpp ] ; then
+               IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+                          awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+       else
+               IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+       fi
+       echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+       exit ;;
+    *:AIX:*:*)
+       echo rs6000-ibm-aix
+       exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+       echo romp-ibm-bsd4.4
+       exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+       echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
+       exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+       echo rs6000-bull-bosx
+       exit ;;
+    DPX/2?00:B.O.S.:*:*)
+       echo m68k-bull-sysv3
+       exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+       echo m68k-hp-bsd
+       exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+       echo m68k-hp-bsd4.4
+       exit ;;
+    9000/[34678]??:HP-UX:*:*)
+       HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+       case "$UNAME_MACHINE" in
+           9000/31?)            HP_ARCH=m68000 ;;
+           9000/[34]??)         HP_ARCH=m68k ;;
+           9000/[678][0-9][0-9])
+               if [ -x /usr/bin/getconf ]; then
+                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                   sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                   case "$sc_cpu_version" in
+                     523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+                     528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
+                     532)                      # CPU_PA_RISC2_0
+                       case "$sc_kernel_bits" in
+                         32) HP_ARCH=hppa2.0n ;;
+                         64) HP_ARCH=hppa2.0w ;;
+                         '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
+                       esac ;;
+                   esac
+               fi
+               if [ "$HP_ARCH" = "" ]; then
+                   eval "$set_cc_for_build"
+                   sed 's/^            //' << EOF > "$dummy.c"
+
+               #define _HPUX_SOURCE
+               #include <stdlib.h>
+               #include <unistd.h>
+
+               int main ()
+               {
+               #if defined(_SC_KERNEL_BITS)
+                   long bits = sysconf(_SC_KERNEL_BITS);
+               #endif
+                   long cpu  = sysconf (_SC_CPU_VERSION);
+
+                   switch (cpu)
+                       {
+                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+                       case CPU_PA_RISC2_0:
+               #if defined(_SC_KERNEL_BITS)
+                           switch (bits)
+                               {
+                               case 64: puts ("hppa2.0w"); break;
+                               case 32: puts ("hppa2.0n"); break;
+                               default: puts ("hppa2.0"); break;
+                               } break;
+               #else  /* !defined(_SC_KERNEL_BITS) */
+                           puts ("hppa2.0"); break;
+               #endif
+                       default: puts ("hppa1.0"); break;
+                       }
+                   exit (0);
+               }
+EOF
+                   (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+                   test -z "$HP_ARCH" && HP_ARCH=hppa
+               fi ;;
+       esac
+       if [ "$HP_ARCH" = hppa2.0w ]
+       then
+           eval "$set_cc_for_build"
+
+           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+           # generating 64-bit code.  GNU and HP use different nomenclature:
+           #
+           # $ CC_FOR_BUILD=cc ./config.guess
+           # => hppa2.0w-hp-hpux11.23
+           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+           # => hppa64-hp-hpux11.23
+
+           if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+               grep -q __LP64__
+           then
+               HP_ARCH=hppa2.0w
+           else
+               HP_ARCH=hppa64
+           fi
+       fi
+       echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+       exit ;;
+    ia64:HP-UX:*:*)
+       HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+       echo ia64-hp-hpux"$HPUX_REV"
+       exit ;;
+    3050*:HI-UX:*:*)
+       eval "$set_cc_for_build"
+       sed 's/^        //' << EOF > "$dummy.c"
+       #include <unistd.h>
+       int
+       main ()
+       {
+         long cpu = sysconf (_SC_CPU_VERSION);
+         /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+            true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+            results, however.  */
+         if (CPU_IS_PA_RISC (cpu))
+           {
+             switch (cpu)
+               {
+                 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+                 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+                 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+                 default: puts ("hppa-hitachi-hiuxwe2"); break;
+               }
+           }
+         else if (CPU_IS_HP_MC68K (cpu))
+           puts ("m68k-hitachi-hiuxwe2");
+         else puts ("unknown-hitachi-hiuxwe2");
+         exit (0);
+       }
+EOF
+       $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+               { echo "$SYSTEM_NAME"; exit; }
+       echo unknown-hitachi-hiuxwe2
+       exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+       echo hppa1.1-hp-bsd
+       exit ;;
+    9000/8??:4.3bsd:*:*)
+       echo hppa1.0-hp-bsd
+       exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+       echo hppa1.0-hp-mpeix
+       exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+       echo hppa1.1-hp-osf
+       exit ;;
+    hp8??:OSF1:*:*)
+       echo hppa1.0-hp-osf
+       exit ;;
+    i*86:OSF1:*:*)
+       if [ -x /usr/sbin/sysversion ] ; then
+           echo "$UNAME_MACHINE"-unknown-osf1mk
+       else
+           echo "$UNAME_MACHINE"-unknown-osf1
+       fi
+       exit ;;
+    parisc*:Lites*:*:*)
+       echo hppa1.1-hp-lites
+       exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+       echo c1-convex-bsd
+       exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+       if getsysinfo -f scalar_acc
+       then echo c32-convex-bsd
+       else echo c2-convex-bsd
+       fi
+       exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+       echo c34-convex-bsd
+       exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+       echo c38-convex-bsd
+       exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+       echo c4-convex-bsd
+       exit ;;
+    CRAY*Y-MP:*:*:*)
+       echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+    CRAY*[A-Z]90:*:*:*)
+       echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+             -e 's/\.[^.]*$/.X/'
+       exit ;;
+    CRAY*TS:*:*:*)
+       echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+    CRAY*T3E:*:*:*)
+       echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+    CRAY*SV1:*:*:*)
+       echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+    *:UNICOS/mp:*:*)
+       echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+       exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+       FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+       FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+       FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+       echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+       exit ;;
+    5000:UNIX_System_V:4.*:*)
+       FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+       FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+       echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+       exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+       echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+       exit ;;
+    sparc*:BSD/OS:*:*)
+       echo sparc-unknown-bsdi"$UNAME_RELEASE"
+       exit ;;
+    *:BSD/OS:*:*)
+       echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+       exit ;;
+    *:FreeBSD:*:*)
+       UNAME_PROCESSOR=`/usr/bin/uname -p`
+       case "$UNAME_PROCESSOR" in
+           amd64)
+               UNAME_PROCESSOR=x86_64 ;;
+           i386)
+               UNAME_PROCESSOR=i586 ;;
+       esac
+       echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+       exit ;;
+    i*:CYGWIN*:*)
+       echo "$UNAME_MACHINE"-pc-cygwin
+       exit ;;
+    *:MINGW64*:*)
+       echo "$UNAME_MACHINE"-pc-mingw64
+       exit ;;
+    *:MINGW*:*)
+       echo "$UNAME_MACHINE"-pc-mingw32
+       exit ;;
+    *:MSYS*:*)
+       echo "$UNAME_MACHINE"-pc-msys
+       exit ;;
+    i*:PW*:*)
+       echo "$UNAME_MACHINE"-pc-pw32
+       exit ;;
+    *:Interix*:*)
+       case "$UNAME_MACHINE" in
+           x86)
+               echo i586-pc-interix"$UNAME_RELEASE"
+               exit ;;
+           authenticamd | genuineintel | EM64T)
+               echo x86_64-unknown-interix"$UNAME_RELEASE"
+               exit ;;
+           IA64)
+               echo ia64-unknown-interix"$UNAME_RELEASE"
+               exit ;;
+       esac ;;
+    i*:UWIN*:*)
+       echo "$UNAME_MACHINE"-pc-uwin
+       exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+       echo x86_64-unknown-cygwin
+       exit ;;
+    prep*:SunOS:5.*:*)
+       echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+       exit ;;
+    *:GNU:*:*)
+       # the GNU system
+       echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+       exit ;;
+    *:GNU/*:*:*)
+       # other systems with GNU libc and userland
+       echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+       exit ;;
+    i*86:Minix:*:*)
+       echo "$UNAME_MACHINE"-pc-minix
+       exit ;;
+    aarch64:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    aarch64_be:Linux:*:*)
+       UNAME_MACHINE=aarch64_be
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    alpha:Linux:*:*)
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+         EV5)   UNAME_MACHINE=alphaev5 ;;
+         EV56)  UNAME_MACHINE=alphaev56 ;;
+         PCA56) UNAME_MACHINE=alphapca56 ;;
+         PCA57) UNAME_MACHINE=alphapca56 ;;
+         EV6)   UNAME_MACHINE=alphaev6 ;;
+         EV67)  UNAME_MACHINE=alphaev67 ;;
+         EV68*) UNAME_MACHINE=alphaev68 ;;
+       esac
+       objdump --private-headers /bin/sh | grep -q ld.so.1
+       if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    arm*:Linux:*:*)
+       eval "$set_cc_for_build"
+       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+           | grep -q __ARM_EABI__
+       then
+           echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       else
+           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+               | grep -q __ARM_PCS_VFP
+           then
+               echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+           else
+               echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+           fi
+       fi
+       exit ;;
+    avr32*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    cris:Linux:*:*)
+       echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+       exit ;;
+    crisv32:Linux:*:*)
+       echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+       exit ;;
+    e2k:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    frv:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    hexagon:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    i*86:Linux:*:*)
+       echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+       exit ;;
+    ia64:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    k1om:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    m32r*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    m68*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+       eval "$set_cc_for_build"
+       sed 's/^        //' << EOF > "$dummy.c"
+       #undef CPU
+       #undef ${UNAME_MACHINE}
+       #undef ${UNAME_MACHINE}el
+       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+       CPU=${UNAME_MACHINE}el
+       #else
+       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+       CPU=${UNAME_MACHINE}
+       #else
+       CPU=
+       #endif
+       #endif
+EOF
+       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+       test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+       ;;
+    mips64el:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    openrisc*:Linux:*:*)
+       echo or1k-unknown-linux-"$LIBC"
+       exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    padre:Linux:*:*)
+       echo sparc-unknown-linux-"$LIBC"
+       exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+       echo hppa64-unknown-linux-"$LIBC"
+       exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+       # Look for CPU level
+       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+         PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+         PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+         *)    echo hppa-unknown-linux-"$LIBC" ;;
+       esac
+       exit ;;
+    ppc64:Linux:*:*)
+       echo powerpc64-unknown-linux-"$LIBC"
+       exit ;;
+    ppc:Linux:*:*)
+       echo powerpc-unknown-linux-"$LIBC"
+       exit ;;
+    ppc64le:Linux:*:*)
+       echo powerpc64le-unknown-linux-"$LIBC"
+       exit ;;
+    ppcle:Linux:*:*)
+       echo powerpcle-unknown-linux-"$LIBC"
+       exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+       echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+       exit ;;
+    sh64*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    sh*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    tile*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    vax:Linux:*:*)
+       echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+       exit ;;
+    x86_64:Linux:*:*)
+       if objdump -f /bin/sh | grep -q elf32-x86-64; then
+           echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+       else
+           echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+       fi
+       exit ;;
+    xtensa*:Linux:*:*)
+       echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+       exit ;;
+    i*86:DYNIX/ptx:4*:*)
+       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+       # earlier versions are messed up and put the nodename in both
+       # sysname and nodename.
+       echo i386-sequent-sysv4
+       exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+       # Unixware is an offshoot of SVR4, but it has its own version
+       # number series starting with 2...
+       # I am not positive that other SVR4 systems won't match this,
+       # I just have to hope.  -- rms.
+       # Use sysv4.2uw... so that sysv4* matches it.
+       echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+       exit ;;
+    i*86:OS/2:*:*)
+       # If we were able to find `uname', then EMX Unix compatibility
+       # is probably installed.
+       echo "$UNAME_MACHINE"-pc-os2-emx
+       exit ;;
+    i*86:XTS-300:*:STOP)
+       echo "$UNAME_MACHINE"-unknown-stop
+       exit ;;
+    i*86:atheos:*:*)
+       echo "$UNAME_MACHINE"-unknown-atheos
+       exit ;;
+    i*86:syllable:*:*)
+       echo "$UNAME_MACHINE"-pc-syllable
+       exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+       echo i386-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+    i*86:*DOS:*:*)
+       echo "$UNAME_MACHINE"-pc-msdosdjgpp
+       exit ;;
+    i*86:*:4.*:*)
+       UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+       if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+               echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+       else
+               echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+       fi
+       exit ;;
+    i*86:*:5:[678]*)
+       # UnixWare 7.x, OpenUNIX and OpenServer 6.
+       case `/bin/uname -X | grep "^Machine"` in
+           *486*)           UNAME_MACHINE=i486 ;;
+           *Pentium)        UNAME_MACHINE=i586 ;;
+           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+       esac
+       echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+       exit ;;
+    i*86:*:3.2:*)
+       if test -f /usr/options/cb.name; then
+               UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+               echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+       elif /bin/uname -X 2>/dev/null >/dev/null ; then
+               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+                       && UNAME_MACHINE=i586
+               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+                       && UNAME_MACHINE=i686
+               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+                       && UNAME_MACHINE=i686
+               echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+       else
+               echo "$UNAME_MACHINE"-pc-sysv32
+       fi
+       exit ;;
+    pc:*:*:*)
+       # Left here for compatibility:
+       # uname -m prints for DJGPP always 'pc', but it prints nothing about
+       # the processor, so we play safe by assuming i586.
+       # Note: whatever this is, it MUST be the same as what config.sub
+       # prints for the "djgpp" host, or else GDB configure will decide that
+       # this is a cross-build.
+       echo i586-pc-msdosdjgpp
+       exit ;;
+    Intel:Mach:3*:*)
+       echo i386-pc-mach3
+       exit ;;
+    paragon:*:*:*)
+       echo i860-intel-osf1
+       exit ;;
+    i860:*:4.*:*) # i860-SVR4
+       if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+         echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+       else # Add other i860-SVR4 vendors below as they are discovered.
+         echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
+       fi
+       exit ;;
+    mini*:CTIX:SYS*5:*)
+       # "miniframe"
+       echo m68010-convergent-sysv
+       exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+       echo m68k-convergent-sysv
+       exit ;;
+    M680?0:D-NIX:5.3:*)
+       echo m68k-diab-dnix
+       exit ;;
+    M68*:*:R3V[5678]*:*)
+       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    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)
+       OS_REL=''
+       test -r /etc/.relid \
+       && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+         && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+         && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+         && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+       OS_REL='.3'
+       test -r /etc/.relid \
+           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+           && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+           && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+       echo m68k-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+       echo m68k-atari-sysv4
+       exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+       echo sparc-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+    rs6000:LynxOS:2.*:*)
+       echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+       echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+       exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+       echo mips-dde-sysv"$UNAME_RELEASE"
+       exit ;;
+    RM*:ReliantUNIX-*:*:*)
+       echo mips-sni-sysv4
+       exit ;;
+    RM*:SINIX-*:*:*)
+       echo mips-sni-sysv4
+       exit ;;
+    *:SINIX-*:*:*)
+       if uname -p 2>/dev/null >/dev/null ; then
+               UNAME_MACHINE=`(uname -p) 2>/dev/null`
+               echo "$UNAME_MACHINE"-sni-sysv4
+       else
+               echo ns32k-sni-sysv
+       fi
+       exit ;;
+    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                       # says <Richard.M.Bartel@ccMail.Census.GOV>
+       echo i586-unisys-sysv4
+       exit ;;
+    *:UNIX_System_V:4*:FTX*)
+       # From Gerald Hewes <hewes@openmarket.com>.
+       # How about differentiating between stratus architectures? -djm
+       echo hppa1.1-stratus-sysv4
+       exit ;;
+    *:*:*:FTX*)
+       # From seanf@swdc.stratus.com.
+       echo i860-stratus-sysv4
+       exit ;;
+    i*86:VOS:*:*)
+       # From Paul.Green@stratus.com.
+       echo "$UNAME_MACHINE"-stratus-vos
+       exit ;;
+    *:VOS:*:*)
+       # From Paul.Green@stratus.com.
+       echo hppa1.1-stratus-vos
+       exit ;;
+    mc68*:A/UX:*:*)
+       echo m68k-apple-aux"$UNAME_RELEASE"
+       exit ;;
+    news*:NEWS-OS:6*:*)
+       echo mips-sony-newsos6
+       exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+       if [ -d /usr/nec ]; then
+               echo mips-nec-sysv"$UNAME_RELEASE"
+       else
+               echo mips-unknown-sysv"$UNAME_RELEASE"
+       fi
+       exit ;;
+    BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
+       echo powerpc-be-beos
+       exit ;;
+    BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
+       echo powerpc-apple-beos
+       exit ;;
+    BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
+       echo i586-pc-beos
+       exit ;;
+    BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
+       echo i586-pc-haiku
+       exit ;;
+    x86_64:Haiku:*:*)
+       echo x86_64-unknown-haiku
+       exit ;;
+    SX-4:SUPER-UX:*:*)
+       echo sx4-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    SX-5:SUPER-UX:*:*)
+       echo sx5-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    SX-6:SUPER-UX:*:*)
+       echo sx6-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    SX-7:SUPER-UX:*:*)
+       echo sx7-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    SX-8:SUPER-UX:*:*)
+       echo sx8-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    SX-8R:SUPER-UX:*:*)
+       echo sx8r-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    SX-ACE:SUPER-UX:*:*)
+       echo sxace-nec-superux"$UNAME_RELEASE"
+       exit ;;
+    Power*:Rhapsody:*:*)
+       echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+       exit ;;
+    *:Rhapsody:*:*)
+       echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+       exit ;;
+    *:Darwin:*:*)
+       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+       eval "$set_cc_for_build"
+       if test "$UNAME_PROCESSOR" = unknown ; then
+           UNAME_PROCESSOR=powerpc
+       fi
+       if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+           if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+               if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                      (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                      grep IS_64BIT_ARCH >/dev/null
+               then
+                   case $UNAME_PROCESSOR in
+                       i386) UNAME_PROCESSOR=x86_64 ;;
+                       powerpc) UNAME_PROCESSOR=powerpc64 ;;
+                   esac
+               fi
+               # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+               if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+                      (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                      grep IS_PPC >/dev/null
+               then
+                   UNAME_PROCESSOR=powerpc
+               fi
+           fi
+       elif test "$UNAME_PROCESSOR" = i386 ; then
+           # Avoid executing cc on OS X 10.9, as it ships with a stub
+           # that puts up a graphical alert prompting to install
+           # developer tools.  Any system running Mac OS X 10.7 or
+           # later (Darwin 11 and later) is required to have a 64-bit
+           # processor. This is not true of the ARM version of Darwin
+           # that Apple uses in portable devices.
+           UNAME_PROCESSOR=x86_64
+       fi
+       echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+       exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+       UNAME_PROCESSOR=`uname -p`
+       if test "$UNAME_PROCESSOR" = x86; then
+               UNAME_PROCESSOR=i386
+               UNAME_MACHINE=pc
+       fi
+       echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+       exit ;;
+    *:QNX:*:4*)
+       echo i386-pc-qnx
+       exit ;;
+    NEO-*:NONSTOP_KERNEL:*:*)
+       echo neo-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+       echo nse-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+       echo nsr-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+       echo nsv-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+       echo nsx-tandem-nsk"$UNAME_RELEASE"
+       exit ;;
+    *:NonStop-UX:*:*)
+       echo mips-compaq-nonstopux
+       exit ;;
+    BS2000:POSIX*:*:*)
+       echo bs2000-siemens-sysv
+       exit ;;
+    DS/*:UNIX_System_V:*:*)
+       echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+       exit ;;
+    *:Plan9:*:*)
+       # "uname -m" is not consistent, so use $cputype instead. 386
+       # is converted to i386 for consistency with other x86
+       # operating systems.
+       if test "$cputype" = 386; then
+           UNAME_MACHINE=i386
+       else
+           UNAME_MACHINE="$cputype"
+       fi
+       echo "$UNAME_MACHINE"-unknown-plan9
+       exit ;;
+    *:TOPS-10:*:*)
+       echo pdp10-unknown-tops10
+       exit ;;
+    *:TENEX:*:*)
+       echo pdp10-unknown-tenex
+       exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+       echo pdp10-dec-tops20
+       exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+       echo pdp10-xkl-tops20
+       exit ;;
+    *:TOPS-20:*:*)
+       echo pdp10-unknown-tops20
+       exit ;;
+    *:ITS:*:*)
+       echo pdp10-unknown-its
+       exit ;;
+    SEI:*:*:SEIUX)
+       echo mips-sei-seiux"$UNAME_RELEASE"
+       exit ;;
+    *:DragonFly:*:*)
+       echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+       exit ;;
+    *:*VMS:*:*)
+       UNAME_MACHINE=`(uname -p) 2>/dev/null`
+       case "$UNAME_MACHINE" in
+           A*) echo alpha-dec-vms ; exit ;;
+           I*) echo ia64-dec-vms ; exit ;;
+           V*) echo vax-dec-vms ; exit ;;
+       esac ;;
+    *:XENIX:*:SysV)
+       echo i386-pc-xenix
+       exit ;;
+    i*86:skyos:*:*)
+       echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+       exit ;;
+    i*86:rdos:*:*)
+       echo "$UNAME_MACHINE"-pc-rdos
+       exit ;;
+    i*86:AROS:*:*)
+       echo "$UNAME_MACHINE"-pc-aros
+       exit ;;
+    x86_64:VMkernel:*:*)
+       echo "$UNAME_MACHINE"-unknown-esx
+       exit ;;
+    amd64:Isilon\ OneFS:*:*)
+       echo x86_64-unknown-onefs
+       exit ;;
+esac
+
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+    mips:Linux | mips64:Linux)
+       # If we got here on MIPS GNU/Linux, output extra information.
+       cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+       ;;
+esac
+
+cat >&2 <<EOF
+
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
+
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+and
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-functions 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/build-aux/config.sub b/build-aux/config.sub
new file mode 100755 (executable)
index 0000000..1d8e98b
--- /dev/null
@@ -0,0 +1,1801 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2018 Free Software Foundation, Inc.
+
+timestamp='2018-02-22'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
+
+Canonicalize a configuration name.
+
+Options:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2018 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo "$1"
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+    if [ "$basic_machine" != "$1" ]
+    then os=`echo "$1" | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+       -sun*os*)
+               # Prevent following clause from handling this invalid input.
+               ;;
+       -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+       -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+       -apple | -axis | -knuth | -cray | -microblaze*)
+               os=
+               basic_machine=$1
+               ;;
+       -bluegene*)
+               os=-cnk
+               ;;
+       -sim | -cisco | -oki | -wec | -winbond)
+               os=
+               basic_machine=$1
+               ;;
+       -scout)
+               ;;
+       -wrs)
+               os=-vxworks
+               basic_machine=$1
+               ;;
+       -chorusos*)
+               os=-chorusos
+               basic_machine=$1
+               ;;
+       -chorusrdb)
+               os=-chorusrdb
+               basic_machine=$1
+               ;;
+       -hiux*)
+               os=-hiuxwe2
+               ;;
+       -sco6)
+               os=-sco5v6
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco5)
+               os=-sco3.2v5
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco4)
+               os=-sco3.2v4
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco3.2.[4-9]*)
+               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco3.2v[4-9]*)
+               # Don't forget version if it is 3.2v4 or newer.
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco5v6*)
+               # Don't forget version if it is 3.2v4 or newer.
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco*)
+               os=-sco3.2v2
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -udk*)
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -isc)
+               os=-isc2.2
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -clix*)
+               basic_machine=clipper-intergraph
+               ;;
+       -isc*)
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -lynx*178)
+               os=-lynxos178
+               ;;
+       -lynx*5)
+               os=-lynxos5
+               ;;
+       -lynx*)
+               os=-lynxos
+               ;;
+       -ptx*)
+               basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+               ;;
+       -psos*)
+               os=-psos
+               ;;
+       -mint | -mint[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+       # Recognize the basic CPU types without company name.
+       # Some are omitted here because they have special meanings below.
+       1750a | 580 \
+       | a29k \
+       | aarch64 | aarch64_be \
+       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+       | am33_2.0 \
+       | arc | arceb \
+       | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+       | avr | avr32 \
+       | ba \
+       | be32 | be64 \
+       | bfin \
+       | c4x | c8051 | clipper \
+       | d10v | d30v | dlx | dsp16xx \
+       | e2k | epiphany \
+       | fido | fr30 | frv | ft32 \
+       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+       | hexagon \
+       | i370 | i860 | i960 | ia16 | ia64 \
+       | ip2k | iq2000 \
+       | k1om \
+       | le32 | le64 \
+       | lm32 \
+       | m32c | m32r | m32rle | m68000 | m68k | m88k \
+       | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64octeon | mips64octeonel \
+       | mips64orion | mips64orionel \
+       | mips64r5900 | mips64r5900el \
+       | mips64vr | mips64vrel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mips64vr5900 | mips64vr5900el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa32r6 | mipsisa32r6el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
+       | mipsisa64r6 | mipsisa64r6el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipsr5900 | mipsr5900el \
+       | mipstx39 | mipstx39el \
+       | mn10200 | mn10300 \
+       | moxie \
+       | mt \
+       | msp430 \
+       | nds32 | nds32le | nds32be \
+       | nios | nios2 | nios2eb | nios2el \
+       | ns16k | ns32k \
+       | open8 | or1k | or1knd | or32 \
+       | pdp10 | pj | pjl \
+       | powerpc | powerpc64 | powerpc64le | powerpcle \
+       | pru \
+       | pyramid \
+       | riscv32 | riscv64 \
+       | rl78 | rx \
+       | score \
+       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \
+       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+       | spu \
+       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+       | ubicom32 \
+       | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+       | visium \
+       | wasm32 \
+       | x86 | xc16x | xstormy16 | xtensa \
+       | z8k | z80)
+               basic_machine=$basic_machine-unknown
+               ;;
+       c54x)
+               basic_machine=tic54x-unknown
+               ;;
+       c55x)
+               basic_machine=tic55x-unknown
+               ;;
+       c6x)
+               basic_machine=tic6x-unknown
+               ;;
+       leon|leon[3-9])
+               basic_machine=sparc-$basic_machine
+               ;;
+       m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+               basic_machine=$basic_machine-unknown
+               os=-none
+               ;;
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+               ;;
+       ms1)
+               basic_machine=mt-unknown
+               ;;
+
+       strongarm | thumb | xscale)
+               basic_machine=arm-unknown
+               ;;
+       xgate)
+               basic_machine=$basic_machine-unknown
+               os=-none
+               ;;
+       xscaleeb)
+               basic_machine=armeb-unknown
+               ;;
+
+       xscaleel)
+               basic_machine=armel-unknown
+               ;;
+
+       # We use `pc' rather than `unknown'
+       # because (1) that's what they normally are, and
+       # (2) the word "unknown" tends to confuse beginning users.
+       i*86 | x86_64)
+         basic_machine=$basic_machine-pc
+         ;;
+       # Object if more than one company name word.
+       *-*-*)
+               echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+               exit 1
+               ;;
+       # Recognize the basic CPU types with company name.
+       580-* \
+       | a29k-* \
+       | aarch64-* | aarch64_be-* \
+       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+       | avr-* | avr32-* \
+       | ba-* \
+       | be32-* | be64-* \
+       | bfin-* | bs2000-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* \
+       | c8051-* | clipper-* | craynv-* | cydra-* \
+       | d10v-* | d30v-* | dlx-* \
+       | e2k-* | elxsi-* \
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+       | h8300-* | h8500-* \
+       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+       | hexagon-* \
+       | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
+       | ip2k-* | iq2000-* \
+       | k1om-* \
+       | le32-* | le64-* \
+       | lm32-* \
+       | m32c-* | m32r-* | m32rle-* \
+       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+       | microblaze-* | microblazeel-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64octeon-* | mips64octeonel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64r5900-* | mips64r5900el-* \
+       | mips64vr-* | mips64vrel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mips64vr5900-* | mips64vr5900el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa32r6-* | mipsisa32r6el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
+       | mipsisa64r6-* | mipsisa64r6el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipsr5900-* | mipsr5900el-* \
+       | mipstx39-* | mipstx39el-* \
+       | mmix-* \
+       | mt-* \
+       | msp430-* \
+       | nds32-* | nds32le-* | nds32be-* \
+       | nios-* | nios2-* | nios2eb-* | nios2el-* \
+       | none-* | np1-* | ns16k-* | ns32k-* \
+       | open8-* \
+       | or1k*-* \
+       | orion-* \
+       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+       | pru-* \
+       | pyramid-* \
+       | riscv32-* | riscv64-* \
+       | rl78-* | romp-* | rs6000-* | rx-* \
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+       | sparclite-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
+       | tahoe-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+       | tile*-* \
+       | tron-* \
+       | ubicom32-* \
+       | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+       | vax-* \
+       | visium-* \
+       | wasm32-* \
+       | we32k-* \
+       | x86-* | x86_64-* | xc16x-* | xps100-* \
+       | xstormy16-* | xtensa*-* \
+       | ymp-* \
+       | z8k-* | z80-*)
+               ;;
+       # Recognize the basic CPU types without company name, with glob match.
+       xtensa*)
+               basic_machine=$basic_machine-unknown
+               ;;
+       # Recognize the various machine names and aliases which stand
+       # for a CPU type and a company and sometimes even an OS.
+       386bsd)
+               basic_machine=i386-pc
+               os=-bsd
+               ;;
+       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+               basic_machine=m68000-att
+               ;;
+       3b*)
+               basic_machine=we32k-att
+               ;;
+       a29khif)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       abacus)
+               basic_machine=abacus-unknown
+               ;;
+       adobe68k)
+               basic_machine=m68010-adobe
+               os=-scout
+               ;;
+       alliant | fx80)
+               basic_machine=fx80-alliant
+               ;;
+       altos | altos3068)
+               basic_machine=m68k-altos
+               ;;
+       am29k)
+               basic_machine=a29k-none
+               os=-bsd
+               ;;
+       amd64)
+               basic_machine=x86_64-pc
+               ;;
+       amd64-*)
+               basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       amdahl)
+               basic_machine=580-amdahl
+               os=-sysv
+               ;;
+       amiga | amiga-*)
+               basic_machine=m68k-unknown
+               ;;
+       amigaos | amigados)
+               basic_machine=m68k-unknown
+               os=-amigaos
+               ;;
+       amigaunix | amix)
+               basic_machine=m68k-unknown
+               os=-sysv4
+               ;;
+       apollo68)
+               basic_machine=m68k-apollo
+               os=-sysv
+               ;;
+       apollo68bsd)
+               basic_machine=m68k-apollo
+               os=-bsd
+               ;;
+       aros)
+               basic_machine=i386-pc
+               os=-aros
+               ;;
+       asmjs)
+               basic_machine=asmjs-unknown
+               ;;
+       aux)
+               basic_machine=m68k-apple
+               os=-aux
+               ;;
+       balance)
+               basic_machine=ns32k-sequent
+               os=-dynix
+               ;;
+       blackfin)
+               basic_machine=bfin-unknown
+               os=-linux
+               ;;
+       blackfin-*)
+               basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
+       bluegene*)
+               basic_machine=powerpc-ibm
+               os=-cnk
+               ;;
+       c54x-*)
+               basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       c55x-*)
+               basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       c6x-*)
+               basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       c90)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;
+       cegcc)
+               basic_machine=arm-unknown
+               os=-cegcc
+               ;;
+       convex-c1)
+               basic_machine=c1-convex
+               os=-bsd
+               ;;
+       convex-c2)
+               basic_machine=c2-convex
+               os=-bsd
+               ;;
+       convex-c32)
+               basic_machine=c32-convex
+               os=-bsd
+               ;;
+       convex-c34)
+               basic_machine=c34-convex
+               os=-bsd
+               ;;
+       convex-c38)
+               basic_machine=c38-convex
+               os=-bsd
+               ;;
+       cray | j90)
+               basic_machine=j90-cray
+               os=-unicos
+               ;;
+       craynv)
+               basic_machine=craynv-cray
+               os=-unicosmp
+               ;;
+       cr16 | cr16-*)
+               basic_machine=cr16-unknown
+               os=-elf
+               ;;
+       crds | unos)
+               basic_machine=m68k-crds
+               ;;
+       crisv32 | crisv32-* | etraxfs*)
+               basic_machine=crisv32-axis
+               ;;
+       cris | cris-* | etrax*)
+               basic_machine=cris-axis
+               ;;
+       crx)
+               basic_machine=crx-unknown
+               os=-elf
+               ;;
+       da30 | da30-*)
+               basic_machine=m68k-da30
+               ;;
+       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+               basic_machine=mips-dec
+               ;;
+       decsystem10* | dec10*)
+               basic_machine=pdp10-dec
+               os=-tops10
+               ;;
+       decsystem20* | dec20*)
+               basic_machine=pdp10-dec
+               os=-tops20
+               ;;
+       delta | 3300 | motorola-3300 | motorola-delta \
+             | 3300-motorola | delta-motorola)
+               basic_machine=m68k-motorola
+               ;;
+       delta88)
+               basic_machine=m88k-motorola
+               os=-sysv3
+               ;;
+       dicos)
+               basic_machine=i686-pc
+               os=-dicos
+               ;;
+       djgpp)
+               basic_machine=i586-pc
+               os=-msdosdjgpp
+               ;;
+       dpx20 | dpx20-*)
+               basic_machine=rs6000-bull
+               os=-bosx
+               ;;
+       dpx2*)
+               basic_machine=m68k-bull
+               os=-sysv3
+               ;;
+       e500v[12])
+               basic_machine=powerpc-unknown
+               os=$os"spe"
+               ;;
+       e500v[12]-*)
+               basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               os=$os"spe"
+               ;;
+       ebmon29k)
+               basic_machine=a29k-amd
+               os=-ebmon
+               ;;
+       elxsi)
+               basic_machine=elxsi-elxsi
+               os=-bsd
+               ;;
+       encore | umax | mmax)
+               basic_machine=ns32k-encore
+               ;;
+       es1800 | OSE68k | ose68k | ose | OSE)
+               basic_machine=m68k-ericsson
+               os=-ose
+               ;;
+       fx2800)
+               basic_machine=i860-alliant
+               ;;
+       genix)
+               basic_machine=ns32k-ns
+               ;;
+       gmicro)
+               basic_machine=tron-gmicro
+               os=-sysv
+               ;;
+       go32)
+               basic_machine=i386-pc
+               os=-go32
+               ;;
+       h3050r* | hiux*)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       h8300hms)
+               basic_machine=h8300-hitachi
+               os=-hms
+               ;;
+       h8300xray)
+               basic_machine=h8300-hitachi
+               os=-xray
+               ;;
+       h8500hms)
+               basic_machine=h8500-hitachi
+               os=-hms
+               ;;
+       harris)
+               basic_machine=m88k-harris
+               os=-sysv3
+               ;;
+       hp300-*)
+               basic_machine=m68k-hp
+               ;;
+       hp300bsd)
+               basic_machine=m68k-hp
+               os=-bsd
+               ;;
+       hp300hpux)
+               basic_machine=m68k-hp
+               os=-hpux
+               ;;
+       hp3k9[0-9][0-9] | hp9[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hp9k2[0-9][0-9] | hp9k31[0-9])
+               basic_machine=m68000-hp
+               ;;
+       hp9k3[2-9][0-9])
+               basic_machine=m68k-hp
+               ;;
+       hp9k6[0-9][0-9] | hp6[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hp9k7[0-79][0-9] | hp7[0-79][0-9])
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k78[0-9] | hp78[0-9])
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[0-9][13679] | hp8[0-9][13679])
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[0-9][0-9] | hp8[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hppaosf)
+               basic_machine=hppa1.1-hp
+               os=-osf
+               ;;
+       hppro)
+               basic_machine=hppa1.1-hp
+               os=-proelf
+               ;;
+       i370-ibm* | ibm*)
+               basic_machine=i370-ibm
+               ;;
+       i*86v32)
+               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+               os=-sysv32
+               ;;
+       i*86v4*)
+               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+               os=-sysv4
+               ;;
+       i*86v)
+               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+               os=-sysv
+               ;;
+       i*86sol2)
+               basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+               os=-solaris2
+               ;;
+       i386mach)
+               basic_machine=i386-mach
+               os=-mach
+               ;;
+       vsta)
+               basic_machine=i386-unknown
+               os=-vsta
+               ;;
+       iris | iris4d)
+               basic_machine=mips-sgi
+               case $os in
+                   -irix*)
+                       ;;
+                   *)
+                       os=-irix4
+                       ;;
+               esac
+               ;;
+       isi68 | isi)
+               basic_machine=m68k-isi
+               os=-sysv
+               ;;
+       leon-*|leon[3-9]-*)
+               basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+               ;;
+       m68knommu)
+               basic_machine=m68k-unknown
+               os=-linux
+               ;;
+       m68knommu-*)
+               basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
+       magnum | m3230)
+               basic_machine=mips-mips
+               os=-sysv
+               ;;
+       merlin)
+               basic_machine=ns32k-utek
+               os=-sysv
+               ;;
+       microblaze*)
+               basic_machine=microblaze-xilinx
+               ;;
+       mingw64)
+               basic_machine=x86_64-pc
+               os=-mingw64
+               ;;
+       mingw32)
+               basic_machine=i686-pc
+               os=-mingw32
+               ;;
+       mingw32ce)
+               basic_machine=arm-unknown
+               os=-mingw32ce
+               ;;
+       miniframe)
+               basic_machine=m68000-convergent
+               ;;
+       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;
+       mips3*-*)
+               basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+               ;;
+       mips3*)
+               basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+               ;;
+       monitor)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       morphos)
+               basic_machine=powerpc-unknown
+               os=-morphos
+               ;;
+       moxiebox)
+               basic_machine=moxie-unknown
+               os=-moxiebox
+               ;;
+       msdos)
+               basic_machine=i386-pc
+               os=-msdos
+               ;;
+       ms1-*)
+               basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+               ;;
+       msys)
+               basic_machine=i686-pc
+               os=-msys
+               ;;
+       mvs)
+               basic_machine=i370-ibm
+               os=-mvs
+               ;;
+       nacl)
+               basic_machine=le32-unknown
+               os=-nacl
+               ;;
+       ncr3000)
+               basic_machine=i486-ncr
+               os=-sysv4
+               ;;
+       netbsd386)
+               basic_machine=i386-unknown
+               os=-netbsd
+               ;;
+       netwinder)
+               basic_machine=armv4l-rebel
+               os=-linux
+               ;;
+       news | news700 | news800 | news900)
+               basic_machine=m68k-sony
+               os=-newsos
+               ;;
+       news1000)
+               basic_machine=m68030-sony
+               os=-newsos
+               ;;
+       news-3600 | risc-news)
+               basic_machine=mips-sony
+               os=-newsos
+               ;;
+       necv70)
+               basic_machine=v70-nec
+               os=-sysv
+               ;;
+       next | m*-next)
+               basic_machine=m68k-next
+               case $os in
+                   -nextstep* )
+                       ;;
+                   -ns2*)
+                     os=-nextstep2
+                       ;;
+                   *)
+                     os=-nextstep3
+                       ;;
+               esac
+               ;;
+       nh3000)
+               basic_machine=m68k-harris
+               os=-cxux
+               ;;
+       nh[45]000)
+               basic_machine=m88k-harris
+               os=-cxux
+               ;;
+       nindy960)
+               basic_machine=i960-intel
+               os=-nindy
+               ;;
+       mon960)
+               basic_machine=i960-intel
+               os=-mon960
+               ;;
+       nonstopux)
+               basic_machine=mips-compaq
+               os=-nonstopux
+               ;;
+       np1)
+               basic_machine=np1-gould
+               ;;
+       neo-tandem)
+               basic_machine=neo-tandem
+               ;;
+       nse-tandem)
+               basic_machine=nse-tandem
+               ;;
+       nsr-tandem)
+               basic_machine=nsr-tandem
+               ;;
+       nsv-tandem)
+               basic_machine=nsv-tandem
+               ;;
+       nsx-tandem)
+               basic_machine=nsx-tandem
+               ;;
+       op50n-* | op60c-*)
+               basic_machine=hppa1.1-oki
+               os=-proelf
+               ;;
+       openrisc | openrisc-*)
+               basic_machine=or32-unknown
+               ;;
+       os400)
+               basic_machine=powerpc-ibm
+               os=-os400
+               ;;
+       OSE68000 | ose68000)
+               basic_machine=m68000-ericsson
+               os=-ose
+               ;;
+       os68k)
+               basic_machine=m68k-none
+               os=-os68k
+               ;;
+       pa-hitachi)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       paragon)
+               basic_machine=i860-intel
+               os=-osf
+               ;;
+       parisc)
+               basic_machine=hppa-unknown
+               os=-linux
+               ;;
+       parisc-*)
+               basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
+       pbd)
+               basic_machine=sparc-tti
+               ;;
+       pbb)
+               basic_machine=m68k-tti
+               ;;
+       pc532 | pc532-*)
+               basic_machine=ns32k-pc532
+               ;;
+       pc98)
+               basic_machine=i386-pc
+               ;;
+       pc98-*)
+               basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       pentium | p5 | k5 | k6 | nexgen | viac3)
+               basic_machine=i586-pc
+               ;;
+       pentiumpro | p6 | 6x86 | athlon | athlon_*)
+               basic_machine=i686-pc
+               ;;
+       pentiumii | pentium2 | pentiumiii | pentium3)
+               basic_machine=i686-pc
+               ;;
+       pentium4)
+               basic_machine=i786-pc
+               ;;
+       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+               basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       pentiumpro-* | p6-* | 6x86-* | athlon-*)
+               basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+               basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       pentium4-*)
+               basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       pn)
+               basic_machine=pn-gould
+               ;;
+       power)  basic_machine=power-ibm
+               ;;
+       ppc | ppcbe)    basic_machine=powerpc-unknown
+               ;;
+       ppc-* | ppcbe-*)
+               basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       ppcle | powerpclittle)
+               basic_machine=powerpcle-unknown
+               ;;
+       ppcle-* | powerpclittle-*)
+               basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       ppc64)  basic_machine=powerpc64-unknown
+               ;;
+       ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       ppc64le | powerpc64little)
+               basic_machine=powerpc64le-unknown
+               ;;
+       ppc64le-* | powerpc64little-*)
+               basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       ps2)
+               basic_machine=i386-ibm
+               ;;
+       pw32)
+               basic_machine=i586-unknown
+               os=-pw32
+               ;;
+       rdos | rdos64)
+               basic_machine=x86_64-pc
+               os=-rdos
+               ;;
+       rdos32)
+               basic_machine=i386-pc
+               os=-rdos
+               ;;
+       rom68k)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       rm[46]00)
+               basic_machine=mips-siemens
+               ;;
+       rtpc | rtpc-*)
+               basic_machine=romp-ibm
+               ;;
+       s390 | s390-*)
+               basic_machine=s390-ibm
+               ;;
+       s390x | s390x-*)
+               basic_machine=s390x-ibm
+               ;;
+       sa29200)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;
+       sde)
+               basic_machine=mipsisa32-sde
+               os=-elf
+               ;;
+       sei)
+               basic_machine=mips-sei
+               os=-seiux
+               ;;
+       sequent)
+               basic_machine=i386-sequent
+               ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
+       simso-wrs)
+               basic_machine=sparclite-wrs
+               os=-vxworks
+               ;;
+       sps7)
+               basic_machine=m68k-bull
+               os=-sysv2
+               ;;
+       spur)
+               basic_machine=spur-unknown
+               ;;
+       st2000)
+               basic_machine=m68k-tandem
+               ;;
+       stratus)
+               basic_machine=i860-stratus
+               os=-sysv4
+               ;;
+       strongarm-* | thumb-*)
+               basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+               ;;
+       sun2)
+               basic_machine=m68000-sun
+               ;;
+       sun2os3)
+               basic_machine=m68000-sun
+               os=-sunos3
+               ;;
+       sun2os4)
+               basic_machine=m68000-sun
+               os=-sunos4
+               ;;
+       sun3os3)
+               basic_machine=m68k-sun
+               os=-sunos3
+               ;;
+       sun3os4)
+               basic_machine=m68k-sun
+               os=-sunos4
+               ;;
+       sun4os3)
+               basic_machine=sparc-sun
+               os=-sunos3
+               ;;
+       sun4os4)
+               basic_machine=sparc-sun
+               os=-sunos4
+               ;;
+       sun4sol2)
+               basic_machine=sparc-sun
+               os=-solaris2
+               ;;
+       sun3 | sun3-*)
+               basic_machine=m68k-sun
+               ;;
+       sun4)
+               basic_machine=sparc-sun
+               ;;
+       sun386 | sun386i | roadrunner)
+               basic_machine=i386-sun
+               ;;
+       sv1)
+               basic_machine=sv1-cray
+               os=-unicos
+               ;;
+       symmetry)
+               basic_machine=i386-sequent
+               os=-dynix
+               ;;
+       t3e)
+               basic_machine=alphaev5-cray
+               os=-unicos
+               ;;
+       t90)
+               basic_machine=t90-cray
+               os=-unicos
+               ;;
+       tile*)
+               basic_machine=$basic_machine-unknown
+               os=-linux-gnu
+               ;;
+       tx39)
+               basic_machine=mipstx39-unknown
+               ;;
+       tx39el)
+               basic_machine=mipstx39el-unknown
+               ;;
+       toad1)
+               basic_machine=pdp10-xkl
+               os=-tops20
+               ;;
+       tower | tower-32)
+               basic_machine=m68k-ncr
+               ;;
+       tpf)
+               basic_machine=s390x-ibm
+               os=-tpf
+               ;;
+       udi29k)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       ultra3)
+               basic_machine=a29k-nyu
+               os=-sym1
+               ;;
+       v810 | necv810)
+               basic_machine=v810-nec
+               os=-none
+               ;;
+       vaxv)
+               basic_machine=vax-dec
+               os=-sysv
+               ;;
+       vms)
+               basic_machine=vax-dec
+               os=-vms
+               ;;
+       vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+       vxworks960)
+               basic_machine=i960-wrs
+               os=-vxworks
+               ;;
+       vxworks68)
+               basic_machine=m68k-wrs
+               os=-vxworks
+               ;;
+       vxworks29k)
+               basic_machine=a29k-wrs
+               os=-vxworks
+               ;;
+       w65*)
+               basic_machine=w65-wdc
+               os=-none
+               ;;
+       w89k-*)
+               basic_machine=hppa1.1-winbond
+               os=-proelf
+               ;;
+       x64)
+               basic_machine=x86_64-pc
+               ;;
+       xbox)
+               basic_machine=i686-pc
+               os=-mingw32
+               ;;
+       xps | xps100)
+               basic_machine=xps100-honeywell
+               ;;
+       xscale-* | xscalee[bl]-*)
+               basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+               ;;
+       ymp)
+               basic_machine=ymp-cray
+               os=-unicos
+               ;;
+       none)
+               basic_machine=none-none
+               os=-none
+               ;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+       w89k)
+               basic_machine=hppa1.1-winbond
+               ;;
+       op50n)
+               basic_machine=hppa1.1-oki
+               ;;
+       op60c)
+               basic_machine=hppa1.1-oki
+               ;;
+       romp)
+               basic_machine=romp-ibm
+               ;;
+       mmix)
+               basic_machine=mmix-knuth
+               ;;
+       rs6000)
+               basic_machine=rs6000-ibm
+               ;;
+       vax)
+               basic_machine=vax-dec
+               ;;
+       pdp11)
+               basic_machine=pdp11-dec
+               ;;
+       we32k)
+               basic_machine=we32k-att
+               ;;
+       sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+               basic_machine=sh-unknown
+               ;;
+       cydra)
+               basic_machine=cydra-cydrome
+               ;;
+       orion)
+               basic_machine=orion-highlevel
+               ;;
+       orion105)
+               basic_machine=clipper-highlevel
+               ;;
+       mac | mpw | mac-mpw)
+               basic_machine=m68k-apple
+               ;;
+       pmac | pmac-mpw)
+               basic_machine=powerpc-apple
+               ;;
+       *-unknown)
+               # Make sure to match an already-canonicalized machine name.
+               ;;
+       *)
+               echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+               exit 1
+               ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+       *-digital*)
+               basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+               ;;
+       *-commodore*)
+               basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+               ;;
+       *)
+               ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+       # First match some system type aliases that might get confused
+       # with valid system types.
+       # -solaris* is a basic system type, with this one exception.
+       -auroraux)
+               os=-auroraux
+               ;;
+       -solaris1 | -solaris1.*)
+               os=`echo $os | sed -e 's|solaris1|sunos4|'`
+               ;;
+       -solaris)
+               os=-solaris2
+               ;;
+       -unixware*)
+               os=-sysv4.2uw
+               ;;
+       -gnu/linux*)
+               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+               ;;
+       # es1800 is here to avoid being matched by es* (a different OS)
+       -es1800*)
+               os=-ose
+               ;;
+       # Now accept the basic system types.
+       # The portable systems comes first.
+       # Each alternative MUST end in a * to match a version number.
+       # -sysv* is not here because it comes later, after sysvr4.
+       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+             | -sym* | -kopensolaris* | -plan9* \
+             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+             | -aos* | -aros* | -cloudabi* | -sortix* \
+             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+             | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+             | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+             | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
+             | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+             | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+             | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+             | -morphos* | -superux* | -rtmk* | -windiss* \
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+             | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+             | -midnightbsd*)
+       # Remember, each alternative MUST END IN *, to match a version number.
+               ;;
+       -qnx*)
+               case $basic_machine in
+                   x86-* | i*86-*)
+                       ;;
+                   *)
+                       os=-nto$os
+                       ;;
+               esac
+               ;;
+       -nto-qnx*)
+               ;;
+       -nto*)
+               os=`echo $os | sed -e 's|nto|nto-qnx|'`
+               ;;
+       -sim | -xray | -os68k* | -v88r* \
+             | -windows* | -osx | -abug | -netware* | -os9* \
+             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+               ;;
+       -mac*)
+               os=`echo "$os" | sed -e 's|mac|macos|'`
+               ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
+       -linux*)
+               os=`echo $os | sed -e 's|linux|linux-gnu|'`
+               ;;
+       -sunos5*)
+               os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+               ;;
+       -sunos6*)
+               os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+               ;;
+       -opened*)
+               os=-openedition
+               ;;
+       -os400*)
+               os=-os400
+               ;;
+       -wince*)
+               os=-wince
+               ;;
+       -utek*)
+               os=-bsd
+               ;;
+       -dynix*)
+               os=-bsd
+               ;;
+       -acis*)
+               os=-aos
+               ;;
+       -atheos*)
+               os=-atheos
+               ;;
+       -syllable*)
+               os=-syllable
+               ;;
+       -386bsd)
+               os=-bsd
+               ;;
+       -ctix* | -uts*)
+               os=-sysv
+               ;;
+       -nova*)
+               os=-rtmk-nova
+               ;;
+       -ns2)
+               os=-nextstep2
+               ;;
+       -nsk*)
+               os=-nsk
+               ;;
+       # Preserve the version number of sinix5.
+       -sinix5.*)
+               os=`echo $os | sed -e 's|sinix|sysv|'`
+               ;;
+       -sinix*)
+               os=-sysv4
+               ;;
+       -tpf*)
+               os=-tpf
+               ;;
+       -triton*)
+               os=-sysv3
+               ;;
+       -oss*)
+               os=-sysv3
+               ;;
+       -svr4*)
+               os=-sysv4
+               ;;
+       -svr3)
+               os=-sysv3
+               ;;
+       -sysvr4)
+               os=-sysv4
+               ;;
+       # This must come after -sysvr4.
+       -sysv*)
+               ;;
+       -ose*)
+               os=-ose
+               ;;
+       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint
+               ;;
+       -zvmoe)
+               os=-zvmoe
+               ;;
+       -dicos*)
+               os=-dicos
+               ;;
+       -pikeos*)
+               # Until real need of OS specific support for
+               # particular features comes up, bare metal
+               # configurations are quite functional.
+               case $basic_machine in
+                   arm*)
+                       os=-eabi
+                       ;;
+                   *)
+                       os=-elf
+                       ;;
+               esac
+               ;;
+       -nacl*)
+               ;;
+       -ios)
+               ;;
+       -none)
+               ;;
+       *)
+               # Get rid of the `-' at the beginning of $os.
+               os=`echo $os | sed 's/[^-]*-//'`
+               echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+               exit 1
+               ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+       score-*)
+               os=-elf
+               ;;
+       spu-*)
+               os=-elf
+               ;;
+       *-acorn)
+               os=-riscix1.2
+               ;;
+       arm*-rebel)
+               os=-linux
+               ;;
+       arm*-semi)
+               os=-aout
+               ;;
+       c4x-* | tic4x-*)
+               os=-coff
+               ;;
+       c8051-*)
+               os=-elf
+               ;;
+       hexagon-*)
+               os=-elf
+               ;;
+       tic54x-*)
+               os=-coff
+               ;;
+       tic55x-*)
+               os=-coff
+               ;;
+       tic6x-*)
+               os=-coff
+               ;;
+       # This must come before the *-dec entry.
+       pdp10-*)
+               os=-tops20
+               ;;
+       pdp11-*)
+               os=-none
+               ;;
+       *-dec | vax-*)
+               os=-ultrix4.2
+               ;;
+       m68*-apollo)
+               os=-domain
+               ;;
+       i386-sun)
+               os=-sunos4.0.2
+               ;;
+       m68000-sun)
+               os=-sunos3
+               ;;
+       m68*-cisco)
+               os=-aout
+               ;;
+       mep-*)
+               os=-elf
+               ;;
+       mips*-cisco)
+               os=-elf
+               ;;
+       mips*-*)
+               os=-elf
+               ;;
+       or32-*)
+               os=-coff
+               ;;
+       *-tti)  # must be before sparc entry or we get the wrong os.
+               os=-sysv3
+               ;;
+       sparc-* | *-sun)
+               os=-sunos4.1.1
+               ;;
+       pru-*)
+               os=-elf
+               ;;
+       *-be)
+               os=-beos
+               ;;
+       *-ibm)
+               os=-aix
+               ;;
+       *-knuth)
+               os=-mmixware
+               ;;
+       *-wec)
+               os=-proelf
+               ;;
+       *-winbond)
+               os=-proelf
+               ;;
+       *-oki)
+               os=-proelf
+               ;;
+       *-hp)
+               os=-hpux
+               ;;
+       *-hitachi)
+               os=-hiux
+               ;;
+       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+               os=-sysv
+               ;;
+       *-cbm)
+               os=-amigaos
+               ;;
+       *-dg)
+               os=-dgux
+               ;;
+       *-dolphin)
+               os=-sysv3
+               ;;
+       m68k-ccur)
+               os=-rtu
+               ;;
+       m88k-omron*)
+               os=-luna
+               ;;
+       *-next)
+               os=-nextstep
+               ;;
+       *-sequent)
+               os=-ptx
+               ;;
+       *-crds)
+               os=-unos
+               ;;
+       *-ns)
+               os=-genix
+               ;;
+       i370-*)
+               os=-mvs
+               ;;
+       *-gould)
+               os=-sysv
+               ;;
+       *-highlevel)
+               os=-bsd
+               ;;
+       *-encore)
+               os=-bsd
+               ;;
+       *-sgi)
+               os=-irix
+               ;;
+       *-siemens)
+               os=-sysv4
+               ;;
+       *-masscomp)
+               os=-rtu
+               ;;
+       f30[01]-fujitsu | f700-fujitsu)
+               os=-uxpv
+               ;;
+       *-rom68k)
+               os=-coff
+               ;;
+       *-*bug)
+               os=-coff
+               ;;
+       *-apple)
+               os=-macos
+               ;;
+       *-atari*)
+               os=-mint
+               ;;
+       *)
+               os=-none
+               ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+       *-unknown)
+               case $os in
+                       -riscix*)
+                               vendor=acorn
+                               ;;
+                       -sunos*)
+                               vendor=sun
+                               ;;
+                       -cnk*|-aix*)
+                               vendor=ibm
+                               ;;
+                       -beos*)
+                               vendor=be
+                               ;;
+                       -hpux*)
+                               vendor=hp
+                               ;;
+                       -mpeix*)
+                               vendor=hp
+                               ;;
+                       -hiux*)
+                               vendor=hitachi
+                               ;;
+                       -unos*)
+                               vendor=crds
+                               ;;
+                       -dgux*)
+                               vendor=dg
+                               ;;
+                       -luna*)
+                               vendor=omron
+                               ;;
+                       -genix*)
+                               vendor=ns
+                               ;;
+                       -mvs* | -opened*)
+                               vendor=ibm
+                               ;;
+                       -os400*)
+                               vendor=ibm
+                               ;;
+                       -ptx*)
+                               vendor=sequent
+                               ;;
+                       -tpf*)
+                               vendor=ibm
+                               ;;
+                       -vxsim* | -vxworks* | -windiss*)
+                               vendor=wrs
+                               ;;
+                       -aux*)
+                               vendor=apple
+                               ;;
+                       -hms*)
+                               vendor=hitachi
+                               ;;
+                       -mpw* | -macos*)
+                               vendor=apple
+                               ;;
+                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                               vendor=atari
+                               ;;
+                       -vos*)
+                               vendor=stratus
+                               ;;
+               esac
+               basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+               ;;
+esac
+
+echo "$basic_machine$os"
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-functions 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/build-aux/depcomp b/build-aux/depcomp
new file mode 100755 (executable)
index 0000000..65cbf70
--- /dev/null
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='  '
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/install-sh b/build-aux/install-sh
new file mode 100755 (executable)
index 0000000..8175c64
--- /dev/null
@@ -0,0 +1,518 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2018-03-11.20; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+tab='  '
+nl='
+'
+IFS=" $tab$nl"
+
+# Set DOITPROG to "echo" to test this script.
+
+doit=${DOITPROG-}
+doit_exec=${doit:-exec}
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+is_target_a_directory=possibly
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
+
+    -o) chowncmd="$chownprog $2"
+        shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --) shift
+        break;;
+
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+        u_plus_rw=
+      else
+        u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename.
+    if test -d "$dst"; then
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
+      fi
+      dstdir=$dst
+      dstbase=`basename "$src"`
+      case $dst in
+       */) dst=$dst$dstbase;;
+       *)  dst=$dst/$dstbase;;
+      esac
+      dstdir_status=0
+    else
+      dstdir=`dirname "$dst"`
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      set -f
+      set fnord $dstdir
+      shift
+      set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       set +f &&
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/libtool.m4 b/build-aux/libtool.m4
new file mode 100644 (file)
index 0000000..9d6dd9f
--- /dev/null
@@ -0,0 +1,8394 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+                  [m4_fatal([Libtool version $1 or higher is required],
+                            63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\    *)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+       [m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+       [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+       [tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+          m4_quote(lt_decl_varnames),
+       m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+                       lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+                                          [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+       dnl If the libtool generation code has been placed in $CONFIG_LT,
+       dnl instead of duplicating it all over again into config.status,
+       dnl then we will have config.status run $CONFIG_LT later, so it
+       dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],                 [_LT_LANG(C)],
+  [C++],               [_LT_LANG(CXX)],
+  [Go],                        [_LT_LANG(GO)],
+  [Java],              [_LT_LANG(GCJ)],
+  [Fortran 77],                [_LT_LANG(F77)],
+  [Fortran],           [_LT_LANG(FC)],
+  [Windows Resource],  [_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+       [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+       [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+       [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+       # By default we will add the -single_module flag. You can override
+       # by either setting the environment variable LT_MULTI_MODULE
+       # non-empty at configure time, or by adding -multi_module to the
+       # link flags.
+       rm -rf libconftest.dylib*
+       echo "int foo(void){return 1;}" > conftest.c
+       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+       # If there is a non-empty error log, and "single_module"
+       # appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+         cat conftest.err >&AS_MESSAGE_LOG_FD
+       # Otherwise, if the output was created with a 0 exit code from
+       # the compiler, it worked.
+       elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+         lt_cv_apple_cc_single_mod=yes
+       else
+         cat conftest.err >&AS_MESSAGE_LOG_FD
+       fi
+       rm -rf libconftest.dylib*
+       rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+       [lt_cv_ld_exported_symbols_list=yes],
+       [lt_cv_ld_exported_symbols_list=no])
+       LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+       cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+       lt_cv_ld_force_load=yes
+      else
+       cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+       10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+         _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+       10.[[012]][[,.]]*)
+         _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+       10.*)
+         _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+         /^0/ {
+             s/^0  *\([^ ]*\) *$/\1/
+             p
+         }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+       HPUX_IA64_MODE=32
+       ;;
+      *ELF-64*)
+       HPUX_IA64_MODE=64
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -melf32bsmip"
+         ;;
+       *N32*)
+         LD="${LD-ld} -melf32bmipn32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -melf64bmip"
+       ;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -32"
+         ;;
+       *N32*)
+         LD="${LD-ld} -n32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -64"
+         ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+       emul="${emul}32"
+       ;;
+      *64-bit*)
+       emul="${emul}64"
+       ;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+       emul="${emul}btsmip"
+       ;;
+      *LSB*)
+       emul="${emul}ltsmip"
+       ;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+       emul="${emul}n32"
+       ;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_i386_fbsd"
+           ;;
+         x86_64-*linux*)
+           case `/usr/bin/file conftest.o` in
+             *x86-64*)
+               LD="${LD-ld} -m elf32_x86_64"
+               ;;
+             *)
+               LD="${LD-ld} -m elf_i386"
+               ;;
+           esac
+           ;;
+         powerpc64le-*linux*)
+           LD="${LD-ld} -m elf32lppclinux"
+           ;;
+         powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+      *64-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         powerpcle-*linux*)
+           LD="${LD-ld} -m elf64lppc"
+           ;;
+         powerpc-*linux*)
+           LD="${LD-ld} -m elf64ppc"
+           ;;
+         s390*-*linux*|s390*-*tpf*)
+           LD="${LD-ld} -m elf64_s390"
+           ;;
+         sparc*-*linux*)
+           LD="${LD-ld} -m elf64_sparc"
+           ;;
+       esac
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+       # Ensure the archiver fails upon bogus file names.
+       rm -f conftest.$ac_objext libconftest.a
+       AC_TRY_EVAL([lt_ar_try])
+       if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#              [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[        ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+                = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+             test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+       }
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+         [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+           [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+       [AC_CHECK_FUNC([dlopen],
+             [lt_cv_dlopen=dlopen],
+         [AC_CHECK_LIB([dl], [dlopen],
+               [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+           [AC_CHECK_LIB([svld], [dlopen],
+                 [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+             [AC_CHECK_LIB([dld], [dld_link],
+                   [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+             ])
+           ])
+         ])
+       ])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+         lt_cv_dlopen_self, [dnl
+         _LT_TRY_DLOPEN_SELF(
+           lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+           lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+         lt_cv_dlopen_self_static, [dnl
+         _LT_TRY_DLOPEN_SELF(
+           lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+           lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+        [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+        [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+        [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+       [Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x@S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+       [], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+          echo ' yes '
+          echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+       :
+      else
+       can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+       if test yes = "$lt_cv_prog_gnu_ld"; then
+               version_type=linux # correct to gnu/linux during the next big refactor
+       else
+               version_type=irix
+       fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+        LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+        [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+       ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+         fi ;;
+       esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+        [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+       [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+       test no != "$with_gnu_ld" && break
+       ;;
+      *)
+       test yes != "$with_gnu_ld" && break
+       ;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+       case $build_os in
+       mingw*) lt_bad_file=conftest.nm/nofile ;;
+       *) lt_bad_file=/dev/null ;;
+       esac
+       case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+       *$lt_bad_file* | *'Invalid file or object type'*)
+         lt_cv_path_NM="$tmp_nm -B"
+         break 2
+         ;;
+       *)
+         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+         */dev/null*)
+           lt_cv_path_NM="$tmp_nm -p"
+           break 2
+           ;;
+         *)
+           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+           continue # so that we can try to find one that supports BSD flags
+           ;;
+         esac
+         ;;
+       esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[        ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[  ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+       [Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[    ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+       mv -f "$nlist"T "$nlist"
+      else
+       rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+       if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+         cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+         # Now generate the symbol file.
+         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+         cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+         $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+         cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+         # Now try linking the two files.
+         mv conftest.$ac_objext conftstm.$ac_objext
+         lt_globsym_save_LIBS=$LIBS
+         lt_globsym_save_CFLAGS=$CFLAGS
+         LIBS=conftstm.$ac_objext
+         CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+         if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+           pipe_works=yes
+         fi
+         LIBS=$lt_globsym_save_LIBS
+         CFLAGS=$lt_globsym_save_CFLAGS
+       else
+         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+       fi
+      else
+       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+       # AIX 5 now supports IA64 processor
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+       ;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+       # All AIX code is PIC.
+       if test ia64 = "$host_cpu"; then
+         # AIX 5 now supports IA64 processor
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       else
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
+      chorus*)
+       case $cc_basename in
+       cxch68*)
+         # Green Hills C++ Compiler
+         # _LT_TAGVAR(lt_prog_compiler_static, $1)="--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"
+         ;;
+       esac
+       ;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       m4_if([$1], [GCJ], [],
+         [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+       ;;
+      dgux*)
+       case $cc_basename in
+         ec++*)
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           ;;
+         ghcx*)
+           # Green Hills C++ Compiler
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      freebsd* | dragonfly*)
+       # FreeBSD uses GNU C++
+       ;;
+      hpux9* | hpux10* | hpux11*)
+       case $cc_basename in
+         CC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+           if test ia64 != "$host_cpu"; then
+             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+           fi
+           ;;
+         aCC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+           case $host_cpu in
+           hppa*64*|ia64*)
+             # +Z the default
+             ;;
+           *)
+             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+             ;;
+           esac
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      interix*)
+       # This is c89, which is MS Visual C++ (no shared libs)
+       # Anyone wants to do a port?
+       ;;
+      irix5* | irix6* | nonstopux*)
+       case $cc_basename in
+         CC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           # CC pic flag -KPIC is the default.
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+       case $cc_basename in
+         KCC*)
+           # KAI C++ Compiler
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           ;;
+         ecpc* )
+           # old Intel C++ for x86_64, which still supported -KPIC.
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;;
+         icpc* )
+           # Intel C++, used to be incompatible with GCC.
+           # ICC 10 doesn't accept -KPIC any more.
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           ;;
+         pgCC* | pgcpp*)
+           # Portland Group C++ compiler
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+         cxx*)
+           # Compaq C++
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           ;;
+         xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+           # IBM XL 8.0, 9.0 on PPC and BlueGene
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+             _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+             _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+             ;;
+           esac
+           ;;
+       esac
+       ;;
+      lynxos*)
+       ;;
+      m88k*)
+       ;;
+      mvs*)
+       case $cc_basename in
+         cxx*)
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      netbsd* | netbsdelf*-gnu)
+       ;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+       case $cc_basename in
+         KCC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           ;;
+         RCC*)
+           # Rational C++ 2.4.1
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         cxx*)
+           # Digital/Compaq C++
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           # Make sure the PIC flag is empty.  It appears that all Alpha
+           # Linux and Compaq Tru64 Unix objects are PIC.
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      psos*)
+       ;;
+      solaris*)
+       case $cc_basename in
+         CC* | sunCC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+           ;;
+         gcx*)
+           # Green Hills C++ Compiler
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sunos4*)
+       case $cc_basename in
+         CC*)
+           # Sun C++ 4.x
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+         lcc*)
+           # Lucid
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+       case $cc_basename in
+         CC*)
+           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           ;;
+       esac
+       ;;
+      tandem*)
+       case $cc_basename in
+         NCC*)
+           # NonStop-UX NCC 3.20
+           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           ;;
+         *)
+           ;;
+       esac
+       ;;
+      vxworks*)
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+       # AIX 5 now supports IA64 processor
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+       ;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+       # +Z the default
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+       # AIX 5 now supports IA64 processor
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+       ;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       # +Z the default
+       ;;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+       ;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+       ;;
+      nagfor*)
+       # NAG Fortran compiler
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+      tcc*)
+       # Fabrice Bellard et al's Tiny C Compiler
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+       ;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+       # which looks to be a dead project)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+       # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+       ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+         ;;
+       *Sun\ F* | *Sun*Fortran*)
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+         ;;
+       *Sun\ C*)
+         # Sun C 5.9
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+        *Intel*\ [[CF]]*Compiler*)
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+         ;;
+       *Portland\ Group*)
+         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         ;;
+       esac
+       ;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+       [Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+       [How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+       [Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+       # The AIX port of GNU ld has always aspired to compatibility
+       # with the native linker.  However, as the warning in the GNU ld
+       # block says, versions before 2.19.5* couldn't really create working
+       # shared libraries, regardless of the interface used.
+       case `$LD -v 2>&1` in
+         *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+         *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+         *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+         *)
+           lt_use_gnu_ld_interface=yes
+           ;;
+       esac
+       ;;
+      *)
+       lt_use_gnu_ld_interface=yes
+       ;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file, use it as
+       # is; otherwise, prepend EXPORTS...
+       _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       prefix_cmds="$SED"~
+       if test EXPORTS = "`$SED 1q $export_symbols`"; then
+         prefix_cmds="$prefix_cmds -e 1d";
+       fi~
+       prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+       cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+       case $cc_basename in
+         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
+       esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+        && test no = "$tmp_diet"
+      then
+       tmp_addflag=' $pic_flag'
+       tmp_sharedflag='-shared'
+       case $cc_basename,$host_cpu in
+        pgcc*)                         # Portland Group C compiler
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         tmp_addflag=' $pic_flag'
+         ;;
+       pgf77* | pgf90* | pgf95* | pgfortran*)
+                                       # Portland Group f77 and f90 compilers
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
+       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
+         tmp_addflag=' -i_dynamic' ;;
+       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
+         tmp_addflag=' -i_dynamic -nofor_main' ;;
+       ifc* | ifort*)                  # Intel Fortran compiler
+         tmp_addflag=' -nofor_main' ;;
+       lf95*)                          # Lahey Fortran 8.1
+         _LT_TAGVAR(whole_archive_flag_spec, $1)=
+         tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+       xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+         tmp_sharedflag='-qmkshrobj'
+         tmp_addflag= ;;
+       nvcc*)  # Cuda Compiler Driver 2.2
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         _LT_TAGVAR(compiler_needs_object, $1)=yes
+         ;;
+       esac
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         _LT_TAGVAR(compiler_needs_object, $1)=yes
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       esac
+       _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+       case $cc_basename in
+       tcc*)
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+         ;;
+       xlf* | bgf* | bgxlf* | mpixlf*)
+         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+         if test yes = "$supports_anon_versioning"; then
+           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+         fi
+         ;;
+       esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+       ;;
+       *)
+         # For security reasons, it is highly recommended that you always
+         # use absolute paths for naming shared libraries, and exclude the
+         # DT_RUNPATH tag from executables and libraries.  But doing so
+         # requires that you compile everything twice, which is a pain.
+         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+         else
+           _LT_TAGVAR(ld_shlibs, $1)=no
+         fi
+       ;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+       # Neither direct hardcoding nor static linking is supported with a
+       # broken collect2.
+       _LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=
+      else
+       # If we're using GNU nm, then we don't want the "-C" option.
+       # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+       # Without the "-l" option, or with the "-B" option, AIX nm treats
+       # weak defined symbols like other global defined symbols, whereas
+       # GNU nm marks them as "W".
+       # While the 'weak' keyword is ignored in the Export File, we need
+       # it in the Import File for the 'aix-soname' feature, so we have
+       # to replace the "-B" option with "-P" for AIX nm.
+       if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+         _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+       else
+         _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+       fi
+       aix_use_runtimelinking=no
+
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # have runtime linking enabled, and use it for executables.
+       # For shared libraries, we enable/disable runtime linking
+       # depending on the kind of the shared library created -
+       # when "with_aix_soname,aix_use_runtimelinking" is:
+       # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+       # "aix,yes"  lib.so          shared, rtl:yes, for executables
+       #            lib.a           static archive
+       # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+       #            lib.a(lib.so.V) shared, rtl:no,  for executables
+       # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+       #            lib.a(lib.so.V) shared, rtl:no
+       # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+       #            lib.a           static archive
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+         for ld_flag in $LDFLAGS; do
+         if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+           aix_use_runtimelinking=yes
+           break
+         fi
+         done
+         if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+           # With aix-soname=svr4, we create the lib.so.V shared archives only,
+           # so we don't have lib.a shared libs to link our executables.
+           # We have to force runtime linking in this case.
+           aix_use_runtimelinking=yes
+           LDFLAGS="$LDFLAGS -Wl,-brtl"
+         fi
+         ;;
+       esac
+
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+       # The Import File defines what to hardcode.
+       _LT_TAGVAR(hardcode_direct, $1)=no
+       _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+       ;;
+      esac
+
+      if test yes = "$GCC"; then
+       case $host_os in aix4.[[012]]|aix4.[[012]].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+         collect2name=`$CC -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+          strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+         # We have reworked collect2
+         :
+         else
+         # We have old collect2
+         _LT_TAGVAR(hardcode_direct, $1)=unsupported
+         # It fails to find uninstalled libraries when the uninstalled
+         # path is not listed in the libpath.  Setting hardcode_minus_L
+         # to unsupported forces relinking
+         _LT_TAGVAR(hardcode_minus_L, $1)=yes
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=
+         fi
+         ;;
+       esac
+       shared_flag='-shared'
+       if test yes = "$aix_use_runtimelinking"; then
+         shared_flag="$shared_flag "'$wl-G'
+       fi
+       # Need to ensure runtime linking is disabled for the traditional
+       # shared library, or the linker may eventually find shared libraries
+       # /with/ Import File - we do not want to mix them.
+       shared_flag_aix='-shared'
+       shared_flag_svr4='-shared $wl-G'
+      else
+       # not using gcc
+       if test ia64 = "$host_cpu"; then
+       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+       # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+       else
+         if test yes = "$aix_use_runtimelinking"; then
+           shared_flag='$wl-G'
+         else
+           shared_flag='$wl-bM:SRE'
+         fi
+         shared_flag_aix='$wl-bM:SRE'
+         shared_flag_svr4='$wl-G'
+       fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+       if test ia64 = "$host_cpu"; then
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+         _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+       else
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+         # Warning - without using the other run time loading flags,
+         # -berok will link without error, but may produce a broken library.
+         _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+         _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+         if test yes = "$with_gnu_ld"; then
+           # We only use this code for GNU lds that support --whole-archive.
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+         else
+           # Exported symbols can be pulled into shared objects from archives
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+         fi
+         _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+         # -brtl affects multiple linker settings, -berok does not and is overridden later
+         compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+         if test svr4 != "$with_aix_soname"; then
+           # This is similar to how AIX traditionally builds its shared libraries.
+           _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+         fi
+         if test aix != "$with_aix_soname"; then
+           _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+         else
+           # used by -dlpreopen to get the symbols
+           _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+         fi
+         _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+       fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+       # Native MSVC
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       _LT_TAGVAR(always_export_symbols, $1)=yes
+       _LT_TAGVAR(file_list_spec, $1)='@'
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+       shrext_cmds=.dll
+       # FIXME: Setting linknames here is a bad hack.
+       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+       _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+       # The linker will not automatically build a static lib if we build a DLL.
+       # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+       # Don't use ranlib
+       _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+       _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+       ;;
+      *)
+       # Assume MSVC wrapper
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+       shrext_cmds=.dll
+       # FIXME: Setting linknames here is a bad hack.
+       _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+       # FIXME: Should let the user specify the lib program.
+       _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+       _LT_TAGVAR(hardcode_direct, $1)=yes
+       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+       case $host_cpu in
+       hppa*64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       esac
+      else
+       case $host_cpu in
+       hppa*64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+       m4_if($1, [], [
+         # Older versions of the 11.00 compiler do not understand -b yet
+         # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+         _LT_LINKER_OPTION([if $CC understands -b],
+           _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+           [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+           [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+         [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+         ;;
+       esac
+      fi
+      if test no = "$with_gnu_ld"; then
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       case $host_cpu in
+       hppa*64*|ia64*)
+         _LT_TAGVAR(hardcode_direct, $1)=no
+         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+         ;;
+       *)
+         _LT_TAGVAR(hardcode_direct, $1)=yes
+         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+         # hardcode_minus_L: Not really in the search PATH,
+         # but as the default location of the library.
+         _LT_TAGVAR(hardcode_minus_L, $1)=yes
+         ;;
+       esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+       # Try to use the -exported_symbol ld option, if it does not
+       # work, assume that -exports_file does not work either and
+       # implicitly export all symbols.
+       # This should be the same for all languages, so no per-tag cache variable.
+       AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+         [lt_cv_irix_exported_symbol],
+         [save_LDFLAGS=$LDFLAGS
+          LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+          AC_LINK_IFELSE(
+            [AC_LANG_SOURCE(
+               [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+                             [C++], [[int foo (void) { return 0; }]],
+                             [Fortran 77], [[
+      subroutine foo
+      end]],
+                             [Fortran], [[
+      subroutine foo
+      end]])])],
+             [lt_cv_irix_exported_symbol=yes],
+             [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+       if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+       fi
+       _LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+       # Fabrice Bellard et al's Tiny C Compiler
+       _LT_TAGVAR(ld_shlibs, $1)=yes
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+       ;;
+      esac
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+       _LT_TAGVAR(hardcode_direct, $1)=yes
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+       else
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+       fi
+      else
+       _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       prefix_cmds="$SED"~
+       if test EXPORTS = "`$SED 1q $export_symbols`"; then
+         prefix_cmds="$prefix_cmds -e 1d";
+       fi~
+       prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+       cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+       _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)     # as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+       _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+       # Both c and cxx compiler support -rpath directly
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+       wlarc='$wl'
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+       case `$CC -V 2>&1` in
+       *"Compilers 5.0"*)
+         wlarc=''
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+         ;;
+       *)
+         wlarc='$wl'
+         _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+         ;;
+       esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+       # The compiler driver will combine and reorder linker options,
+       # but understands '-z linker_flag'.  GCC discards it without '$wl',
+       # but is careful enough not to reorder.
+       # Supported since Solaris 2.6 (maybe 2.5.1?)
+       if test yes = "$GCC"; then
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+       else
+         _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+       # Use $CC to link under sequent, because it throws in some extra .o
+       # files that make .init and .fini sections work.
+       _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+       sni)
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+       ;;
+       siemens)
+         ## LD is ld it makes a PLAMLIB
+         ## CC just makes a GrossModule.
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+         _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+       motorola)
+         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+       ;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       _LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+       ;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+       [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+       [$RM conftest*
+       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+         pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+         output_objdir=.
+         libname=conftest
+         lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+         _LT_TAGVAR(allow_undefined_flag, $1)=
+         if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+         then
+           lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+         else
+           lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+         fi
+         _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+       else
+         cat conftest.err 1>&5
+       fi
+       $RM conftest*
+       ])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;                  # shared object as lib.so file only
+      yes,svr4,*) ;;                   # shared object as lib.so archive member only
+      yes,*) enable_static=no ;;       # shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+         $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+           for ld_flag in $LDFLAGS; do
+             case $ld_flag in
+             *-brtl*)
+               aix_use_runtimelinking=yes
+               break
+               ;;
+             esac
+           done
+           if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+             # With aix-soname=svr4, we create the lib.so.V shared archives only,
+             # so we don't have lib.a shared libs to link our executables.
+             # We have to force runtime linking in this case.
+             aix_use_runtimelinking=yes
+             LDFLAGS="$LDFLAGS -Wl,-brtl"
+           fi
+           ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;      # no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+         collect2name=`$CC -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+            strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+           # We have reworked collect2
+           :
+         else
+           # We have old collect2
+           _LT_TAGVAR(hardcode_direct, $1)=unsupported
+           # It fails to find uninstalled libraries when the uninstalled
+           # path is not listed in the libpath.  Setting hardcode_minus_L
+           # to unsupported forces relinking
+           _LT_TAGVAR(hardcode_minus_L, $1)=yes
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=
+         fi
+          esac
+          shared_flag='-shared'
+         if test yes = "$aix_use_runtimelinking"; then
+           shared_flag=$shared_flag' $wl-G'
+         fi
+         # Need to ensure runtime linking is disabled for the traditional
+         # shared library, or the linker may eventually find shared libraries
+         # /with/ Import File - we do not want to mix them.
+         shared_flag_aix='-shared'
+         shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+         # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+         # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+          else
+           if test yes = "$aix_use_runtimelinking"; then
+             shared_flag='$wl-G'
+           else
+             shared_flag='$wl-bM:SRE'
+           fi
+           shared_flag_aix='$wl-bM:SRE'
+           shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+       # export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+       if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+           _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+           # Determine the default libpath from the value encoded in an
+           # empty executable.
+           _LT_SYS_MODULE_PATH_AIX([$1])
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+           # Warning - without using the other run time loading flags,
+           # -berok will link without error, but may produce a broken library.
+           _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+           _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+           if test yes = "$with_gnu_ld"; then
+             # We only use this code for GNU lds that support --whole-archive.
+             _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+           else
+             # Exported symbols can be pulled into shared objects from archives
+             _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+           fi
+           _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+           # -brtl affects multiple linker settings, -berok does not and is overridden later
+           compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+           if test svr4 != "$with_aix_soname"; then
+             # This is similar to how AIX traditionally builds its shared
+             # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+             _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+           fi
+           if test aix != "$with_aix_soname"; then
+             _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+           else
+             # used by -dlpreopen to get the symbols
+             _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+           fi
+           _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+         # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+         # support --undefined.  This deserves some investigation.  FIXME
+         _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       else
+         _LT_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+         # FIXME: insert proper C++ library support
+         _LT_TAGVAR(ld_shlibs, $1)=no
+         ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+       case $GXX,$cc_basename in
+       ,cl* | no,cl*)
+         # Native MSVC
+         # hardcode_libdir_flag_spec is actually meaningless, as there is
+         # no search path for DLLs.
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+         _LT_TAGVAR(always_export_symbols, $1)=yes
+         _LT_TAGVAR(file_list_spec, $1)='@'
+         # Tell ltmain to make .lib files, not .a files.
+         libext=lib
+         # Tell ltmain to make .dll files, not .so files.
+         shrext_cmds=.dll
+         # FIXME: Setting linknames here is a bad hack.
+         _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+         _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+         # The linker will not automatically build a static lib if we build a DLL.
+         # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+         # Don't use ranlib
+         _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+         _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+         ;;
+       *)
+         # g++
+         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+         # as there is no search path for DLLs.
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+         _LT_TAGVAR(always_export_symbols, $1)=no
+         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+         if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+           # If the export-symbols file already is a .def file, use it as
+           # is; otherwise, prepend EXPORTS...
+           _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+         else
+           _LT_TAGVAR(ld_shlibs, $1)=no
+         fi
+         ;;
+       esac
+       ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+       ;;
+
+      os2*)
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       _LT_TAGVAR(hardcode_minus_L, $1)=yes
+       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+       shrext_cmds=.dll
+       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+         $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+         $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+         $ECHO EXPORTS >> $output_objdir/$libname.def~
+         emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+         $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+         emximp -o $lib $output_objdir/$libname.def'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+         $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+         $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+         $ECHO EXPORTS >> $output_objdir/$libname.def~
+         prefix_cmds="$SED"~
+         if test EXPORTS = "`$SED 1q $export_symbols`"; then
+           prefix_cmds="$prefix_cmds -e 1d";
+         fi~
+         prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+         cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+         $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+         emximp -o $lib $output_objdir/$libname.def'
+       _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          ghcx*)
+           # Green Hills C++ Compiler
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+       # switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+                                            # but as the default
+                                            # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+             _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+                                                # but as the default
+                                                # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          aCC*)
+           case $host_cpu in
+             hppa*64*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+             ia64*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+             *)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+               ;;
+           esac
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+           ;;
+          *)
+           if test yes = "$GXX"; then
+             if test no = "$with_gnu_ld"; then
+               case $host_cpu in
+                 hppa*64*)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+                 ia64*)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+                 *)
+                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+                   ;;
+               esac
+             fi
+           else
+             # FIXME: insert proper C++ library support
+             _LT_TAGVAR(ld_shlibs, $1)=no
+           fi
+           ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+       _LT_TAGVAR(hardcode_direct, $1)=no
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+       # Instead, shared libraries are loaded at an image base (0x10000000 by
+       # default) and relocated if they conflict, which is a slow very memory
+       # consuming and fragmenting process.  To avoid this, we pick a random,
+       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+           # SGI C++
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+           # Archives containing C++ object files must be created using
+           # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+           # necessary to make sure instantiated templates are included
+           # in the archive.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+           ;;
+          *)
+           if test yes = "$GXX"; then
+             if test no = "$with_gnu_ld"; then
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+             else
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+             fi
+           fi
+           _LT_TAGVAR(link_all_deplibs, $1)=yes
+           ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+           # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+           # KCC will only create a shared library if the output file
+           # ends with ".so" (or ".sl" for HP-UX), so rename the library
+           # to its proper name (with version) after linking.
+           _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+           # Archives containing C++ object files must be created using
+           # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+           ;;
+         icpc* | ecpc* )
+           # Intel C++
+           with_gnu_ld=yes
+           # version 8.0 and above of icpc choke on multiply defined symbols
+           # if we add $predep_objects and $postdep_objects, however 7.1 and
+           # earlier do not add the objects themselves.
+           case `$CC -V 2>&1` in
+             *"Version 7."*)
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+               ;;
+             *)  # Version 8.0 or newer
+               tmp_idyn=
+               case $host_cpu in
+                 ia64*) tmp_idyn=' -i_dynamic';;
+               esac
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+               ;;
+           esac
+           _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+           ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+           case `$CC -V` in
+           *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+             _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+             _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+             _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+             ;;
+           *) # Version 6 and above use weak symbols
+             _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+             ;;
+           esac
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+           _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+         cxx*)
+           # Compaq C++
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+           runpath_var=LD_RUN_PATH
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+           ;;
+         xl* | mpixl* | bgxl*)
+           # IBM XL 8.0 on PPC, with GNU ld
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+           if test yes = "$supports_anon_versioning"; then
+             _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+           fi
+           ;;
+         *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+             _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+             _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+             _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+             # Not sure whether something based on
+             # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+             # would be better.
+             output_verbose_link_cmd='func_echo_all'
+
+             # Archives containing C++ object files must be created using
+             # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+             # necessary to make sure instantiated templates are included
+             # in the archive.
+             _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+             ;;
+           esac
+           ;;
+       esac
+       ;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+         *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+       esac
+       ;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+         _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+         wlarc=
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+         _LT_TAGVAR(hardcode_direct, $1)=yes
+         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       fi
+       # Workaround some broken pre-1.5 toolchains
+       output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+       ;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+       ;;
+
+      openbsd* | bitrig*)
+       if test -f /usr/libexec/ld.so; then
+         _LT_TAGVAR(hardcode_direct, $1)=yes
+         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+         if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+           _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+           _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+         fi
+         output_verbose_link_cmd=func_echo_all
+       else
+         _LT_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+           # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+           # KCC will only create a shared library if the output file
+           # ends with ".so" (or ".sl" for HP-UX), so rename the library
+           # to its proper name (with version) after linking.
+           _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+           # Archives containing C++ object files must be created using
+           # the KAI C++ compiler.
+           case $host in
+             osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+             *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+           esac
+           ;;
+          RCC*)
+           # Rational C++ 2.4.1
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          cxx*)
+           case $host in
+             osf3*)
+               _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+               ;;
+             *)
+               _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+               ;;
+           esac
+
+           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+           # Commands to make compiler produce verbose output that lists
+           # what "hidden" libraries, object files and flags are used when
+           # linking a shared library.
+           #
+           # There doesn't appear to be a way to prevent this compiler from
+           # explicitly linking system object files so we need to strip them
+           # from the output so that they don't get included in the library
+           # dependencies.
+           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+           ;;
+         *)
+           if test yes,no = "$GXX,$with_gnu_ld"; then
+             _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+             case $host in
+               osf3*)
+                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+                 ;;
+               *)
+                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+                 ;;
+             esac
+
+             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+             _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+             # Commands to make compiler produce verbose output that lists
+             # what "hidden" libraries, object files and flags are used when
+             # linking a shared library.
+             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+
+           else
+             # FIXME: insert proper C++ library support
+             _LT_TAGVAR(ld_shlibs, $1)=no
+           fi
+           ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+           # Sun C++ 4.x
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          lcc*)
+           # Lucid
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+           # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+           _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+           _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+           case $host_os in
+             solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+             *)
+               # The compiler driver will combine and reorder linker options,
+               # but understands '-z linker_flag'.
+               # Supported since Solaris 2.6 (maybe 2.5.1?)
+               _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+               ;;
+           esac
+           _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+           output_verbose_link_cmd='func_echo_all'
+
+           # Archives containing C++ object files must be created using
+           # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+           # necessary to make sure instantiated templates are included
+           # in the archive.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+           ;;
+          gcx*)
+           # Green Hills C++ Compiler
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+           # The C++ compiler must be used to create the archive.
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+           ;;
+          *)
+           # GNU C++ compiler with Solaris linker
+           if test yes,no = "$GXX,$with_gnu_ld"; then
+             _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+             if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+               # Commands to make compiler produce verbose output that lists
+               # what "hidden" libraries, object files and flags are used when
+               # linking a shared library.
+               output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+             else
+               # g++ 2.7 appears to require '-G' NOT '-shared' on this
+               # platform.
+               _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+               _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+               # Commands to make compiler produce verbose output that lists
+               # what "hidden" libraries, object files and flags are used when
+               # linking a shared library.
+               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
+             fi
+
+             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+             case $host_os in
+               solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+               *)
+                 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+                 ;;
+             esac
+           fi
+           ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+       # Note: We CANNOT use -z defs as we might desire, because we do not
+       # link with -lc, and that would cause any symbols used from libc to
+       # always be unresolved, which means just about no library would
+       # ever link correctly.  If we're not using GNU ld we use -z text
+       # though, which does catch some bad symbols but isn't as heavy-handed
+       # as -z defs.
+       _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+       _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+       _LT_TAGVAR(link_all_deplibs, $1)=yes
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+       runpath_var='LD_RUN_PATH'
+
+       case $cc_basename in
+          CC*)
+           _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+           _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+           ;;
+         *)
+           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+           ;;
+       esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+           # NonStop-UX NCC 3.20
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+          *)
+           # FIXME: insert proper C++ library support
+           _LT_TAGVAR(ld_shlibs, $1)=no
+           ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+        prev=$p
+        continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+        case $prev in
+        -L | -R)
+          # Internal compiler library paths should come after those
+          # provided the user.  The postdeps already come after the
+          # user supplied libs so there is no need to process them.
+          if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+            _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+          else
+            _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+          fi
+          ;;
+        # The "-l" case would never come before the object being
+        # linked, so don't bother handling this case.
+        esac
+       else
+        if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+          _LT_TAGVAR(postdeps, $1)=$prev$p
+        else
+          _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+        fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+        pre_test_object_deps_done=yes
+        continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+        if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+          _LT_TAGVAR(predep_objects, $1)=$p
+        else
+          _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+        fi
+       else
+        if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+          _LT_TAGVAR(postdep_objects, $1)=$p
+        else
+          _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+        fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+       if test ia64 != "$host_cpu"; then
+         case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+         yes,aix,yes) ;;               # shared object as lib.so file only
+         yes,svr4,*) ;;                # shared object as lib.so archive member only
+         yes,*) enable_static=no ;;    # shared object in lib.a archive as well
+         esac
+       fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+       if test ia64 != "$host_cpu"; then
+         case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+         yes,aix,yes) ;;               # shared object as lib.so file only
+         yes,svr4,*) ;;                # shared object as lib.so archive member only
+         yes,*) enable_static=no ;;    # shared object in lib.a archive as well
+         esac
+       fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
new file mode 100644 (file)
index 0000000..d11f1e0
--- /dev/null
@@ -0,0 +1,11249 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+##               by inline-source v2014-01-03.01
+
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.6 Debian-2.4.6-11"
+package_revision=2.4.6
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
+fi
+
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test set = \"\${$_G_var+set}\"; then
+          save_$_G_var=\$$_G_var
+          $_G_var=C
+         export $_G_var
+         _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+         _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
+       fi"
+done
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp       $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+    test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+    _G_progs_list=$1
+    _G_check_func=$2
+    _G_PATH=${3-"$PATH"}
+
+    _G_path_prog_max=0
+    _G_path_prog_found=false
+    _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+    for _G_dir in $_G_PATH; do
+      IFS=$_G_save_IFS
+      test -z "$_G_dir" && _G_dir=.
+      for _G_prog_name in $_G_progs_list; do
+        for _exeext in '' .EXE; do
+          _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+          func_executable_p "$_G_path_prog" || continue
+          case `"$_G_path_prog" --version 2>&1` in
+            *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+            *)     $_G_check_func $_G_path_prog
+                  func_path_progs_result=$func_check_prog_result
+                  ;;
+          esac
+          $_G_path_prog_found && break 3
+        done
+      done
+    done
+    IFS=$_G_save_IFS
+    test -z "$func_path_progs_result" && {
+      echo "no acceptable sed could be found in \$PATH" >&2
+      exit 1
+    }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+  _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+  for _G_i in 1 2 3 4 5 6 7; do
+    _G_sed_script=$_G_sed_script$nl$_G_sed_script
+  done
+  echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+  _G_sed_script=
+
+  func_check_prog_sed ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo '' >> conftest.nl
+      "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+  rm -f conftest.sed
+  SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+  func_check_prog_grep ()
+  {
+    _G_path_prog=$1
+
+    _G_count=0
+    _G_path_prog_max=0
+    printf 0123456789 >conftest.in
+    while :
+    do
+      cat conftest.in conftest.in >conftest.tmp
+      mv conftest.tmp conftest.in
+      cp conftest.in conftest.nl
+      echo 'GREP' >> conftest.nl
+      "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+      diff conftest.out conftest.nl >/dev/null 2>&1 || break
+      _G_count=`expr $_G_count + 1`
+      if test "$_G_count" -gt "$_G_path_prog_max"; then
+        # Best one so far, save it but keep looking for a better one
+        func_check_prog_result=$_G_path_prog
+        _G_path_prog_max=$_G_count
+      fi
+      # 10*(2^10) chars as input seems more than enough
+      test 10 -lt "$_G_count" && break
+    done
+    rm -f conftest.in conftest.tmp conftest.nl conftest.out
+  }
+
+  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+  GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables.  These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
+: ${CP="cp -f"}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+
+
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same.  If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion.  Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+  s/$_G_bs4/&\\
+/g
+  s/^$_G_bs2$_G_dollar/$_G_bs&/
+  s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+  s/\n//g"
+
+
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77     # $? = 77 is used to indicate a skipped test to automake.
+
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+#    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
+
+# By convention, finish your script with:
+#
+#    exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
+
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
+
+# Make sure we have an absolute progpath for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
+     progdir=`cd "$progdir" && pwd`
+     progpath=$progdir/$progname
+     ;;
+  *)
+     _G_IFS=$IFS
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS=$_G_IFS
+       test -x "$progdir/$progname" && break
+     done
+     IFS=$_G_IFS
+     test -n "$progdir" || progdir=`pwd`
+     progpath=$progdir/$progname
+     ;;
+esac
+
+
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
+
+opt_dry_run=false
+opt_quiet=false
+opt_verbose=false
+
+# Categories 'all' and 'none' are always available.  Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'.  Set
+# 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+    $debug_cmd
+
+    test -t 1 && {
+      # COLORTERM and USE_ANSI_COLORS environment variables take
+      # precedence, because most terminfo databases neglect to describe
+      # whether color sequences are supported.
+      test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+      if test 1 = "$USE_ANSI_COLORS"; then
+        # Standard ANSI escape sequences
+        tc_reset='\e[0m'
+        tc_bold='\e[1m';   tc_standout='\e[7m'
+        tc_red='\e[31m';   tc_green='\e[32m'
+        tc_blue='\e[34m';  tc_cyan='\e[36m'
+      else
+        # Otherwise trust the terminfo database after all.
+        test -n "`tput sgr0 2>/dev/null`" && {
+          tc_reset=`tput sgr0`
+          test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+          tc_standout=$tc_bold
+          test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+          test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+          test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+          test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+          test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+        }
+      fi
+    }
+
+    require_term_colors=:
+}
+
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+  # We should try to minimise forks, especially on Windows where they are
+  # unreasonably slow, so skip the feature probes when bash or zsh are
+  # being used:
+  if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+    : ${_G_HAVE_ARITH_OP="yes"}
+    : ${_G_HAVE_XSI_OPS="yes"}
+    # The += operator was introduced in bash 3.1
+    case $BASH_VERSION in
+      [12].* | 3.0 | 3.0*) ;;
+      *)
+        : ${_G_HAVE_PLUSEQ_OP="yes"}
+        ;;
+    esac
+  fi
+
+  # _G_HAVE_PLUSEQ_OP
+  # Can be empty, in which case the shell is probed, "yes" if += is
+  # useable or anything else if it does not work.
+  test -z "$_G_HAVE_PLUSEQ_OP" \
+    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+    && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_append ()
+  {
+    $debug_cmd
+
+    eval "$1+=\$2"
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_append ()
+  {
+    $debug_cmd
+
+    eval "$1=\$$1\$2"
+  }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+  eval 'func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1+=\\ \$func_quote_for_eval_result"
+  }'
+else
+  func_append_quoted ()
+  {
+    $debug_cmd
+
+    func_quote_for_eval "$2"
+    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+  }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE.  For example:
+#
+#   func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+    $debug_cmd
+
+    eval _G_current_value='`$ECHO $'$1'`'
+    _G_delim=`expr "$2" : '\(.\)'`
+
+    case $_G_delim$_G_current_value$_G_delim in
+      *"$2$_G_delim"*) ;;
+      *) func_append "$@" ;;
+    esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+  test -z "$_G_HAVE_ARITH_OP" \
+    && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+    && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+  eval 'func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=$(( $* ))
+  }'
+else
+  func_arith ()
+  {
+    $debug_cmd
+
+    func_arith_result=`expr "$@"`
+  }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  # If this shell supports suffix pattern removal, then use it to avoid
+  # forking. Hide the definitions single quotes in case the shell chokes
+  # on unsupported syntax...
+  _b='func_basename_result=${1##*/}'
+  _d='case $1 in
+        */*) func_dirname_result=${1%/*}$2 ;;
+        *  ) func_dirname_result=$3        ;;
+      esac'
+
+else
+  # ...otherwise fall back to using sed.
+  _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+  _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
+      if test "X$func_dirname_result" = "X$1"; then
+        func_dirname_result=$3
+      else
+        func_append func_dirname_result "$2"
+      fi'
+fi
+
+eval 'func_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+    $debug_cmd
+
+    '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+    $debug_cmd
+
+    '"$_b"'
+    '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    _G_infix=$1; shift
+    _G_indent=$_G_infix
+    _G_prefix="$progname: $_G_infix: "
+    _G_message=$*
+
+    # Strip color escape sequences before counting printable length
+    for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+    do
+      test -n "$_G_tc" && {
+        _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+        _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+      }
+    done
+    _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
+
+    func_echo_infix_1_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_infix_1_IFS
+      $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+      _G_prefix=$_G_indent
+    done
+    IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    $debug_cmd
+
+    func_error "$*"
+    exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $debug_cmd
+
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+  test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=${#1}
+  }'
+else
+  func_len ()
+  {
+    $debug_cmd
+
+    func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+  }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    $debug_cmd
+
+    _G_directory_path=$1
+    _G_dir_list=
+
+    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+      # Protect directory names starting with '-'
+      case $_G_directory_path in
+        -*) _G_directory_path=./$_G_directory_path ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$_G_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+       # list incase some portion of path contains whitespace.
+        _G_dir_list=$_G_directory_path:$_G_dir_list
+
+        # If the last portion added has no slash in it, the list is done
+        case $_G_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
+      done
+      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
+
+      func_mkdir_p_IFS=$IFS; IFS=:
+      for _G_dir in $_G_dir_list; do
+       IFS=$func_mkdir_p_IFS
+        # mkdir can fail with a 'File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$_G_dir" 2>/dev/null || :
+      done
+      IFS=$func_mkdir_p_IFS
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$_G_directory_path" || \
+        func_fatal_error "Failed to create '$1'"
+    fi
+}
+
+
+# func_mktempdir [BASENAME]
+# -------------------------
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, BASENAME is the basename for that directory.
+func_mktempdir ()
+{
+    $debug_cmd
+
+    _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+    if test : = "$opt_dry_run"; then
+      # Return a directory name, but don't create it in dry-run mode
+      _G_tmpdir=$_G_template-$$
+    else
+
+      # If mktemp works, use that first and foremost
+      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$_G_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        _G_tmpdir=$_G_template-${RANDOM-0}$$
+
+        func_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$_G_tmpdir"
+        umask $func_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$_G_tmpdir" || \
+        func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+    fi
+
+    $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+    $debug_cmd
+
+    # These SED scripts presuppose an absolute path with a trailing slash.
+    _G_pathcar='s|^/\([^/]*\).*$|\1|'
+    _G_pathcdr='s|^/[^/]*||'
+    _G_removedotparts=':dotsl
+               s|/\./|/|g
+               t dotsl
+               s|/\.$|/|'
+    _G_collapseslashes='s|/\{1,\}|/|g'
+    _G_finalslash='s|/*$|/|'
+
+    # Start from root dir and reassemble the path.
+    func_normal_abspath_result=
+    func_normal_abspath_tpath=$1
+    func_normal_abspath_altnamespace=
+    case $func_normal_abspath_tpath in
+      "")
+        # Empty path, that just means $cwd.
+        func_stripname '' '/' "`pwd`"
+        func_normal_abspath_result=$func_stripname_result
+        return
+        ;;
+      # The next three entries are used to spot a run of precisely
+      # two leading slashes without using negated character classes;
+      # we take advantage of case's first-match behaviour.
+      ///*)
+        # Unusual form of absolute path, do nothing.
+        ;;
+      //*)
+        # Not necessarily an ordinary path; POSIX reserves leading '//'
+        # and for example Cygwin uses it to access remote file shares
+        # over CIFS/SMB, so we conserve a leading double slash if found.
+        func_normal_abspath_altnamespace=/
+        ;;
+      /*)
+        # Absolute path, do nothing.
+        ;;
+      *)
+        # Relative path, prepend $cwd.
+        func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+        ;;
+    esac
+
+    # Cancel out all the simple stuff to save iterations.  We also want
+    # the path to end with a slash for ease of parsing, so make sure
+    # there is one (and only one) here.
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+    while :; do
+      # Processed it all yet?
+      if test / = "$func_normal_abspath_tpath"; then
+        # If we ascended to the root using ".." the result may be empty now.
+        if test -z "$func_normal_abspath_result"; then
+          func_normal_abspath_result=/
+        fi
+        break
+      fi
+      func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcar"`
+      func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+          -e "$_G_pathcdr"`
+      # Figure out what to do with it
+      case $func_normal_abspath_tcomponent in
+        "")
+          # Trailing empty path component, ignore it.
+          ;;
+        ..)
+          # Parent dir; strip last assembled component from result.
+          func_dirname "$func_normal_abspath_result"
+          func_normal_abspath_result=$func_dirname_result
+          ;;
+        *)
+          # Actual path component, append it.
+          func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+          ;;
+      esac
+    done
+    # Restore leading double-slash if one was found on entry.
+    func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+    $debug_cmd
+
+    $opt_quiet || func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+    $debug_cmd
+
+    func_relative_path_result=
+    func_normal_abspath "$1"
+    func_relative_path_tlibdir=$func_normal_abspath_result
+    func_normal_abspath "$2"
+    func_relative_path_tbindir=$func_normal_abspath_result
+
+    # Ascend the tree starting from libdir
+    while :; do
+      # check if we have found a prefix of bindir
+      case $func_relative_path_tbindir in
+        $func_relative_path_tlibdir)
+          # found an exact match
+          func_relative_path_tcancelled=
+          break
+          ;;
+        $func_relative_path_tlibdir*)
+          # found a matching prefix
+          func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+          func_relative_path_tcancelled=$func_stripname_result
+          if test -z "$func_relative_path_result"; then
+            func_relative_path_result=.
+          fi
+          break
+          ;;
+        *)
+          func_dirname $func_relative_path_tlibdir
+          func_relative_path_tlibdir=$func_dirname_result
+          if test -z "$func_relative_path_tlibdir"; then
+            # Have to descend all the way to the root!
+            func_relative_path_result=../$func_relative_path_result
+            func_relative_path_tcancelled=$func_relative_path_tbindir
+            break
+          fi
+          func_relative_path_result=../$func_relative_path_result
+          ;;
+      esac
+    done
+
+    # Now calculate path; take care to avoid doubling-up slashes.
+    func_stripname '' '/' "$func_relative_path_result"
+    func_relative_path_result=$func_stripname_result
+    func_stripname '/' '/' "$func_relative_path_tcancelled"
+    if test -n "$func_stripname_result"; then
+      func_append func_relative_path_result "/$func_stripname_result"
+    fi
+
+    # Normalisation. If bindir is libdir, return '.' else relative path.
+    if test -n "$func_relative_path_result"; then
+      func_stripname './' '' "$func_relative_path_result"
+      func_relative_path_result=$func_stripname_result
+    fi
+
+    test -n "$func_relative_path_result" || func_relative_path_result=.
+
+    :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+#   i) func_quote_for_eval_result
+#      double-quoted, suitable for a subsequent eval
+#  ii) func_quote_for_eval_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.
+func_quote_for_eval ()
+{
+    $debug_cmd
+
+    func_quote_for_eval_unquoted_result=
+    func_quote_for_eval_result=
+    while test 0 -lt $#; do
+      case $1 in
+        *[\\\`\"\$]*)
+         _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+        *)
+          _G_unquoted_arg=$1 ;;
+      esac
+      if test -n "$func_quote_for_eval_unquoted_result"; then
+       func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+      else
+        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+      fi
+
+      case $_G_unquoted_arg in
+        # Double-quote args containing shell metacharacters to delay
+        # word splitting, command substitution and variable expansion
+        # for a subsequent eval.
+        # Many Bourne shells cannot handle close brackets correctly
+        # in scan sets, so we specify it separately.
+        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \  ]*|*]*|"")
+          _G_quoted_arg=\"$_G_unquoted_arg\"
+          ;;
+        *)
+          _G_quoted_arg=$_G_unquoted_arg
+         ;;
+      esac
+
+      if test -n "$func_quote_for_eval_result"; then
+       func_append func_quote_for_eval_result " $_G_quoted_arg"
+      else
+        func_append func_quote_for_eval_result "$_G_quoted_arg"
+      fi
+      shift
+    done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    $debug_cmd
+
+    case $1 in
+      *[\\\`\"]*)
+       _G_arg=`$ECHO "$1" | $SED \
+           -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        _G_arg=$1 ;;
+    esac
+
+    case $_G_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
+        _G_arg=\"$_G_arg\"
+        ;;
+    esac
+
+    func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_stripname ()
+  {
+    $debug_cmd
+
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary variable first.
+    func_stripname_result=$3
+    func_stripname_result=${func_stripname_result#"$1"}
+    func_stripname_result=${func_stripname_result%"$2"}
+  }'
+else
+  func_stripname ()
+  {
+    $debug_cmd
+
+    case $2 in
+      .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+      *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+    esac
+  }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    func_quote_for_expand "$_G_cmd"
+    eval "func_notquiet $func_quote_for_expand_result"
+
+    $opt_dry_run || {
+      eval "$_G_cmd"
+      _G_status=$?
+      if test 0 -ne "$_G_status"; then
+       eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    $debug_cmd
+
+    _G_cmd=$1
+    _G_fail_exp=${2-':'}
+
+    $opt_quiet || {
+      func_quote_for_expand "$_G_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    $opt_dry_run || {
+      eval "$_G_user_locale
+           $_G_cmd"
+      _G_status=$?
+      eval "$_G_safe_locale"
+      if test 0 -ne "$_G_status"; then
+       eval "(exit $_G_status); $_G_fail_exp"
+      fi
+    }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+    $debug_cmd
+
+    case $1 in
+    [0-9]* | *[!a-zA-Z0-9_]*)
+      func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+      ;;
+    * )
+      func_tr_sh_result=$1
+      ;;
+    esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $debug_cmd
+
+    $opt_verbose && func_echo "$*"
+
+    :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+    $debug_cmd
+
+    $require_term_colors
+
+    func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+    $debug_cmd
+
+    # CATEGORY must be in the warning_categories list!
+    case " $warning_categories " in
+      *" $1 "*) ;;
+      *) func_internal_error "invalid warning category '$1'" ;;
+    esac
+
+    _G_category=$1
+    shift
+
+    case " $opt_warning_types " in
+      *" $_G_category "*) $warning_func ${1+"$@"} ;;
+    esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+    $debug_cmd
+
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false.  Use it like this:
+#
+#  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+    $debug_cmd
+
+    test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2015-10-07.11; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+#   #!/bin/sh
+#   . relative/path/to/funclib.sh
+#   . relative/path/to/options-parser
+#   scriptversion=1.0
+#   func_options ${1+"$@"}
+#   eval set dummy "$func_options_result"; shift
+#   ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'.  Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+       --debug        enable verbose shell tracing
+   -W, --warnings=CATEGORY
+                      report the warnings falling in CATEGORY [all]
+   -v, --verbose      verbosely report processing
+       --version      print version information and exit
+   -h, --help         print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+       'all'          show all warnings
+       'none'         turn off all the warnings
+       'error'        warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code.  A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+    $debug_cmd
+
+    func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+    $debug_cmd
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not accept hook functions." ;;
+    esac
+
+    eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+    $debug_cmd
+
+    eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+    $debug_cmd
+
+    _G_rc_run_hooks=false
+
+    case " $hookable_fns " in
+      *" $1 "*) ;;
+      *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+    esac
+
+    eval _G_hook_fns=\$$1_hooks; shift
+
+    for _G_hook in $_G_hook_fns; do
+      if eval $_G_hook '"$@"'; then
+        # store returned options list back into positional
+        # parameters for next 'cmd' execution.
+        eval _G_hook_result=\$${_G_hook}_result
+        eval set dummy "$_G_hook_result"; shift
+        _G_rc_run_hooks=:
+      fi
+    done
+
+    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, you may remove/edit
+# any options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
+# hook's caller know that it should pay attention to
+# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
+# arguments are left untouched by the hook and therefore caller will ignore the
+# result variable.
+#
+# Like this:
+#
+#    my_options_prep ()
+#    {
+#        $debug_cmd
+#
+#        # Extend the existing usage message.
+#        usage_message=$usage_message'
+#      -s, --silent       don'\''t print informational messages
+#    '
+#        # No change in '$@' (ignored completely by this hook).  There is
+#        # no need to do the equivalent (but slower) action:
+#        # func_quote_for_eval ${1+"$@"}
+#        # my_options_prep_result=$func_quote_for_eval_result
+#        false
+#    }
+#    func_add_hook func_options_prep my_options_prep
+#
+#
+#    my_silent_option ()
+#    {
+#        $debug_cmd
+#
+#        args_changed=false
+#
+#        # Note that for efficiency, we parse as many options as we can
+#        # recognise in a loop before passing the remainder back to the
+#        # caller on the first unrecognised argument we encounter.
+#        while test $# -gt 0; do
+#          opt=$1; shift
+#          case $opt in
+#            --silent|-s) opt_silent=:
+#                         args_changed=:
+#                         ;;
+#            # Separate non-argument short options:
+#            -s*)         func_split_short_opt "$_G_opt"
+#                         set dummy "$func_split_short_opt_name" \
+#                             "-$func_split_short_opt_arg" ${1+"$@"}
+#                         shift
+#                         args_changed=:
+#                         ;;
+#            *)           # Make sure the first unrecognised option "$_G_opt"
+#                         # is added back to "$@", we could need that later
+#                         # if $args_changed is true.
+#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+#          esac
+#        done
+#
+#        if $args_changed; then
+#          func_quote_for_eval ${1+"$@"}
+#          my_silent_option_result=$func_quote_for_eval_result
+#        fi
+#
+#        $args_changed
+#    }
+#    func_add_hook func_parse_options my_silent_option
+#
+#
+#    my_option_validation ()
+#    {
+#        $debug_cmd
+#
+#        $opt_silent && $opt_verbose && func_fatal_help "\
+#    '--silent' and '--verbose' options are mutually exclusive."
+#
+#        false
+#    }
+#    func_add_hook func_validate_options my_option_validation
+#
+# You'll also need to manually amend $usage_message to reflect the extra
+# options you parse.  It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options_finish [ARG]...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+    $debug_cmd
+
+    _G_func_options_finish_exit=false
+    if func_run_hooks func_options ${1+"$@"}; then
+      func_options_finish_result=$func_run_hooks_result
+      _G_func_options_finish_exit=:
+    fi
+
+    $_G_func_options_finish_exit
+}
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+    $debug_cmd
+
+    _G_rc_options=false
+
+    for my_func in options_prep parse_options validate_options options_finish
+    do
+      if eval func_$my_func '${1+"$@"}'; then
+        eval _G_res_var='$'"func_${my_func}_result"
+        eval set dummy "$_G_res_var" ; shift
+        _G_rc_options=:
+      fi
+    done
+
+    # Save modified positional parameters for caller.  As a top-level
+    # options-parser function we always need to set the 'func_options_result'
+    # variable (regardless the $_G_rc_options value).
+    if $_G_rc_options; then
+      func_options_result=$_G_res_var
+    else
+      func_quote_for_eval ${1+"$@"}
+      func_options_result=$func_quote_for_eval_result
+    fi
+
+    $_G_rc_options
+}
+
+
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters.  If a hook function modifies that list, and
+# needs to propagate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
+func_hookable func_options_prep
+func_options_prep ()
+{
+    $debug_cmd
+
+    # Option defaults:
+    opt_verbose=false
+    opt_warning_types=
+
+    _G_rc_options_prep=false
+    if func_run_hooks func_options_prep ${1+"$@"}; then
+      _G_rc_options_prep=:
+      # save modified positional parameters for caller
+      func_options_prep_result=$func_run_hooks_result
+    fi
+
+    $_G_rc_options_prep
+}
+
+
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+    $debug_cmd
+
+    func_parse_options_result=
+
+    _G_rc_parse_options=false
+    # this just eases exit handling
+    while test $# -gt 0; do
+      # Defer to hook functions for initial option parsing, so they
+      # get priority in the event of reusing an option name.
+      if func_run_hooks func_parse_options ${1+"$@"}; then
+        eval set dummy "$func_run_hooks_result"; shift
+        _G_rc_parse_options=:
+      fi
+
+      # Break out of the loop if we already parsed every option.
+      test $# -gt 0 || break
+
+      _G_match_parse_options=:
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --debug|-x)   debug_cmd='set -x'
+                      func_echo "enabling shell trace mode"
+                      $debug_cmd
+                      ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                      set dummy --warnings none ${1+"$@"}
+                      shift
+                     ;;
+
+        --warnings|--warning|-W)
+                      if test $# = 0 && func_missing_arg $_G_opt; then
+                        _G_rc_parse_options=:
+                        break
+                      fi
+                      case " $warning_categories $1" in
+                        *" $1 "*)
+                          # trailing space prevents matching last $1 above
+                          func_append_uniq opt_warning_types " $1"
+                          ;;
+                        *all)
+                          opt_warning_types=$warning_categories
+                          ;;
+                        *none)
+                          opt_warning_types=none
+                          warning_func=:
+                          ;;
+                        *error)
+                          opt_warning_types=$warning_categories
+                          warning_func=func_fatal_error
+                          ;;
+                        *)
+                          func_fatal_error \
+                             "unsupported warning category: '$1'"
+                          ;;
+                      esac
+                      shift
+                      ;;
+
+        --verbose|-v) opt_verbose=: ;;
+        --version)    func_version ;;
+        -\?|-h)       func_usage ;;
+        --help)       func_help ;;
+
+       # Separate optargs to long options (plugins may need this):
+       --*=*)        func_split_equals "$_G_opt"
+                     set dummy "$func_split_equals_lhs" \
+                          "$func_split_equals_rhs" ${1+"$@"}
+                      shift
+                      ;;
+
+       # Separate optargs to short options:
+        -W*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        # Separate non-argument short options:
+        -\?*|-h*|-v*|-x*)
+                      func_split_short_opt "$_G_opt"
+                      set dummy "$func_split_short_opt_name" \
+                          "-$func_split_short_opt_arg" ${1+"$@"}
+                      shift
+                      ;;
+
+        --)           _G_rc_parse_options=: ; break ;;
+        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift
+                      _G_match_parse_options=false
+                      break
+                      ;;
+      esac
+
+      $_G_match_parse_options && _G_rc_parse_options=:
+    done
+
+
+    if $_G_rc_parse_options; then
+      # save modified positional parameters for caller
+      func_quote_for_eval ${1+"$@"}
+      func_parse_options_result=$func_quote_for_eval_result
+    fi
+
+    $_G_rc_parse_options
+}
+
+
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+    $debug_cmd
+
+    _G_rc_validate_options=false
+
+    # Display all warnings if -W was not given.
+    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+    if func_run_hooks func_validate_options ${1+"$@"}; then
+      # save modified positional parameters for caller
+      func_validate_options_result=$func_run_hooks_result
+      _G_rc_validate_options=:
+    fi
+
+    # Bail if the options were screwed!
+    $exit_cmd $EXIT_FAILURE
+
+    $_G_rc_validate_options
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    eval \$ECHO \""$fatal_help"\"
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message"
+    exit 0
+}
+
+
+# func_missing_arg ARGNAME
+# ------------------------
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $debug_cmd
+
+    func_error "Missing argument for '$1'."
+    exit_cmd=exit
+}
+
+
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+    && (eval 'x=a/b/c;
+      test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+    && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=${1%%=*}
+      func_split_equals_rhs=${1#*=}
+      test "x$func_split_equals_lhs" = "x$1" \
+        && func_split_equals_rhs=
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_equals ()
+  {
+      $debug_cmd
+
+      func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+      func_split_equals_rhs=
+      test "x$func_split_equals_lhs" = "x$1" \
+        || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+  }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+  # This is an XSI compatible shell, allowing a faster implementation...
+  eval 'func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_arg=${1#??}
+      func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+  }'
+else
+  # ...otherwise fall back to using expr, which is often a shell builtin.
+  func_split_short_opt ()
+  {
+      $debug_cmd
+
+      func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+      func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+  }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+    exit 0
+}
+
+
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
+{
+    $debug_cmd
+
+    eval \$ECHO \""Usage: $usage"\"
+    echo
+    $SED -n 's|^# ||
+        /^Written by/{
+          x;p;x
+        }
+       h
+       /^Written by/q' < "$progpath"
+    echo
+    eval \$ECHO \""$usage_message"\"
+}
+
+
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $debug_cmd
+
+    printf '%s\n' "$progname $scriptversion"
+    $SED -n '
+        /(C)/!b go
+        :more
+        /\./!{
+          N
+          s|\n# | |
+          b more
+        }
+        :go
+        /^# Written by /,/# warranty; / {
+          s|^# ||
+          s|^# *$||
+          s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+          p
+        }
+        /^# Written by / {
+          s|^# ||
+          p
+        }
+        /^warranty; /q' < "$progpath"
+
+    exit $?
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
+
+
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
+{
+    $debug_cmd
+
+    _G_message=$*
+
+    func_echo_IFS=$IFS
+    IFS=$nl
+    for _G_line in $_G_message; do
+      IFS=$func_echo_IFS
+      $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+    done
+    IFS=$func_echo_IFS
+}
+
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
+{
+    $debug_cmd
+
+    $warning_func ${1+"$@"}
+}
+
+
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+       --config             show all configuration variables
+       --debug              enable verbose shell tracing
+   -n, --dry-run            display commands without modifying any files
+       --features           display basic configuration information and exit
+       --mode=MODE          use operation mode MODE
+       --no-warnings        equivalent to '-Wnone'
+       --preserve-dup-deps  don't remove duplicate dependency libraries
+       --quiet, --silent    don't print informational messages
+       --tag=TAG            use configuration variables from tag TAG
+   -v, --verbose            print more informational messages than default
+       --version            print version information
+   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
+   -h, --help, --help-all   print short, long, or detailed help message
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
+{
+    $debug_cmd
+
+    func_usage_message
+    $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+       clean           remove files from the build directory
+       compile         compile a source file into a libtool object
+       execute         automatically set library path, then run a program
+       finish          complete the installation of libtool libraries
+       install         install libraries or executables
+       link            create a library or an executable
+       uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+       host-triplet:   $host
+       shell:          $SHELL
+       compiler:       $LTCC
+       compiler flags: $LTCFLAGS
+       linker:         $LD (gnu? $with_gnu_ld)
+       version:        $progname $scriptversion Debian-2.4.6-11
+       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+    exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+  eval 'func_lo2o ()
+  {
+    case $1 in
+      *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+      *   ) func_lo2o_result=$1               ;;
+    esac
+  }'
+
+  # func_xform LIBOBJ-OR-SOURCE
+  # ---------------------------
+  # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+  # suffix to a '.lo' libtool-object suffix.
+  eval 'func_xform ()
+  {
+    func_xform_result=${1%.*}.lo
+  }'
+else
+  # ...otherwise fall back to using sed.
+  func_lo2o ()
+  {
+    func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+  }
+
+  func_xform ()
+  {
+    func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+  }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func__fatal_error ${1+"$@"} \
+      "See the $PACKAGE documentation for more information." \
+      "Fatal configuration error."
+}
+
+
+# func_config
+# -----------
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+
+# func_features
+# -------------
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test yes = "$build_libtool_libs"; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test yes = "$build_old_libs"; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+
+# func_enable_tag TAGNAME
+# -----------------------
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+    # Global variable:
+    tagname=$1
+
+    re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+    re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+    sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+    # Validate tagname.
+    case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+        func_fatal_error "invalid tag name: $tagname"
+        ;;
+    esac
+
+    # Don't test for the "default" C tag, as we know it's
+    # there but not specially marked.
+    case $tagname in
+        CC) ;;
+    *)
+        if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+         taglist="$taglist $tagname"
+
+         # Evaluate the configuration.  Be careful to quote the path
+         # and the sed script, to avoid splitting on whitespace, but
+         # also don't use non-portable quotes within backquotes within
+         # quotes we have to do it in 2 steps:
+         extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+         eval "$extractedcf"
+        else
+         func_error "ignoring unknown tag $tagname"
+        fi
+        ;;
+    esac
+}
+
+
+# func_check_version_match
+# ------------------------
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+    if test "$package_revision" != "$macro_revision"; then
+      if test "$VERSION" != "$macro_version"; then
+        if test -z "$macro_version"; then
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        else
+          cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+        fi
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+      fi
+
+      exit $EXIT_MISMATCH
+    fi
+}
+
+
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+    $debug_mode
+
+    # Option defaults:
+    opt_config=false
+    opt_dlopen=
+    opt_dry_run=false
+    opt_help=false
+    opt_mode=
+    opt_preserve_dup_deps=false
+    opt_quiet=false
+
+    nonopt=
+    preserve_args=
+
+    _G_rc_lt_options_prep=:
+
+    # Shorthand for --mode=foo, only valid as the first argument
+    case $1 in
+    clean|clea|cle|cl)
+      shift; set dummy --mode clean ${1+"$@"}; shift
+      ;;
+    compile|compil|compi|comp|com|co|c)
+      shift; set dummy --mode compile ${1+"$@"}; shift
+      ;;
+    execute|execut|execu|exec|exe|ex|e)
+      shift; set dummy --mode execute ${1+"$@"}; shift
+      ;;
+    finish|finis|fini|fin|fi|f)
+      shift; set dummy --mode finish ${1+"$@"}; shift
+      ;;
+    install|instal|insta|inst|ins|in|i)
+      shift; set dummy --mode install ${1+"$@"}; shift
+      ;;
+    link|lin|li|l)
+      shift; set dummy --mode link ${1+"$@"}; shift
+      ;;
+    uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+      shift; set dummy --mode uninstall ${1+"$@"}; shift
+      ;;
+    *)
+      _G_rc_lt_options_prep=false
+      ;;
+    esac
+
+    if $_G_rc_lt_options_prep; then
+      # Pass back the list of options.
+      func_quote_for_eval ${1+"$@"}
+      libtool_options_prep_result=$func_quote_for_eval_result
+    fi
+
+    $_G_rc_lt_options_prep
+}
+func_add_hook func_options_prep libtool_options_prep
+
+
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+    $debug_cmd
+
+    _G_rc_lt_parse_options=false
+
+    # Perform our own loop to consume as many options as possible in
+    # each iteration.
+    while test $# -gt 0; do
+      _G_match_lt_parse_options=:
+      _G_opt=$1
+      shift
+      case $_G_opt in
+        --dry-run|--dryrun|-n)
+                        opt_dry_run=:
+                        ;;
+
+        --config)       func_config ;;
+
+        --dlopen|-dlopen)
+                        opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+                        shift
+                        ;;
+
+        --preserve-dup-deps)
+                        opt_preserve_dup_deps=: ;;
+
+        --features)     func_features ;;
+
+        --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
+
+        --help)         opt_help=: ;;
+
+        --help-all)     opt_help=': help-all' ;;
+
+        --mode)         test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_mode=$1
+                        case $1 in
+                          # Valid mode arguments:
+                          clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+                          # Catch anything else as an error
+                          *) func_error "invalid argument for $_G_opt"
+                             exit_cmd=exit
+                             break
+                             ;;
+                        esac
+                        shift
+                        ;;
+
+        --no-silent|--no-quiet)
+                        opt_quiet=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-warnings|--no-warning|--no-warn)
+                        opt_warning=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --no-verbose)
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --silent|--quiet)
+                        opt_quiet=:
+                        opt_verbose=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        --tag)          test $# = 0 && func_missing_arg $_G_opt && break
+                        opt_tag=$1
+                        func_append preserve_args " $_G_opt $1"
+                        func_enable_tag "$1"
+                        shift
+                        ;;
+
+        --verbose|-v)   opt_quiet=false
+                        opt_verbose=:
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
+        # An option not handled by this hook function:
+        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
+                        _G_match_lt_parse_options=false
+                        break
+                        ;;
+      esac
+      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
+    done
+
+    if $_G_rc_lt_parse_options; then
+      # save modified positional parameters for caller
+      func_quote_for_eval ${1+"$@"}
+      libtool_parse_options_result=$func_quote_for_eval_result
+    fi
+
+    $_G_rc_lt_parse_options
+}
+func_add_hook func_parse_options libtool_parse_options
+
+
+
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+    # save first non-option argument
+    if test 0 -lt $#; then
+      nonopt=$1
+      shift
+    fi
+
+    # preserve --debug
+    test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+    case $host in
+      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+        # don't eliminate duplications in $postdeps and $predeps
+        opt_duplicate_compiler_generated_deps=:
+        ;;
+      *)
+        opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+        ;;
+    esac
+
+    $opt_help || {
+      # Sanity checks first:
+      func_check_version_match
+
+      test yes != "$build_libtool_libs" \
+        && test yes != "$build_old_libs" \
+        && func_fatal_configuration "not configured to build any kind of library"
+
+      # Darwin sucks
+      eval std_shrext=\"$shrext_cmds\"
+
+      # Only execute mode is allowed to have -dlopen flags.
+      if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+        func_error "unrecognized option '-dlopen'"
+        $ECHO "$help" 1>&2
+        exit $EXIT_FAILURE
+      fi
+
+      # Change the help message to a mode-specific one.
+      generic_help=$help
+      help="Try '$progname --help --mode=$opt_mode' for more information."
+    }
+
+    # Pass back the unparsed argument list
+    func_quote_for_eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_validate_options libtool_validate_options
+
+
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+  $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool '.la' library or '.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if 'file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+       for lalib_p_l in 1 2 3 4
+       do
+           read lalib_p_line
+           case $lalib_p_line in
+               \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+           esac
+       done
+       exec 0<&5 5<&-
+    fi
+    test yes = "$lalib_p"
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    test -f "$1" &&
+      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $debug_cmd
+
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$sp$nl
+      eval cmd=\"$cmd\"
+      IFS=$save_ifs
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# 'FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $debug_cmd
+
+    case $1 in
+    */* | *\\*)        . "$1" ;;
+    *)         . "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case $lt_sysroot:$1 in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result='='$func_stripname_result
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $debug_cmd
+
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+       func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+       for z in $available_tags; do
+         if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+           # Evaluate the configuration.
+           eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+           CC_quoted=
+           for arg in $CC; do
+             # Double-quote args containing other shell metacharacters.
+             func_append_quoted CC_quoted "$arg"
+           done
+           CC_expanded=`func_echo_all $CC`
+           CC_quoted_expanded=`func_echo_all $CC_quoted`
+           case "$@ " in
+           " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+           " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+             # The compiler in the base compile command matches
+             # the one in the tagged configuration.
+             # Assume this is the tagged configuration we want.
+             tagname=$z
+             break
+             ;;
+           esac
+         fi
+       done
+       # If $tagname still isn't set, then no tagged configuration
+       # was found and let the user know that the "--tag" command
+       # line option must be used.
+       if test -z "$tagname"; then
+         func_echo "unable to infer tagged configuration"
+         func_fatal_error "specify a tag with '--tag'"
+#      else
+#        func_verbose "using $tagname tagged configuration"
+       fi
+       ;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=$1
+    if test yes = "$build_libtool_libs"; then
+      write_lobj=\'$2\'
+    else
+      write_lobj=none
+    fi
+
+    if test yes = "$build_old_libs"; then
+      write_oldobj=\'$3\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "$write_libobj"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $debug_cmd
+
+  func_convert_core_file_wine_to_w32_result=$1
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $debug_cmd
+
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result"; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $debug_cmd
+
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $debug_cmd
+
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $debug_cmd
+
+  if test -z "$2" && test -n "$1"; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  '$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result=$1
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $debug_cmd
+
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  '$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result=$3
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $debug_cmd
+
+  case $4 in
+  $1 ) func_to_host_path_result=$3$func_to_host_path_result
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via '$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $debug_cmd
+
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $debug_cmd
+
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result=$1
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_file_result=$1
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result=$func_cygpath_result
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via '$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $debug_cmd
+
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd=func_convert_path_$func_stripname_result
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $debug_cmd
+
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result=$1
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $debug_cmd
+
+  func_to_host_path_result=$1
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result=$func_cygpath_result
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+  $debug_cmd
+
+  func_dll_def_p_tmp=`$SED -n \
+    -e 's/^[    ]*//' \
+    -e '/^\(;.*\)*$/d' \
+    -e 's/^\(EXPORTS\|LIBRARY\)\([      ].*\)*$/DEF/p' \
+    -e q \
+    "$1"`
+  test DEF = "$func_dll_def_p_tmp"
+}
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $debug_cmd
+
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+       # do not "continue".  Instead, add this to base_compile
+       lastarg=$arg
+       arg_mode=normal
+       ;;
+
+      target )
+       libobj=$arg
+       arg_mode=normal
+       continue
+       ;;
+
+      normal )
+       # Accept any command-line options.
+       case $arg in
+       -o)
+         test -n "$libobj" && \
+           func_fatal_error "you cannot specify '-o' more than once"
+         arg_mode=target
+         continue
+         ;;
+
+       -pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+         continue
+         ;;
+
+       -shared | -static | -prefer-pic | -prefer-non-pic)
+         func_append later " $arg"
+         continue
+         ;;
+
+       -no-suppress)
+         suppress_opt=no
+         continue
+         ;;
+
+       -Xcompiler)
+         arg_mode=arg  #  the next one goes into the "base_compile" arg list
+         continue      #  The current "srcfile" will either be retained or
+         ;;            #  replaced later.  I would guess that would be a bug.
+
+       -Wc,*)
+         func_stripname '-Wc,' '' "$arg"
+         args=$func_stripname_result
+         lastarg=
+         save_ifs=$IFS; IFS=,
+         for arg in $args; do
+           IFS=$save_ifs
+           func_append_quoted lastarg "$arg"
+         done
+         IFS=$save_ifs
+         func_stripname ' ' '' "$lastarg"
+         lastarg=$func_stripname_result
+
+         # Add the arguments to base_compile.
+         func_append base_compile " $lastarg"
+         continue
+         ;;
+
+       *)
+         # Accept the current argument as the source file.
+         # The previous "srcfile" becomes the current argument.
+         #
+         lastarg=$srcfile
+         srcfile=$arg
+         ;;
+       esac  #  case $arg
+       ;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with '-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+       func_basename "$srcfile"
+       libobj=$func_basename_result
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from '$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+       test yes = "$build_libtool_libs" \
+         || func_fatal_configuration "cannot build a shared library"
+       build_old_libs=no
+       continue
+       ;;
+
+      -static)
+       build_libtool_libs=no
+       build_old_libs=yes
+       continue
+       ;;
+
+      -prefer-pic)
+       pic_mode=yes
+       continue
+       ;;
+
+      -prefer-non-pic)
+       pic_mode=no
+       continue
+       ;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'   &()|`$[]' \
+      && func_warning "libobj name '$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname=$func_basename_result
+    xdir=$func_dirname_result
+    lobj=$xdir$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test yes = "$build_old_libs"; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test no = "$compiler_c_o"; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+      lockfile=$output_obj.lock
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test yes = "$need_locks"; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+       func_echo "Waiting for $lockfile to be removed"
+       sleep 2
+      done
+    elif test warn = "$need_locks"; then
+      if test -f "$lockfile"; then
+       $ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+       $opt_dry_run || $RM $removelist
+       exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test yes = "$build_libtool_libs"; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test no != "$pic_mode"; then
+       command="$base_compile $qsrcfile $pic_flag"
+      else
+       # Don't build PIC code
+       command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+       # Place PIC objects in $objdir
+       func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command" \
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+       $ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+       $opt_dry_run || $RM $removelist
+       exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+       func_show_eval '$MV "$output_obj" "$lobj"' \
+         'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test yes = "$suppress_opt"; then
+       suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test yes = "$build_old_libs"; then
+      if test yes != "$pic_mode"; then
+       # Don't build PIC code
+       command="$base_compile $qsrcfile$pie_flag"
+      else
+       command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test yes = "$compiler_c_o"; then
+       func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test warn = "$need_locks" &&
+        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+       $ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support '-c' and '-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+       $opt_dry_run || $RM $removelist
+       exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+       func_show_eval '$MV "$output_obj" "$obj"' \
+         'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test no != "$need_locks"; then
+       removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a '.o' file suitable for static linking
+  -static           only build a '.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to '-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the '--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the 'install' or 'cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  use a list of object files found in FILE to specify objects
+  -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with '-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in '.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
+
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode '$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try '$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test : = "$opt_help"; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+       func_mode_help
+      done
+    } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+       echo
+       func_mode_help
+      done
+    } |
+    $SED '1d
+      /^When reporting/,/^Report/{
+       H
+       d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $debug_cmd
+
+    # The first argument is the command name.
+    cmd=$nonopt
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+       || func_fatal_help "'$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+       func_resolve_sysroot "$file"
+       file=$func_resolve_sysroot_result
+
+       # Check to see that this really is a libtool archive.
+       func_lalib_unsafe_p "$file" \
+         || func_fatal_help "'$lib' is not a valid libtool archive"
+
+       # Read the libtool library.
+       dlname=
+       library_names=
+       func_source "$file"
+
+       # Skip this library if it cannot be dlopened.
+       if test -z "$dlname"; then
+         # Warn if it was a shared library.
+         test -n "$library_names" && \
+           func_warning "'$file' was not linked with '-export-dynamic'"
+         continue
+       fi
+
+       func_dirname "$file" "" "."
+       dir=$func_dirname_result
+
+       if test -f "$dir/$objdir/$dlname"; then
+         func_append dir "/$objdir"
+       else
+         if test ! -f "$dir/$dlname"; then
+           func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
+         fi
+       fi
+       ;;
+
+      *.lo)
+       # Just add the directory containing the .lo file.
+       func_dirname "$file" "" "."
+       dir=$func_dirname_result
+       ;;
+
+      *)
+       func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
+       continue
+       ;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir=$absdir
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+       eval "$shlibpath_var=\"\$dir\""
+      else
+       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic=$magic
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+       # Do a test to see if this is really a libtool program.
+       if func_ltwrapper_script_p "$file"; then
+         func_source "$file"
+         # Transform arg to wrapped name.
+         file=$progdir/$program
+       elif func_ltwrapper_executable_p "$file"; then
+         func_ltwrapper_scriptname "$file"
+         func_source "$func_ltwrapper_scriptname_result"
+         # Transform arg to wrapped name.
+         file=$progdir/$program
+       fi
+       ;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if $opt_dry_run; then
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+       eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+       echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    else
+      if test -n "$shlibpath_var"; then
+       # Export the shlibpath_var.
+       eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd=\$cmd$args
+    fi
+}
+
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $debug_cmd
+
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+       func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+       if func_lalib_unsafe_p "$opt"; then
+         func_append libs " $opt"
+       else
+         func_warning "'$opt' is not a valid libtool archive"
+       fi
+
+      else
+       func_fatal_error "invalid argument '$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and '=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+         $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+           > $tmpdir/tmp-la
+         mv -f $tmpdir/tmp-la $lib
+       done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+       if test -n "$finish_cmds"; then
+         # Do each command in the finish commands.
+         func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+       fi
+       if test -n "$finish_eval"; then
+         # Do the single finish_eval.
+         eval cmds=\"$finish_eval\"
+         $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+       fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_quiet && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+       $ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the '-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+       echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
+       echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+       echo "   - add LIBDIR to the '$runpath_var' environment variable"
+       echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+       libdir=LIBDIR
+       eval flag=\"$hardcode_libdir_flag_spec\"
+
+       $ECHO "   - use the '$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+       $ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+       echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+       solaris2.[6789]|solaris2.1[0-9])
+         echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+         echo "pages."
+         ;;
+       *)
+         echo "more information, such as the ld(1) and ld.so(8) manual pages."
+         ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $debug_cmd
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac
+    then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=false
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+       func_append files " $dest"
+       dest=$arg
+       continue
+      fi
+
+      case $arg in
+      -d) isdir=: ;;
+      -f)
+       if $install_cp; then :; else
+         prev=$arg
+       fi
+       ;;
+      -g | -m | -o)
+       prev=$arg
+       ;;
+      -s)
+       stripme=" -s"
+       continue
+       ;;
+      -*)
+       ;;
+      *)
+       # If the previous option needed an argument, then skip it.
+       if test -n "$prev"; then
+         if test X-m = "X$prev" && test -n "$install_override_mode"; then
+           arg2=$install_override_mode
+           no_mode=false
+         fi
+         prev=
+       else
+         dest=$arg
+         continue
+       fi
+       ;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+       func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+       func_quote_for_eval "$install_override_mode"
+       func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+       func_fatal_help "no file or destination specified"
+      else
+       func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=:
+    if $isdir; then
+      destdir=$dest
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir=$func_dirname_result
+      destname=$func_basename_result
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+       func_fatal_help "'$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+       case $file in
+       *.lo) ;;
+       *)
+         func_fatal_help "'$destdir' must be an absolute directory name"
+         ;;
+       esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+       # Do the static libraries later.
+       func_append staticlibs " $file"
+       ;;
+
+      *.la)
+       func_resolve_sysroot "$file"
+       file=$func_resolve_sysroot_result
+
+       # Check to see that this really is a libtool archive.
+       func_lalib_unsafe_p "$file" \
+         || func_fatal_help "'$file' is not a valid libtool archive"
+
+       library_names=
+       old_library=
+       relink_command=
+       func_source "$file"
+
+       # Add the libdir to current_libdirs if it is the destination.
+       if test "X$destdir" = "X$libdir"; then
+         case "$current_libdirs " in
+         *" $libdir "*) ;;
+         *) func_append current_libdirs " $libdir" ;;
+         esac
+       else
+         # Note the libdir as a future libdir.
+         case "$future_libdirs " in
+         *" $libdir "*) ;;
+         *) func_append future_libdirs " $libdir" ;;
+         esac
+       fi
+
+       func_dirname "$file" "/" ""
+       dir=$func_dirname_result
+       func_append dir "$objdir"
+
+       if test -n "$relink_command"; then
+         # Determine the prefix the user has applied to our future dir.
+         inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+         # Don't allow the user to place us outside of our expected
+         # location b/c this prevents finding dependent libraries that
+         # are installed to the same prefix.
+         # At present, this check doesn't affect windows .dll's that
+         # are installed into $libdir/../bin (currently, that works fine)
+         # but it's something to keep an eye on.
+         test "$inst_prefix_dir" = "$destdir" && \
+           func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
+
+         if test -n "$inst_prefix_dir"; then
+           # Stick the inst_prefix_dir data into the link command.
+           relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+         else
+           relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+         fi
+
+         func_warning "relinking '$file'"
+         func_show_eval "$relink_command" \
+           'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
+       fi
+
+       # See the names of the shared library.
+       set dummy $library_names; shift
+       if test -n "$1"; then
+         realname=$1
+         shift
+
+         srcname=$realname
+         test -n "$relink_command" && srcname=${realname}T
+
+         # Install the shared library and build the symlinks.
+         func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+             'exit $?'
+         tstripme=$stripme
+         case $host_os in
+         cygwin* | mingw* | pw32* | cegcc*)
+           case $realname in
+           *.dll.a)
+             tstripme=
+             ;;
+           esac
+           ;;
+         os2*)
+           case $realname in
+           *_dll.a)
+             tstripme=
+             ;;
+           esac
+           ;;
+         esac
+         if test -n "$tstripme" && test -n "$striplib"; then
+           func_show_eval "$striplib $destdir/$realname" 'exit $?'
+         fi
+
+         if test "$#" -gt 0; then
+           # Delete the old symlinks, and create new ones.
+           # Try 'ln -sf' first, because the 'ln' binary might depend on
+           # the symlink we replace!  Solaris /bin/ln does not understand -f,
+           # so we also need to try rm && ln -s.
+           for linkname
+           do
+             test "$linkname" != "$realname" \
+               && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+           done
+         fi
+
+         # Do each command in the postinstall commands.
+         lib=$destdir/$realname
+         func_execute_cmds "$postinstall_cmds" 'exit $?'
+       fi
+
+       # Install the pseudo-library for information purposes.
+       func_basename "$file"
+       name=$func_basename_result
+       instname=$dir/${name}i
+       func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+       # Maybe install the static library, too.
+       test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+       ;;
+
+      *.lo)
+       # Install (i.e. copy) a libtool object.
+
+       # Figure out destination file name, if it wasn't already specified.
+       if test -n "$destname"; then
+         destfile=$destdir/$destname
+       else
+         func_basename "$file"
+         destfile=$func_basename_result
+         destfile=$destdir/$destfile
+       fi
+
+       # Deduce the name of the destination old-style object file.
+       case $destfile in
+       *.lo)
+         func_lo2o "$destfile"
+         staticdest=$func_lo2o_result
+         ;;
+       *.$objext)
+         staticdest=$destfile
+         destfile=
+         ;;
+       *)
+         func_fatal_help "cannot copy a libtool object to '$destfile'"
+         ;;
+       esac
+
+       # Install the libtool object if requested.
+       test -n "$destfile" && \
+         func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+       # Install the old object if enabled.
+       if test yes = "$build_old_libs"; then
+         # Deduce the name of the old-style object file.
+         func_lo2o "$file"
+         staticobj=$func_lo2o_result
+         func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+       fi
+       exit $EXIT_SUCCESS
+       ;;
+
+      *)
+       # Figure out destination file name, if it wasn't already specified.
+       if test -n "$destname"; then
+         destfile=$destdir/$destname
+       else
+         func_basename "$file"
+         destfile=$func_basename_result
+         destfile=$destdir/$destfile
+       fi
+
+       # If the file is missing, and there is a .exe on the end, strip it
+       # because it is most likely a libtool script we actually want to
+       # install
+       stripped_ext=
+       case $file in
+         *.exe)
+           if test ! -f "$file"; then
+             func_stripname '' '.exe' "$file"
+             file=$func_stripname_result
+             stripped_ext=.exe
+           fi
+           ;;
+       esac
+
+       # Do a test to see if this is really a libtool program.
+       case $host in
+       *cygwin* | *mingw*)
+           if func_ltwrapper_executable_p "$file"; then
+             func_ltwrapper_scriptname "$file"
+             wrapper=$func_ltwrapper_scriptname_result
+           else
+             func_stripname '' '.exe' "$file"
+             wrapper=$func_stripname_result
+           fi
+           ;;
+       *)
+           wrapper=$file
+           ;;
+       esac
+       if func_ltwrapper_script_p "$wrapper"; then
+         notinst_deplibs=
+         relink_command=
+
+         func_source "$wrapper"
+
+         # Check the variables that should have been set.
+         test -z "$generated_by_libtool_version" && \
+           func_fatal_error "invalid libtool wrapper script '$wrapper'"
+
+         finalize=:
+         for lib in $notinst_deplibs; do
+           # Check to see that each library is installed.
+           libdir=
+           if test -f "$lib"; then
+             func_source "$lib"
+           fi
+           libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
+           if test -n "$libdir" && test ! -f "$libfile"; then
+             func_warning "'$lib' has not been installed in '$libdir'"
+             finalize=false
+           fi
+         done
+
+         relink_command=
+         func_source "$wrapper"
+
+         outputname=
+         if test no = "$fast_install" && test -n "$relink_command"; then
+           $opt_dry_run || {
+             if $finalize; then
+               tmpdir=`func_mktempdir`
+               func_basename "$file$stripped_ext"
+               file=$func_basename_result
+               outputname=$tmpdir/$file
+               # Replace the output file specification.
+               relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+               $opt_quiet || {
+                 func_quote_for_expand "$relink_command"
+                 eval "func_echo $func_quote_for_expand_result"
+               }
+               if eval "$relink_command"; then :
+                 else
+                 func_error "error: relink '$file' with the above command before installing it"
+                 $opt_dry_run || ${RM}r "$tmpdir"
+                 continue
+               fi
+               file=$outputname
+             else
+               func_warning "cannot relink '$file'"
+             fi
+           }
+         else
+           # Install the binary that we compiled earlier.
+           file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+         fi
+       fi
+
+       # remove .exe since cygwin /usr/bin/install will append another
+       # one anyway
+       case $install_prog,$host in
+       */usr/bin/install*,*cygwin*)
+         case $file:$destfile in
+         *.exe:*.exe)
+           # this is ok
+           ;;
+         *.exe:*)
+           destfile=$destfile.exe
+           ;;
+         *:*.exe)
+           func_stripname '' '.exe' "$destfile"
+           destfile=$func_stripname_result
+           ;;
+         esac
+         ;;
+       esac
+       func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+       $opt_dry_run || if test -n "$outputname"; then
+         ${RM}r "$tmpdir"
+       fi
+       ;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name=$func_basename_result
+
+      # Set up the ranlib parameters.
+      oldlib=$destdir/$name
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+       func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run '$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $debug_cmd
+
+    my_outputname=$1
+    my_originator=$2
+    my_pic_p=${3-false}
+    my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+       my_dlsyms=${my_outputname}S.c
+      else
+       func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+       # Discover the nlist of each of the dlfiles.
+       nlist=$output_objdir/$my_outputname.nm
+
+       func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+       # Parse the name list into a source file.
+       func_verbose "creating $output_objdir/$my_dlsyms"
+
+       $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* External symbol declarations for the compiler. */\
+"
+
+       if test yes = "$dlself"; then
+         func_verbose "generating symbol list for '$output'"
+
+         $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+         # Add our own program objects to the symbol list.
+         progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+         for progfile in $progfiles; do
+           func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+           func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
+           $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+         done
+
+         if test -n "$exclude_expsyms"; then
+           $opt_dry_run || {
+             eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+             eval '$MV "$nlist"T "$nlist"'
+           }
+         fi
+
+         if test -n "$export_symbols_regex"; then
+           $opt_dry_run || {
+             eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+             eval '$MV "$nlist"T "$nlist"'
+           }
+         fi
+
+         # Prepare the list of exported symbols
+         if test -z "$export_symbols"; then
+           export_symbols=$output_objdir/$outputname.exp
+           $opt_dry_run || {
+             $RM $export_symbols
+             eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+             case $host in
+             *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+               ;;
+             esac
+           }
+         else
+           $opt_dry_run || {
+             eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+             eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+             eval '$MV "$nlist"T "$nlist"'
+             case $host in
+               *cygwin* | *mingw* | *cegcc* )
+                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                 ;;
+             esac
+           }
+         fi
+       fi
+
+       for dlprefile in $dlprefiles; do
+         func_verbose "extracting global C symbols from '$dlprefile'"
+         func_basename "$dlprefile"
+         name=$func_basename_result
+          case $host in
+           *cygwin* | *mingw* | *cegcc* )
+             # if an import library, we need to obtain dlname
+             if func_win32_import_lib_p "$dlprefile"; then
+               func_tr_sh "$dlprefile"
+               eval "curr_lafile=\$libfile_$func_tr_sh_result"
+               dlprefile_dlbasename=
+               if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+                 # Use subshell, to avoid clobbering current variable values
+                 dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+                 if test -n "$dlprefile_dlname"; then
+                   func_basename "$dlprefile_dlname"
+                   dlprefile_dlbasename=$func_basename_result
+                 else
+                   # no lafile. user explicitly requested -dlpreopen <import library>.
+                   $sharedlib_from_linklib_cmd "$dlprefile"
+                   dlprefile_dlbasename=$sharedlib_from_linklib_result
+                 fi
+               fi
+               $opt_dry_run || {
+                 if test -n "$dlprefile_dlbasename"; then
+                   eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+                 else
+                   func_warning "Could not compute DLL name from $name"
+                   eval '$ECHO ": $name " >> "$nlist"'
+                 fi
+                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+                   $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+               }
+             else # not an import lib
+               $opt_dry_run || {
+                 eval '$ECHO ": $name " >> "$nlist"'
+                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+               }
+             fi
+           ;;
+           *)
+             $opt_dry_run || {
+               eval '$ECHO ": $name " >> "$nlist"'
+               func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+               eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+             }
+           ;;
+          esac
+       done
+
+       $opt_dry_run || {
+         # Make sure we have at least an empty file.
+         test -f "$nlist" || : > "$nlist"
+
+         if test -n "$exclude_expsyms"; then
+           $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+           $MV "$nlist"T "$nlist"
+         fi
+
+         # Try sorting and uniquifying the output.
+         if $GREP -v "^: " < "$nlist" |
+             if sort -k 3 </dev/null >/dev/null 2>&1; then
+               sort -k 3
+             else
+               sort +2
+             fi |
+             uniq > "$nlist"S; then
+           :
+         else
+           $GREP -v "^: " < "$nlist" > "$nlist"S
+         fi
+
+         if test -f "$nlist"S; then
+           eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+         else
+           echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+         fi
+
+         func_show_eval '$RM "${nlist}I"'
+         if test -n "$global_symbol_to_import"; then
+           eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+         fi
+
+         echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+         if test -s "$nlist"I; then
+           echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+  LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+  for (; symbol->name; ++symbol)
+    {"
+           $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+           echo >> "$output_objdir/$my_dlsyms" "\
+    }
+}"
+         fi
+         echo >> "$output_objdir/$my_dlsyms" "\
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{ {\"$my_originator\", (void *) 0},"
+
+         if test -s "$nlist"I; then
+           echo >> "$output_objdir/$my_dlsyms" "\
+  {\"@INIT@\", (void *) &lt_syminit},"
+         fi
+
+         case $need_lib_prefix in
+         no)
+           eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+           ;;
+         *)
+           eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+           ;;
+         esac
+         echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+       } # !$opt_dry_run
+
+       pic_flag_for_symtable=
+       case "$compile_command " in
+       *" -static "*) ;;
+       *)
+         case $host in
+         # compiling the symbol table file with pic_flag works around
+         # a FreeBSD bug that causes programs to crash when -lm is
+         # linked before any other PIC object.  But we must not use
+         # pic_flag when linking with -static.  The problem exists in
+         # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+         *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+           pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+         *-*-hpux*)
+           pic_flag_for_symtable=" $pic_flag"  ;;
+         *)
+           $my_pic_p && pic_flag_for_symtable=" $pic_flag"
+           ;;
+         esac
+         ;;
+       esac
+       symtab_cflags=
+       for arg in $LTCFLAGS; do
+         case $arg in
+         -pie | -fpie | -fPIE) ;;
+         *) func_append symtab_cflags " $arg" ;;
+         esac
+       done
+
+       # Now compile the dynamic symbol file.
+       func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+       # Clean up the generated files.
+       func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
+
+       # Transform the symbol file into the correct name.
+       symfileobj=$output_objdir/${my_outputname}S.$objext
+       case $host in
+       *cygwin* | *mingw* | *cegcc* )
+         if test -f "$output_objdir/$my_outputname.def"; then
+           compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+           finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+         else
+           compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+           finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+         fi
+         ;;
+       *)
+         compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+         finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+         ;;
+       esac
+       ;;
+      *)
+       func_fatal_error "unknown suffix for '$my_dlsyms'"
+       ;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $debug_cmd
+
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $debug_cmd
+
+  win32_libid_type=unknown
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      case $nm_interface in
+      "MS dumpbin")
+       if func_cygming_ms_implib_p "$1" ||
+          func_cygming_gnu_implib_p "$1"
+       then
+         win32_nmres=import
+       else
+         win32_nmres=
+       fi
+       ;;
+      *)
+       func_to_tool_file "$1" func_convert_file_msys_to_w32
+       win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+         $SED -n -e '
+           1,100{
+               / I /{
+                   s|.*|import|
+                   p
+                   q
+               }
+           }'`
+       ;;
+      esac
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $debug_cmd
+
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $debug_cmd
+
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[         ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive that possess that section. Heuristic: eliminate
+    # all those that have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $debug_cmd
+
+  if func_cygming_gnu_implib_p "$1"; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1"; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $debug_cmd
+
+    f_ex_an_ar_dir=$1; shift
+    f_ex_an_ar_oldlib=$1
+    if test yes = "$lock_old_archive_extraction"; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+       func_echo "Waiting for $lockfile to be removed"
+       sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+                  'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test yes = "$lock_old_archive_extraction"; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $debug_cmd
+
+    my_gentop=$1; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=
+    my_xlib=
+    my_xabs=
+    my_xdir=
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+       [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
+       *) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib=$func_basename_result
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         func_arith $extracted_serial + 1
+         extracted_serial=$func_arith_result
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir=$my_gentop/$my_xlib_u
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+       func_verbose "Extracting $my_xabs"
+       # Do not bother doing anything if just a dry run
+       $opt_dry_run || {
+         darwin_orig_dir=`pwd`
+         cd $my_xdir || exit $?
+         darwin_archive=$my_xabs
+         darwin_curdir=`pwd`
+         func_basename "$darwin_archive"
+         darwin_base_archive=$func_basename_result
+         darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+         if test -n "$darwin_arches"; then
+           darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+           darwin_arch=
+           func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+           for darwin_arch in  $darwin_arches; do
+             func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+             $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+             cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+             func_extract_an_archive "`pwd`" "$darwin_base_archive"
+             cd "$darwin_curdir"
+             $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
+           done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+           darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
+           darwin_file=
+           darwin_files=
+           for darwin_file in $darwin_filelist; do
+             darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+             $LIPO -create -output "$darwin_file" $darwin_files
+           done # $darwin_filelist
+           $RM -rf unfat-$$
+           cd "$darwin_orig_dir"
+         else
+           cd $darwin_orig_dir
+           func_extract_an_archive "$my_xdir" "$my_xabs"
+         fi # $darwin_arches
+       } # !$opt_dry_run
+       ;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+       ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result=$my_oldobjs
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory where it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+       func_emit_wrapper_arg1=${1-no}
+
+       $ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+       if test yes = "$fast_install"; then
+         $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+         $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+       \$ECHO \"\$relink_command_output\" >&2
+       $RM \"\$progdir/\$file\"
+       exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+       else
+         $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+       fi
+
+       $ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+       # fixup the dll searchpath if we need to.
+       #
+       # Fix the DLL searchpath if we need to.  Do this before prepending
+       # to shlibpath, because on Windows, both are PATH and uninstalled
+       # libraries must come first.
+       if test -n "$dllsearchpath"; then
+         $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+       fi
+
+       # Export our shlibpath_var if we have one.
+       if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+         $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+       fi
+
+       $ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+       cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+           cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
+/* declarations of non-ANSI functions */
+#if defined __MINGW32__
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined __CYGWIN__
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined other_platform || defined ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined _MSC_VER
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+#elif defined __MINGW32__
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined __CYGWIN__
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined other platforms ... */
+#endif
+
+#if defined PATH_MAX
+# define LT_PATHMAX PATH_MAX
+#elif defined MAXPATHLEN
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+  defined __OS2__
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+       (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free (stale); stale = 0; } \
+} while (0)
+
+#if defined LT_DEBUGWRAPPER
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+           cat <<EOF
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+           if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+             cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+           else
+             cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+           fi
+
+           if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+             cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+           else
+             cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+           fi
+
+           if test yes = "$fast_install"; then
+             cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+           else
+             cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+           fi
+
+
+           cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  int rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, (size_t) argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (STREQ (argv[i], dumpscript_opt))
+       {
+EOF
+           case $host in
+             *mingw* | *cygwin* )
+               # make stdout use "unix" line endings
+               echo "          setmode(1,_O_BINARY);"
+               ;;
+             esac
+
+           cat <<"EOF"
+         lt_dump_script (stdout);
+         return 0;
+       }
+      if (STREQ (argv[i], debug_opt))
+       {
+          lt_debug = 1;
+          continue;
+       }
+      if (STREQ (argv[i], ltwrapper_option_prefix))
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+                   "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+           cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
+EOF
+           cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+                 tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+                 actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+                 "(main) libtool target name: %s\n",
+                 target_name);
+EOF
+
+           cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+                   strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+           cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+           case $host_os in
+             mingw*)
+           cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+       *p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+       *p = '/';
+      }
+  }
+EOF
+           ;;
+           esac
+
+           cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+                 nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+                     i, nonnull (newargz[i]));
+    }
+
+EOF
+
+           case $host_os in
+             mingw*)
+               cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+                     "(main) failed to launch target \"%s\": %s\n",
+                     lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+               ;;
+             *)
+               cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+               ;;
+           esac
+
+           cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+                         string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  size_t tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+       return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+       {
+         concat_name = xstrdup (wrapper);
+         if (check_executable (concat_name))
+           return concat_name;
+         XFREE (concat_name);
+       }
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+       has_slash = 1;
+       break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+       {
+         for (p = path; *p; p = p_next)
+           {
+             const char *q;
+             size_t p_len;
+             for (q = p; *q; q++)
+               if (IS_PATH_SEPARATOR (*q))
+                 break;
+             p_len = (size_t) (q - p);
+             p_next = (*q == '\0' ? q : q + 1);
+             if (p_len == 0)
+               {
+                 /* empty path: current directory */
+                 if (getcwd (tmp, LT_PATHMAX) == NULL)
+                   lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+                 tmp_len = strlen (tmp);
+                 concat_name =
+                   XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+                 memcpy (concat_name, tmp, tmp_len);
+                 concat_name[tmp_len] = '/';
+                 strcpy (concat_name + tmp_len + 1, wrapper);
+               }
+             else
+               {
+                 concat_name =
+                   XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+                 memcpy (concat_name, p, p_len);
+                 concat_name[p_len] = '/';
+                 strcpy (concat_name + p_len + 1, wrapper);
+               }
+             if (check_executable (concat_name))
+               return concat_name;
+             XFREE (concat_name);
+           }
+       }
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+                     "checking path component for symlinks: %s\n",
+                     tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+       {
+         if (S_ISLNK (s.st_mode) != 0)
+           {
+             has_symlinks = 1;
+             break;
+           }
+
+         /* search backwards for last DIR_SEPARATOR */
+         p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+         while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+           p--;
+         if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+           {
+             /* no more DIR_SEPARATORS left */
+             break;
+           }
+         *p = '\0';
+       }
+      else
+       {
+         lt_fatal (__FILE__, __LINE__,
+                   "error accessing file \"%s\": %s",
+                   tmp_pathspec, nonnull (strerror (errno)));
+       }
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+               "could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (STREQ (str, pat))
+       *str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+              int line, const char *mode,
+              const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+                 "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    size_t len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      size_t orig_value_len = strlen (orig_value);
+      size_t add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+                 "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      size_t len = strlen (new_value);
+      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[--len] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+                 "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+           case $host_os in
+             mingw*)
+               cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+       new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+       {
+         int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+         size_t length;
+         unsigned int backslashes;
+         const char *s;
+         char *quoted_string;
+         char *p;
+
+         length = 0;
+         backslashes = 0;
+         if (quote_around)
+           length++;
+         for (s = string; *s != '\0'; s++)
+           {
+             char c = *s;
+             if (c == '"')
+               length += backslashes + 1;
+             length++;
+             if (c == '\\')
+               backslashes++;
+             else
+               backslashes = 0;
+           }
+         if (quote_around)
+           length += backslashes + 1;
+
+         quoted_string = XMALLOC (char, length + 1);
+
+         p = quoted_string;
+         backslashes = 0;
+         if (quote_around)
+           *p++ = '"';
+         for (s = string; *s != '\0'; s++)
+           {
+             char c = *s;
+             if (c == '"')
+               {
+                 unsigned int j;
+                 for (j = backslashes + 1; j > 0; j--)
+                   *p++ = '\\';
+               }
+             *p++ = c;
+             if (c == '\\')
+               backslashes++;
+             else
+               backslashes = 0;
+           }
+         if (quote_around)
+           {
+             unsigned int j;
+             for (j = backslashes; j > 0; j--)
+               *p++ = '\\';
+             *p++ = '"';
+           }
+         *p = '\0';
+
+         new_argv[i] = quoted_string;
+       }
+      else
+       new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+               ;;
+           esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+           func_emit_wrapper yes |
+             $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $debug_cmd
+
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+    $debug_cmd
+
+    case " $compile_command " in
+    *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+      suncc_use_cstd_abi=no
+      ;;
+    *)
+      suncc_use_cstd_abi=yes
+      ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $debug_cmd
+
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # what system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll that has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    os2dllname=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=false
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module=$wl-single_module
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+       test yes != "$build_libtool_libs" \
+         && func_fatal_configuration "cannot build a shared library"
+       build_old_libs=no
+       break
+       ;;
+      -all-static | -static | -static-libtool-libs)
+       case $arg in
+       -all-static)
+         if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
+           func_warning "complete static linking is impossible in this configuration"
+         fi
+         if test -n "$link_static_flag"; then
+           dlopen_self=$dlopen_self_static
+         fi
+         prefer_static_libs=yes
+         ;;
+       -static)
+         if test -z "$pic_flag" && test -n "$link_static_flag"; then
+           dlopen_self=$dlopen_self_static
+         fi
+         prefer_static_libs=built
+         ;;
+       -static-libtool-libs)
+         if test -z "$pic_flag" && test -n "$link_static_flag"; then
+           dlopen_self=$dlopen_self_static
+         fi
+         prefer_static_libs=yes
+         ;;
+       esac
+       build_libtool_libs=no
+       build_old_libs=yes
+       break
+       ;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg=$1
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+       case $prev in
+       output)
+         func_append compile_command " @OUTPUT@"
+         func_append finalize_command " @OUTPUT@"
+         ;;
+       esac
+
+       case $prev in
+       bindir)
+         bindir=$arg
+         prev=
+         continue
+         ;;
+       dlfiles|dlprefiles)
+         $preload || {
+           # Add the symbol object into the linking commands.
+           func_append compile_command " @SYMFILE@"
+           func_append finalize_command " @SYMFILE@"
+           preload=:
+         }
+         case $arg in
+         *.la | *.lo) ;;  # We handle these cases below.
+         force)
+           if test no = "$dlself"; then
+             dlself=needless
+             export_dynamic=yes
+           fi
+           prev=
+           continue
+           ;;
+         self)
+           if test dlprefiles = "$prev"; then
+             dlself=yes
+           elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
+             dlself=yes
+           else
+             dlself=needless
+             export_dynamic=yes
+           fi
+           prev=
+           continue
+           ;;
+         *)
+           if test dlfiles = "$prev"; then
+             func_append dlfiles " $arg"
+           else
+             func_append dlprefiles " $arg"
+           fi
+           prev=
+           continue
+           ;;
+         esac
+         ;;
+       expsyms)
+         export_symbols=$arg
+         test -f "$arg" \
+           || func_fatal_error "symbol file '$arg' does not exist"
+         prev=
+         continue
+         ;;
+       expsyms_regex)
+         export_symbols_regex=$arg
+         prev=
+         continue
+         ;;
+       framework)
+         case $host in
+           *-*-darwin*)
+             case "$deplibs " in
+               *" $qarg.ltframework "*) ;;
+               *) func_append deplibs " $qarg.ltframework" # this is fixed later
+                  ;;
+             esac
+             ;;
+         esac
+         prev=
+         continue
+         ;;
+       inst_prefix)
+         inst_prefix_dir=$arg
+         prev=
+         continue
+         ;;
+       mllvm)
+         # Clang does not use LLVM to link, so we can simply discard any
+         # '-mllvm $arg' options when doing the link step.
+         prev=
+         continue
+         ;;
+       objectlist)
+         if test -f "$arg"; then
+           save_arg=$arg
+           moreargs=
+           for fil in `cat "$save_arg"`
+           do
+#            func_append moreargs " $fil"
+             arg=$fil
+             # A libtool-controlled object.
+
+             # Check to see that this really is a libtool object.
+             if func_lalib_unsafe_p "$arg"; then
+               pic_object=
+               non_pic_object=
+
+               # Read the .lo file
+               func_source "$arg"
+
+               if test -z "$pic_object" ||
+                  test -z "$non_pic_object" ||
+                  test none = "$pic_object" &&
+                  test none = "$non_pic_object"; then
+                 func_fatal_error "cannot find name of object for '$arg'"
+               fi
+
+               # Extract subdirectory from the argument.
+               func_dirname "$arg" "/" ""
+               xdir=$func_dirname_result
+
+               if test none != "$pic_object"; then
+                 # Prepend the subdirectory the object is found in.
+                 pic_object=$xdir$pic_object
+
+                 if test dlfiles = "$prev"; then
+                   if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+                     func_append dlfiles " $pic_object"
+                     prev=
+                     continue
+                   else
+                     # If libtool objects are unsupported, then we need to preload.
+                     prev=dlprefiles
+                   fi
+                 fi
+
+                 # CHECK ME:  I think I busted this.  -Ossama
+                 if test dlprefiles = "$prev"; then
+                   # Preload the old-style object.
+                   func_append dlprefiles " $pic_object"
+                   prev=
+                 fi
+
+                 # A PIC object.
+                 func_append libobjs " $pic_object"
+                 arg=$pic_object
+               fi
+
+               # Non-PIC object.
+               if test none != "$non_pic_object"; then
+                 # Prepend the subdirectory the object is found in.
+                 non_pic_object=$xdir$non_pic_object
+
+                 # A standard non-PIC object
+                 func_append non_pic_objects " $non_pic_object"
+                 if test -z "$pic_object" || test none = "$pic_object"; then
+                   arg=$non_pic_object
+                 fi
+               else
+                 # If the PIC object exists, use it instead.
+                 # $xdir was prepended to $pic_object above.
+                 non_pic_object=$pic_object
+                 func_append non_pic_objects " $non_pic_object"
+               fi
+             else
+               # Only an error if not doing a dry-run.
+               if $opt_dry_run; then
+                 # Extract subdirectory from the argument.
+                 func_dirname "$arg" "/" ""
+                 xdir=$func_dirname_result
+
+                 func_lo2o "$arg"
+                 pic_object=$xdir$objdir/$func_lo2o_result
+                 non_pic_object=$xdir$func_lo2o_result
+                 func_append libobjs " $pic_object"
+                 func_append non_pic_objects " $non_pic_object"
+               else
+                 func_fatal_error "'$arg' is not a valid libtool object"
+               fi
+             fi
+           done
+         else
+           func_fatal_error "link input file '$arg' does not exist"
+         fi
+         arg=$save_arg
+         prev=
+         continue
+         ;;
+       os2dllname)
+         os2dllname=$arg
+         prev=
+         continue
+         ;;
+       precious_regex)
+         precious_files_regex=$arg
+         prev=
+         continue
+         ;;
+       release)
+         release=-$arg
+         prev=
+         continue
+         ;;
+       rpath | xrpath)
+         # We need an absolute path.
+         case $arg in
+         [\\/]* | [A-Za-z]:[\\/]*) ;;
+         *)
+           func_fatal_error "only absolute run-paths are allowed"
+           ;;
+         esac
+         if test rpath = "$prev"; then
+           case "$rpath " in
+           *" $arg "*) ;;
+           *) func_append rpath " $arg" ;;
+           esac
+         else
+           case "$xrpath " in
+           *" $arg "*) ;;
+           *) func_append xrpath " $arg" ;;
+           esac
+         fi
+         prev=
+         continue
+         ;;
+       shrext)
+         shrext_cmds=$arg
+         prev=
+         continue
+         ;;
+       weak)
+         func_append weak_libs " $arg"
+         prev=
+         continue
+         ;;
+       xcclinker)
+         func_append linker_flags " $qarg"
+         func_append compiler_flags " $qarg"
+         prev=
+         func_append compile_command " $qarg"
+         func_append finalize_command " $qarg"
+         continue
+         ;;
+       xcompiler)
+         func_append compiler_flags " $qarg"
+         prev=
+         func_append compile_command " $qarg"
+         func_append finalize_command " $qarg"
+         continue
+         ;;
+       xlinker)
+         func_append linker_flags " $qarg"
+         func_append compiler_flags " $wl$qarg"
+         prev=
+         func_append compile_command " $wl$qarg"
+         func_append finalize_command " $wl$qarg"
+         continue
+         ;;
+       *)
+         eval "$prev=\"\$arg\""
+         prev=
+         continue
+         ;;
+       esac
+      fi # test -n "$prev"
+
+      prevarg=$arg
+
+      case $arg in
+      -all-static)
+       if test -n "$link_static_flag"; then
+         # See comment for -static flag below, for more details.
+         func_append compile_command " $link_static_flag"
+         func_append finalize_command " $link_static_flag"
+       fi
+       continue
+       ;;
+
+      -allow-undefined)
+       # FIXME: remove this flag sometime in the future.
+       func_fatal_error "'-allow-undefined' must not be used because it is the default"
+       ;;
+
+      -avoid-version)
+       avoid_version=yes
+       continue
+       ;;
+
+      -bindir)
+       prev=bindir
+       continue
+       ;;
+
+      -dlopen)
+       prev=dlfiles
+       continue
+       ;;
+
+      -dlpreopen)
+       prev=dlprefiles
+       continue
+       ;;
+
+      -export-dynamic)
+       export_dynamic=yes
+       continue
+       ;;
+
+      -export-symbols | -export-symbols-regex)
+       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+         func_fatal_error "more than one -exported-symbols argument is not allowed"
+       fi
+       if test X-export-symbols = "X$arg"; then
+         prev=expsyms
+       else
+         prev=expsyms_regex
+       fi
+       continue
+       ;;
+
+      -framework)
+       prev=framework
+       continue
+       ;;
+
+      -inst-prefix-dir)
+       prev=inst_prefix
+       continue
+       ;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+       case $with_gcc/$host in
+       no/*-*-irix* | /*-*-irix*)
+         func_append compile_command " $arg"
+         func_append finalize_command " $arg"
+         ;;
+       esac
+       continue
+       ;;
+
+      -L*)
+       func_stripname "-L" '' "$arg"
+       if test -z "$func_stripname_result"; then
+         if test "$#" -gt 0; then
+           func_fatal_error "require no space between '-L' and '$1'"
+         else
+           func_fatal_error "need path for '-L' option"
+         fi
+       fi
+       func_resolve_sysroot "$func_stripname_result"
+       dir=$func_resolve_sysroot_result
+       # We need an absolute path.
+       case $dir in
+       [\\/]* | [A-Za-z]:[\\/]*) ;;
+       *)
+         absdir=`cd "$dir" && pwd`
+         test -z "$absdir" && \
+           func_fatal_error "cannot determine absolute directory name of '$dir'"
+         dir=$absdir
+         ;;
+       esac
+       case "$deplibs " in
+       *" -L$dir "* | *" $arg "*)
+         # Will only happen for absolute or sysroot arguments
+         ;;
+       *)
+         # Preserve sysroot, but never include relative directories
+         case $dir in
+           [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+           *) func_append deplibs " -L$dir" ;;
+         esac
+         func_append lib_search_path " $dir"
+         ;;
+       esac
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+         testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+         case :$dllsearchpath: in
+         *":$dir:"*) ;;
+         ::) dllsearchpath=$dir;;
+         *) func_append dllsearchpath ":$dir";;
+         esac
+         case :$dllsearchpath: in
+         *":$testbindir:"*) ;;
+         ::) dllsearchpath=$testbindir;;
+         *) func_append dllsearchpath ":$testbindir";;
+         esac
+         ;;
+       esac
+       continue
+       ;;
+
+      -l*)
+       if test X-lc = "X$arg" || test X-lm = "X$arg"; then
+         case $host in
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+           # These systems don't actually have a C or math library (as such)
+           continue
+           ;;
+         *-*-os2*)
+           # These systems don't actually have a C library (as such)
+           test X-lc = "X$arg" && continue
+           ;;
+         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+           # Do not include libc due to us having libc/libc_r.
+           test X-lc = "X$arg" && continue
+           ;;
+         *-*-rhapsody* | *-*-darwin1.[012])
+           # Rhapsody C and math libraries are in the System framework
+           func_append deplibs " System.ltframework"
+           continue
+           ;;
+         *-*-sco3.2v5* | *-*-sco5v6*)
+           # Causes problems with __ctype
+           test X-lc = "X$arg" && continue
+           ;;
+         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+           # Compiler inserts libc in the correct place for threads to work
+           test X-lc = "X$arg" && continue
+           ;;
+         esac
+       elif test X-lc_r = "X$arg"; then
+        case $host in
+        *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+          # Do not include libc_r directly, use -pthread flag.
+          continue
+          ;;
+        esac
+       fi
+       func_append deplibs " $arg"
+       continue
+       ;;
+
+      -mllvm)
+       prev=mllvm
+       continue
+       ;;
+
+      -module)
+       module=yes
+       continue
+       ;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+       func_append compiler_flags " $arg"
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+       prev=xcompiler
+       continue
+       ;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+       func_append compiler_flags " $arg"
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+       case "$new_inherited_linker_flags " in
+           *" $arg "*) ;;
+           * ) func_append new_inherited_linker_flags " $arg" ;;
+       esac
+       continue
+       ;;
+
+      -multi_module)
+       single_module=$wl-multi_module
+       continue
+       ;;
+
+      -no-fast-install)
+       fast_install=no
+       continue
+       ;;
+
+      -no-install)
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+         # The PATH hackery in wrapper scripts is required on Windows
+         # and Darwin in order for the loader to find any dlls it needs.
+         func_warning "'-no-install' is ignored for $host"
+         func_warning "assuming '-no-fast-install' instead"
+         fast_install=no
+         ;;
+       *) no_install=yes ;;
+       esac
+       continue
+       ;;
+
+      -no-undefined)
+       allow_undefined=no
+       continue
+       ;;
+
+      -objectlist)
+       prev=objectlist
+       continue
+       ;;
+
+      -os2dllname)
+       prev=os2dllname
+       continue
+       ;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+       prev=precious_regex
+       continue
+       ;;
+
+      -release)
+       prev=release
+       continue
+       ;;
+
+      -rpath)
+       prev=rpath
+       continue
+       ;;
+
+      -R)
+       prev=xrpath
+       continue
+       ;;
+
+      -R*)
+       func_stripname '-R' '' "$arg"
+       dir=$func_stripname_result
+       # We need an absolute path.
+       case $dir in
+       [\\/]* | [A-Za-z]:[\\/]*) ;;
+       =*)
+         func_stripname '=' '' "$dir"
+         dir=$lt_sysroot$func_stripname_result
+         ;;
+       *)
+         func_fatal_error "only absolute run-paths are allowed"
+         ;;
+       esac
+       case "$xrpath " in
+       *" $dir "*) ;;
+       *) func_append xrpath " $dir" ;;
+       esac
+       continue
+       ;;
+
+      -shared)
+       # The effects of -shared are defined in a previous loop.
+       continue
+       ;;
+
+      -shrext)
+       prev=shrext
+       continue
+       ;;
+
+      -static | -static-libtool-libs)
+       # The effects of -static are defined in a previous loop.
+       # We used to do the same as -all-static on platforms that
+       # didn't have a PIC flag, but the assumption that the effects
+       # would be equivalent was wrong.  It would break on at least
+       # Digital Unix and AIX.
+       continue
+       ;;
+
+      -thread-safe)
+       thread_safe=yes
+       continue
+       ;;
+
+      -version-info)
+       prev=vinfo
+       continue
+       ;;
+
+      -version-number)
+       prev=vinfo
+       vinfo_number=yes
+       continue
+       ;;
+
+      -weak)
+        prev=weak
+       continue
+       ;;
+
+      -Wc,*)
+       func_stripname '-Wc,' '' "$arg"
+       args=$func_stripname_result
+       arg=
+       save_ifs=$IFS; IFS=,
+       for flag in $args; do
+         IFS=$save_ifs
+          func_quote_for_eval "$flag"
+         func_append arg " $func_quote_for_eval_result"
+         func_append compiler_flags " $func_quote_for_eval_result"
+       done
+       IFS=$save_ifs
+       func_stripname ' ' '' "$arg"
+       arg=$func_stripname_result
+       ;;
+
+      -Wl,*)
+       func_stripname '-Wl,' '' "$arg"
+       args=$func_stripname_result
+       arg=
+       save_ifs=$IFS; IFS=,
+       for flag in $args; do
+         IFS=$save_ifs
+          func_quote_for_eval "$flag"
+         func_append arg " $wl$func_quote_for_eval_result"
+         func_append compiler_flags " $wl$func_quote_for_eval_result"
+         func_append linker_flags " $func_quote_for_eval_result"
+       done
+       IFS=$save_ifs
+       func_stripname ' ' '' "$arg"
+       arg=$func_stripname_result
+       ;;
+
+      -Xcompiler)
+       prev=xcompiler
+       continue
+       ;;
+
+      -Xlinker)
+       prev=xlinker
+       continue
+       ;;
+
+      -XCClinker)
+       prev=xcclinker
+       continue
+       ;;
+
+      # -msg_* for osf cc
+      -msg_*)
+       func_quote_for_eval "$arg"
+       arg=$func_quote_for_eval_result
+       ;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # -fstack-protector*   stack protector flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      # -specs=*             GCC specs files
+      # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
+      # -fuse-ld=*           Linker select flags for GCC
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+      -specs=*|-fsanitize=*|-fuse-ld=*)
+        func_quote_for_eval "$arg"
+       arg=$func_quote_for_eval_result
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      -Z*)
+        if test os2 = "`expr $host : '.*\(os2\)'`"; then
+          # OS/2 uses -Zxxx to specify OS/2-specific options
+         compiler_flags="$compiler_flags $arg"
+         func_append compile_command " $arg"
+         func_append finalize_command " $arg"
+         case $arg in
+         -Zlinker | -Zstack)
+           prev=xcompiler
+           ;;
+         esac
+         continue
+        else
+         # Otherwise treat like 'Some other compiler flag' below
+         func_quote_for_eval "$arg"
+         arg=$func_quote_for_eval_result
+        fi
+       ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+       arg=$func_quote_for_eval_result
+       ;;
+
+      *.$objext)
+       # A standard object.
+       func_append objs " $arg"
+       ;;
+
+      *.lo)
+       # A libtool-controlled object.
+
+       # Check to see that this really is a libtool object.
+       if func_lalib_unsafe_p "$arg"; then
+         pic_object=
+         non_pic_object=
+
+         # Read the .lo file
+         func_source "$arg"
+
+         if test -z "$pic_object" ||
+            test -z "$non_pic_object" ||
+            test none = "$pic_object" &&
+            test none = "$non_pic_object"; then
+           func_fatal_error "cannot find name of object for '$arg'"
+         fi
+
+         # Extract subdirectory from the argument.
+         func_dirname "$arg" "/" ""
+         xdir=$func_dirname_result
+
+         test none = "$pic_object" || {
+           # Prepend the subdirectory the object is found in.
+           pic_object=$xdir$pic_object
+
+           if test dlfiles = "$prev"; then
+             if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
+               func_append dlfiles " $pic_object"
+               prev=
+               continue
+             else
+               # If libtool objects are unsupported, then we need to preload.
+               prev=dlprefiles
+             fi
+           fi
+
+           # CHECK ME:  I think I busted this.  -Ossama
+           if test dlprefiles = "$prev"; then
+             # Preload the old-style object.
+             func_append dlprefiles " $pic_object"
+             prev=
+           fi
+
+           # A PIC object.
+           func_append libobjs " $pic_object"
+           arg=$pic_object
+         }
+
+         # Non-PIC object.
+         if test none != "$non_pic_object"; then
+           # Prepend the subdirectory the object is found in.
+           non_pic_object=$xdir$non_pic_object
+
+           # A standard non-PIC object
+           func_append non_pic_objects " $non_pic_object"
+           if test -z "$pic_object" || test none = "$pic_object"; then
+             arg=$non_pic_object
+           fi
+         else
+           # If the PIC object exists, use it instead.
+           # $xdir was prepended to $pic_object above.
+           non_pic_object=$pic_object
+           func_append non_pic_objects " $non_pic_object"
+         fi
+       else
+         # Only an error if not doing a dry-run.
+         if $opt_dry_run; then
+           # Extract subdirectory from the argument.
+           func_dirname "$arg" "/" ""
+           xdir=$func_dirname_result
+
+           func_lo2o "$arg"
+           pic_object=$xdir$objdir/$func_lo2o_result
+           non_pic_object=$xdir$func_lo2o_result
+           func_append libobjs " $pic_object"
+           func_append non_pic_objects " $non_pic_object"
+         else
+           func_fatal_error "'$arg' is not a valid libtool object"
+         fi
+       fi
+       ;;
+
+      *.$libext)
+       # An archive.
+       func_append deplibs " $arg"
+       func_append old_deplibs " $arg"
+       continue
+       ;;
+
+      *.la)
+       # A libtool-controlled library.
+
+       func_resolve_sysroot "$arg"
+       if test dlfiles = "$prev"; then
+         # This library was specified with -dlopen.
+         func_append dlfiles " $func_resolve_sysroot_result"
+         prev=
+       elif test dlprefiles = "$prev"; then
+         # The library was specified with -dlpreopen.
+         func_append dlprefiles " $func_resolve_sysroot_result"
+         prev=
+       else
+         func_append deplibs " $func_resolve_sysroot_result"
+       fi
+       continue
+       ;;
+
+      # Some other compiler argument.
+      *)
+       # Unknown arguments in both finalize_command and compile_command need
+       # to be aesthetically quoted because they are evaled later.
+       func_quote_for_eval "$arg"
+       arg=$func_quote_for_eval_result
+       ;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+       func_append compile_command " $arg"
+       func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the '$prevarg' option requires an argument"
+
+    if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname=$func_basename_result
+    libobjs_save=$libobjs
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    # Definition is injected by LT_CONFIG during libtool generation.
+    func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
+    func_dirname "$output" "/" ""
+    output_objdir=$func_dirname_result$objdir
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps; then
+       case "$libs " in
+       *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+       esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test lib = "$linkmode"; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+       for pre_post_dep in $predeps $postdeps; do
+         case "$pre_post_deps " in
+         *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+         esac
+         func_append pre_post_deps " $pre_post_dep"
+       done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+       passes="conv dlpreopen link"
+       for file in $dlfiles $dlprefiles; do
+         case $file in
+         *.la) ;;
+         *)
+           func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
+           ;;
+         esac
+       done
+       ;;
+    prog)
+       compile_deplibs=
+       finalize_deplibs=
+       alldeplibs=false
+       newdlfiles=
+       newdlprefiles=
+       passes="conv scan dlopen dlpreopen link"
+       ;;
+    *)  passes="conv"
+       ;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test lib,link = "$linkmode,$pass"; then
+       ## FIXME: Find the place where the list is rebuilt in the wrong
+       ##        order, and fix it there properly
+        tmp_deplibs=
+       for deplib in $deplibs; do
+         tmp_deplibs="$deplib $tmp_deplibs"
+       done
+       deplibs=$tmp_deplibs
+      fi
+
+      if test lib,link = "$linkmode,$pass" ||
+        test prog,scan = "$linkmode,$pass"; then
+       libs=$deplibs
+       deplibs=
+      fi
+      if test prog = "$linkmode"; then
+       case $pass in
+       dlopen) libs=$dlfiles ;;
+       dlpreopen) libs=$dlprefiles ;;
+       link)
+         libs="$deplibs %DEPLIBS%"
+         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+         ;;
+       esac
+      fi
+      if test lib,dlpreopen = "$linkmode,$pass"; then
+       # Collect and forward deplibs of preopened libtool libs
+       for lib in $dlprefiles; do
+         # Ignore non-libtool-libs
+         dependency_libs=
+         func_resolve_sysroot "$lib"
+         case $lib in
+         *.la) func_source "$func_resolve_sysroot_result" ;;
+         esac
+
+         # Collect preopened libtool deplibs, except any this library
+         # has declared as weak libs
+         for deplib in $dependency_libs; do
+           func_basename "$deplib"
+            deplib_base=$func_basename_result
+           case " $weak_libs " in
+           *" $deplib_base "*) ;;
+           *) func_append deplibs " $deplib" ;;
+           esac
+         done
+       done
+       libs=$dlprefiles
+      fi
+      if test dlopen = "$pass"; then
+       # Collect dlpreopened libraries
+       save_deplibs=$deplibs
+       deplibs=
+      fi
+
+      for deplib in $libs; do
+       lib=
+       found=false
+       case $deplib in
+       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+         if test prog,link = "$linkmode,$pass"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           func_append compiler_flags " $deplib"
+           if test lib = "$linkmode"; then
+               case "$new_inherited_linker_flags " in
+                   *" $deplib "*) ;;
+                   * ) func_append new_inherited_linker_flags " $deplib" ;;
+               esac
+           fi
+         fi
+         continue
+         ;;
+       -l*)
+         if test lib != "$linkmode" && test prog != "$linkmode"; then
+           func_warning "'-l' is ignored for archives/objects"
+           continue
+         fi
+         func_stripname '-l' '' "$deplib"
+         name=$func_stripname_result
+         if test lib = "$linkmode"; then
+           searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+         else
+           searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+         fi
+         for searchdir in $searchdirs; do
+           for search_ext in .la $std_shrext .so .a; do
+             # Search the libtool library
+             lib=$searchdir/lib$name$search_ext
+             if test -f "$lib"; then
+               if test .la = "$search_ext"; then
+                 found=:
+               else
+                 found=false
+               fi
+               break 2
+             fi
+           done
+         done
+         if $found; then
+           # deplib is a libtool library
+           # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+           # We need to do some special things here, and not later.
+           if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+             case " $predeps $postdeps " in
+             *" $deplib "*)
+               if func_lalib_p "$lib"; then
+                 library_names=
+                 old_library=
+                 func_source "$lib"
+                 for l in $old_library $library_names; do
+                   ll=$l
+                 done
+                 if test "X$ll" = "X$old_library"; then # only static version available
+                   found=false
+                   func_dirname "$lib" "" "."
+                   ladir=$func_dirname_result
+                   lib=$ladir/$old_library
+                   if test prog,link = "$linkmode,$pass"; then
+                     compile_deplibs="$deplib $compile_deplibs"
+                     finalize_deplibs="$deplib $finalize_deplibs"
+                   else
+                     deplibs="$deplib $deplibs"
+                     test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+                   fi
+                   continue
+                 fi
+               fi
+               ;;
+             *) ;;
+             esac
+           fi
+         else
+           # deplib doesn't seem to be a libtool library
+           if test prog,link = "$linkmode,$pass"; then
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           else
+             deplibs="$deplib $deplibs"
+             test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+           fi
+           continue
+         fi
+         ;; # -l
+       *.ltframework)
+         if test prog,link = "$linkmode,$pass"; then
+           compile_deplibs="$deplib $compile_deplibs"
+           finalize_deplibs="$deplib $finalize_deplibs"
+         else
+           deplibs="$deplib $deplibs"
+           if test lib = "$linkmode"; then
+               case "$new_inherited_linker_flags " in
+                   *" $deplib "*) ;;
+                   * ) func_append new_inherited_linker_flags " $deplib" ;;
+               esac
+           fi
+         fi
+         continue
+         ;;
+       -L*)
+         case $linkmode in
+         lib)
+           deplibs="$deplib $deplibs"
+           test conv = "$pass" && continue
+           newdependency_libs="$deplib $newdependency_libs"
+           func_stripname '-L' '' "$deplib"
+           func_resolve_sysroot "$func_stripname_result"
+           func_append newlib_search_path " $func_resolve_sysroot_result"
+           ;;
+         prog)
+           if test conv = "$pass"; then
+             deplibs="$deplib $deplibs"
+             continue
+           fi
+           if test scan = "$pass"; then
+             deplibs="$deplib $deplibs"
+           else
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           fi
+           func_stripname '-L' '' "$deplib"
+           func_resolve_sysroot "$func_stripname_result"
+           func_append newlib_search_path " $func_resolve_sysroot_result"
+           ;;
+         *)
+           func_warning "'-L' is ignored for archives/objects"
+           ;;
+         esac # linkmode
+         continue
+         ;; # -L
+       -R*)
+         if test link = "$pass"; then
+           func_stripname '-R' '' "$deplib"
+           func_resolve_sysroot "$func_stripname_result"
+           dir=$func_resolve_sysroot_result
+           # Make sure the xrpath contains only unique directories.
+           case "$xrpath " in
+           *" $dir "*) ;;
+           *) func_append xrpath " $dir" ;;
+           esac
+         fi
+         deplibs="$deplib $deplibs"
+         continue
+         ;;
+       *.la)
+         func_resolve_sysroot "$deplib"
+         lib=$func_resolve_sysroot_result
+         ;;
+       *.$libext)
+         if test conv = "$pass"; then
+           deplibs="$deplib $deplibs"
+           continue
+         fi
+         case $linkmode in
+         lib)
+           # Linking convenience modules into shared libraries is allowed,
+           # but linking other static libraries is non-portable.
+           case " $dlpreconveniencelibs " in
+           *" $deplib "*) ;;
+           *)
+             valid_a_lib=false
+             case $deplibs_check_method in
+               match_pattern*)
+                 set dummy $deplibs_check_method; shift
+                 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+                 if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+                   | $EGREP "$match_pattern_regex" > /dev/null; then
+                   valid_a_lib=:
+                 fi
+               ;;
+               pass_all)
+                 valid_a_lib=:
+               ;;
+             esac
+             if $valid_a_lib; then
+               echo
+               $ECHO "*** Warning: Linking the shared library $output against the"
+               $ECHO "*** static library $deplib is not portable!"
+               deplibs="$deplib $deplibs"
+             else
+               echo
+               $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+               echo "*** I have the capability to make that library automatically link in when"
+               echo "*** you link to this library.  But I can only do this if you have a"
+               echo "*** shared version of the library, which you do not appear to have"
+               echo "*** because the file extensions .$libext of this argument makes me believe"
+               echo "*** that it is just a static archive that I should not use here."
+             fi
+             ;;
+           esac
+           continue
+           ;;
+         prog)
+           if test link != "$pass"; then
+             deplibs="$deplib $deplibs"
+           else
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           fi
+           continue
+           ;;
+         esac # linkmode
+         ;; # *.$libext
+       *.lo | *.$objext)
+         if test conv = "$pass"; then
+           deplibs="$deplib $deplibs"
+         elif test prog = "$linkmode"; then
+           if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
+             # If there is no dlopen support or we're linking statically,
+             # we need to preload.
+             func_append newdlprefiles " $deplib"
+             compile_deplibs="$deplib $compile_deplibs"
+             finalize_deplibs="$deplib $finalize_deplibs"
+           else
+             func_append newdlfiles " $deplib"
+           fi
+         fi
+         continue
+         ;;
+       %DEPLIBS%)
+         alldeplibs=:
+         continue
+         ;;
+       esac # case $deplib
+
+       $found || test -f "$lib" \
+         || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
+
+       # Check to see that this really is a libtool archive.
+       func_lalib_unsafe_p "$lib" \
+         || func_fatal_error "'$lib' is not a valid libtool archive"
+
+       func_dirname "$lib" "" "."
+       ladir=$func_dirname_result
+
+       dlname=
+       dlopen=
+       dlpreopen=
+       libdir=
+       library_names=
+       old_library=
+       inherited_linker_flags=
+       # If the library was installed with an old release of libtool,
+       # it will not redefine variables installed, or shouldnotlink
+       installed=yes
+       shouldnotlink=no
+       avoidtemprpath=
+
+
+       # Read the .la file
+       func_source "$lib"
+
+       # Convert "-framework foo" to "foo.ltframework"
+       if test -n "$inherited_linker_flags"; then
+         tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+         for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+           case " $new_inherited_linker_flags " in
+             *" $tmp_inherited_linker_flag "*) ;;
+             *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+           esac
+         done
+       fi
+       dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+       if test lib,link = "$linkmode,$pass" ||
+          test prog,scan = "$linkmode,$pass" ||
+          { test prog != "$linkmode" && test lib != "$linkmode"; }; then
+         test -n "$dlopen" && func_append dlfiles " $dlopen"
+         test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+       fi
+
+       if test conv = "$pass"; then
+         # Only check for convenience libraries
+         deplibs="$lib $deplibs"
+         if test -z "$libdir"; then
+           if test -z "$old_library"; then
+             func_fatal_error "cannot find name of link library for '$lib'"
+           fi
+           # It is a libtool convenience library, so add in its objects.
+           func_append convenience " $ladir/$objdir/$old_library"
+           func_append old_convenience " $ladir/$objdir/$old_library"
+           tmp_libs=
+           for deplib in $dependency_libs; do
+             deplibs="$deplib $deplibs"
+             if $opt_preserve_dup_deps; then
+               case "$tmp_libs " in
+               *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+               esac
+             fi
+             func_append tmp_libs " $deplib"
+           done
+         elif test prog != "$linkmode" && test lib != "$linkmode"; then
+           func_fatal_error "'$lib' is not a convenience library"
+         fi
+         continue
+       fi # $pass = conv
+
+
+       # Get the name of the library we link against.
+       linklib=
+       if test -n "$old_library" &&
+          { test yes = "$prefer_static_libs" ||
+            test built,no = "$prefer_static_libs,$installed"; }; then
+         linklib=$old_library
+       else
+         for l in $old_library $library_names; do
+           linklib=$l
+         done
+       fi
+       if test -z "$linklib"; then
+         func_fatal_error "cannot find name of link library for '$lib'"
+       fi
+
+       # This library was specified with -dlopen.
+       if test dlopen = "$pass"; then
+         test -z "$libdir" \
+           && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
+         if test -z "$dlname" ||
+            test yes != "$dlopen_support" ||
+            test no = "$build_libtool_libs"
+         then
+           # If there is no dlname, no dlopen support or we're linking
+           # statically, we need to preload.  We also need to preload any
+           # dependent libraries so libltdl's deplib preloader doesn't
+           # bomb out in the load deplibs phase.
+           func_append dlprefiles " $lib $dependency_libs"
+         else
+           func_append newdlfiles " $lib"
+         fi
+         continue
+       fi # $pass = dlopen
+
+       # We need an absolute path.
+       case $ladir in
+       [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
+       *)
+         abs_ladir=`cd "$ladir" && pwd`
+         if test -z "$abs_ladir"; then
+           func_warning "cannot determine absolute directory name of '$ladir'"
+           func_warning "passing it literally to the linker, although it might fail"
+           abs_ladir=$ladir
+         fi
+         ;;
+       esac
+       func_basename "$lib"
+       laname=$func_basename_result
+
+       # Find the relevant object directory and library name.
+       if test yes = "$installed"; then
+         if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+           func_warning "library '$lib' was moved."
+           dir=$ladir
+           absdir=$abs_ladir
+           libdir=$abs_ladir
+         else
+           dir=$lt_sysroot$libdir
+           absdir=$lt_sysroot$libdir
+         fi
+         test yes = "$hardcode_automatic" && avoidtemprpath=yes
+       else
+         if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+           dir=$ladir
+           absdir=$abs_ladir
+           # Remove this search path later
+           func_append notinst_path " $abs_ladir"
+         else
+           dir=$ladir/$objdir
+           absdir=$abs_ladir/$objdir
+           # Remove this search path later
+           func_append notinst_path " $abs_ladir"
+         fi
+       fi # $installed = yes
+       func_stripname 'lib' '.la' "$laname"
+       name=$func_stripname_result
+
+       # This library was specified with -dlpreopen.
+       if test dlpreopen = "$pass"; then
+         if test -z "$libdir" && test prog = "$linkmode"; then
+           func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
+         fi
+         case $host in
+           # special handling for platforms with PE-DLLs.
+           *cygwin* | *mingw* | *cegcc* )
+             # Linker will automatically link against shared library if both
+             # static and shared are present.  Therefore, ensure we extract
+             # symbols from the import library if a shared library is present
+             # (otherwise, the dlopen module name will be incorrect).  We do
+             # this by putting the import library name into $newdlprefiles.
+             # We recover the dlopen module name by 'saving' the la file
+             # name in a special purpose variable, and (later) extracting the
+             # dlname from the la file.
+             if test -n "$dlname"; then
+               func_tr_sh "$dir/$linklib"
+               eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+               func_append newdlprefiles " $dir/$linklib"
+             else
+               func_append newdlprefiles " $dir/$old_library"
+               # Keep a list of preopened convenience libraries to check
+               # that they are being used correctly in the link pass.
+               test -z "$libdir" && \
+                 func_append dlpreconveniencelibs " $dir/$old_library"
+             fi
+           ;;
+           * )
+             # Prefer using a static library (so that no silly _DYNAMIC symbols
+             # are required to link).
+             if test -n "$old_library"; then
+               func_append newdlprefiles " $dir/$old_library"
+               # Keep a list of preopened convenience libraries to check
+               # that they are being used correctly in the link pass.
+               test -z "$libdir" && \
+                 func_append dlpreconveniencelibs " $dir/$old_library"
+             # Otherwise, use the dlname, so that lt_dlopen finds it.
+             elif test -n "$dlname"; then
+               func_append newdlprefiles " $dir/$dlname"
+             else
+               func_append newdlprefiles " $dir/$linklib"
+             fi
+           ;;
+         esac
+       fi # $pass = dlpreopen
+
+       if test -z "$libdir"; then
+         # Link the convenience library
+         if test lib = "$linkmode"; then
+           deplibs="$dir/$old_library $deplibs"
+         elif test prog,link = "$linkmode,$pass"; then
+           compile_deplibs="$dir/$old_library $compile_deplibs"
+           finalize_deplibs="$dir/$old_library $finalize_deplibs"
+         else
+           deplibs="$lib $deplibs" # used for prog,scan pass
+         fi
+         continue
+       fi
+
+
+       if test prog = "$linkmode" && test link != "$pass"; then
+         func_append newlib_search_path " $ladir"
+         deplibs="$lib $deplibs"
+
+         linkalldeplibs=false
+         if test no != "$link_all_deplibs" || test -z "$library_names" ||
+            test no = "$build_libtool_libs"; then
+           linkalldeplibs=:
+         fi
+
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           case $deplib in
+           -L*) func_stripname '-L' '' "$deplib"
+                func_resolve_sysroot "$func_stripname_result"
+                func_append newlib_search_path " $func_resolve_sysroot_result"
+                ;;
+           esac
+           # Need to link against all dependency_libs?
+           if $linkalldeplibs; then
+             deplibs="$deplib $deplibs"
+           else
+             # Need to hardcode shared library paths
+             # or/and link against static libraries
+             newdependency_libs="$deplib $newdependency_libs"
+           fi
+           if $opt_preserve_dup_deps; then
+             case "$tmp_libs " in
+             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+             esac
+           fi
+           func_append tmp_libs " $deplib"
+         done # for deplib
+         continue
+       fi # $linkmode = prog...
+
+       if test prog,link = "$linkmode,$pass"; then
+         if test -n "$library_names" &&
+            { { test no = "$prefer_static_libs" ||
+                test built,yes = "$prefer_static_libs,$installed"; } ||
+              test -z "$old_library"; }; then
+           # We need to hardcode the library path
+           if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+             # Make sure the rpath contains only unique directories.
+             case $temp_rpath: in
+             *"$absdir:"*) ;;
+             *) func_append temp_rpath "$absdir:" ;;
+             esac
+           fi
+
+           # Hardcode the library path.
+           # Skip directories that are in the system default run-time
+           # search path.
+           case " $sys_lib_dlsearch_path " in
+           *" $absdir "*) ;;
+           *)
+             case "$compile_rpath " in
+             *" $absdir "*) ;;
+             *) func_append compile_rpath " $absdir" ;;
+             esac
+             ;;
+           esac
+           case " $sys_lib_dlsearch_path " in
+           *" $libdir "*) ;;
+           *)
+             case "$finalize_rpath " in
+             *" $libdir "*) ;;
+             *) func_append finalize_rpath " $libdir" ;;
+             esac
+             ;;
+           esac
+         fi # $linkmode,$pass = prog,link...
+
+         if $alldeplibs &&
+            { test pass_all = "$deplibs_check_method" ||
+              { test yes = "$build_libtool_libs" &&
+                test -n "$library_names"; }; }; then
+           # We only need to search for static libraries
+           continue
+         fi
+       fi
+
+       link_static=no # Whether the deplib will be linked statically
+       use_static_libs=$prefer_static_libs
+       if test built = "$use_static_libs" && test yes = "$installed"; then
+         use_static_libs=no
+       fi
+       if test -n "$library_names" &&
+          { test no = "$use_static_libs" || test -z "$old_library"; }; then
+         case $host in
+         *cygwin* | *mingw* | *cegcc* | *os2*)
+             # No point in relinking DLLs because paths are not encoded
+             func_append notinst_deplibs " $lib"
+             need_relink=no
+           ;;
+         *)
+           if test no = "$installed"; then
+             func_append notinst_deplibs " $lib"
+             need_relink=yes
+           fi
+           ;;
+         esac
+         # This is a shared library
+
+         # Warn about portability, can't link against -module's on some
+         # systems (darwin).  Don't bleat about dlopened modules though!
+         dlopenmodule=
+         for dlpremoduletest in $dlprefiles; do
+           if test "X$dlpremoduletest" = "X$lib"; then
+             dlopenmodule=$dlpremoduletest
+             break
+           fi
+         done
+         if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
+           echo
+           if test prog = "$linkmode"; then
+             $ECHO "*** Warning: Linking the executable $output against the loadable module"
+           else
+             $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+           fi
+           $ECHO "*** $linklib is not portable!"
+         fi
+         if test lib = "$linkmode" &&
+            test yes = "$hardcode_into_libs"; then
+           # Hardcode the library path.
+           # Skip directories that are in the system default run-time
+           # search path.
+           case " $sys_lib_dlsearch_path " in
+           *" $absdir "*) ;;
+           *)
+             case "$compile_rpath " in
+             *" $absdir "*) ;;
+             *) func_append compile_rpath " $absdir" ;;
+             esac
+             ;;
+           esac
+           case " $sys_lib_dlsearch_path " in
+           *" $libdir "*) ;;
+           *)
+             case "$finalize_rpath " in
+             *" $libdir "*) ;;
+             *) func_append finalize_rpath " $libdir" ;;
+             esac
+             ;;
+           esac
+         fi
+
+         if test -n "$old_archive_from_expsyms_cmds"; then
+           # figure out the soname
+           set dummy $library_names
+           shift
+           realname=$1
+           shift
+           libname=`eval "\\$ECHO \"$libname_spec\""`
+           # use dlname if we got it. it's perfectly good, no?
+           if test -n "$dlname"; then
+             soname=$dlname
+           elif test -n "$soname_spec"; then
+             # bleh windows
+             case $host in
+             *cygwin* | mingw* | *cegcc* | *os2*)
+               func_arith $current - $age
+               major=$func_arith_result
+               versuffix=-$major
+               ;;
+             esac
+             eval soname=\"$soname_spec\"
+           else
+             soname=$realname
+           fi
+
+           # Make a new name for the extract_expsyms_cmds to use
+           soroot=$soname
+           func_basename "$soroot"
+           soname=$func_basename_result
+           func_stripname 'lib' '.dll' "$soname"
+           newlib=libimp-$func_stripname_result.a
+
+           # If the library has no export list, then create one now
+           if test -f "$output_objdir/$soname-def"; then :
+           else
+             func_verbose "extracting exported symbol list from '$soname'"
+             func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+           fi
+
+           # Create $newlib
+           if test -f "$output_objdir/$newlib"; then :; else
+             func_verbose "generating import library for '$soname'"
+             func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+           fi
+           # make sure the library variables are pointing to the new library
+           dir=$output_objdir
+           linklib=$newlib
+         fi # test -n "$old_archive_from_expsyms_cmds"
+
+         if test prog = "$linkmode" || test relink != "$opt_mode"; then
+           add_shlibpath=
+           add_dir=
+           add=
+           lib_linked=yes
+           case $hardcode_action in
+           immediate | unsupported)
+             if test no = "$hardcode_direct"; then
+               add=$dir/$linklib
+               case $host in
+                 *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+                 *-*-sysv4*uw2*) add_dir=-L$dir ;;
+                 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+                   *-*-unixware7*) add_dir=-L$dir ;;
+                 *-*-darwin* )
+                   # if the lib is a (non-dlopened) module then we cannot
+                   # link against it, someone is ignoring the earlier warnings
+                   if /usr/bin/file -L $add 2> /dev/null |
+                        $GREP ": [^:]* bundle" >/dev/null; then
+                     if test "X$dlopenmodule" != "X$lib"; then
+                       $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+                       if test -z "$old_library"; then
+                         echo
+                         echo "*** And there doesn't seem to be a static archive available"
+                         echo "*** The link will probably fail, sorry"
+                       else
+                         add=$dir/$old_library
+                       fi
+                     elif test -n "$old_library"; then
+                       add=$dir/$old_library
+                     fi
+                   fi
+               esac
+             elif test no = "$hardcode_minus_L"; then
+               case $host in
+               *-*-sunos*) add_shlibpath=$dir ;;
+               esac
+               add_dir=-L$dir
+               add=-l$name
+             elif test no = "$hardcode_shlibpath_var"; then
+               add_shlibpath=$dir
+               add=-l$name
+             else
+               lib_linked=no
+             fi
+             ;;
+           relink)
+             if test yes = "$hardcode_direct" &&
+                test no = "$hardcode_direct_absolute"; then
+               add=$dir/$linklib
+             elif test yes = "$hardcode_minus_L"; then
+               add_dir=-L$absdir
+               # Try looking first in the location we're being installed to.
+               if test -n "$inst_prefix_dir"; then
+                 case $libdir in
+                   [\\/]*)
+                     func_append add_dir " -L$inst_prefix_dir$libdir"
+                     ;;
+                 esac
+               fi
+               add=-l$name
+             elif test yes = "$hardcode_shlibpath_var"; then
+               add_shlibpath=$dir
+               add=-l$name
+             else
+               lib_linked=no
+             fi
+             ;;
+           *) lib_linked=no ;;
+           esac
+
+           if test yes != "$lib_linked"; then
+             func_fatal_configuration "unsupported hardcode properties"
+           fi
+
+           if test -n "$add_shlibpath"; then
+             case :$compile_shlibpath: in
+             *":$add_shlibpath:"*) ;;
+             *) func_append compile_shlibpath "$add_shlibpath:" ;;
+             esac
+           fi
+           if test prog = "$linkmode"; then
+             test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+             test -n "$add" && compile_deplibs="$add $compile_deplibs"
+           else
+             test -n "$add_dir" && deplibs="$add_dir $deplibs"
+             test -n "$add" && deplibs="$add $deplibs"
+             if test yes != "$hardcode_direct" &&
+                test yes != "$hardcode_minus_L" &&
+                test yes = "$hardcode_shlibpath_var"; then
+               case :$finalize_shlibpath: in
+               *":$libdir:"*) ;;
+               *) func_append finalize_shlibpath "$libdir:" ;;
+               esac
+             fi
+           fi
+         fi
+
+         if test prog = "$linkmode" || test relink = "$opt_mode"; then
+           add_shlibpath=
+           add_dir=
+           add=
+           # Finalize command for both is simple: just hardcode it.
+           if test yes = "$hardcode_direct" &&
+              test no = "$hardcode_direct_absolute"; then
+             add=$libdir/$linklib
+           elif test yes = "$hardcode_minus_L"; then
+             add_dir=-L$libdir
+             add=-l$name
+           elif test yes = "$hardcode_shlibpath_var"; then
+             case :$finalize_shlibpath: in
+             *":$libdir:"*) ;;
+             *) func_append finalize_shlibpath "$libdir:" ;;
+             esac
+             add=-l$name
+           elif test yes = "$hardcode_automatic"; then
+             if test -n "$inst_prefix_dir" &&
+                test -f "$inst_prefix_dir$libdir/$linklib"; then
+               add=$inst_prefix_dir$libdir/$linklib
+             else
+               add=$libdir/$linklib
+             fi
+           else
+             # We cannot seem to hardcode it, guess we'll fake it.
+             add_dir=-L$libdir
+             # Try looking first in the location we're being installed to.
+             if test -n "$inst_prefix_dir"; then
+               case $libdir in
+                 [\\/]*)
+                   func_append add_dir " -L$inst_prefix_dir$libdir"
+                   ;;
+               esac
+             fi
+             add=-l$name
+           fi
+
+           if test prog = "$linkmode"; then
+             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+           else
+             test -n "$add_dir" && deplibs="$add_dir $deplibs"
+             test -n "$add" && deplibs="$add $deplibs"
+           fi
+         fi
+       elif test prog = "$linkmode"; then
+         # Here we assume that one of hardcode_direct or hardcode_minus_L
+         # is not unsupported.  This is valid on all known static and
+         # shared platforms.
+         if test unsupported != "$hardcode_direct"; then
+           test -n "$old_library" && linklib=$old_library
+           compile_deplibs="$dir/$linklib $compile_deplibs"
+           finalize_deplibs="$dir/$linklib $finalize_deplibs"
+         else
+           compile_deplibs="-l$name -L$dir $compile_deplibs"
+           finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+         fi
+       elif test yes = "$build_libtool_libs"; then
+         # Not a shared library
+         if test pass_all != "$deplibs_check_method"; then
+           # We're trying link a shared library against a static one
+           # but the system doesn't support it.
+
+           # Just print a warning and add the library to dependency_libs so
+           # that the program can be linked against the static library.
+           echo
+           $ECHO "*** Warning: This system cannot link to static lib archive $lib."
+           echo "*** I have the capability to make that library automatically link in when"
+           echo "*** you link to this library.  But I can only do this if you have a"
+           echo "*** shared version of the library, which you do not appear to have."
+           if test yes = "$module"; then
+             echo "*** But as you try to build a module library, libtool will still create "
+             echo "*** a static module, that should work as long as the dlopening application"
+             echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+             if test -z "$global_symbol_pipe"; then
+               echo
+               echo "*** However, this would only work if libtool was able to extract symbol"
+               echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+               echo "*** not find such a program.  So, this module is probably useless."
+               echo "*** 'nm' from GNU binutils and a full rebuild may help."
+             fi
+             if test no = "$build_old_libs"; then
+               build_libtool_libs=module
+               build_old_libs=yes
+             else
+               build_libtool_libs=no
+             fi
+           fi
+         else
+           deplibs="$dir/$old_library $deplibs"
+           link_static=yes
+         fi
+       fi # link shared/static library?
+
+       if test lib = "$linkmode"; then
+         if test -n "$dependency_libs" &&
+            { test yes != "$hardcode_into_libs" ||
+              test yes = "$build_old_libs" ||
+              test yes = "$link_static"; }; then
+           # Extract -R from dependency_libs
+           temp_deplibs=
+           for libdir in $dependency_libs; do
+             case $libdir in
+             -R*) func_stripname '-R' '' "$libdir"
+                  temp_xrpath=$func_stripname_result
+                  case " $xrpath " in
+                  *" $temp_xrpath "*) ;;
+                  *) func_append xrpath " $temp_xrpath";;
+                  esac;;
+             *) func_append temp_deplibs " $libdir";;
+             esac
+           done
+           dependency_libs=$temp_deplibs
+         fi
+
+         func_append newlib_search_path " $absdir"
+         # Link against this library
+         test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+         # ... and its dependency_libs
+         tmp_libs=
+         for deplib in $dependency_libs; do
+           newdependency_libs="$deplib $newdependency_libs"
+           case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+           if $opt_preserve_dup_deps; then
+             case "$tmp_libs " in
+             *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+             esac
+           fi
+           func_append tmp_libs " $func_resolve_sysroot_result"
+         done
+
+         if test no != "$link_all_deplibs"; then
+           # Add the search paths of all dependency libraries
+           for deplib in $dependency_libs; do
+             path=
+             case $deplib in
+             -L*) path=$deplib ;;
+             *.la)
+               func_resolve_sysroot "$deplib"
+               deplib=$func_resolve_sysroot_result
+               func_dirname "$deplib" "" "."
+               dir=$func_dirname_result
+               # We need an absolute path.
+               case $dir in
+               [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
+               *)
+                 absdir=`cd "$dir" && pwd`
+                 if test -z "$absdir"; then
+                   func_warning "cannot determine absolute directory name of '$dir'"
+                   absdir=$dir
+                 fi
+                 ;;
+               esac
+               if $GREP "^installed=no" $deplib > /dev/null; then
+               case $host in
+               *-*-darwin*)
+                 depdepl=
+                 eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                 if test -n "$deplibrary_names"; then
+                   for tmp in $deplibrary_names; do
+                     depdepl=$tmp
+                   done
+                   if test -f "$absdir/$objdir/$depdepl"; then
+                     depdepl=$absdir/$objdir/$depdepl
+                     darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+                     func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+                     func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
+                     path=
+                   fi
+                 fi
+                 ;;
+               *)
+                 path=-L$absdir/$objdir
+                 ;;
+               esac
+               else
+                 eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+                 test -z "$libdir" && \
+                   func_fatal_error "'$deplib' is not a valid libtool archive"
+                 test "$absdir" != "$libdir" && \
+                   func_warning "'$deplib' seems to be moved"
+
+                 path=-L$absdir
+               fi
+               ;;
+             esac
+             case " $deplibs " in
+             *" $path "*) ;;
+             *) deplibs="$path $deplibs" ;;
+             esac
+           done
+         fi # link_all_deplibs != no
+       fi # linkmode = lib
+      done # for deplib in $libs
+      if test link = "$pass"; then
+       if test prog = "$linkmode"; then
+         compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+         finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+       else
+         compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+       fi
+      fi
+      dependency_libs=$newdependency_libs
+      if test dlpreopen = "$pass"; then
+       # Link the dlpreopened libraries before other libraries
+       for deplib in $save_deplibs; do
+         deplibs="$deplib $deplibs"
+       done
+      fi
+      if test dlopen != "$pass"; then
+       test conv = "$pass" || {
+         # Make sure lib_search_path contains only unique directories.
+         lib_search_path=
+         for dir in $newlib_search_path; do
+           case "$lib_search_path " in
+           *" $dir "*) ;;
+           *) func_append lib_search_path " $dir" ;;
+           esac
+         done
+         newlib_search_path=
+       }
+
+       if test prog,link = "$linkmode,$pass"; then
+         vars="compile_deplibs finalize_deplibs"
+       else
+         vars=deplibs
+       fi
+       for var in $vars dependency_libs; do
+         # Add libraries to $var in reverse order
+         eval tmp_libs=\"\$$var\"
+         new_libs=
+         for deplib in $tmp_libs; do
+           # FIXME: Pedantically, this is the right thing to do, so
+           #        that some nasty dependency loop isn't accidentally
+           #        broken:
+           #new_libs="$deplib $new_libs"
+           # Pragmatically, this seems to cause very few problems in
+           # practice:
+           case $deplib in
+           -L*) new_libs="$deplib $new_libs" ;;
+           -R*) ;;
+           *)
+             # And here is the reason: when a library appears more
+             # than once as an explicit dependence of a library, or
+             # is implicitly linked in more than once by the
+             # compiler, it is considered special, and multiple
+             # occurrences thereof are not removed.  Compare this
+             # with having the same library being listed as a
+             # dependency of multiple other libraries: in this case,
+             # we know (pedantically, we assume) the library does not
+             # need to be listed more than once, so we keep only the
+             # last copy.  This is not always right, but it is rare
+             # enough that we require users that really mean to play
+             # such unportable linking tricks to link the library
+             # using -Wl,-lname, so that libtool does not consider it
+             # for duplicate removal.
+             case " $specialdeplibs " in
+             *" $deplib "*) new_libs="$deplib $new_libs" ;;
+             *)
+               case " $new_libs " in
+               *" $deplib "*) ;;
+               *) new_libs="$deplib $new_libs" ;;
+               esac
+               ;;
+             esac
+             ;;
+           esac
+         done
+         tmp_libs=
+         for deplib in $new_libs; do
+           case $deplib in
+           -L*)
+             case " $tmp_libs " in
+             *" $deplib "*) ;;
+             *) func_append tmp_libs " $deplib" ;;
+             esac
+             ;;
+           *) func_append tmp_libs " $deplib" ;;
+           esac
+         done
+         eval $var=\"$tmp_libs\"
+       done # for var
+      fi
+
+      # Add Sun CC postdeps if required:
+      test CXX = "$tagname" && {
+        case $host_os in
+        linux*)
+          case `$CC -V 2>&1 | sed 5q` in
+          *Sun\ C*) # Sun C++ 5.9
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+
+        solaris*)
+          func_cc_basename "$CC"
+          case $func_cc_basename_result in
+          CC* | sunCC*)
+            func_suncc_cstd_abi
+
+            if test no != "$suncc_use_cstd_abi"; then
+              func_append postdeps ' -library=Cstd -library=Crun'
+            fi
+            ;;
+          esac
+          ;;
+        esac
+      }
+
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs; do
+       case " $predeps $postdeps $compiler_lib_search_path " in
+       *" $i "*)
+         i=
+         ;;
+       esac
+       if test -n "$i"; then
+         func_append tmp_libs " $i"
+       fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test prog = "$linkmode"; then
+      dlfiles=$newdlfiles
+    fi
+    if test prog = "$linkmode" || test lib = "$linkmode"; then
+      dlprefiles=$newdlprefiles
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+       func_warning "'-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+       func_warning "'-l' and '-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+       func_warning "'-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+       func_warning "'-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+       func_warning "'-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+       func_warning "'-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+       func_warning "'-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs=$output
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form 'libNAME.la'.
+      case $outputname in
+      lib*)
+       func_stripname 'lib' '.la' "$outputname"
+       name=$func_stripname_result
+       eval shared_ext=\"$shrext_cmds\"
+       eval libname=\"$libname_spec\"
+       ;;
+      *)
+       test no = "$module" \
+         && func_fatal_help "libtool library '$output' must begin with 'lib'"
+
+       if test no != "$need_lib_prefix"; then
+         # Add the "lib" prefix for modules if required
+         func_stripname '' '.la' "$outputname"
+         name=$func_stripname_result
+         eval shared_ext=\"$shrext_cmds\"
+         eval libname=\"$libname_spec\"
+       else
+         func_stripname '' '.la' "$outputname"
+         libname=$func_stripname_result
+       fi
+       ;;
+      esac
+
+      if test -n "$objs"; then
+       if test pass_all != "$deplibs_check_method"; then
+         func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
+       else
+         echo
+         $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+         $ECHO "*** objects $objs is not portable!"
+         func_append libobjs " $objs"
+       fi
+      fi
+
+      test no = "$dlself" \
+       || func_warning "'-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test 1 -lt "$#" \
+       && func_warning "ignoring multiple '-rpath's for a libtool library"
+
+      install_libdir=$1
+
+      oldlibs=
+      if test -z "$rpath"; then
+       if test yes = "$build_libtool_libs"; then
+         # Building a libtool convenience library.
+         # Some compilers have problems with a '.al' extension so
+         # convenience libraries should have the same extension an
+         # archive normally would.
+         oldlibs="$output_objdir/$libname.$libext $oldlibs"
+         build_libtool_libs=convenience
+         build_old_libs=yes
+       fi
+
+       test -n "$vinfo" && \
+         func_warning "'-version-info/-version-number' is ignored for convenience libraries"
+
+       test -n "$release" && \
+         func_warning "'-release' is ignored for convenience libraries"
+      else
+
+       # Parse the version information argument.
+       save_ifs=$IFS; IFS=:
+       set dummy $vinfo 0 0 0
+       shift
+       IFS=$save_ifs
+
+       test -n "$7" && \
+         func_fatal_help "too many parameters to '-version-info'"
+
+       # convert absolute version numbers to libtool ages
+       # this retains compatibility with .la files and attempts
+       # to make the code below a bit more comprehensible
+
+       case $vinfo_number in
+       yes)
+         number_major=$1
+         number_minor=$2
+         number_revision=$3
+         #
+         # There are really only two kinds -- those that
+         # use the current revision as the major version
+         # and those that subtract age and use age as
+         # a minor version.  But, then there is irix
+         # that has an extra 1 added just for fun
+         #
+         case $version_type in
+         # correct linux to gnu/linux during the next big refactor
+         darwin|freebsd-elf|linux|osf|windows|none)
+           func_arith $number_major + $number_minor
+           current=$func_arith_result
+           age=$number_minor
+           revision=$number_revision
+           ;;
+         freebsd-aout|qnx|sunos)
+           current=$number_major
+           revision=$number_minor
+           age=0
+           ;;
+         irix|nonstopux)
+           func_arith $number_major + $number_minor
+           current=$func_arith_result
+           age=$number_minor
+           revision=$number_minor
+           lt_irix_increment=no
+           ;;
+         *)
+           func_fatal_configuration "$modename: unknown library version type '$version_type'"
+           ;;
+         esac
+         ;;
+       no)
+         current=$1
+         revision=$2
+         age=$3
+         ;;
+       esac
+
+       # Check that each of the things are valid numbers.
+       case $current in
+       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+       *)
+         func_error "CURRENT '$current' must be a nonnegative integer"
+         func_fatal_error "'$vinfo' is not valid version information"
+         ;;
+       esac
+
+       case $revision in
+       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+       *)
+         func_error "REVISION '$revision' must be a nonnegative integer"
+         func_fatal_error "'$vinfo' is not valid version information"
+         ;;
+       esac
+
+       case $age in
+       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+       *)
+         func_error "AGE '$age' must be a nonnegative integer"
+         func_fatal_error "'$vinfo' is not valid version information"
+         ;;
+       esac
+
+       if test "$age" -gt "$current"; then
+         func_error "AGE '$age' is greater than the current interface number '$current'"
+         func_fatal_error "'$vinfo' is not valid version information"
+       fi
+
+       # Calculate the version variables.
+       major=
+       versuffix=
+       verstring=
+       case $version_type in
+       none) ;;
+
+       darwin)
+         # Like Linux, but with the current version available in
+         # verstring for coding it into the library header
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix=$major.$age.$revision
+         # Darwin ld doesn't like 0 for these options...
+         func_arith $current + 1
+         minor_current=$func_arith_result
+         xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+         verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+          # On Darwin other compilers
+          case $CC in
+              nagfor*)
+                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  ;;
+              *)
+                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  ;;
+          esac
+         ;;
+
+       freebsd-aout)
+         major=.$current
+         versuffix=.$current.$revision
+         ;;
+
+       freebsd-elf)
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix=$major.$age.$revision
+         ;;
+
+       irix | nonstopux)
+         if test no = "$lt_irix_increment"; then
+           func_arith $current - $age
+         else
+           func_arith $current - $age + 1
+         fi
+         major=$func_arith_result
+
+         case $version_type in
+           nonstopux) verstring_prefix=nonstopux ;;
+           *)         verstring_prefix=sgi ;;
+         esac
+         verstring=$verstring_prefix$major.$revision
+
+         # Add in all the interfaces that we are compatible with.
+         loop=$revision
+         while test 0 -ne "$loop"; do
+           func_arith $revision - $loop
+           iface=$func_arith_result
+           func_arith $loop - 1
+           loop=$func_arith_result
+           verstring=$verstring_prefix$major.$iface:$verstring
+         done
+
+         # Before this point, $major must not contain '.'.
+         major=.$major
+         versuffix=$major.$revision
+         ;;
+
+       linux) # correct to gnu/linux during the next big refactor
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix=$major.$age.$revision
+         ;;
+
+       osf)
+         func_arith $current - $age
+         major=.$func_arith_result
+         versuffix=.$current.$age.$revision
+         verstring=$current.$age.$revision
+
+         # Add in all the interfaces that we are compatible with.
+         loop=$age
+         while test 0 -ne "$loop"; do
+           func_arith $current - $loop
+           iface=$func_arith_result
+           func_arith $loop - 1
+           loop=$func_arith_result
+           verstring=$verstring:$iface.0
+         done
+
+         # Make executables depend on our current version.
+         func_append verstring ":$current.0"
+         ;;
+
+       qnx)
+         major=.$current
+         versuffix=.$current
+         ;;
+
+       sco)
+         major=.$current
+         versuffix=.$current
+         ;;
+
+       sunos)
+         major=.$current
+         versuffix=.$current.$revision
+         ;;
+
+       windows)
+         # Use '-' rather than '.', since we only want one
+         # extension on DOS 8.3 file systems.
+         func_arith $current - $age
+         major=$func_arith_result
+         versuffix=-$major
+         ;;
+
+       *)
+         func_fatal_configuration "unknown library version type '$version_type'"
+         ;;
+       esac
+
+       # Clear the version info if we defaulted, and they specified a release.
+       if test -z "$vinfo" && test -n "$release"; then
+         major=
+         case $version_type in
+         darwin)
+           # we can't check for "0.0" in archive_cmds due to quoting
+           # problems, so we reset it completely
+           verstring=
+           ;;
+         *)
+           verstring=0.0
+           ;;
+         esac
+         if test no = "$need_version"; then
+           versuffix=
+         else
+           versuffix=.0.0
+         fi
+       fi
+
+       # Remove version info from name if versioning should be avoided
+       if test yes,no = "$avoid_version,$need_version"; then
+         major=
+         versuffix=
+         verstring=
+       fi
+
+       # Check to see if the archive will have undefined symbols.
+       if test yes = "$allow_undefined"; then
+         if test unsupported = "$allow_undefined_flag"; then
+           if test yes = "$build_old_libs"; then
+             func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+             build_libtool_libs=no
+           else
+             func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+           fi
+         fi
+       else
+         # Don't allow undefined symbols.
+         allow_undefined_flag=$no_undefined_flag
+       fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" :
+      func_append libobjs " $symfileobj"
+      test " " = "$libobjs" && libobjs=
+
+      if test relink != "$opt_mode"; then
+       # Remove our outputs, but don't remove object files since they
+       # may have been created when compiling PIC objects.
+       removelist=
+       tempremovelist=`$ECHO "$output_objdir/*"`
+       for p in $tempremovelist; do
+         case $p in
+           *.$objext | *.gcno)
+              ;;
+           $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+              if test -n "$precious_files_regex"; then
+                if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+                then
+                  continue
+                fi
+              fi
+              func_append removelist " $p"
+              ;;
+           *) ;;
+         esac
+       done
+       test -n "$removelist" && \
+         func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
+       func_append oldlibs " $output_objdir/$libname.$libext"
+
+       # Transform .lo files to .o files.
+       oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #        lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #        deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #        dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+       # If the user specified any rpath flags, then add them.
+       temp_xrpath=
+       for libdir in $xrpath; do
+         func_replace_sysroot "$libdir"
+         func_append temp_xrpath " -R$func_replace_sysroot_result"
+         case "$finalize_rpath " in
+         *" $libdir "*) ;;
+         *) func_append finalize_rpath " $libdir" ;;
+         esac
+       done
+       if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
+         dependency_libs="$temp_xrpath $dependency_libs"
+       fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles=$dlfiles
+      dlfiles=
+      for lib in $old_dlfiles; do
+       case " $dlprefiles $dlfiles " in
+       *" $lib "*) ;;
+       *) func_append dlfiles " $lib" ;;
+       esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles=$dlprefiles
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+       case "$dlprefiles " in
+       *" $lib "*) ;;
+       *) func_append dlprefiles " $lib" ;;
+       esac
+      done
+
+      if test yes = "$build_libtool_libs"; then
+       if test -n "$rpath"; then
+         case $host in
+         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+           # these systems don't actually have a c library (as such)!
+           ;;
+         *-*-rhapsody* | *-*-darwin1.[012])
+           # Rhapsody C library is in the System framework
+           func_append deplibs " System.ltframework"
+           ;;
+         *-*-netbsd*)
+           # Don't link with libc until the a.out ld.so is fixed.
+           ;;
+         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+           # Do not include libc due to us having libc/libc_r.
+           ;;
+         *-*-sco3.2v5* | *-*-sco5v6*)
+           # Causes problems with __ctype
+           ;;
+         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+           # Compiler inserts libc in the correct place for threads to work
+           ;;
+         *)
+           # Add libc to deplibs on all other systems if necessary.
+           if test yes = "$build_libtool_need_lc"; then
+             func_append deplibs " -lc"
+           fi
+           ;;
+         esac
+       fi
+
+       # Transform deplibs into only deplibs that can be linked in shared.
+       name_save=$name
+       libname_save=$libname
+       release_save=$release
+       versuffix_save=$versuffix
+       major_save=$major
+       # I'm not sure if I'm treating the release correctly.  I think
+       # release should show up in the -l (ie -lgmp5) so we don't want to
+       # add it in twice.  Is that correct?
+       release=
+       versuffix=
+       major=
+       newdeplibs=
+       droppeddeps=no
+       case $deplibs_check_method in
+       pass_all)
+         # Don't check for shared/static.  Everything works.
+         # This might be a little naive.  We might want to check
+         # whether the library exists or not.  But this is on
+         # osf3 & osf4 and I'm not really sure... Just
+         # implementing what was already the behavior.
+         newdeplibs=$deplibs
+         ;;
+       test_compile)
+         # This code stresses the "libraries are programs" paradigm to its
+         # limits. Maybe even breaks it.  We compile a program, linking it
+         # against the deplibs as a proxy for the library.  Then we can check
+         # whether they linked in statically or dynamically with ldd.
+         $opt_dry_run || $RM conftest.c
+         cat > conftest.c <<EOF
+         int main() { return 0; }
+EOF
+         $opt_dry_run || $RM conftest
+         if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+           ldd_output=`ldd conftest`
+           for i in $deplibs; do
+             case $i in
+             -l*)
+               func_stripname -l '' "$i"
+               name=$func_stripname_result
+               if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+                 case " $predeps $postdeps " in
+                 *" $i "*)
+                   func_append newdeplibs " $i"
+                   i=
+                   ;;
+                 esac
+               fi
+               if test -n "$i"; then
+                 libname=`eval "\\$ECHO \"$libname_spec\""`
+                 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+                 set dummy $deplib_matches; shift
+                 deplib_match=$1
+                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+                   func_append newdeplibs " $i"
+                 else
+                   droppeddeps=yes
+                   echo
+                   $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+                   echo "*** I have the capability to make that library automatically link in when"
+                   echo "*** you link to this library.  But I can only do this if you have a"
+                   echo "*** shared version of the library, which I believe you do not have"
+                   echo "*** because a test_compile did reveal that the linker did not use it for"
+                   echo "*** its dynamic dependency list that programs get resolved with at runtime."
+                 fi
+               fi
+               ;;
+             *)
+               func_append newdeplibs " $i"
+               ;;
+             esac
+           done
+         else
+           # Error occurred in the first compile.  Let's try to salvage
+           # the situation: Compile a separate program for each library.
+           for i in $deplibs; do
+             case $i in
+             -l*)
+               func_stripname -l '' "$i"
+               name=$func_stripname_result
+               $opt_dry_run || $RM conftest
+               if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+                 ldd_output=`ldd conftest`
+                 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+                   case " $predeps $postdeps " in
+                   *" $i "*)
+                     func_append newdeplibs " $i"
+                     i=
+                     ;;
+                   esac
+                 fi
+                 if test -n "$i"; then
+                   libname=`eval "\\$ECHO \"$libname_spec\""`
+                   deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+                   set dummy $deplib_matches; shift
+                   deplib_match=$1
+                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
+                     func_append newdeplibs " $i"
+                   else
+                     droppeddeps=yes
+                     echo
+                     $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+                     echo "*** I have the capability to make that library automatically link in when"
+                     echo "*** you link to this library.  But I can only do this if you have a"
+                     echo "*** shared version of the library, which you do not appear to have"
+                     echo "*** because a test_compile did reveal that the linker did not use this one"
+                     echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+                   fi
+                 fi
+               else
+                 droppeddeps=yes
+                 echo
+                 $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+                 echo "*** make it link in!  You will probably need to install it or some"
+                 echo "*** library that it depends on before this library will be fully"
+                 echo "*** functional.  Installing it before continuing would be even better."
+               fi
+               ;;
+             *)
+               func_append newdeplibs " $i"
+               ;;
+             esac
+           done
+         fi
+         ;;
+       file_magic*)
+         set dummy $deplibs_check_method; shift
+         file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+         for a_deplib in $deplibs; do
+           case $a_deplib in
+           -l*)
+             func_stripname -l '' "$a_deplib"
+             name=$func_stripname_result
+             if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+               case " $predeps $postdeps " in
+               *" $a_deplib "*)
+                 func_append newdeplibs " $a_deplib"
+                 a_deplib=
+                 ;;
+               esac
+             fi
+             if test -n "$a_deplib"; then
+               libname=`eval "\\$ECHO \"$libname_spec\""`
+               if test -n "$file_magic_glob"; then
+                 libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+               else
+                 libnameglob=$libname
+               fi
+               test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
+               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 if test yes = "$want_nocaseglob"; then
+                   shopt -s nocaseglob
+                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+                   $nocaseglob
+                 else
+                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+                 fi
+                 for potent_lib in $potential_libs; do
+                     # Follow soft links.
+                     if ls -lLd "$potent_lib" 2>/dev/null |
+                        $GREP " -> " >/dev/null; then
+                       continue
+                     fi
+                     # The statement above tries to avoid entering an
+                     # endless loop below, in case of cyclic links.
+                     # We might still enter an endless loop, since a link
+                     # loop can be closed while we follow links,
+                     # but so what?
+                     potlib=$potent_lib
+                     while test -h "$potlib" 2>/dev/null; do
+                       potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
+                       case $potliblink in
+                       [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+                       *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
+                       esac
+                     done
+                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+                        $SED -e 10q |
+                        $EGREP "$file_magic_regex" > /dev/null; then
+                       func_append newdeplibs " $a_deplib"
+                       a_deplib=
+                       break 2
+                     fi
+                 done
+               done
+             fi
+             if test -n "$a_deplib"; then
+               droppeddeps=yes
+               echo
+               $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+               echo "*** I have the capability to make that library automatically link in when"
+               echo "*** you link to this library.  But I can only do this if you have a"
+               echo "*** shared version of the library, which you do not appear to have"
+               echo "*** because I did check the linker path looking for a file starting"
+               if test -z "$potlib"; then
+                 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+               else
+                 $ECHO "*** with $libname and none of the candidates passed a file format test"
+                 $ECHO "*** using a file magic. Last file checked: $potlib"
+               fi
+             fi
+             ;;
+           *)
+             # Add a -L argument.
+             func_append newdeplibs " $a_deplib"
+             ;;
+           esac
+         done # Gone through all deplibs.
+         ;;
+       match_pattern*)
+         set dummy $deplibs_check_method; shift
+         match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+         for a_deplib in $deplibs; do
+           case $a_deplib in
+           -l*)
+             func_stripname -l '' "$a_deplib"
+             name=$func_stripname_result
+             if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+               case " $predeps $postdeps " in
+               *" $a_deplib "*)
+                 func_append newdeplibs " $a_deplib"
+                 a_deplib=
+                 ;;
+               esac
+             fi
+             if test -n "$a_deplib"; then
+               libname=`eval "\\$ECHO \"$libname_spec\""`
+               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                 for potent_lib in $potential_libs; do
+                   potlib=$potent_lib # see symlink-check above in file_magic test
+                   if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+                      $EGREP "$match_pattern_regex" > /dev/null; then
+                     func_append newdeplibs " $a_deplib"
+                     a_deplib=
+                     break 2
+                   fi
+                 done
+               done
+             fi
+             if test -n "$a_deplib"; then
+               droppeddeps=yes
+               echo
+               $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+               echo "*** I have the capability to make that library automatically link in when"
+               echo "*** you link to this library.  But I can only do this if you have a"
+               echo "*** shared version of the library, which you do not appear to have"
+               echo "*** because I did check the linker path looking for a file starting"
+               if test -z "$potlib"; then
+                 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+               else
+                 $ECHO "*** with $libname and none of the candidates passed a file format test"
+                 $ECHO "*** using a regex pattern. Last file checked: $potlib"
+               fi
+             fi
+             ;;
+           *)
+             # Add a -L argument.
+             func_append newdeplibs " $a_deplib"
+             ;;
+           esac
+         done # Gone through all deplibs.
+         ;;
+       none | unknown | *)
+         newdeplibs=
+         tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+         if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+           for i in $predeps $postdeps; do
+             # can't use Xsed below, because $i might contain '/'
+             tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
+           done
+         fi
+         case $tmp_deplibs in
+         *[!\  \ ]*)
+           echo
+           if test none = "$deplibs_check_method"; then
+             echo "*** Warning: inter-library dependencies are not supported in this platform."
+           else
+             echo "*** Warning: inter-library dependencies are not known to be supported."
+           fi
+           echo "*** All declared inter-library dependencies are being dropped."
+           droppeddeps=yes
+           ;;
+         esac
+         ;;
+       esac
+       versuffix=$versuffix_save
+       major=$major_save
+       release=$release_save
+       libname=$libname_save
+       name=$name_save
+
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+         # On Rhapsody replace the C library with the System framework
+         newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+         ;;
+       esac
+
+       if test yes = "$droppeddeps"; then
+         if test yes = "$module"; then
+           echo
+           echo "*** Warning: libtool could not satisfy all declared inter-library"
+           $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+           echo "*** a static module, that should work as long as the dlopening"
+           echo "*** application is linked with the -dlopen flag."
+           if test -z "$global_symbol_pipe"; then
+             echo
+             echo "*** However, this would only work if libtool was able to extract symbol"
+             echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
+             echo "*** not find such a program.  So, this module is probably useless."
+             echo "*** 'nm' from GNU binutils and a full rebuild may help."
+           fi
+           if test no = "$build_old_libs"; then
+             oldlibs=$output_objdir/$libname.$libext
+             build_libtool_libs=module
+             build_old_libs=yes
+           else
+             build_libtool_libs=no
+           fi
+         else
+           echo "*** The inter-library dependencies that have been dropped here will be"
+           echo "*** automatically added whenever a program is linked with this library"
+           echo "*** or is declared to -dlopen it."
+
+           if test no = "$allow_undefined"; then
+             echo
+             echo "*** Since this library must not contain undefined symbols,"
+             echo "*** because either the platform does not support them or"
+             echo "*** it was explicitly requested with -no-undefined,"
+             echo "*** libtool will only create a static version of it."
+             if test no = "$build_old_libs"; then
+               oldlibs=$output_objdir/$libname.$libext
+               build_libtool_libs=module
+               build_old_libs=yes
+             else
+               build_libtool_libs=no
+             fi
+           fi
+         fi
+       fi
+       # Done checking deplibs!
+       deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+       *-*-darwin*)
+         newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+         new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+         deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+         ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+       case " $new_libs " in
+       *" -L$path/$objdir "*) ;;
+       *)
+         case " $deplibs " in
+         *" -L$path/$objdir "*)
+           func_append new_libs " -L$path/$objdir" ;;
+         esac
+         ;;
+       esac
+      done
+      for deplib in $deplibs; do
+       case $deplib in
+       -L*)
+         case " $new_libs " in
+         *" $deplib "*) ;;
+         *) func_append new_libs " $deplib" ;;
+         esac
+         ;;
+       *) func_append new_libs " $deplib" ;;
+       esac
+      done
+      deplibs=$new_libs
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test yes = "$build_libtool_libs"; then
+       # Remove $wl instances when linking with ld.
+       # FIXME: should test the right _cmds variable.
+       case $archive_cmds in
+         *\$LD\ *) wl= ;;
+        esac
+       if test yes = "$hardcode_into_libs"; then
+         # Hardcode the library paths
+         hardcode_libdirs=
+         dep_rpath=
+         rpath=$finalize_rpath
+         test relink = "$opt_mode" || rpath=$compile_rpath$rpath
+         for libdir in $rpath; do
+           if test -n "$hardcode_libdir_flag_spec"; then
+             if test -n "$hardcode_libdir_separator"; then
+               func_replace_sysroot "$libdir"
+               libdir=$func_replace_sysroot_result
+               if test -z "$hardcode_libdirs"; then
+                 hardcode_libdirs=$libdir
+               else
+                 # Just accumulate the unique libdirs.
+                 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+                 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                   ;;
+                 *)
+                   func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+                   ;;
+                 esac
+               fi
+             else
+               eval flag=\"$hardcode_libdir_flag_spec\"
+               func_append dep_rpath " $flag"
+             fi
+           elif test -n "$runpath_var"; then
+             case "$perm_rpath " in
+             *" $libdir "*) ;;
+             *) func_append perm_rpath " $libdir" ;;
+             esac
+           fi
+         done
+         # Substitute the hardcoded libdirs into the rpath.
+         if test -n "$hardcode_libdir_separator" &&
+            test -n "$hardcode_libdirs"; then
+           libdir=$hardcode_libdirs
+           eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+         fi
+         if test -n "$runpath_var" && test -n "$perm_rpath"; then
+           # We should set the runpath_var.
+           rpath=
+           for dir in $perm_rpath; do
+             func_append rpath "$dir:"
+           done
+           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+         fi
+         test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+       fi
+
+       shlibpath=$finalize_shlibpath
+       test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
+       if test -n "$shlibpath"; then
+         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+       fi
+
+       # Get the real and link names of the library.
+       eval shared_ext=\"$shrext_cmds\"
+       eval library_names=\"$library_names_spec\"
+       set dummy $library_names
+       shift
+       realname=$1
+       shift
+
+       if test -n "$soname_spec"; then
+         eval soname=\"$soname_spec\"
+       else
+         soname=$realname
+       fi
+       if test -z "$dlname"; then
+         dlname=$soname
+       fi
+
+       lib=$output_objdir/$realname
+       linknames=
+       for link
+       do
+         func_append linknames " $link"
+       done
+
+       # Use standard objects if they are pic
+       test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+       test "X$libobjs" = "X " && libobjs=
+
+       delfiles=
+       if test -n "$export_symbols" && test -n "$include_expsyms"; then
+         $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+         export_symbols=$output_objdir/$libname.uexp
+         func_append delfiles " $export_symbols"
+       fi
+
+       orig_export_symbols=
+       case $host_os in
+       cygwin* | mingw* | cegcc*)
+         if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+           # exporting using user supplied symfile
+           func_dll_def_p "$export_symbols" || {
+             # and it's NOT already a .def file. Must figure out
+             # which of the given symbols are data symbols and tag
+             # them as such. So, trigger use of export_symbols_cmds.
+             # export_symbols gets reassigned inside the "prepare
+             # the list of exported symbols" if statement, so the
+             # include_expsyms logic still works.
+             orig_export_symbols=$export_symbols
+             export_symbols=
+             always_export_symbols=yes
+           }
+         fi
+         ;;
+       esac
+
+       # Prepare the list of exported symbols
+       if test -z "$export_symbols"; then
+         if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+           func_verbose "generating symbol list for '$libname.la'"
+           export_symbols=$output_objdir/$libname.exp
+           $opt_dry_run || $RM $export_symbols
+           cmds=$export_symbols_cmds
+           save_ifs=$IFS; IFS='~'
+           for cmd1 in $cmds; do
+             IFS=$save_ifs
+             # Take the normal branch if the nm_file_list_spec branch
+             # doesn't work or if tool conversion is not needed.
+             case $nm_file_list_spec~$to_tool_file_cmd in
+               *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+                 try_normal_branch=yes
+                 eval cmd=\"$cmd1\"
+                 func_len " $cmd"
+                 len=$func_len_result
+                 ;;
+               *)
+                 try_normal_branch=no
+                 ;;
+             esac
+             if test yes = "$try_normal_branch" \
+                && { test "$len" -lt "$max_cmd_len" \
+                     || test "$max_cmd_len" -le -1; }
+             then
+               func_show_eval "$cmd" 'exit $?'
+               skipped_export=false
+             elif test -n "$nm_file_list_spec"; then
+               func_basename "$output"
+               output_la=$func_basename_result
+               save_libobjs=$libobjs
+               save_output=$output
+               output=$output_objdir/$output_la.nm
+               func_to_tool_file "$output"
+               libobjs=$nm_file_list_spec$func_to_tool_file_result
+               func_append delfiles " $output"
+               func_verbose "creating $NM input file list: $output"
+               for obj in $save_libobjs; do
+                 func_to_tool_file "$obj"
+                 $ECHO "$func_to_tool_file_result"
+               done > "$output"
+               eval cmd=\"$cmd1\"
+               func_show_eval "$cmd" 'exit $?'
+               output=$save_output
+               libobjs=$save_libobjs
+               skipped_export=false
+             else
+               # The command line is too long to execute in one step.
+               func_verbose "using reloadable object file for export list..."
+               skipped_export=:
+               # Break out early, otherwise skipped_export may be
+               # set to false by a later but shorter cmd.
+               break
+             fi
+           done
+           IFS=$save_ifs
+           if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
+             func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+           fi
+         fi
+       fi
+
+       if test -n "$export_symbols" && test -n "$include_expsyms"; then
+         tmp_export_symbols=$export_symbols
+         test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+         $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+       fi
+
+       if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
+         # The given exports_symbols file has to be filtered, so filter it.
+         func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+         # FIXME: $output_objdir/$libname.filter potentially contains lots of
+         # 's' commands, which not all seds can handle. GNU sed should be fine
+         # though. Also, the filter scales superlinearly with the number of
+         # global variables. join(1) would be nice here, but unfortunately
+         # isn't a blessed tool.
+         $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+         func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+         export_symbols=$output_objdir/$libname.def
+         $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+       fi
+
+       tmp_deplibs=
+       for test_deplib in $deplibs; do
+         case " $convenience " in
+         *" $test_deplib "*) ;;
+         *)
+           func_append tmp_deplibs " $test_deplib"
+           ;;
+         esac
+       done
+       deplibs=$tmp_deplibs
+
+       if test -n "$convenience"; then
+         if test -n "$whole_archive_flag_spec" &&
+           test yes = "$compiler_needs_object" &&
+           test -z "$libobjs"; then
+           # extract the archives, so we have objects to list.
+           # TODO: could optimize this to just extract one archive.
+           whole_archive_flag_spec=
+         fi
+         if test -n "$whole_archive_flag_spec"; then
+           save_libobjs=$libobjs
+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+           test "X$libobjs" = "X " && libobjs=
+         else
+           gentop=$output_objdir/${outputname}x
+           func_append generated " $gentop"
+
+           func_extract_archives $gentop $convenience
+           func_append libobjs " $func_extract_archives_result"
+           test "X$libobjs" = "X " && libobjs=
+         fi
+       fi
+
+       if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
+         eval flag=\"$thread_safe_flag_spec\"
+         func_append linker_flags " $flag"
+       fi
+
+       # Make a backup of the uninstalled library when relinking
+       if test relink = "$opt_mode"; then
+         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+       fi
+
+       # Do each of the archive commands.
+       if test yes = "$module" && test -n "$module_cmds"; then
+         if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+           eval test_cmds=\"$module_expsym_cmds\"
+           cmds=$module_expsym_cmds
+         else
+           eval test_cmds=\"$module_cmds\"
+           cmds=$module_cmds
+         fi
+       else
+         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+           eval test_cmds=\"$archive_expsym_cmds\"
+           cmds=$archive_expsym_cmds
+         else
+           eval test_cmds=\"$archive_cmds\"
+           cmds=$archive_cmds
+         fi
+       fi
+
+       if test : != "$skipped_export" &&
+          func_len " $test_cmds" &&
+          len=$func_len_result &&
+          test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+         :
+       else
+         # The command line is too long to link in one step, link piecewise
+         # or, if using GNU ld and skipped_export is not :, use a linker
+         # script.
+
+         # Save the value of $output and $libobjs because we want to
+         # use them later.  If we have whole_archive_flag_spec, we
+         # want to use save_libobjs as it was before
+         # whole_archive_flag_spec was expanded, because we can't
+         # assume the linker understands whole_archive_flag_spec.
+         # This may have to be revisited, in case too many
+         # convenience libraries get linked in and end up exceeding
+         # the spec.
+         if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+           save_libobjs=$libobjs
+         fi
+         save_output=$output
+         func_basename "$output"
+         output_la=$func_basename_result
+
+         # Clear the reloadable object creation command queue and
+         # initialize k to one.
+         test_cmds=
+         concat_cmds=
+         objlist=
+         last_robj=
+         k=1
+
+         if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+           output=$output_objdir/$output_la.lnkscript
+           func_verbose "creating GNU ld script: $output"
+           echo 'INPUT (' > $output
+           for obj in $save_libobjs
+           do
+             func_to_tool_file "$obj"
+             $ECHO "$func_to_tool_file_result" >> $output
+           done
+           echo ')' >> $output
+           func_append delfiles " $output"
+           func_to_tool_file "$output"
+           output=$func_to_tool_file_result
+         elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+           output=$output_objdir/$output_la.lnk
+           func_verbose "creating linker input file list: $output"
+           : > $output
+           set x $save_libobjs
+           shift
+           firstobj=
+           if test yes = "$compiler_needs_object"; then
+             firstobj="$1 "
+             shift
+           fi
+           for obj
+           do
+             func_to_tool_file "$obj"
+             $ECHO "$func_to_tool_file_result" >> $output
+           done
+           func_append delfiles " $output"
+           func_to_tool_file "$output"
+           output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+         else
+           if test -n "$save_libobjs"; then
+             func_verbose "creating reloadable object files..."
+             output=$output_objdir/$output_la-$k.$objext
+             eval test_cmds=\"$reload_cmds\"
+             func_len " $test_cmds"
+             len0=$func_len_result
+             len=$len0
+
+             # Loop over the list of objects to be linked.
+             for obj in $save_libobjs
+             do
+               func_len " $obj"
+               func_arith $len + $func_len_result
+               len=$func_arith_result
+               if test -z "$objlist" ||
+                  test "$len" -lt "$max_cmd_len"; then
+                 func_append objlist " $obj"
+               else
+                 # The command $test_cmds is almost too long, add a
+                 # command to the queue.
+                 if test 1 -eq "$k"; then
+                   # The first file doesn't have a previous command to add.
+                   reload_objs=$objlist
+                   eval concat_cmds=\"$reload_cmds\"
+                 else
+                   # All subsequent reloadable object files will link in
+                   # the last one created.
+                   reload_objs="$objlist $last_robj"
+                   eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+                 fi
+                 last_robj=$output_objdir/$output_la-$k.$objext
+                 func_arith $k + 1
+                 k=$func_arith_result
+                 output=$output_objdir/$output_la-$k.$objext
+                 objlist=" $obj"
+                 func_len " $last_robj"
+                 func_arith $len0 + $func_len_result
+                 len=$func_arith_result
+               fi
+             done
+             # Handle the remaining objects by creating one last
+             # reloadable object file.  All subsequent reloadable object
+             # files will link in the last one created.
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             reload_objs="$objlist $last_robj"
+             eval concat_cmds=\"\$concat_cmds$reload_cmds\"
+             if test -n "$last_robj"; then
+               eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+             fi
+             func_append delfiles " $output"
+
+           else
+             output=
+           fi
+
+           ${skipped_export-false} && {
+             func_verbose "generating symbol list for '$libname.la'"
+             export_symbols=$output_objdir/$libname.exp
+             $opt_dry_run || $RM $export_symbols
+             libobjs=$output
+             # Append the command to create the export file.
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+             if test -n "$last_robj"; then
+               eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+             fi
+           }
+
+           test -n "$save_libobjs" &&
+             func_verbose "creating a temporary reloadable object file: $output"
+
+           # Loop through the commands generated above and execute them.
+           save_ifs=$IFS; IFS='~'
+           for cmd in $concat_cmds; do
+             IFS=$save_ifs
+             $opt_quiet || {
+                 func_quote_for_expand "$cmd"
+                 eval "func_echo $func_quote_for_expand_result"
+             }
+             $opt_dry_run || eval "$cmd" || {
+               lt_exit=$?
+
+               # Restore the uninstalled library and exit
+               if test relink = "$opt_mode"; then
+                 ( cd "$output_objdir" && \
+                   $RM "${realname}T" && \
+                   $MV "${realname}U" "$realname" )
+               fi
+
+               exit $lt_exit
+             }
+           done
+           IFS=$save_ifs
+
+           if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+             func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+           fi
+         fi
+
+          ${skipped_export-false} && {
+           if test -n "$export_symbols" && test -n "$include_expsyms"; then
+             tmp_export_symbols=$export_symbols
+             test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
+             $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+           fi
+
+           if test -n "$orig_export_symbols"; then
+             # The given exports_symbols file has to be filtered, so filter it.
+             func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
+             # FIXME: $output_objdir/$libname.filter potentially contains lots of
+             # 's' commands, which not all seds can handle. GNU sed should be fine
+             # though. Also, the filter scales superlinearly with the number of
+             # global variables. join(1) would be nice here, but unfortunately
+             # isn't a blessed tool.
+             $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+             func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+             export_symbols=$output_objdir/$libname.def
+             $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+           fi
+         }
+
+         libobjs=$output
+         # Restore the value of output.
+         output=$save_output
+
+         if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+           test "X$libobjs" = "X " && libobjs=
+         fi
+         # Expand the library linking commands again to reset the
+         # value of $libobjs for piecewise linking.
+
+         # Do each of the archive commands.
+         if test yes = "$module" && test -n "$module_cmds"; then
+           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+             cmds=$module_expsym_cmds
+           else
+             cmds=$module_cmds
+           fi
+         else
+           if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+             cmds=$archive_expsym_cmds
+           else
+             cmds=$archive_cmds
+           fi
+         fi
+       fi
+
+       if test -n "$delfiles"; then
+         # Append the command to remove temporary files to $cmds.
+         eval cmds=\"\$cmds~\$RM $delfiles\"
+       fi
+
+       # Add any objects from preloaded convenience libraries
+       if test -n "$dlprefiles"; then
+         gentop=$output_objdir/${outputname}x
+         func_append generated " $gentop"
+
+         func_extract_archives $gentop $dlprefiles
+         func_append libobjs " $func_extract_archives_result"
+         test "X$libobjs" = "X " && libobjs=
+       fi
+
+       save_ifs=$IFS; IFS='~'
+       for cmd in $cmds; do
+         IFS=$sp$nl
+         eval cmd=\"$cmd\"
+         IFS=$save_ifs
+         $opt_quiet || {
+           func_quote_for_expand "$cmd"
+           eval "func_echo $func_quote_for_expand_result"
+         }
+         $opt_dry_run || eval "$cmd" || {
+           lt_exit=$?
+
+           # Restore the uninstalled library and exit
+           if test relink = "$opt_mode"; then
+             ( cd "$output_objdir" && \
+               $RM "${realname}T" && \
+               $MV "${realname}U" "$realname" )
+           fi
+
+           exit $lt_exit
+         }
+       done
+       IFS=$save_ifs
+
+       # Restore the uninstalled library and exit
+       if test relink = "$opt_mode"; then
+         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+         if test -n "$convenience"; then
+           if test -z "$whole_archive_flag_spec"; then
+             func_show_eval '${RM}r "$gentop"'
+           fi
+         fi
+
+         exit $EXIT_SUCCESS
+       fi
+
+       # Create links to the real library.
+       for linkname in $linknames; do
+         if test "$realname" != "$linkname"; then
+           func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+         fi
+       done
+
+       # If -module or -export-dynamic was specified, set the dlname.
+       if test yes = "$module" || test yes = "$export_dynamic"; then
+         # On all known operating systems, these are identical.
+         dlname=$soname
+       fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+       func_warning "'-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+       func_warning "'-l' and '-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+       func_warning "'-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+       func_warning "'-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+       func_warning "'-version-info' is ignored for objects"
+
+      test -n "$release" && \
+       func_warning "'-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+       test -n "$objs$old_deplibs" && \
+         func_fatal_error "cannot build library object '$output' from non-libtool objects"
+
+       libobj=$output
+       func_lo2o "$libobj"
+       obj=$func_lo2o_result
+       ;;
+      *)
+       libobj=
+       obj=$output
+       ;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # if reload_cmds runs $LD directly, get rid of -Wl from
+      # whole_archive_flag_spec and hope we can get by with turning comma
+      # into space.
+      case $reload_cmds in
+        *\$LD[\ \$]*) wl= ;;
+      esac
+      if test -n "$convenience"; then
+       if test -n "$whole_archive_flag_spec"; then
+         eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+         test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+         reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
+       else
+         gentop=$output_objdir/${obj}x
+         func_append generated " $gentop"
+
+         func_extract_archives $gentop $convenience
+         reload_conv_objs="$reload_objs $func_extract_archives_result"
+       fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
+
+      # Create the old-style object.
+      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
+
+      output=$obj
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+       if test -n "$gentop"; then
+         func_show_eval '${RM}r "$gentop"'
+       fi
+
+       exit $EXIT_SUCCESS
+      fi
+
+      test yes = "$build_libtool_libs" || {
+       if test -n "$gentop"; then
+         func_show_eval '${RM}r "$gentop"'
+       fi
+
+       # Create an invalid libtool object if no PIC, so that we don't
+       # accidentally link it into a program.
+       # $show "echo timestamp > $libobj"
+       # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+       exit $EXIT_SUCCESS
+      }
+
+      if test -n "$pic_flag" || test default != "$pic_mode"; then
+       # Only do commands if we really have different PIC objects.
+       reload_objs="$libobjs $reload_conv_objs"
+       output=$libobj
+       func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+       func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+       *cygwin*) func_stripname '' '.exe' "$output"
+                 output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+       func_warning "'-version-info' is ignored for programs"
+
+      test -n "$release" && \
+       func_warning "'-release' is ignored for programs"
+
+      $preload \
+       && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+       && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+       # On Rhapsody replace the C library is the System framework
+       compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+       finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+       ;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+       # Don't allow lazy linking, it breaks C++ global constructors
+       # But is supposedly fixed on 10.4 or later (yay!).
+       if test CXX = "$tagname"; then
+         case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+           10.[0123])
+             func_append compile_command " $wl-bind_at_load"
+             func_append finalize_command " $wl-bind_at_load"
+           ;;
+         esac
+       fi
+       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+       compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+       finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+       ;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+       case " $new_libs " in
+       *" -L$path/$objdir "*) ;;
+       *)
+         case " $compile_deplibs " in
+         *" -L$path/$objdir "*)
+           func_append new_libs " -L$path/$objdir" ;;
+         esac
+         ;;
+       esac
+      done
+      for deplib in $compile_deplibs; do
+       case $deplib in
+       -L*)
+         case " $new_libs " in
+         *" $deplib "*) ;;
+         *) func_append new_libs " $deplib" ;;
+         esac
+         ;;
+       *) func_append new_libs " $deplib" ;;
+       esac
+      done
+      compile_deplibs=$new_libs
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+       # If the user specified any rpath flags, then add them.
+       for libdir in $rpath $xrpath; do
+         # This is the magic to use -rpath.
+         case "$finalize_rpath " in
+         *" $libdir "*) ;;
+         *) func_append finalize_rpath " $libdir" ;;
+         esac
+       done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+       if test -n "$hardcode_libdir_flag_spec"; then
+         if test -n "$hardcode_libdir_separator"; then
+           if test -z "$hardcode_libdirs"; then
+             hardcode_libdirs=$libdir
+           else
+             # Just accumulate the unique libdirs.
+             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+               ;;
+             *)
+               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+               ;;
+             esac
+           fi
+         else
+           eval flag=\"$hardcode_libdir_flag_spec\"
+           func_append rpath " $flag"
+         fi
+       elif test -n "$runpath_var"; then
+         case "$perm_rpath " in
+         *" $libdir "*) ;;
+         *) func_append perm_rpath " $libdir" ;;
+         esac
+       fi
+       case $host in
+       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+         testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
+         case :$dllsearchpath: in
+         *":$libdir:"*) ;;
+         ::) dllsearchpath=$libdir;;
+         *) func_append dllsearchpath ":$libdir";;
+         esac
+         case :$dllsearchpath: in
+         *":$testbindir:"*) ;;
+         ::) dllsearchpath=$testbindir;;
+         *) func_append dllsearchpath ":$testbindir";;
+         esac
+         ;;
+       esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+        test -n "$hardcode_libdirs"; then
+       libdir=$hardcode_libdirs
+       eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath=$rpath
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+       if test -n "$hardcode_libdir_flag_spec"; then
+         if test -n "$hardcode_libdir_separator"; then
+           if test -z "$hardcode_libdirs"; then
+             hardcode_libdirs=$libdir
+           else
+             # Just accumulate the unique libdirs.
+             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+               ;;
+             *)
+               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+               ;;
+             esac
+           fi
+         else
+           eval flag=\"$hardcode_libdir_flag_spec\"
+           func_append rpath " $flag"
+         fi
+       elif test -n "$runpath_var"; then
+         case "$finalize_perm_rpath " in
+         *" $libdir "*) ;;
+         *) func_append finalize_perm_rpath " $libdir" ;;
+         esac
+       fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+        test -n "$hardcode_libdirs"; then
+       libdir=$hardcode_libdirs
+       eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath=$rpath
+
+      if test -n "$libobjs" && test yes = "$build_old_libs"; then
+       # Transform all the library objects into standard objects.
+       compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+       finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" false
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+       func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=:
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=false
+        ;;
+      *cygwin* | *mingw* )
+        test yes = "$build_libtool_libs" || wrappers_required=false
+        ;;
+      *)
+        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+          wrappers_required=false
+        fi
+        ;;
+      esac
+      $wrappers_required || {
+       # Replace the output file specification.
+       compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+       link_command=$compile_command$compile_rpath
+
+       # We have no uninstalled library dependencies, so finalize right now.
+       exit_status=0
+       func_show_eval "$link_command" 'exit_status=$?'
+
+       if test -n "$postlink_cmds"; then
+         func_to_tool_file "$output"
+         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+         func_execute_cmds "$postlink_cmds" 'exit $?'
+       fi
+
+       # Delete the generated files.
+       if test -f "$output_objdir/${outputname}S.$objext"; then
+         func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
+       fi
+
+       exit $exit_status
+      }
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+       compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+       finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+       if test -n "$perm_rpath"; then
+         # We should set the runpath_var.
+         rpath=
+         for dir in $perm_rpath; do
+           func_append rpath "$dir:"
+         done
+         compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+       fi
+       if test -n "$finalize_perm_rpath"; then
+         # We should set the runpath_var.
+         rpath=
+         for dir in $finalize_perm_rpath; do
+           func_append rpath "$dir:"
+         done
+         finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+       fi
+      fi
+
+      if test yes = "$no_install"; then
+       # We don't need to create a wrapper script.
+       link_command=$compile_var$compile_command$compile_rpath
+       # Replace the output file specification.
+       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+       # Delete the old output file.
+       $opt_dry_run || $RM $output
+       # Link the executable and exit
+       func_show_eval "$link_command" 'exit $?'
+
+       if test -n "$postlink_cmds"; then
+         func_to_tool_file "$output"
+         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+         func_execute_cmds "$postlink_cmds" 'exit $?'
+       fi
+
+       exit $EXIT_SUCCESS
+      fi
+
+      case $hardcode_action,$fast_install in
+        relink,*)
+         # Fast installation is not supported
+         link_command=$compile_var$compile_command$compile_rpath
+         relink_command=$finalize_var$finalize_command$finalize_rpath
+
+         func_warning "this platform does not like uninstalled shared libraries"
+         func_warning "'$output' will be relinked during installation"
+         ;;
+        *,yes)
+         link_command=$finalize_var$compile_command$finalize_rpath
+         relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+          ;;
+       *,no)
+         link_command=$compile_var$compile_command$compile_rpath
+         relink_command=$finalize_var$finalize_command$finalize_rpath
+          ;;
+       *,needless)
+         link_command=$finalize_var$compile_command$finalize_rpath
+         relink_command=
+          ;;
+      esac
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+       func_to_tool_file "$output_objdir/$outputname"
+       postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+       func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+       # Preserve any variables that may affect compiler behavior
+       for var in $variables_saved_for_relink; do
+         if eval test -z \"\${$var+set}\"; then
+           relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+         elif eval var_value=\$$var; test -z "$var_value"; then
+           relink_command="$var=; export $var; $relink_command"
+         else
+           func_quote_for_eval "$var_value"
+           relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+         fi
+       done
+       relink_command="(cd `pwd`; $relink_command)"
+       relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+       # win32 will think the script is a binary if it has
+       # a .exe suffix, so we strip it off here.
+       case $output in
+         *.exe) func_stripname '' '.exe' "$output"
+                output=$func_stripname_result ;;
+       esac
+       # test for cygwin because mv fails w/o .exe extensions
+       case $host in
+         *cygwin*)
+           exeext=.exe
+           func_stripname '' '.exe' "$outputname"
+           outputname=$func_stripname_result ;;
+         *) exeext= ;;
+       esac
+       case $host in
+         *cygwin* | *mingw* )
+           func_dirname_and_basename "$output" "" "."
+           output_name=$func_basename_result
+           output_path=$func_dirname_result
+           cwrappersource=$output_path/$objdir/lt-$output_name.c
+           cwrapper=$output_path/$output_name.exe
+           $RM $cwrappersource $cwrapper
+           trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+           func_emit_cwrapperexe_src > $cwrappersource
+
+           # The wrapper executable is built using the $host compiler,
+           # because it contains $host paths and files. If cross-
+           # compiling, it, like the target executable, must be
+           # executed on the $host or under an emulation environment.
+           $opt_dry_run || {
+             $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+             $STRIP $cwrapper
+           }
+
+           # Now, create the wrapper script for func_source use:
+           func_ltwrapper_scriptname $cwrapper
+           $RM $func_ltwrapper_scriptname_result
+           trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+           $opt_dry_run || {
+             # note: this script will not be executed, so do not chmod.
+             if test "x$build" = "x$host"; then
+               $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+             else
+               func_emit_wrapper no > $func_ltwrapper_scriptname_result
+             fi
+           }
+         ;;
+         * )
+           $RM $output
+           trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+           func_emit_wrapper no > $output
+           chmod +x $output
+         ;;
+       esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      case $build_libtool_libs in
+        convenience)
+         oldobjs="$libobjs_save $symfileobj"
+         addlibs=$convenience
+         build_libtool_libs=no
+         ;;
+       module)
+         oldobjs=$libobjs_save
+         addlibs=$old_convenience
+         build_libtool_libs=no
+          ;;
+       *)
+         oldobjs="$old_deplibs $non_pic_objects"
+         $preload && test -f "$symfileobj" \
+           && func_append oldobjs " $symfileobj"
+         addlibs=$old_convenience
+         ;;
+      esac
+
+      if test -n "$addlibs"; then
+       gentop=$output_objdir/${outputname}x
+       func_append generated " $gentop"
+
+       func_extract_archives $gentop $addlibs
+       func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
+       cmds=$old_archive_from_new_cmds
+      else
+
+       # Add any objects from preloaded convenience libraries
+       if test -n "$dlprefiles"; then
+         gentop=$output_objdir/${outputname}x
+         func_append generated " $gentop"
+
+         func_extract_archives $gentop $dlprefiles
+         func_append oldobjs " $func_extract_archives_result"
+       fi
+
+       # POSIX demands no paths to be encoded in archives.  We have
+       # to avoid creating archives with duplicate basenames if we
+       # might have to extract them afterwards, e.g., when creating a
+       # static archive out of a convenience library, or when linking
+       # the entirety of a libtool archive into another (currently
+       # not supported by libtool).
+       if (for obj in $oldobjs
+           do
+             func_basename "$obj"
+             $ECHO "$func_basename_result"
+           done | sort | sort -uc >/dev/null 2>&1); then
+         :
+       else
+         echo "copying selected object files to avoid basename conflicts..."
+         gentop=$output_objdir/${outputname}x
+         func_append generated " $gentop"
+         func_mkdir_p "$gentop"
+         save_oldobjs=$oldobjs
+         oldobjs=
+         counter=1
+         for obj in $save_oldobjs
+         do
+           func_basename "$obj"
+           objbase=$func_basename_result
+           case " $oldobjs " in
+           " ") oldobjs=$obj ;;
+           *[\ /]"$objbase "*)
+             while :; do
+               # Make sure we don't pick an alternate name that also
+               # overlaps.
+               newobj=lt$counter-$objbase
+               func_arith $counter + 1
+               counter=$func_arith_result
+               case " $oldobjs " in
+               *[\ /]"$newobj "*) ;;
+               *) if test ! -f "$gentop/$newobj"; then break; fi ;;
+               esac
+             done
+             func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+             func_append oldobjs " $gentop/$newobj"
+             ;;
+           *) func_append oldobjs " $obj" ;;
+           esac
+         done
+       fi
+       func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+       tool_oldlib=$func_to_tool_file_result
+       eval cmds=\"$old_archive_cmds\"
+
+       func_len " $cmds"
+       len=$func_len_result
+       if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+         cmds=$old_archive_cmds
+       elif test -n "$archiver_list_spec"; then
+         func_verbose "using command file archive linking..."
+         for obj in $oldobjs
+         do
+           func_to_tool_file "$obj"
+           $ECHO "$func_to_tool_file_result"
+         done > $output_objdir/$libname.libcmd
+         func_to_tool_file "$output_objdir/$libname.libcmd"
+         oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+         cmds=$old_archive_cmds
+       else
+         # the command line is too long to link in one step, link in parts
+         func_verbose "using piecewise archive linking..."
+         save_RANLIB=$RANLIB
+         RANLIB=:
+         objlist=
+         concat_cmds=
+         save_oldobjs=$oldobjs
+         oldobjs=
+         # Is there a better way of finding the last object in the list?
+         for obj in $save_oldobjs
+         do
+           last_oldobj=$obj
+         done
+         eval test_cmds=\"$old_archive_cmds\"
+         func_len " $test_cmds"
+         len0=$func_len_result
+         len=$len0
+         for obj in $save_oldobjs
+         do
+           func_len " $obj"
+           func_arith $len + $func_len_result
+           len=$func_arith_result
+           func_append objlist " $obj"
+           if test "$len" -lt "$max_cmd_len"; then
+             :
+           else
+             # the above command should be used before it gets too long
+             oldobjs=$objlist
+             if test "$obj" = "$last_oldobj"; then
+               RANLIB=$save_RANLIB
+             fi
+             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+             eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
+             objlist=
+             len=$len0
+           fi
+         done
+         RANLIB=$save_RANLIB
+         oldobjs=$objlist
+         if test -z "$oldobjs"; then
+           eval cmds=\"\$concat_cmds\"
+         else
+           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+         fi
+       fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test yes = "$build_old_libs" && old_library=$libname.$libext
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+       if eval test -z \"\${$var+set}\"; then
+         relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+       elif eval var_value=\$$var; test -z "$var_value"; then
+         relink_command="$var=; export $var; $relink_command"
+       else
+         func_quote_for_eval "$var_value"
+         relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+       fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test yes = "$hardcode_automatic"; then
+       relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+       for installed in no yes; do
+         if test yes = "$installed"; then
+           if test -z "$install_libdir"; then
+             break
+           fi
+           output=$output_objdir/${outputname}i
+           # Replace all uninstalled libtool libraries with the installed ones
+           newdependency_libs=
+           for deplib in $dependency_libs; do
+             case $deplib in
+             *.la)
+               func_basename "$deplib"
+               name=$func_basename_result
+               func_resolve_sysroot "$deplib"
+               eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+               test -z "$libdir" && \
+                 func_fatal_error "'$deplib' is not a valid libtool archive"
+               func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+               ;;
+             -L*)
+               func_stripname -L '' "$deplib"
+               func_replace_sysroot "$func_stripname_result"
+               func_append newdependency_libs " -L$func_replace_sysroot_result"
+               ;;
+             -R*)
+               func_stripname -R '' "$deplib"
+               func_replace_sysroot "$func_stripname_result"
+               func_append newdependency_libs " -R$func_replace_sysroot_result"
+               ;;
+             *) func_append newdependency_libs " $deplib" ;;
+             esac
+           done
+           dependency_libs=$newdependency_libs
+           newdlfiles=
+
+           for lib in $dlfiles; do
+             case $lib in
+             *.la)
+               func_basename "$lib"
+               name=$func_basename_result
+               eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+               test -z "$libdir" && \
+                 func_fatal_error "'$lib' is not a valid libtool archive"
+               func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+               ;;
+             *) func_append newdlfiles " $lib" ;;
+             esac
+           done
+           dlfiles=$newdlfiles
+           newdlprefiles=
+           for lib in $dlprefiles; do
+             case $lib in
+             *.la)
+               # Only pass preopened files to the pseudo-archive (for
+               # eventual linking with the app. that links it) if we
+               # didn't already link the preopened objects directly into
+               # the library:
+               func_basename "$lib"
+               name=$func_basename_result
+               eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+               test -z "$libdir" && \
+                 func_fatal_error "'$lib' is not a valid libtool archive"
+               func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+               ;;
+             esac
+           done
+           dlprefiles=$newdlprefiles
+         else
+           newdlfiles=
+           for lib in $dlfiles; do
+             case $lib in
+               [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+               *) abs=`pwd`"/$lib" ;;
+             esac
+             func_append newdlfiles " $abs"
+           done
+           dlfiles=$newdlfiles
+           newdlprefiles=
+           for lib in $dlprefiles; do
+             case $lib in
+               [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
+               *) abs=`pwd`"/$lib" ;;
+             esac
+             func_append newdlprefiles " $abs"
+           done
+           dlprefiles=$newdlprefiles
+         fi
+         $RM $output
+         # place dlname in correct position for cygwin
+         # In fact, it would be nice if we could use this code for all target
+         # systems that can't hard-code library paths into their executables
+         # and that have no shared library path variable independent of PATH,
+         # but it turns out we can't easily determine that from inspecting
+         # libtool variables, so we have to hard-code the OSs to which it
+         # applies here; at the moment, that means platforms that use the PE
+         # object format with DLL files.  See the long comment at the top of
+         # tests/bindir.at for full details.
+         tdlname=$dlname
+         case $host,$output,$installed,$module,$dlname in
+           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+             # If a -bindir argument was supplied, place the dll there.
+             if test -n "$bindir"; then
+               func_relative_path "$install_libdir" "$bindir"
+               tdlname=$func_relative_path_result/$dlname
+             else
+               # Otherwise fall back on heuristic.
+               tdlname=../bin/$dlname
+             fi
+             ;;
+         esac
+         $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+         if test no,yes = "$installed,$need_relink"; then
+           $ECHO >> $output "\
+relink_command=\"$relink_command\""
+         fi
+       done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+  func_mode_link ${1+"$@"}
+fi
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $debug_cmd
+
+    RM=$nonopt
+    files=
+    rmforce=false
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic=$magic
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=: ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir=$func_dirname_result
+      if test . = "$dir"; then
+       odir=$objdir
+      else
+       odir=$dir/$objdir
+      fi
+      func_basename "$file"
+      name=$func_basename_result
+      test uninstall = "$opt_mode" && odir=$dir
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test clean = "$opt_mode"; then
+       case " $rmdirs " in
+         *" $odir "*) ;;
+         *) func_append rmdirs " $odir" ;;
+       esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+        { test -h "$file"; } >/dev/null 2>&1 ||
+        test -f "$file"; then
+       :
+      elif test -d "$file"; then
+       exit_status=1
+       continue
+      elif $rmforce; then
+       continue
+      fi
+
+      rmfiles=$file
+
+      case $name in
+      *.la)
+       # Possibly a libtool archive, so verify it.
+       if func_lalib_p "$file"; then
+         func_source $dir/$name
+
+         # Delete the libtool libraries and symlinks.
+         for n in $library_names; do
+           func_append rmfiles " $odir/$n"
+         done
+         test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+         case $opt_mode in
+         clean)
+           case " $library_names " in
+           *" $dlname "*) ;;
+           *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+           esac
+           test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+           ;;
+         uninstall)
+           if test -n "$library_names"; then
+             # Do each command in the postuninstall commands.
+             func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
+           fi
+
+           if test -n "$old_library"; then
+             # Do each command in the old_postuninstall commands.
+             func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
+           fi
+           # FIXME: should reinstall the best remaining shared library.
+           ;;
+         esac
+       fi
+       ;;
+
+      *.lo)
+       # Possibly a libtool object, so verify it.
+       if func_lalib_p "$file"; then
+
+         # Read the .lo file
+         func_source $dir/$name
+
+         # Add PIC object to the list of files to remove.
+         if test -n "$pic_object" && test none != "$pic_object"; then
+           func_append rmfiles " $dir/$pic_object"
+         fi
+
+         # Add non-PIC object to the list of files to remove.
+         if test -n "$non_pic_object" && test none != "$non_pic_object"; then
+           func_append rmfiles " $dir/$non_pic_object"
+         fi
+       fi
+       ;;
+
+      *)
+       if test clean = "$opt_mode"; then
+         noexename=$name
+         case $file in
+         *.exe)
+           func_stripname '' '.exe' "$file"
+           file=$func_stripname_result
+           func_stripname '' '.exe' "$name"
+           noexename=$func_stripname_result
+           # $file with .exe has already been added to rmfiles,
+           # add $file without .exe
+           func_append rmfiles " $file"
+           ;;
+         esac
+         # Do a test to see if this is a libtool program.
+         if func_ltwrapper_p "$file"; then
+           if func_ltwrapper_executable_p "$file"; then
+             func_ltwrapper_scriptname "$file"
+             relink_command=
+             func_source $func_ltwrapper_scriptname_result
+             func_append rmfiles " $func_ltwrapper_scriptname_result"
+           else
+             relink_command=
+             func_source $dir/$noexename
+           fi
+
+           # note $name still contains .exe if it was in $file originally
+           # as does the version of $file that was added into $rmfiles
+           func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+           if test yes = "$fast_install" && test -n "$relink_command"; then
+             func_append rmfiles " $odir/lt-$name"
+           fi
+           if test "X$noexename" != "X$name"; then
+             func_append rmfiles " $odir/lt-$noexename.c"
+           fi
+         fi
+       fi
+       ;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the $objdir's in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+       func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+  func_mode_uninstall ${1+"$@"}
+fi
+
+test -z "$opt_mode" && {
+  help=$generic_help
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode '$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# where we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/build-aux/ltoptions.m4 b/build-aux/ltoptions.m4
new file mode 100644 (file)
index 0000000..94b0829
--- /dev/null
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+           [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+                     [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+                  [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+                  [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+       [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+       IFS=$lt_save_ifs
+       if test "X$pkg" = "X$p"; then
+         enable_shared=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+       [Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+       [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+       IFS=$lt_save_ifs
+       if test "X$pkg" = "X$p"; then
+         enable_static=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+       [Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+       IFS=$lt_save_ifs
+       if test "X$pkg" = "X$p"; then
+         enable_fast_install=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+        [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+       [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+       IFS=$lt_save_ifs
+       if test "X$lt_pkg" = "X$lt_p"; then
+         pic_mode=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+                [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+                [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+                [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+                [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+                [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/build-aux/ltsugar.m4 b/build-aux/ltsugar.m4
new file mode 100644 (file)
index 0000000..48bc934
--- /dev/null
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+          m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+            [m4_foreach([_Lt_suffix],
+               ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+       [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+         [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+                [lt_append([$1], [$2], [$3])$4],
+                [$5])],
+         [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+       m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+       [$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+                     [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/build-aux/ltversion.m4 b/build-aux/ltversion.m4
new file mode 100644 (file)
index 0000000..fa04b52
--- /dev/null
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers                      -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/build-aux/lt~obsolete.m4 b/build-aux/lt~obsolete.m4
new file mode 100644 (file)
index 0000000..c6b26f8
--- /dev/null
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],  [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],             [AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],        [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],         [AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],    [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],           [AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],             [AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],    [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],           [AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],       [AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],               [AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],        [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],    [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],    [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],         [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],            [AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],  [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],             [AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],            [AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],    [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],   [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],          [AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],            [AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],           [AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],  [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],    [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],          [AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],          [AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],                [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],     [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],          [AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],   [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],           [AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],           [AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],           [AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],  [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],      [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],    [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],    [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],    [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],     [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],         [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],       [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],        [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],                [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],        [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],   [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],              [AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],               [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],              [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/build-aux/missing b/build-aux/missing
new file mode 100755 (executable)
index 0000000..625aeb1
--- /dev/null
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/test-driver b/build-aux/test-driver
new file mode 100755 (executable)
index 0000000..b8521a4
--- /dev/null
@@ -0,0 +1,148 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 2011-2018 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+   *) break;;
+  esac
+  shift
+done
+
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='\e[0;31m' # Red.
+  grn='\e[0;32m' # Green.
+  lgn='\e[1;32m' # Light green.
+  blu='\e[1;34m' # Blue.
+  mgn='\e[0;35m' # Magenta.
+  std='\e[m'     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
+fi
+
+case $tweaked_estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.h.in b/config.h.in
new file mode 100644 (file)
index 0000000..2fd0897
--- /dev/null
@@ -0,0 +1,99 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `explicit_bzero' function. */
+#undef HAVE_EXPLICIT_BZERO
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `asan' library (-lasan). */
+#undef HAVE_LIBASAN
+
+/* Define to 1 if you have the `lsan' library (-llsan). */
+#undef HAVE_LIBLSAN
+
+/* Define to 1 if you have the `ubsan' library (-lubsan). */
+#undef HAVE_LIBUBSAN
+
+/* Define to 1 if you have the <linux/if_alg.h> header file. */
+#undef HAVE_LINUX_IF_ALG_H
+
+/* Define to 1 if you have the <linux/types.h> header file. */
+#undef HAVE_LINUX_TYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Define to 1 if type `char' is unsigned and you are not using gcc.  */
+#ifndef __CHAR_UNSIGNED__
+# undef __CHAR_UNSIGNED__
+#endif
diff --git a/configure b/configure
new file mode 100755 (executable)
index 0000000..5d0b8cd
--- /dev/null
+++ b/configure
@@ -0,0 +1,15437 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for ell 0.28.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+       expr "X$arg" : "X\\(.*\\)$as_nl";
+       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""       $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+        /*)
+          for as_base in sh bash ksh sh5; do
+            # Try only shells that exist, to save several forks.
+            as_shell=$as_dir/$as_base
+            if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+                   { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+                  if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+          done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+             { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+        X"$0" : 'X\(//\)$' \| \
+        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='        ';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='ell'
+PACKAGE_TARNAME='ell'
+PACKAGE_VERSION='0.28'
+PACKAGE_STRING='ell 0.28'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_default_prefix=/usr/local
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+CERT_TESTS_FALSE
+CERT_TESTS_TRUE
+DBUS_TESTS_FALSE
+DBUS_TESTS_TRUE
+have_xxd
+have_openssl
+GLIB_FALSE
+GLIB_TRUE
+GLIB_LIBS
+GLIB_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+LT_SYS_LIBRARY_PATH
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+EGREP
+GREP
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+runstatedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+am__quote'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_maintainer_mode
+enable_dependency_tracking
+enable_static
+enable_shared
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_optimization
+enable_debug
+enable_pie
+enable_asan
+enable_lsan
+enable_ubsan
+enable_glib
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+LT_SYS_LIBRARY_PATH
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+GLIB_CFLAGS
+GLIB_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+        ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
+               datadir sysconfdir sharedstatedir localstatedir includedir \
+               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+               libdir localedir mandir runstatedir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_myself" : 'X\(//\)[^/]' \| \
+        X"$as_myself" : 'X\(//\)$' \| \
+        X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+       pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures ell 0.28 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/ell]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+Program names:
+  --program-prefix=PREFIX            prepend PREFIX to installed program names
+  --program-suffix=SUFFIX            append SUFFIX to installed program names
+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of ell 0.28:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-static[=PKGS]  build static libraries [default=no]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-optimization  disable code optimization through compiler
+  --enable-debug          enable compiling with debugging information
+  --enable-pie            enable position independent executables flag
+  --enable-asan           enable linking with address sanitizer
+  --enable-lsan           enable linking with leak sanitizer
+  --enable-ubsan          enable linking with undefined behavior sanitizer
+  --enable-glib           enable ell/glib main loop example
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-aix-soname=aix|svr4|both
+                          shared library versioning (aka "SONAME") variant to
+                          provide on AIX, [default=aix].
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                          compiler's sysroot if not specified).
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  LT_SYS_LIBRARY_PATH
+              User-defined run-time library search path.
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+  GLIB_LIBS   linker flags for GLIB, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+ell configure 0.28
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by ell $as_me 0.28, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+       ac_must_keep_next=false # Got value, back to normal.
+      else
+       case $ac_arg in
+         *=* | --config-cache | -C | -disable-* | --disable-* \
+         | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+         | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+         | -with-* | --with-* | -without-* | --without-* | --x)
+           case "$ac_configure_args0 " in
+             "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+           esac
+           ;;
+         -* ) ac_must_keep_next=true ;;
+       esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+       "s/'\''/'\''\\\\'\'''\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+       eval ac_val=\$$ac_var
+       case $ac_val in
+       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+       esac
+       $as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+       # differences in whitespace do not lead to failure.
+       ac_old_val_w=`echo x $ac_old_val`
+       ac_new_val_w=`echo x $ac_new_val`
+       if test "$ac_old_val_w" != "$ac_new_val_w"; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+         ac_cache_corrupted=:
+       else
+         { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+         eval $ac_var=\$ac_old_val
+       fi
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+       { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_config_headers="$ac_config_headers config.h"
+
+ac_aux_dir=
+for ac_dir in build-aux "$srcdir"/build-aux; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+
+am__api_version='1.16'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+       if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+         if test $ac_prog = install &&
+           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+           # AIX install.  It has an incompatible calling convention.
+           :
+         elif test $ac_prog = install &&
+           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+           # program-specific install script used by HP pwplus--don't use.
+           :
+         else
+           rm -rf conftest.one conftest.two conftest.dir
+           echo one > conftest.one
+           echo two > conftest.two
+           mkdir conftest.dir
+           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+             test -s conftest.one && test -s conftest.two &&
+             test -s conftest.dir/conftest.one &&
+             test -s conftest.dir/conftest.two
+           then
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
+         fi
+       fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \    ]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+       # -L didn't work.
+       set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+       && test "$*" != "X conftest.file $srcdir/configure"; then
+
+       # If neither matched, then we have a broken ls.  This can happen
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+       as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\    *)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+        for ac_exec_ext in '' $ac_executable_extensions; do
+          as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+          case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+            'mkdir (GNU coreutils) '* | \
+            'mkdir (coreutils) '* | \
+            'mkdir (fileutils) '4.1*)
+              ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+              break 3;;
+          esac
+        done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+       @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+       @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE='ell'
+ VERSION='0.28'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
+$as_echo_n "checking how to create a pax tar archive... " >&6; }
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_pax-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        { echo "$as_me:$LINENO: $_am_tar --version" >&5
+   ($_am_tar --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && break
+      done
+      am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x pax -w "$$tardir"'
+      am__tar_='pax -L -x pax -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H pax -L'
+      am__tar_='find "$tardir" -print | cpio -o -H pax -L'
+      am__untar='cpio -i -H pax -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_pax}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+   ($am__untar <conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+   (cat conftest.dir/file) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  if ${am_cv_prog_tar_pax+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_prog_tar_pax=$_am_tool
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
+$as_echo "$am_cv_prog_tar_pax" >&6; }
+
+
+
+
+
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+       @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+
+
+
+       if (test "${CFLAGS}" = ""); then
+               CFLAGS="-Wall -O2 -fsigned-char -fno-exceptions"
+               CFLAGS+=" -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
+       fi
+       if (test "$USE_MAINTAINER_MODE" = "yes"); then
+               CFLAGS+=" -Werror -Wextra"
+               CFLAGS+=" -Wno-unused-parameter"
+               CFLAGS+=" -Wno-missing-field-initializers"
+               CFLAGS+=" -Wdeclaration-after-statement"
+               CFLAGS+=" -Wmissing-declarations"
+               CFLAGS+=" -Wredundant-decls"
+               CFLAGS+=" -Wswitch-enum"
+               CFLAGS+=" -Wtype-limits"
+               CFLAGS+=" -Wvariadic-macros"
+               CFLAGS+=" -Wformat -Wformat-security"
+               if ( $CC -v 2>/dev/null | grep "gcc version" ); then
+                       CFLAGS+=" -Wcast-align"
+               fi
+       fi
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+       ;;
+    [ab].out )
+       # We found the default executable, but exeext='' is most
+       # certainly right.
+       break;;
+    *.* )
+       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+       then :; else
+          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+       fi
+       # We set ac_cv_exeext here because the later test for it is not
+       # safe: cross compilers may not add the suffix if given an `-o'
+       # argument, so we may need to know it at that point already.
+       # Even if this section looks crufty: it has the advantage of
+       # actually working.
+       break;;
+    * )
+       break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+         break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+       cross_compiling=yes
+    else
+       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+        CFLAGS="-g"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
+am__doit:
+       @echo this is the am__doit target >confinc.out
+.PHONY: am__doit
+END
+am__include="#"
+am__quote=
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
+     ;;
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    nosideeffect)
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
+      if test "x$enable_dependency_tracking" = xyes; then
+       continue
+      else
+       break
+      fi
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+  am__fastdepCC_TRUE=
+  am__fastdepCC_FALSE='#'
+else
+  am__fastdepCC_TRUE='#'
+  am__fastdepCC_FALSE=
+fi
+
+
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -fPIE" >&5
+$as_echo_n "checking whether ${CC-cc} accepts -fPIE... " >&6; }
+if ${ac_cv_prog_cc_pie+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fPIE -pie -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_pie=yes
+               else
+                       ac_cv_prog_cc_pie=no
+               fi
+               rm -rf conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_pie" >&5
+$as_echo "$ac_cv_prog_cc_pie" >&6; }
+
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -fsanitize=address" >&5
+$as_echo_n "checking whether ${CC-cc} accepts -fsanitize=address... " >&6; }
+if ${ac_cv_prog_cc_asan+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fsanitize=address -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_asan=yes
+               else
+                       ac_cv_prog_cc_asan=no
+               fi
+               rm -rf conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_asan" >&5
+$as_echo "$ac_cv_prog_cc_asan" >&6; }
+
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -fsanitize=leak" >&5
+$as_echo_n "checking whether ${CC-cc} accepts -fsanitize=leak... " >&6; }
+if ${ac_cv_prog_cc_lsan+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fsanitize=leak -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_lsan=yes
+               else
+                       ac_cv_prog_cc_lsan=no
+               fi
+               rm -rf conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_lsan" >&5
+$as_echo "$ac_cv_prog_cc_lsan" >&6; }
+
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -fsanitize=undefined" >&5
+$as_echo_n "checking whether ${CC-cc} accepts -fsanitize=undefined... " >&6; }
+if ${ac_cv_prog_cc_ubsan+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+               echo 'void f(){}' > conftest.c
+               if test -z "`${CC-cc} -fsanitize=undefined -c conftest.c 2>&1`"; then
+                       ac_cv_prog_cc_ubsan=yes
+               else
+                       ac_cv_prog_cc_ubsan=no
+               fi
+               rm -rf conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_ubsan" >&5
+$as_echo "$ac_cv_prog_cc_ubsan" >&6; }
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+                  (('a' <= (c) && (c) <= 'i') \
+                    || ('j' <= (c) && (c) <= 'r') \
+                    || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+       || toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                 inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+$as_echo_n "checking whether char is unsigned... " >&6; }
+if ${ac_cv_c_char_unsigned+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((char) -1) < 0)];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_char_unsigned=no
+else
+  ac_cv_c_char_unsigned=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
+$as_echo "$ac_cv_c_char_unsigned" >&6; }
+if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
+  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+              not a universal capable compiler
+            #endif
+            typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+       # Check for potential -arch flags.  It is not universal unless
+       # there are at least two -arch flags with different values.
+       ac_arch=
+       ac_prev=
+       for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+        if test -n "$ac_prev"; then
+          case $ac_word in
+            i?86 | x86_64 | ppc | ppc64)
+              if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+                ac_arch=$ac_word
+              else
+                ac_cv_c_bigendian=universal
+                break
+              fi
+              ;;
+          esac
+          ac_prev=
+        elif test "x$ac_word" = "x-arch"; then
+          ac_prev=arch
+        fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+            #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+                    && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+                    && LITTLE_ENDIAN)
+             bogus endian macros
+            #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+               #include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+                not big endian
+               #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+             bogus endian macros
+            #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+                not big endian
+               #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+                 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+               short int ascii_ii[] =
+                 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+               int use_ascii (int i) {
+                 return ascii_mm[i] + ascii_ii[i];
+               }
+               short int ebcdic_ii[] =
+                 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+               short int ebcdic_mm[] =
+                 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+               int use_ebcdic (int i) {
+                 return ebcdic_mm[i] + ebcdic_ii[i];
+               }
+               extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+             ac_cv_c_bigendian=yes
+           fi
+           if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+             if test "$ac_cv_c_bigendian" = unknown; then
+               ac_cv_c_bigendian=no
+             else
+               # finding both strings is unlikely to happen, but who knows?
+               ac_cv_c_bigendian=unknown
+             fi
+           fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+            /* Are we little or big endian?  From Harbison&Steele.  */
+            union
+            {
+              long int l;
+              char c[sizeof (long int)];
+            } u;
+            u.l = 1;
+            return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     little_endian=no;; #(
+   no)
+     little_endian=yes ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     little_endian=no ;;
+ esac
+
+
+
+case `pwd` in
+  *\ * | *\    *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.6'
+macro_revision='2.4.6'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case $ECHO in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+       test no != "$with_gnu_ld" && break
+       ;;
+      *)
+       test yes != "$with_gnu_ld" && break
+       ;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
+fi
+
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+       # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+       case $build_os in
+       mingw*) lt_bad_file=conftest.nm/nofile ;;
+       *) lt_bad_file=/dev/null ;;
+       esac
+       case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+       *$lt_bad_file* | *'Invalid file or object type'*)
+         lt_cv_path_NM="$tmp_nm -B"
+         break 2
+         ;;
+       *)
+         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+         */dev/null*)
+           lt_cv_path_NM="$tmp_nm -p"
+           break 2
+           ;;
+         *)
+           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+           continue # so that we can try to find one that supports BSD flags
+           ;;
+         esac
+         ;;
+       esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[         ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+                = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+             test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test 0 -eq "$ac_status"; then
+       # Ensure the archiver fails upon bogus file names.
+       rm -f conftest.$ac_objext libconftest.a
+       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+       if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+       mv -f "$nlist"T "$nlist"
+      else
+       rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+       if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+         cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+         # Now generate the symbol file.
+         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+         cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+         $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+         cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+         # Now try linking the two files.
+         mv conftest.$ac_objext conftstm.$ac_objext
+         lt_globsym_save_LIBS=$LIBS
+         lt_globsym_save_CFLAGS=$CFLAGS
+         LIBS=conftstm.$ac_objext
+         CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+           pipe_works=yes
+         fi
+         LIBS=$lt_globsym_save_LIBS
+         CFLAGS=$lt_globsym_save_CFLAGS
+       else
+         echo "cannot find nm_test_func in $nlist" >&5
+       fi
+      else
+       echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+  ac_path_lt_DD_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in dd; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+      $ac_path_lt_DD_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_lt_DD"; then
+    :
+  fi
+else
+  ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+       HPUX_IA64_MODE=32
+       ;;
+      *ELF-64*)
+       HPUX_IA64_MODE=64
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -melf32bsmip"
+         ;;
+       *N32*)
+         LD="${LD-ld} -melf32bmipn32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -melf64bmip"
+       ;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+       *32-bit*)
+         LD="${LD-ld} -32"
+         ;;
+       *N32*)
+         LD="${LD-ld} -n32"
+         ;;
+       *64-bit*)
+         LD="${LD-ld} -64"
+         ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+       emul="${emul}32"
+       ;;
+      *64-bit*)
+       emul="${emul}64"
+       ;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+       emul="${emul}btsmip"
+       ;;
+      *LSB*)
+       emul="${emul}ltsmip"
+       ;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+       emul="${emul}n32"
+       ;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_i386_fbsd"
+           ;;
+         x86_64-*linux*)
+           case `/usr/bin/file conftest.o` in
+             *x86-64*)
+               LD="${LD-ld} -m elf32_x86_64"
+               ;;
+             *)
+               LD="${LD-ld} -m elf_i386"
+               ;;
+           esac
+           ;;
+         powerpc64le-*linux*)
+           LD="${LD-ld} -m elf32lppclinux"
+           ;;
+         powerpc64-*linux*)
+           LD="${LD-ld} -m elf32ppclinux"
+           ;;
+         s390x-*linux*)
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+      *64-bit*)
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         powerpcle-*linux*)
+           LD="${LD-ld} -m elf64lppc"
+           ;;
+         powerpc-*linux*)
+           LD="${LD-ld} -m elf64ppc"
+           ;;
+         s390*-*linux*|s390*-*tpf*)
+           LD="${LD-ld} -m elf64_s390"
+           ;;
+         sparc*-*linux*)
+           LD="${LD-ld} -m elf64_sparc"
+           ;;
+       esac
+       ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+       # By default we will add the -single_module flag. You can override
+       # by either setting the environment variable LT_MULTI_MODULE
+       # non-empty at configure time, or by adding -multi_module to the
+       # link flags.
+       rm -rf libconftest.dylib*
+       echo "int foo(void){return 1;}" > conftest.c
+       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+       # If there is a non-empty error log, and "single_module"
+       # appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+         cat conftest.err >&5
+       # Otherwise, if the output was created with a 0 exit code from
+       # the compiler, it worked.
+       elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+         lt_cv_apple_cc_single_mod=yes
+       else
+         cat conftest.err >&5
+       fi
+       rm -rf libconftest.dylib*
+       rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+       LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+       cat conftest.err >&5
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+       lt_cv_ld_force_load=yes
+      else
+       cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+       10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+         _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+       10.[012][,.]*)
+         _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+       10.*)
+         _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+       IFS=$lt_save_ifs
+       if test "X$pkg" = "X$p"; then
+         enable_static=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
+
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+       IFS=$lt_save_ifs
+       if test "X$pkg" = "X$p"; then
+         enable_shared=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+       IFS=$lt_save_ifs
+       if test "X$lt_pkg" = "X$lt_p"; then
+         pic_mode=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+       IFS=$lt_save_ifs
+       if test "X$pkg" = "X$p"; then
+         enable_fast_install=yes
+       fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+  shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+  withval=$with_aix_soname; case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname
+else
+  if ${lt_cv_with_aix_soname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_with_aix_soname=aix
+fi
+
+    with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/${ac_tool_prefix}file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+         fi ;;
+       esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/file"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+      if test -n "$file_magic_test_file"; then
+       case $deplibs_check_method in
+       "file_magic "*)
+         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+         MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+           $EGREP "$file_magic_regex" > /dev/null; then
+           :
+         else
+           cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+         fi ;;
+       esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test yes = "$GCC"; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+       # AIX 5 now supports IA64 processor
+       lt_prog_compiler_static='-Bstatic'
+      fi
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+       lt_prog_compiler_static='$wl-static'
+       ;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+       # +Z the default
+       ;;
+      *)
+       lt_prog_compiler_pic='-fPIC'
+       ;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test ia64 = "$host_cpu"; then
+       # AIX 5 now supports IA64 processor
+       lt_prog_compiler_static='-Bstatic'
+      else
+       lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        lt_prog_compiler_wl='-Wl,-Wl,,'
+        lt_prog_compiler_pic='-PIC'
+        lt_prog_compiler_static='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      case $host_os in
+      os2*)
+       lt_prog_compiler_static='$wl-static'
+       ;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+       # +Z the default
+       ;;
+      *)
+       lt_prog_compiler_pic='+Z'
+       ;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-KPIC'
+       lt_prog_compiler_static='-static'
+        ;;
+      # flang / f18. f95 an alias for gfortran or flang on Debian
+      flang* | f18* | f95*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-fPIC'
+       lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-fPIC'
+       lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='--shared'
+       lt_prog_compiler_static='--static'
+       ;;
+      nagfor*)
+       # NAG Fortran compiler
+       lt_prog_compiler_wl='-Wl,-Wl,,'
+       lt_prog_compiler_pic='-PIC'
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+      tcc*)
+       # Fabrice Bellard et al's Tiny C Compiler
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-fPIC'
+       lt_prog_compiler_static='-static'
+       ;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+       # which looks to be a dead project)
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-fpic'
+       lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+       # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+       lt_prog_compiler_wl='-Wl,'
+       lt_prog_compiler_pic='-qpic'
+       lt_prog_compiler_static='-qstaticlink'
+       ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl=''
+         ;;
+       *Sun\ F* | *Sun*Fortran*)
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl='-Qoption ld '
+         ;;
+       *Sun\ C*)
+         # Sun C 5.9
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+        *Intel*\ [CF]*Compiler*)
+         lt_prog_compiler_wl='-Wl,'
+         lt_prog_compiler_pic='-fPIC'
+         lt_prog_compiler_static='-static'
+         ;;
+       *Portland\ Group*)
+         lt_prog_compiler_wl='-Wl,'
+         lt_prog_compiler_pic='-fpic'
+         lt_prog_compiler_static='-Bstatic'
+         ;;
+       esac
+       ;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+       lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+       lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       lt_prog_compiler_pic='-Kconform_pic'
+       lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test no = "$hard_links"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+       # The AIX port of GNU ld has always aspired to compatibility
+       # with the native linker.  However, as the warning in the GNU ld
+       # block says, versions before 2.19.5* couldn't really create working
+       # shared libraries, regardless of the interface used.
+       case `$LD -v 2>&1` in
+         *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+         *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+         *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+         *)
+           lt_use_gnu_ld_interface=yes
+           ;;
+       esac
+       ;;
+      *)
+       lt_use_gnu_ld_interface=yes
+       ;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+    export_dynamic_flag_spec='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+       ld_shlibs=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag=unsupported
+       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+       ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='$wl--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+       # If the export-symbols file already is a .def file, use it as
+       # is; otherwise, prepend EXPORTS...
+       archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[   ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+       ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       prefix_cmds="$SED"~
+       if test EXPORTS = "`$SED 1q $export_symbols`"; then
+         prefix_cmds="$prefix_cmds -e 1d";
+       fi~
+       prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+       cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+      export_dynamic_flag_spec='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+       case $cc_basename in
+         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
+       esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+        && test no = "$tmp_diet"
+      then
+       tmp_addflag=' $pic_flag'
+       tmp_sharedflag='-shared'
+       case $cc_basename,$host_cpu in
+        pgcc*)                         # Portland Group C compiler
+         whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         tmp_addflag=' $pic_flag'
+         ;;
+       pgf77* | pgf90* | pgf95* | pgfortran*)
+                                       # Portland Group f77 and f90 compilers
+         whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         tmp_addflag=' $pic_flag -Mnomain' ;;
+       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
+         tmp_addflag=' -i_dynamic' ;;
+       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
+         tmp_addflag=' -i_dynamic -nofor_main' ;;
+       ifc* | ifort*)                  # Intel Fortran compiler
+         tmp_addflag=' -nofor_main' ;;
+       lf95*)                          # Lahey Fortran 8.1
+         whole_archive_flag_spec=
+         tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+       xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+         tmp_sharedflag='-qmkshrobj'
+         tmp_addflag= ;;
+       nvcc*)  # Cuda Compiler Driver 2.2
+         whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         compiler_needs_object=yes
+         ;;
+       esac
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+         compiler_needs_object=yes
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       esac
+       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+       case $cc_basename in
+       tcc*)
+         export_dynamic_flag_spec='-rdynamic'
+         ;;
+       xlf* | bgf* | bgxlf* | mpixlf*)
+         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+         whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+         hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+         archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+         if test yes = "$supports_anon_versioning"; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+         fi
+         ;;
+       esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+       wlarc=
+      else
+       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+       ld_shlibs=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+       ld_shlibs=no
+       cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+       ;;
+       *)
+         # For security reasons, it is highly recommended that you always
+         # use absolute paths for naming shared libraries, and exclude the
+         # DT_RUNPATH tag from executables and libraries.  But doing so
+         # requires that you compile everything twice, which is a pain.
+         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+           hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+           archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+           archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+         else
+           ld_shlibs=no
+         fi
+       ;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+       ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test no = "$ld_shlibs"; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+       # Neither direct hardcoding nor static linking is supported with a
+       # broken collect2.
+       hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test ia64 = "$host_cpu"; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+       aix_use_runtimelinking=no
+       exp_sym_flag='-Bexport'
+       no_entry_flag=
+      else
+       # If we're using GNU nm, then we don't want the "-C" option.
+       # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+       # Without the "-l" option, or with the "-B" option, AIX nm treats
+       # weak defined symbols like other global defined symbols, whereas
+       # GNU nm marks them as "W".
+       # While the 'weak' keyword is ignored in the Export File, we need
+       # it in the Import File for the 'aix-soname' feature, so we have
+       # to replace the "-B" option with "-P" for AIX nm.
+       if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+         export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+       else
+         export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+       fi
+       aix_use_runtimelinking=no
+
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # have runtime linking enabled, and use it for executables.
+       # For shared libraries, we enable/disable runtime linking
+       # depending on the kind of the shared library created -
+       # when "with_aix_soname,aix_use_runtimelinking" is:
+       # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+       # "aix,yes"  lib.so          shared, rtl:yes, for executables
+       #            lib.a           static archive
+       # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+       #            lib.a(lib.so.V) shared, rtl:no,  for executables
+       # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+       #            lib.a(lib.so.V) shared, rtl:no
+       # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+       #            lib.a           static archive
+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+         for ld_flag in $LDFLAGS; do
+         if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+           aix_use_runtimelinking=yes
+           break
+         fi
+         done
+         if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+           # With aix-soname=svr4, we create the lib.so.V shared archives only,
+           # so we don't have lib.a shared libs to link our executables.
+           # We have to force runtime linking in this case.
+           aix_use_runtimelinking=yes
+           LDFLAGS="$LDFLAGS -Wl,-brtl"
+         fi
+         ;;
+       esac
+
+       exp_sym_flag='-bexport'
+       no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+       # The Import File defines what to hardcode.
+       hardcode_direct=no
+       hardcode_direct_absolute=no
+       ;;
+      esac
+
+      if test yes = "$GCC"; then
+       case $host_os in aix4.[012]|aix4.[012].*)
+       # We only want to do this on AIX 4.2 and lower, the check
+       # below for broken collect2 doesn't work under 4.3+
+         collect2name=`$CC -print-prog-name=collect2`
+         if test -f "$collect2name" &&
+          strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+         then
+         # We have reworked collect2
+         :
+         else
+         # We have old collect2
+         hardcode_direct=unsupported
+         # It fails to find uninstalled libraries when the uninstalled
+         # path is not listed in the libpath.  Setting hardcode_minus_L
+         # to unsupported forces relinking
+         hardcode_minus_L=yes
+         hardcode_libdir_flag_spec='-L$libdir'
+         hardcode_libdir_separator=
+         fi
+         ;;
+       esac
+       shared_flag='-shared'
+       if test yes = "$aix_use_runtimelinking"; then
+         shared_flag="$shared_flag "'$wl-G'
+       fi
+       # Need to ensure runtime linking is disabled for the traditional
+       # shared library, or the linker may eventually find shared libraries
+       # /with/ Import File - we do not want to mix them.
+       shared_flag_aix='-shared'
+       shared_flag_svr4='-shared $wl-G'
+      else
+       # not using gcc
+       if test ia64 = "$host_cpu"; then
+       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+       # chokes on -Wl,-G. The following line is correct:
+         shared_flag='-G'
+       else
+         if test yes = "$aix_use_runtimelinking"; then
+           shared_flag='$wl-G'
+         else
+           shared_flag='$wl-bM:SRE'
+         fi
+         shared_flag_aix='$wl-bM:SRE'
+         shared_flag_svr4='$wl-G'
+       fi
+      fi
+
+      export_dynamic_flag_spec='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+       # Warning - without using the other runtime loading flags (-brtl),
+       # -berok will link without error, but may produce a broken library.
+       allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+         /^0/ {
+             s/^0  *\([^ ]*\) *$/\1/
+             p
+         }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+       if test ia64 = "$host_cpu"; then
+         hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+         allow_undefined_flag="-z nodefs"
+         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+       else
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+         /^0/ {
+             s/^0  *\([^ ]*\) *$/\1/
+             p
+         }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=/usr/lib:/lib
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+         # Warning - without using the other run time loading flags,
+         # -berok will link without error, but may produce a broken library.
+         no_undefined_flag=' $wl-bernotok'
+         allow_undefined_flag=' $wl-berok'
+         if test yes = "$with_gnu_ld"; then
+           # We only use this code for GNU lds that support --whole-archive.
+           whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+         else
+           # Exported symbols can be pulled into shared objects from archives
+           whole_archive_flag_spec='$convenience'
+         fi
+         archive_cmds_need_lc=yes
+         archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+         # -brtl affects multiple linker settings, -berok does not and is overridden later
+         compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+         if test svr4 != "$with_aix_soname"; then
+           # This is similar to how AIX traditionally builds its shared libraries.
+           archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+         fi
+         if test aix != "$with_aix_soname"; then
+           archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+         else
+           # used by -dlpreopen to get the symbols
+           archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+         fi
+         archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+       fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+       # Native MSVC
+       hardcode_libdir_flag_spec=' '
+       allow_undefined_flag=unsupported
+       always_export_symbols=yes
+       file_list_spec='@'
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+       shrext_cmds=.dll
+       # FIXME: Setting linknames here is a bad hack.
+       archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+       archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[   ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+       # The linker will not automatically build a static lib if we build a DLL.
+       # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+       enable_shared_with_static_runtimes=yes
+       exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+       # Don't use ranlib
+       old_postinstall_cmds='chmod 644 $oldlib'
+       postlink_cmds='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+       ;;
+      *)
+       # Assume MSVC wrapper
+       hardcode_libdir_flag_spec=' '
+       allow_undefined_flag=unsupported
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+       shrext_cmds=.dll
+       # FIXME: Setting linknames here is a bad hack.
+       archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+       old_archive_from_new_cmds='true'
+       # FIXME: Should let the user specify the lib program.
+       old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+       enable_shared_with_static_runtimes=yes
+       ;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+       archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+       archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+       archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+       hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+       hardcode_libdir_separator=:
+       hardcode_direct=yes
+       hardcode_direct_absolute=yes
+       export_dynamic_flag_spec='$wl-E'
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+       case $host_cpu in
+       hppa*64*)
+         archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+         archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       esac
+      else
+       case $host_cpu in
+       hppa*64*)
+         archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       ia64*)
+         archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
+       *)
+
+         # Older versions of the 11.00 compiler do not understand -b yet
+         # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+    archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+         ;;
+       esac
+      fi
+      if test no = "$with_gnu_ld"; then
+       hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+       hardcode_libdir_separator=:
+
+       case $host_cpu in
+       hppa*64*|ia64*)
+         hardcode_direct=no
+         hardcode_shlibpath_var=no
+         ;;
+       *)
+         hardcode_direct=yes
+         hardcode_direct_absolute=yes
+         export_dynamic_flag_spec='$wl-E'
+
+         # hardcode_minus_L: Not really in the search PATH,
+         # but as the default location of the library.
+         hardcode_minus_L=yes
+         ;;
+       esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+       # Try to use the -exported_symbol ld option, if it does not
+       # work, assume that -exports_file does not work either and
+       # implicitly export all symbols.
+       # This should be the same for all languages, so no per-tag cache variable.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS=$LDFLAGS
+          LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+       if test yes = "$lt_cv_irix_exported_symbol"; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+       fi
+       link_all_deplibs=no
+      else
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+       # Fabrice Bellard et al's Tiny C Compiler
+       ld_shlibs=yes
+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+       ;;
+      esac
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+       archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       hardcode_direct_absolute=yes
+       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+         hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+         export_dynamic_flag_spec='$wl-E'
+       else
+         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+       fi
+      else
+       ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      shrext_cmds=.dll
+      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+       $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+       $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+       $ECHO EXPORTS >> $output_objdir/$libname.def~
+       prefix_cmds="$SED"~
+       if test EXPORTS = "`$SED 1q $export_symbols`"; then
+         prefix_cmds="$prefix_cmds -e 1d";
+       fi~
+       prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+       cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+       $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+       emximp -o $lib $output_objdir/$libname.def'
+      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      enable_shared_with_static_runtimes=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+       allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+       archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+       allow_undefined_flag=' -expect_unresolved \*'
+       archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)     # as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+       allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+       archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+       hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+      else
+       allow_undefined_flag=' -expect_unresolved \*'
+       archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+       archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+       # Both c and cxx compiler support -rpath directly
+       hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test yes = "$GCC"; then
+       wlarc='$wl'
+       archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+       case `$CC -V 2>&1` in
+       *"Compilers 5.0"*)
+         wlarc=''
+         archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+         ;;
+       *)
+         wlarc='$wl'
+         archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+         ;;
+       esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+       # The compiler driver will combine and reorder linker options,
+       # but understands '-z linker_flag'.  GCC discards it without '$wl',
+       # but is careful enough not to reorder.
+       # Supported since Solaris 2.6 (maybe 2.5.1?)
+       if test yes = "$GCC"; then
+         whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+       else
+         whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+       # Use $CC to link under sequent, because it throws in some extra .o
+       # files that make .init and .fini sections work.
+       archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+       sni)
+         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         hardcode_direct=yes # is this really true???
+       ;;
+       siemens)
+         ## LD is ld it makes a PLAMLIB
+         ## CC just makes a GrossModule.
+         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+         reload_cmds='$CC -r -o $output$reload_objs'
+         hardcode_direct=no
+        ;;
+       motorola)
+         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+       ;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_shlibpath_var=no
+       runpath_var=LD_RUN_PATH
+       hardcode_runpath_var=yes
+       ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='$wl-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+       archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='$wl-z,text'
+      allow_undefined_flag='$wl-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='$wl-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+       archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+       export_dynamic_flag_spec='$wl-Blargedynsym'
+       ;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+         deplibs=
+         wl=$lt_prog_compiler_wl
+         pic_flag=$lt_prog_compiler_pic
+         compiler_flags=-v
+         linker_flags=-v
+         verstring=
+         output_objdir=.
+         libname=conftest
+         lt_save_allow_undefined_flag=$allow_undefined_flag
+         allow_undefined_flag=
+         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+         then
+           lt_cv_archive_cmds_need_lc=no
+         else
+           lt_cv_archive_cmds_need_lc=yes
+         fi
+         allow_undefined_flag=$lt_save_allow_undefined_flag
+       else
+         cat conftest.err 1>&5
+       fi
+       $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+          echo ' yes '
+          echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+       :
+      else
+       can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a(lib.so.V)'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+       if test yes = "$lt_cv_prog_gnu_ld"; then
+               version_type=linux # correct to gnu/linux during the next big refactor
+       else
+               version_type=irix
+       fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  hardcode_libdir_flag_spec='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[      ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+       ;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test yes = "$hardcode_automatic"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$hardcode_direct" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+     test no != "$hardcode_minus_L"; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+   test yes = "$inherit_rpath"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+         if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+       }
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+         if test yes = "$cross_compiling"; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL          RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL                DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL                0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW         DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW       RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW     DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW     0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+       }
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report what library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;                  # shared object as lib.so file only
+      yes,svr4,*) ;;                   # shared object as lib.so archive member only
+      yes,*) enable_static=no ;;       # shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# Check whether --enable-optimization was given.
+if test "${enable_optimization+set}" = set; then :
+  enableval=$enable_optimization;
+       if (test "${enableval}" = "no"); then
+               CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -O0"
+       fi
+
+fi
+
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_prog_cc_g}" = "yes"); then
+               CFLAGS="$CFLAGS -g"
+       fi
+
+fi
+
+
+# Check whether --enable-pie was given.
+if test "${enable_pie+set}" = set; then :
+  enableval=$enable_pie;
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_prog_cc_pie}" = "yes"); then
+               CFLAGS="$CFLAGS -fPIE"
+               LDFLAGS="$LDFLAGS -pie"
+       fi
+
+fi
+
+
+save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lasan" >&5
+$as_echo_n "checking for _init in -lasan... " >&6; }
+if ${ac_cv_lib_asan__init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lasan  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _init ();
+int
+main ()
+{
+return _init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_asan__init=yes
+else
+  ac_cv_lib_asan__init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asan__init" >&5
+$as_echo "$ac_cv_lib_asan__init" >&6; }
+if test "x$ac_cv_lib_asan__init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBASAN 1
+_ACEOF
+
+  LIBS="-lasan $LIBS"
+
+fi
+
+LIBS=$save_LIBS
+
+# Check whether --enable-asan was given.
+if test "${enable_asan+set}" = set; then :
+  enableval=$enable_asan;
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_lib_asan__init}" = "yes" &&
+                               test "${ac_cv_prog_cc_asan}" = "yes"); then
+               CFLAGS="$CFLAGS -fsanitize=address";
+               LDFLAGS="$LDFLAGS -fsanitize=address"
+       fi
+
+fi
+
+
+save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -llsan" >&5
+$as_echo_n "checking for _init in -llsan... " >&6; }
+if ${ac_cv_lib_lsan__init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llsan  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _init ();
+int
+main ()
+{
+return _init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lsan__init=yes
+else
+  ac_cv_lib_lsan__init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lsan__init" >&5
+$as_echo "$ac_cv_lib_lsan__init" >&6; }
+if test "x$ac_cv_lib_lsan__init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBLSAN 1
+_ACEOF
+
+  LIBS="-llsan $LIBS"
+
+fi
+
+LIBS=$save_LIBS
+
+# Check whether --enable-lsan was given.
+if test "${enable_lsan+set}" = set; then :
+  enableval=$enable_lsan;
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_lib_lsan__init}" = "yes" &&
+                               test "${ac_cv_prog_cc_lsan}" = "yes"); then
+               CFLAGS="$CFLAGS -fsanitize=leak";
+               LDFLAGS="$LDFLAGS -fsanitize=leak"
+       fi
+
+fi
+
+
+save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lubsan" >&5
+$as_echo_n "checking for _init in -lubsan... " >&6; }
+if ${ac_cv_lib_ubsan__init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lubsan  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char _init ();
+int
+main ()
+{
+return _init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ubsan__init=yes
+else
+  ac_cv_lib_ubsan__init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ubsan__init" >&5
+$as_echo "$ac_cv_lib_ubsan__init" >&6; }
+if test "x$ac_cv_lib_ubsan__init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUBSAN 1
+_ACEOF
+
+  LIBS="-lubsan $LIBS"
+
+fi
+
+LIBS=$save_LIBS
+
+# Check whether --enable-ubsan was given.
+if test "${enable_ubsan+set}" = set; then :
+  enableval=$enable_ubsan;
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_lib_ubsan__init}" = "yes" &&
+                               test "${ac_cv_prog_cc_ubsan}" = "yes"); then
+               CFLAGS="$CFLAGS -fsanitize=undefined";
+               LDFLAGS="$LDFLAGS -fsanitize=undefined"
+       fi
+
+fi
+
+
+for ac_func in explicit_bzero
+do :
+  ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
+if test "x$ac_cv_func_explicit_bzero" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EXPLICIT_BZERO 1
+_ACEOF
+
+fi
+done
+
+
+ac_fn_c_check_func "$LINENO" "signalfd" "ac_cv_func_signalfd"
+if test "x$ac_cv_func_signalfd" = xyes; then :
+  dummy=yes
+else
+  as_fn_error $? "signalfd support is required" "$LINENO" 5
+fi
+
+
+ac_fn_c_check_func "$LINENO" "timerfd_create" "ac_cv_func_timerfd_create"
+if test "x$ac_cv_func_timerfd_create" = xyes; then :
+  dummy=yes
+else
+  as_fn_error $? "timerfd support is required" "$LINENO" 5
+fi
+
+
+ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
+if test "x$ac_cv_func_epoll_create" = xyes; then :
+  dummy=yes
+else
+  as_fn_error $? "epoll support is required" "$LINENO" 5
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  dummy=yes
+else
+  as_fn_error $? "dynamic linking loader is required" "$LINENO" 5
+fi
+
+
+for ac_header in linux/types.h linux/if_alg.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# Check whether --enable-glib was given.
+if test "${enable_glib+set}" = set; then :
+  enableval=$enable_glib; enable_glib=${enableval}
+fi
+
+
+if (test "${enable_glib}" = "yes"); then
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+       if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+       _pkg_min_version=0.9.0
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       else
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+               PKG_CONFIG=""
+       fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+$as_echo_n "checking for GLIB... " >&6; }
+
+if test -n "$GLIB_CFLAGS"; then
+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$GLIB_LIBS"; then
+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
+        else
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GLIB_PKG_ERRORS" >&5
+
+       as_fn_error $? "GLib >= 2.32 is required" "$LINENO" 5
+elif test $pkg_failed = untried; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+       as_fn_error $? "GLib >= 2.32 is required" "$LINENO" 5
+else
+       GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+       GLIB_LIBS=$pkg_cv_GLIB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+       dummy=yes
+fi
+
+
+fi
+
+ if test "${enable_glib}" = "yes"; then
+  GLIB_TRUE=
+  GLIB_FALSE='#'
+else
+  GLIB_TRUE='#'
+  GLIB_FALSE=
+fi
+
+
+if (test "$USE_MAINTAINER_MODE" = "yes"); then
+       # Extract the first word of "openssl", so it can be a program name with args.
+set dummy openssl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_have_openssl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$have_openssl"; then
+  ac_cv_prog_have_openssl="$have_openssl" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_have_openssl="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_have_openssl" && ac_cv_prog_have_openssl="no"
+fi
+fi
+have_openssl=$ac_cv_prog_have_openssl
+if test -n "$have_openssl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_openssl" >&5
+$as_echo "$have_openssl" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+       # Extract the first word of "xxd", so it can be a program name with args.
+set dummy xxd; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_have_xxd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$have_xxd"; then
+  ac_cv_prog_have_xxd="$have_xxd" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_have_xxd="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_have_xxd" && ac_cv_prog_have_xxd="no"
+fi
+fi
+have_xxd=$ac_cv_prog_have_xxd
+if test -n "$have_xxd"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xxd" >&5
+$as_echo "$have_xxd" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+
+ if test "${little_endian}" = "yes"; then
+  DBUS_TESTS_TRUE=
+  DBUS_TESTS_FALSE='#'
+else
+  DBUS_TESTS_TRUE='#'
+  DBUS_TESTS_FALSE=
+fi
+
+ if test "${have_openssl}" = "yes"; then
+  CERT_TESTS_TRUE=
+  CERT_TESTS_FALSE='#'
+else
+  CERT_TESTS_TRUE='#'
+  CERT_TESTS_FALSE=
+fi
+
+
+ac_config_files="$ac_config_files Makefile ell/ell.pc"
+
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+       "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+       cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+         mv -f confcache "$cache_file"$$ &&
+         mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+         mv -f confcache "$cache_file" ;;
+       esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+if test -z "${GLIB_TRUE}" && test -z "${GLIB_FALSE}"; then
+  as_fn_error $? "conditional \"GLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${DBUS_TESTS_TRUE}" && test -z "${DBUS_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"DBUS_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${CERT_TESTS_TRUE}" && test -z "${CERT_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"CERT_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+       expr "X$arg" : "X\\(.*\\)$as_nl";
+       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""       $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+        X"$0" : 'X\(//\)$' \| \
+        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='        ';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by ell $as_me 0.28, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+ell config.status 0.28
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "ell/ell.pc") CONFIG_FILES="$CONFIG_FILES ell/ell.pc" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = "\a"
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[         ]*VPATH[        ]*=[    ]*/{
+h
+s///
+s/^/:/
+s/[     ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[  ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[      ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[    ]*#[    ]*define[       ][      ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = "\a"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+        # (if the path is not absolute).  The absolute path cannot be DOS-style,
+        # because $ac_f cannot contain `:'.
+        test -f "$ac_f" ||
+          case $ac_f in
+          [\\/$]*) false;;
+          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+          esac ||
+          as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+         $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+       `' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$ac_file" : 'X\(//\)[^/]' \| \
+        X"$ac_file" : 'X\(//\)$' \| \
+        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$_am_arg" : 'X\(//\)[^/]' \| \
+        X"$_am_arg" : 'X\(//\)$' \| \
+        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
+  shift
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
+  do
+    # Strip MF so we end up with the name of the file.
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$am_mf" : 'X\(//\)[^/]' \| \
+        X"$am_mf" : 'X\(//\)$' \| \
+        X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)[^/].*/{
+           s//\1/
+           q
+         }
+         /^X\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+        X"$am_mf" : 'X\(//\)$' \| \
+        X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\/\)$/{
+           s//\1/
+           q
+         }
+         /^X\/\(\/\).*/{
+           s//\1/
+           q
+         }
+         s/.*/./; q'`
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
+  done
+  if test $am_rc -ne 0; then
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=''
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x$2 in
+    x)
+        ;;
+    *:)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+        ;;
+    x:*)
+        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+        ;;
+    *)
+        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+
+
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in $*""; do
+      case $cc_temp in
+        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..b5a18f6
--- /dev/null
@@ -0,0 +1,139 @@
+AC_PREREQ(2.60)
+AC_INIT(ell, 0.28)
+
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(build-aux)
+
+AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
+                                       tar-pax no-dist-gzip dist-xz])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+AM_MAINTAINER_MODE
+
+AC_PREFIX_DEFAULT(/usr/local)
+
+COMPILER_FLAGS
+
+AC_LANG_C
+
+AC_PROG_CC
+AC_PROG_CC_PIE
+AC_PROG_CC_ASAN
+AC_PROG_CC_LSAN
+AC_PROG_CC_UBSAN
+AC_PROG_INSTALL
+
+AC_C_CHAR_UNSIGNED
+AC_C_BIGENDIAN(little_endian=no, little_endian=yes, little_endian=no)
+
+LT_PREREQ(2.2)
+LT_INIT([disable-static])
+
+AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization],
+                       [disable code optimization through compiler]), [
+       if (test "${enableval}" = "no"); then
+               CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -O0"
+       fi
+])
+
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
+                       [enable compiling with debugging information]), [
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_prog_cc_g}" = "yes"); then
+               CFLAGS="$CFLAGS -g"
+       fi
+])
+
+AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
+                       [enable position independent executables flag]), [
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_prog_cc_pie}" = "yes"); then
+               CFLAGS="$CFLAGS -fPIE"
+               LDFLAGS="$LDFLAGS -pie"
+       fi
+])
+
+save_LIBS=$LIBS
+AC_CHECK_LIB(asan, _init)
+LIBS=$save_LIBS
+
+AC_ARG_ENABLE(asan, AC_HELP_STRING([--enable-asan],
+                       [enable linking with address sanitizer]), [
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_lib_asan__init}" = "yes" &&
+                               test "${ac_cv_prog_cc_asan}" = "yes"); then
+               CFLAGS="$CFLAGS -fsanitize=address";
+               LDFLAGS="$LDFLAGS -fsanitize=address"
+       fi
+])
+
+save_LIBS=$LIBS
+AC_CHECK_LIB(lsan, _init)
+LIBS=$save_LIBS
+
+AC_ARG_ENABLE(lsan, AC_HELP_STRING([--enable-lsan],
+                       [enable linking with leak sanitizer]), [
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_lib_lsan__init}" = "yes" &&
+                               test "${ac_cv_prog_cc_lsan}" = "yes"); then
+               CFLAGS="$CFLAGS -fsanitize=leak";
+               LDFLAGS="$LDFLAGS -fsanitize=leak"
+       fi
+])
+
+save_LIBS=$LIBS
+AC_CHECK_LIB(ubsan, _init)
+LIBS=$save_LIBS
+
+AC_ARG_ENABLE(ubsan, AC_HELP_STRING([--enable-ubsan],
+                       [enable linking with undefined behavior sanitizer]), [
+       if (test "${enableval}" = "yes" &&
+                               test "${ac_cv_lib_ubsan__init}" = "yes" &&
+                               test "${ac_cv_prog_cc_ubsan}" = "yes"); then
+               CFLAGS="$CFLAGS -fsanitize=undefined";
+               LDFLAGS="$LDFLAGS -fsanitize=undefined"
+       fi
+])
+
+AC_CHECK_FUNCS(explicit_bzero)
+
+AC_CHECK_FUNC(signalfd, dummy=yes,
+                       AC_MSG_ERROR(signalfd support is required))
+
+AC_CHECK_FUNC(timerfd_create, dummy=yes,
+                       AC_MSG_ERROR(timerfd support is required))
+
+AC_CHECK_FUNC(epoll_create, dummy=yes,
+                       AC_MSG_ERROR(epoll support is required))
+
+AC_CHECK_LIB(dl, dlopen, dummy=yes,
+                       AC_MSG_ERROR(dynamic linking loader is required))
+
+AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)
+
+AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib],
+                               [enable ell/glib main loop example]),
+                                       [enable_glib=${enableval}])
+
+if (test "${enable_glib}" = "yes"); then
+       PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32, dummy=yes,
+                               AC_MSG_ERROR(GLib >= 2.32 is required))
+       AC_SUBST(GLIB_CFLAGS)
+       AC_SUBST(GLIB_LIBS)
+fi
+
+AM_CONDITIONAL(GLIB, test "${enable_glib}" = "yes")
+
+if (test "$USE_MAINTAINER_MODE" = "yes"); then
+       AC_CHECK_PROG(have_openssl, [openssl], [yes], [no])
+       AC_CHECK_PROG(have_xxd, [xxd], [yes], [no])
+fi
+
+AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes")
+AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes")
+
+AC_CONFIG_FILES(Makefile ell/ell.pc)
+
+AC_OUTPUT
diff --git a/ell/asn1-private.h b/ell/asn1-private.h
new file mode 100644 (file)
index 0000000..e34f977
--- /dev/null
@@ -0,0 +1,203 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#define ASN1_ID(class, pc, tag)        (((class) << 6) | ((pc) << 5) | (tag))
+
+#define ASN1_CLASS_UNIVERSAL   0
+#define ASN1_CLASS_CONTEXT     2
+
+#define ASN1_ID_SEQUENCE       ASN1_ID(ASN1_CLASS_UNIVERSAL, 1, 0x10)
+#define ASN1_ID_SET            ASN1_ID(ASN1_CLASS_UNIVERSAL, 1, 0x11)
+#define ASN1_ID_BOOLEAN                ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x01)
+#define ASN1_ID_INTEGER                ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x02)
+#define ASN1_ID_BIT_STRING     ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x03)
+#define ASN1_ID_OCTET_STRING   ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x04)
+#define ASN1_ID_OID            ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x06)
+#define ASN1_ID_UTF8STRING     ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x0c)
+#define ASN1_ID_PRINTABLESTRING        ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x13)
+#define ASN1_ID_IA5STRING      ASN1_ID(ASN1_CLASS_UNIVERSAL, 0, 0x16)
+
+struct asn1_oid {
+       uint8_t asn1_len;
+       uint8_t asn1[10];
+};
+
+#define asn1_oid_eq(oid1, oid2_len, oid2_string) \
+       ((oid1)->asn1_len == (oid2_len) && \
+        !memcmp((oid1)->asn1, (oid2_string), (oid2_len)))
+
+#if __STDC_VERSION__ <= 199409L
+#define inline __inline__
+#endif
+
+static inline int asn1_parse_definite_length(const uint8_t **buf,
+                                               size_t *len)
+{
+       int n;
+       size_t result = 0;
+
+       /* Decrease the buffer length left */
+       if ((*len)-- < 1)
+               return -1;
+
+       /*
+        * If short form length, move the pointer to start of data and
+        * return the data length.
+        */
+       if (!(**buf & 0x80))
+               return *(*buf)++;
+
+       n = *(*buf)++ & 0x7f;
+       if ((size_t) n > *len)
+               return -1;
+
+       *len -= n;
+       while (n--)
+               result = (result << 8) | *(*buf)++;
+
+       return result;
+}
+
+static inline void asn1_write_definite_length(uint8_t **buf, size_t len)
+{
+       int n;
+
+       if (len < 0x80) {
+               *(*buf)++ = len;
+               return;
+       }
+
+       for (n = 1; len >> (n * 8); n++);
+       *(*buf)++ = 0x80 | n;
+
+       while (n--)
+               *(*buf)++ = len >> (n * 8);
+}
+
+#define ASN1_CONTEXT_IMPLICIT(tag) (0x1000 | (tag))
+#define ASN1_CONTEXT_EXPLICIT(tag) (0x2000 | (tag))
+
+/*
+ * Return the tag, length and value of the @index'th
+ * non-context-specific-tagged element in a DER SEQUENCE or one who's
+ * ASN1_CONTEXT_IMPLICIT(tag) matches @index or the inner element of
+ * the one who's ASN1_CONTEXT_EXPLICIT(tag) matches @index.
+ */
+static inline const uint8_t *asn1_der_find_elem(const uint8_t *buf,
+                                               size_t len_in, int index,
+                                               uint8_t *tag, size_t *len_out)
+{
+       int n = 0;
+
+       while (1) {
+               int tlv_len;
+
+               if (len_in < 2)
+                       return NULL;
+
+               *tag = *buf++;
+               len_in--;
+
+               tlv_len = asn1_parse_definite_length((void *) &buf, &len_in);
+               if (tlv_len < 0 || (size_t) tlv_len > len_in)
+                       return NULL;
+
+               if (*tag >> 6 != ASN1_CLASS_CONTEXT) {
+                       if (n++ == index) {
+                               *len_out = tlv_len;
+                               return buf;
+                       }
+               } else if ((*tag & 0x1f) == (index & 0xfff)) {
+                       /* Context-specific tag */
+                       if (index & 0x1000) {           /* Implicit */
+                               *len_out = tlv_len;
+                               return buf;
+                       } else if (index & 0x2000) {    /* Explicit */
+                               const uint8_t *outer = buf;
+                               int inner_len;
+
+                               if (!(*tag & 0x20))     /* Primitive */
+                                       return NULL;
+
+                               if (unlikely(tlv_len < 2))
+                                       return NULL;
+
+                               *tag = *buf++;
+
+                               inner_len = asn1_parse_definite_length(
+                                                       (void *) &buf, &len_in);
+                               if (outer + tlv_len != buf + inner_len)
+                                       return NULL;
+
+                               *len_out = inner_len;
+                               return buf;
+                       }
+               }
+
+               buf += tlv_len;
+               len_in -= tlv_len;
+       }
+}
+
+/* Return an element in a DER SEQUENCE structure by path */
+static inline const uint8_t *asn1_der_find_elem_by_path(const uint8_t *buf,
+                                               size_t len_in, uint8_t tag,
+                                               size_t *len_out, ...)
+{
+       int index;
+       va_list vl;
+
+       va_start(vl, len_out);
+
+       index = va_arg(vl, int);
+
+       while (index != -1) {
+               uint8_t elem_tag;
+               uint8_t expect_tag;
+               int prev_index = index;
+
+               buf = asn1_der_find_elem(buf, len_in, index,
+                                               &elem_tag, &len_in);
+               if (!buf) {
+                       va_end(vl);
+                       return NULL;
+               }
+
+               index = va_arg(vl, int);
+
+               if (prev_index & 0x1000)
+                       expect_tag = ASN1_ID(ASN1_CLASS_CONTEXT,
+                                               index != -1 ? 1 :
+                                               ((elem_tag >> 5) & 1),
+                                               prev_index & 0xfff);
+               else
+                       expect_tag = (index == -1) ? tag : ASN1_ID_SEQUENCE;
+
+               if (elem_tag != expect_tag) {
+                       va_end(vl);
+                       return NULL;
+               }
+       }
+
+       va_end(vl);
+
+       *len_out = len_in;
+       return buf;
+}
diff --git a/ell/base64.c b/ell/base64.c
new file mode 100644 (file)
index 0000000..c241869
--- /dev/null
@@ -0,0 +1,173 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+
+#include "utf8.h"
+#include "base64.h"
+#include "private.h"
+
+LIB_EXPORT uint8_t *l_base64_decode(const char *in, size_t in_len,
+                                       size_t *n_written)
+{
+       const char *ptr, *in_end = in + in_len;
+       uint8_t *out_buf, *out;
+       int base64_len = 0, pad_len;
+       uint16_t reg = 0;
+
+       for (ptr = in; ptr < in_end; ptr++)
+               if (l_ascii_isspace(*ptr))
+                       /* Whitespace */
+                       continue;
+               else if (*ptr == '=')
+                       /* Final padding */
+                       break;
+               else if (l_ascii_isalnum(*ptr) || *ptr == '+' || *ptr == '/')
+                       /* Base64 character */
+                       base64_len++;
+               else
+                       /* Bad character */
+                       return NULL;
+
+       in_end = ptr;
+
+       if ((base64_len & 3) == 1)
+               /* Invalid length */
+               return NULL;
+
+       pad_len = (4 - base64_len) & 3;
+       for (; ptr < in + in_len && pad_len; ptr++)
+               if (l_ascii_isspace(*ptr))
+                       /* Whitespace */
+                       continue;
+               else if (*ptr == '=')
+                       /* Final padding */
+                       pad_len--;
+               else
+                       /* Bad character */
+                       return NULL;
+       if (pad_len)
+               return NULL;
+
+       *n_written = base64_len * 3 / 4;
+       out_buf = l_malloc(*n_written);
+
+       out = out_buf;
+       base64_len = 0;
+
+       for (ptr = in; ptr < in_end; ptr++) {
+               if (l_ascii_isspace(*ptr))
+                       /* Whitespace */
+                       continue;
+
+               /* Base64 character */
+               reg <<= 6;
+               if (l_ascii_isupper(*ptr))
+                       reg |= *ptr - 'A' + 0;
+               else if (l_ascii_islower(*ptr))
+                       reg |= *ptr - 'a' + 26;
+               else if (l_ascii_isdigit(*ptr))
+                       reg |= *ptr - '0' + 52;
+               else if (*ptr == '+')
+                       reg |= 62;
+               else if (*ptr == '/')
+                       reg |= 63;
+
+               if ((base64_len & 3) == 1)
+                       *out++ = reg >> 4;
+               else if ((base64_len & 3) == 2)
+                       *out++ = reg >> 2;
+               else if ((base64_len & 3) == 3)
+                       *out++ = reg >> 0;
+
+               base64_len++;
+       }
+
+       return out_buf;
+}
+
+LIB_EXPORT char *l_base64_encode(const uint8_t *in, size_t in_len,
+                                       int columns, size_t *n_written)
+{
+       const uint8_t *in_end = in + in_len;
+       char *out_buf, *out;
+       size_t out_len;
+       uint32_t reg;
+       uint8_t idx;
+       int i, pad = 4;
+       int col = 0;
+
+       /* For simplicity allow multiples of 4 only */
+       if (columns & 3)
+               return NULL;
+
+       out_len = (in_len + 2) / 3 * 4;
+
+       if (columns && out_len)
+               out_len += (out_len - 4) / columns;
+
+       out_buf = l_malloc(out_len);
+       *n_written = out_len;
+
+       out = out_buf;
+
+       while (in < in_end) {
+               reg = *in++ << 16;
+
+               if (in < in_end)
+                       reg |= *in++ << 8;
+               else
+                       pad--;
+
+               if (in < in_end)
+                       reg |= *in++ << 0;
+               else
+                       pad--;
+
+               if (columns && col == columns) {
+                       *out++ = '\n';
+                       col = 0;
+               }
+               col += 4;
+
+               for (i = 0; i < pad; i++) {
+                       idx = (reg >> 18) & 63;
+                       reg <<= 6;
+
+                       if (idx < 26)
+                               *out++ = idx + 'A';
+                       else if (idx < 52)
+                               *out++ = idx - 26 + 'a';
+                       else if (idx < 62)
+                               *out++ = idx - 52 + '0';
+                       else
+                               *out++ = (idx == 62) ? '+' : '/';
+               }
+       }
+
+       for (; pad < 4; pad++)
+               *out++ = '=';
+
+       return out_buf;
+}
diff --git a/ell/base64.h b/ell/base64.h
new file mode 100644 (file)
index 0000000..74dae8f
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __ELL_BASE64_H
+#define __ELL_BASE64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint8_t *l_base64_decode(const char *in, size_t in_len, size_t *n_written);
+
+char *l_base64_encode(const uint8_t *in, size_t in_len, int columns,
+                               size_t *n_written);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_BASE64_H */
diff --git a/ell/cert-private.h b/ell/cert-private.h
new file mode 100644 (file)
index 0000000..ba9a513
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+struct asn1_oid;
+
+struct l_certchain *certchain_new_from_leaf(struct l_cert *leaf);
+void certchain_link_issuer(struct l_certchain *chain, struct l_cert *issuer);
+
+const uint8_t *cert_get_extension(struct l_cert *cert,
+                                       const struct asn1_oid *ext_id,
+                                       bool *out_critical, size_t *out_len);
diff --git a/ell/cert.c b/ell/cert.c
new file mode 100644 (file)
index 0000000..d1f58d7
--- /dev/null
@@ -0,0 +1,559 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <stdio.h>
+
+#include "private.h"
+#include "key.h"
+#include "queue.h"
+#include "asn1-private.h"
+#include "cert.h"
+#include "cert-private.h"
+
+#define X509_CERTIFICATE_POS                   0
+#define   X509_TBSCERTIFICATE_POS                0
+#define     X509_TBSCERT_VERSION_POS               ASN1_CONTEXT_EXPLICIT(0)
+#define     X509_TBSCERT_SERIAL_POS                0
+#define     X509_TBSCERT_SIGNATURE_POS             1
+#define       X509_ALGORITHM_ID_ALGORITHM_POS        0
+#define       X509_ALGORITHM_ID_PARAMS_POS           1
+#define     X509_TBSCERT_ISSUER_DN_POS             2
+#define     X509_TBSCERT_VALIDITY_POS              3
+#define     X509_TBSCERT_SUBJECT_DN_POS                    4
+#define     X509_TBSCERT_SUBJECT_KEY_POS           5
+#define       X509_SUBJECT_KEY_ALGORITHM_POS         0
+#define       X509_SUBJECT_KEY_VALUE_POS             1
+#define     X509_TBSCERT_ISSUER_UID_POS                    ASN1_CONTEXT_IMPLICIT(1)
+#define     X509_TBSCERT_SUBJECT_UID_POS           ASN1_CONTEXT_IMPLICIT(2)
+#define     X509_TBSCERT_EXTENSIONS_POS                    ASN1_CONTEXT_EXPLICIT(3)
+#define   X509_SIGNATURE_ALGORITHM_POS           1
+#define   X509_SIGNATURE_VALUE_POS               2
+
+struct l_cert {
+       enum l_cert_key_type pubkey_type;
+       struct l_cert *issuer;
+       struct l_cert *issued;
+       size_t asn1_len;
+       uint8_t asn1[0];
+};
+
+struct l_certchain {
+       struct l_cert *leaf;    /* Bottom of the doubly-linked list */
+       struct l_cert *ca;      /* Top of the doubly-linked list */
+};
+
+static const struct pkcs1_encryption_oid {
+       enum l_cert_key_type key_type;
+       struct asn1_oid oid;
+} pkcs1_encryption_oids[] = {
+       { /* rsaEncryption */
+               L_CERT_KEY_RSA,
+               { 9, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01 } },
+       },
+};
+
+static bool cert_set_pubkey_type(struct l_cert *cert)
+{
+       const uint8_t *key_type;
+       size_t key_type_len;
+       int i;
+
+       key_type = asn1_der_find_elem_by_path(cert->asn1, cert->asn1_len,
+                                               ASN1_ID_OID, &key_type_len,
+                                               X509_CERTIFICATE_POS,
+                                               X509_TBSCERTIFICATE_POS,
+                                               X509_TBSCERT_SUBJECT_KEY_POS,
+                                               X509_SUBJECT_KEY_ALGORITHM_POS,
+                                               X509_ALGORITHM_ID_ALGORITHM_POS,
+                                               -1);
+       if (!key_type)
+               return false;
+
+       for (i = 0; i < (int) L_ARRAY_SIZE(pkcs1_encryption_oids); i++)
+               if (asn1_oid_eq(&pkcs1_encryption_oids[i].oid,
+                                       key_type_len, key_type))
+                       break;
+
+       if (i == L_ARRAY_SIZE(pkcs1_encryption_oids))
+               cert->pubkey_type = L_CERT_KEY_UNKNOWN;
+       else
+               cert->pubkey_type = pkcs1_encryption_oids[i].key_type;
+
+       return true;
+}
+
+LIB_EXPORT struct l_cert *l_cert_new_from_der(const uint8_t *buf,
+                                               size_t buf_len)
+{
+       const uint8_t *seq = buf;
+       size_t seq_len = buf_len;
+       size_t content_len;
+       struct l_cert *cert;
+
+       /* Sanity check: outer element is a SEQUENCE */
+       if (seq_len-- < 1 || *seq++ != ASN1_ID_SEQUENCE)
+               return NULL;
+
+       /* Sanity check: the SEQUENCE spans the whole buffer */
+       content_len = asn1_parse_definite_length(&seq, &seq_len);
+       if (content_len < 64 || content_len != seq_len)
+               return NULL;
+
+       /*
+        * We could require the signature algorithm and the key algorithm
+        * to be one of our supported types here but instead we only
+        * require that when the user wants to verify this certificate or
+        * get the public key respectively.
+        */
+
+       cert = l_malloc(sizeof(struct l_cert) + buf_len);
+       cert->issuer = NULL;
+       cert->issued = NULL;
+       cert->asn1_len = buf_len;
+       memcpy(cert->asn1, buf, buf_len);
+
+       /* Sanity check: structure is correct up to the Public Key Algorithm */
+       if (!cert_set_pubkey_type(cert)) {
+               l_free(cert);
+               return NULL;
+       }
+
+       return cert;
+}
+
+LIB_EXPORT void l_cert_free(struct l_cert *cert)
+{
+       l_free(cert);
+}
+
+LIB_EXPORT const uint8_t *l_cert_get_der_data(struct l_cert *cert,
+                                               size_t *out_len)
+{
+       if (unlikely(!cert))
+               return NULL;
+
+       *out_len = cert->asn1_len;
+       return cert->asn1;
+}
+
+LIB_EXPORT const uint8_t *l_cert_get_dn(struct l_cert *cert, size_t *out_len)
+{
+       if (unlikely(!cert))
+               return NULL;
+
+       return asn1_der_find_elem_by_path(cert->asn1, cert->asn1_len,
+                                               ASN1_ID_SEQUENCE, out_len,
+                                               X509_CERTIFICATE_POS,
+                                               X509_TBSCERTIFICATE_POS,
+                                               X509_TBSCERT_SUBJECT_DN_POS,
+                                               -1);
+}
+
+const uint8_t *cert_get_extension(struct l_cert *cert,
+                                       const struct asn1_oid *ext_id,
+                                       bool *out_critical, size_t *out_len)
+{
+       const uint8_t *ext, *end;
+       size_t ext_len;
+
+       if (unlikely(!cert))
+               return NULL;
+
+       ext = asn1_der_find_elem_by_path(cert->asn1, cert->asn1_len,
+                                               ASN1_ID_SEQUENCE, &ext_len,
+                                               X509_CERTIFICATE_POS,
+                                               X509_TBSCERTIFICATE_POS,
+                                               X509_TBSCERT_EXTENSIONS_POS,
+                                               -1);
+       if (unlikely(!ext))
+               return NULL;
+
+       end = ext + ext_len;
+       while (ext < end) {
+               const uint8_t *seq, *oid, *data;
+               uint8_t tag;
+               size_t len, oid_len, data_len;
+               bool critical;
+
+               seq = asn1_der_find_elem(ext, end - ext, 0, &tag, &len);
+               if (unlikely(!seq || tag != ASN1_ID_SEQUENCE))
+                       return false;
+
+               ext = seq + len;
+
+               oid = asn1_der_find_elem(seq, len, 0, &tag, &oid_len);
+               if (unlikely(!oid || tag != ASN1_ID_OID))
+                       return false;
+
+               if (!asn1_oid_eq(ext_id, oid_len, oid))
+                       continue;
+
+               data = asn1_der_find_elem(seq, len, 1, &tag, &data_len);
+               critical = false;
+
+               if (data && tag == ASN1_ID_BOOLEAN) {
+                       if (data_len != 1)
+                               return false;
+
+                       critical = *data != 0;  /* Tolerate BER booleans */
+
+                       data = asn1_der_find_elem(seq, len, 2, &tag, &data_len);
+               }
+
+               if (unlikely(!data || tag != ASN1_ID_OCTET_STRING))
+                       return false;
+
+               if (out_critical)
+                       *out_critical = critical;
+
+               if (out_len)
+                       *out_len = data_len;
+
+               return data;
+       }
+
+       return NULL;
+}
+
+LIB_EXPORT enum l_cert_key_type l_cert_get_pubkey_type(struct l_cert *cert)
+{
+       if (unlikely(!cert))
+               return L_CERT_KEY_UNKNOWN;
+
+       return cert->pubkey_type;
+}
+
+/*
+ * Note: Returns a new l_key object to be freed by the caller.
+ */
+LIB_EXPORT struct l_key *l_cert_get_pubkey(struct l_cert *cert)
+{
+       if (unlikely(!cert))
+               return NULL;
+
+       /* Use kernel's ASN.1 certificate parser to find the key data for us */
+       if (cert->pubkey_type == L_CERT_KEY_RSA)
+               return l_key_new(L_KEY_RSA, cert->asn1, cert->asn1_len);
+
+       return NULL;
+}
+
+/*
+ * Note: takes ownership of the certificate.  The certificate is
+ * assumed to be new and not linked into any certchain object.
+ */
+struct l_certchain *certchain_new_from_leaf(struct l_cert *leaf)
+{
+       struct l_certchain *chain;
+
+       chain = l_new(struct l_certchain, 1);
+       chain->leaf = leaf;
+       chain->ca = leaf;
+       return chain;
+}
+
+/*
+ * Note: takes ownership of the certificate.  The certificate is
+ * assumed to be new and not linked into any certchain object.
+ */
+void certchain_link_issuer(struct l_certchain *chain, struct l_cert *ca)
+{
+       ca->issued = chain->ca;
+       chain->ca->issuer = ca;
+       chain->ca = ca;
+}
+
+static struct l_cert *certchain_pop_ca(struct l_certchain *chain)
+{
+       struct l_cert *ca = chain->ca;
+
+       if (!ca)
+               return NULL;
+
+       if (ca->issued) {
+               chain->ca = ca->issued;
+               ca->issued->issuer = NULL;
+               ca->issued = NULL;
+       } else {
+               chain->ca = NULL;
+               chain->leaf = NULL;
+       }
+
+       return ca;
+}
+
+LIB_EXPORT void l_certchain_free(struct l_certchain *chain)
+{
+       while (chain && chain->ca)
+               l_cert_free(certchain_pop_ca(chain));
+
+       l_free(chain);
+}
+
+LIB_EXPORT struct l_cert *l_certchain_get_leaf(struct l_certchain *chain)
+{
+       if (unlikely(!chain))
+               return NULL;
+
+       return chain->leaf;
+}
+
+/*
+ * Call @cb for each certificate in the chain starting from the leaf
+ * certificate.  Stop if a call returns @true.
+ */
+LIB_EXPORT void l_certchain_walk_from_leaf(struct l_certchain *chain,
+                                               l_cert_walk_cb_t cb,
+                                               void *user_data)
+{
+       struct l_cert *cert;
+
+       if (unlikely(!chain))
+               return;
+
+       for (cert = chain->leaf; cert; cert = cert->issuer)
+               if (cb(cert, user_data))
+                       break;
+}
+
+/*
+ * Call @cb for each certificate in the chain starting from the root
+ * certificate.  Stop if a call returns @true.
+ */
+LIB_EXPORT void l_certchain_walk_from_ca(struct l_certchain *chain,
+                                               l_cert_walk_cb_t cb,
+                                               void *user_data)
+{
+       struct l_cert *cert;
+
+       if (unlikely(!chain))
+               return;
+
+       for (cert = chain->ca; cert; cert = cert->issued)
+               if (cb(cert, user_data))
+                       break;
+}
+
+static struct l_keyring *cert_set_to_keyring(struct l_queue *certs, char *error)
+{
+       struct l_keyring *ring;
+       const struct l_queue_entry *entry;
+       int i = 1;
+
+       ring = l_keyring_new();
+       if (!ring)
+               return NULL;
+
+       for (entry = l_queue_get_entries(certs); entry; entry = entry->next) {
+               struct l_cert *cert = entry->data;
+               struct l_key *key = l_cert_get_pubkey(cert);
+
+               if (!key) {
+                       sprintf(error, "Can't get public key from certificate "
+                               "%i / %i in certificate set", i,
+                               l_queue_length(certs));
+                       goto cleanup;
+               }
+
+               if (!l_keyring_link(ring, key)) {
+                       l_key_free(key);
+                       sprintf(error, "Can't link the public key from "
+                               "certificate %i / %i to target keyring",
+                               i, l_queue_length(certs));
+                       goto cleanup;
+               }
+
+               l_key_free_norevoke(key);
+               i++;
+       }
+
+       return ring;
+
+cleanup:
+       l_keyring_free(ring);
+       return NULL;
+}
+
+static bool cert_is_in_set(struct l_cert *cert, struct l_queue *set)
+{
+       const struct l_queue_entry *entry;
+
+       for (entry = l_queue_get_entries(set); entry; entry = entry->next) {
+               struct l_cert *cert2 = entry->data;
+
+               if (cert == cert2)
+                       return true;
+
+               if (cert->asn1_len == cert2->asn1_len &&
+                               !memcmp(cert->asn1, cert2->asn1,
+                                       cert->asn1_len))
+                       return true;
+       }
+
+       return false;
+}
+
+static struct l_key *cert_try_link(struct l_cert *cert, struct l_keyring *ring)
+{
+       struct l_key *key;
+
+       key = l_key_new(L_KEY_RSA, cert->asn1, cert->asn1_len);
+       if (!key)
+               return NULL;
+
+       if (l_keyring_link(ring, key))
+               return key;
+
+       l_key_free(key);
+       return NULL;
+}
+
+static void cert_keyring_cleanup(struct l_keyring **p)
+{
+       l_keyring_free(*p);
+}
+
+#define RETURN_ERROR(msg, args...)     \
+       do {    \
+               if (error) {    \
+                       *error = error_buf;     \
+                       snprintf(error_buf, sizeof(error_buf), msg, ## args); \
+               }       \
+               return false;   \
+       } while (0)
+
+LIB_EXPORT bool l_certchain_verify(struct l_certchain *chain,
+                                       struct l_queue *ca_certs,
+                                       const char **error)
+{
+       struct l_keyring *ca_ring = NULL;
+       L_AUTO_CLEANUP_VAR(struct l_keyring *, verify_ring,
+                               cert_keyring_cleanup) = NULL;
+       struct l_cert *cert;
+       struct l_key *prev_key = NULL;
+       int verified = 0;
+       static char error_buf[200];
+
+       if (unlikely(!chain || !chain->leaf))
+               RETURN_ERROR("Chain empty");
+
+       verify_ring = l_keyring_new();
+       if (!verify_ring)
+               RETURN_ERROR("Can't create verify keyring");
+
+       cert = chain->ca;
+
+       /*
+        * For TLS compatibility the trusted root CA certificate is
+        * optionally present in the chain.
+        *
+        * RFC5246 7.4.2:
+        * "Because certificate validation requires that root keys be
+        * distributed independently, the self-signed certificate that
+        * specifies the root certificate authority MAY be omitted from
+        * the chain, under the assumption that the remote end must
+        * already possess it in order to validate it in any case."
+        *
+        * The following is an optimization to skip verifying the root
+        * cert in the chain if it is identical to one of the trusted CA
+        * certificates.  It also happens to work around a kernel issue
+        * preventing self-signed certificates missing the AKID
+        * extension from being linked to a keyring.
+        */
+       if (cert_is_in_set(cert, ca_certs)) {
+               verified++;
+               cert = cert->issued;
+               if (!cert)
+                       return true;
+
+               prev_key = cert_try_link(cert, verify_ring);
+       } else if (ca_certs) {
+               ca_ring = cert_set_to_keyring(ca_certs, error_buf);
+               if (!ca_ring) {
+                       if (error)
+                               *error = error_buf;
+                       return false;
+               }
+
+               if (!l_keyring_link_nested(verify_ring, ca_ring)) {
+                       l_keyring_free(ca_ring);
+                       RETURN_ERROR("Can't link CA ring to verify ring");
+               }
+       } else
+               prev_key = cert_try_link(cert, verify_ring);
+
+       /*
+        * The top, unverified certificate(s) are linked to the keyring and
+        * we can now force verification of any new certificates linked.
+        */
+       if (!l_keyring_restrict(verify_ring, L_KEYRING_RESTRICT_ASYM_CHAIN,
+                               NULL)) {
+               l_key_free(prev_key);
+               l_keyring_free(ca_ring);
+               RETURN_ERROR("Can't restrict verify keyring");
+       }
+
+       if (ca_ring) {
+               /*
+                * Verify the first certificate outside of the loop, then
+                * revoke the trusted CAs' keys so that only the newly
+                * verified cert's public key remains in the ring.
+                */
+               prev_key = cert_try_link(cert, verify_ring);
+               l_keyring_free(ca_ring);
+       }
+
+       cert = cert->issued;
+
+       /* Verify the rest of the chain */
+       while (prev_key && cert) {
+               struct l_key *new_key = cert_try_link(cert, verify_ring);
+
+               /*
+                * Free and revoke the issuer's public key again leaving only
+                * new_key in verify_ring to ensure the next certificate linked
+                * is signed by the owner of this key.
+                */
+               l_key_free(prev_key);
+               prev_key = new_key;
+               cert = cert->issued;
+               verified++;
+       }
+
+       if (!prev_key) {
+               int total = 0;
+
+               for (cert = chain->ca; cert; cert = cert->issued, total++);
+               RETURN_ERROR("Linking certificate %i / %i failed, root %s"
+                               "verified against trusted CA(s) and the "
+                               "following %i top certificates verified ok",
+                               verified + 1, total,
+                               ca_certs && verified ? "" : "not ",
+                               verified ? verified - 1 : 0);
+       }
+
+       l_key_free(prev_key);
+       return true;
+}
diff --git a/ell/cert.h b/ell/cert.h
new file mode 100644 (file)
index 0000000..9fab88e
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_CERT_H
+#define __ELL_CERT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+
+struct l_queue;
+struct l_cert;
+struct l_certchain;
+
+enum l_cert_key_type {
+       L_CERT_KEY_RSA,
+       L_CERT_KEY_UNKNOWN,
+};
+
+typedef bool (*l_cert_walk_cb_t)(struct l_cert *cert, void *user_data);
+
+struct l_cert *l_cert_new_from_der(const uint8_t *buf, size_t buf_len);
+void l_cert_free(struct l_cert *cert);
+
+const uint8_t *l_cert_get_der_data(struct l_cert *cert, size_t *out_len);
+const uint8_t *l_cert_get_dn(struct l_cert *cert, size_t *out_len);
+enum l_cert_key_type l_cert_get_pubkey_type(struct l_cert *cert);
+struct l_key *l_cert_get_pubkey(struct l_cert *cert);
+
+void l_certchain_free(struct l_certchain *chain);
+
+struct l_cert *l_certchain_get_leaf(struct l_certchain *chain);
+void l_certchain_walk_from_leaf(struct l_certchain *chain,
+                               l_cert_walk_cb_t cb, void *user_data);
+void l_certchain_walk_from_ca(struct l_certchain *chain,
+                               l_cert_walk_cb_t cb, void *user_data);
+
+bool l_certchain_verify(struct l_certchain *chain, struct l_queue *ca_certs,
+                       const char **error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_CERT_H */
diff --git a/ell/checksum.c b/ell/checksum.c
new file mode 100644 (file)
index 0000000..729399e
--- /dev/null
@@ -0,0 +1,489 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "checksum.h"
+#include "private.h"
+
+#ifndef HAVE_LINUX_IF_ALG_H
+#ifndef HAVE_LINUX_TYPES_H
+typedef uint8_t __u8;
+typedef uint16_t __u16;
+typedef uint32_t __u32;
+#else
+#include <linux/types.h>
+#endif
+
+#ifndef AF_ALG
+#define AF_ALG 38
+#define PF_ALG AF_ALG
+#endif
+
+struct sockaddr_alg {
+       __u16   salg_family;
+       __u8    salg_type[14];
+       __u32   salg_feat;
+       __u32   salg_mask;
+       __u8    salg_name[64];
+};
+
+/* Socket options */
+#define ALG_SET_KEY    1
+
+#else
+#include <linux/if_alg.h>
+#endif
+
+#ifndef SOL_ALG
+#define SOL_ALG 279
+#endif
+
+struct checksum_info {
+       const char *name;
+       uint8_t digest_len;
+       bool supported;
+};
+
+static struct checksum_info checksum_algs[] = {
+       [L_CHECKSUM_MD4] = { .name = "md4", .digest_len = 16 },
+       [L_CHECKSUM_MD5] = { .name = "md5", .digest_len = 16 },
+       [L_CHECKSUM_SHA1] = { .name = "sha1", .digest_len = 20 },
+       [L_CHECKSUM_SHA256] = { .name = "sha256", .digest_len = 32 },
+       [L_CHECKSUM_SHA384] = { .name = "sha384", .digest_len = 48 },
+       [L_CHECKSUM_SHA512] = { .name = "sha512", .digest_len = 64 },
+};
+
+static struct checksum_info checksum_cmac_aes_alg =
+       { .name = "cmac(aes)", .digest_len = 16 };
+
+static struct checksum_info checksum_hmac_algs[] = {
+       [L_CHECKSUM_MD4] = { .name = "hmac(md4)", .digest_len = 16 },
+       [L_CHECKSUM_MD5] = { .name = "hmac(md5)", .digest_len = 16 },
+       [L_CHECKSUM_SHA1] = { .name = "hmac(sha1)", .digest_len = 20 },
+       [L_CHECKSUM_SHA256] = { .name = "hmac(sha256)", .digest_len = 32 },
+       [L_CHECKSUM_SHA384] = { .name = "hmac(sha384)", .digest_len = 48 },
+       [L_CHECKSUM_SHA512] = { .name = "hmac(sha512)", .digest_len = 64 },
+};
+
+static const struct {
+       struct checksum_info *list;
+       size_t n;
+} checksum_info_table[] = {
+       { checksum_algs, L_ARRAY_SIZE(checksum_algs) },
+       { &checksum_cmac_aes_alg, 1 },
+       { checksum_hmac_algs, L_ARRAY_SIZE(checksum_hmac_algs) },
+       {}
+};
+
+/**
+ * SECTION:checksum
+ * @short_description: Checksum handling
+ *
+ * Checksum handling
+ */
+
+#define is_valid_index(array, i) ((i) >= 0 && (i) < L_ARRAY_SIZE(array))
+
+/**
+ * l_checksum:
+ *
+ * Opaque object representing the checksum.
+ */
+struct l_checksum {
+       int sk;
+       const struct checksum_info *alg_info;
+};
+
+static int create_alg(const char *alg)
+{
+       struct sockaddr_alg salg;
+       int sk;
+
+       sk = socket(PF_ALG, SOCK_SEQPACKET | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return -1;
+
+       memset(&salg, 0, sizeof(salg));
+       salg.salg_family = AF_ALG;
+       strcpy((char *) salg.salg_type, "hash");
+       strcpy((char *) salg.salg_name, alg);
+
+       if (bind(sk, (struct sockaddr *) &salg, sizeof(salg)) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       return sk;
+}
+
+/**
+ * l_checksum_new:
+ * @type: checksum type
+ *
+ * Creates new #l_checksum, using the checksum algorithm @type.
+ *
+ * Returns: a newly allocated #l_checksum object.
+ **/
+LIB_EXPORT struct l_checksum *l_checksum_new(enum l_checksum_type type)
+{
+       struct l_checksum *checksum;
+       int fd;
+
+       if (!is_valid_index(checksum_algs, type) || !checksum_algs[type].name)
+               return NULL;
+
+       checksum = l_new(struct l_checksum, 1);
+       checksum->alg_info = &checksum_algs[type];
+
+       fd = create_alg(checksum->alg_info->name);
+       if (fd < 0)
+               goto error;
+
+       checksum->sk = accept4(fd, NULL, 0, SOCK_CLOEXEC);
+       close(fd);
+
+       if (checksum->sk < 0)
+               goto error;
+
+       return checksum;
+
+error:
+       l_free(checksum);
+       return NULL;
+}
+
+LIB_EXPORT struct l_checksum *l_checksum_new_cmac_aes(const void *key,
+                                                       size_t key_len)
+{
+       struct l_checksum *checksum;
+       int fd;
+
+       fd = create_alg("cmac(aes)");
+       if (fd < 0)
+               return NULL;
+
+       if (setsockopt(fd, SOL_ALG, ALG_SET_KEY, key, key_len) < 0) {
+               close(fd);
+               return NULL;
+       }
+
+       checksum = l_new(struct l_checksum, 1);
+       checksum->sk = accept4(fd, NULL, 0, SOCK_CLOEXEC);
+       close(fd);
+
+       if (checksum->sk < 0) {
+               l_free(checksum);
+               return NULL;
+       }
+
+       checksum->alg_info = &checksum_cmac_aes_alg;
+       return checksum;
+}
+
+LIB_EXPORT struct l_checksum *l_checksum_new_hmac(enum l_checksum_type type,
+                                         const void *key, size_t key_len)
+{
+       struct l_checksum *checksum;
+       int fd;
+
+       if (!is_valid_index(checksum_hmac_algs, type) ||
+                       !checksum_hmac_algs[type].name)
+               return NULL;
+
+       fd = create_alg(checksum_hmac_algs[type].name);
+       if (fd < 0)
+               return NULL;
+
+       if (setsockopt(fd, SOL_ALG, ALG_SET_KEY, key, key_len) < 0) {
+               close(fd);
+               return NULL;
+       }
+
+       checksum = l_new(struct l_checksum, 1);
+       checksum->sk = accept4(fd, NULL, 0, SOCK_CLOEXEC);
+       close(fd);
+
+       if (checksum->sk < 0) {
+               l_free(checksum);
+               return NULL;
+       }
+
+       checksum->alg_info = &checksum_hmac_algs[type];
+       return checksum;
+}
+
+/**
+ * l_checksum_clone:
+ * @checksum: parent checksum object
+ *
+ * Creates a new checksum with an independent copy of parent @checksum's
+ * state.  l_checksum_get_digest can then be called on the parent or the
+ * clone without affecting the state of the other object.
+ **/
+LIB_EXPORT struct l_checksum *l_checksum_clone(struct l_checksum *checksum)
+{
+       struct l_checksum *clone;
+
+       if (unlikely(!checksum))
+               return NULL;
+
+       clone = l_new(struct l_checksum, 1);
+       clone->sk = accept4(checksum->sk, NULL, 0, SOCK_CLOEXEC);
+
+       if (clone->sk < 0) {
+               l_free(clone);
+               return NULL;
+       }
+
+       clone->alg_info = checksum->alg_info;
+       return clone;
+}
+
+/**
+ * l_checksum_free:
+ * @checksum: checksum object
+ *
+ * Frees the memory allocated for @checksum.
+ **/
+LIB_EXPORT void l_checksum_free(struct l_checksum *checksum)
+{
+       if (unlikely(!checksum))
+               return;
+
+       close(checksum->sk);
+       l_free(checksum);
+}
+
+/**
+ * l_checksum_reset:
+ * @checksum: checksum object
+ *
+ * Resets the internal state of @checksum.
+ **/
+LIB_EXPORT void l_checksum_reset(struct l_checksum *checksum)
+{
+       if (unlikely(!checksum))
+               return;
+
+       send(checksum->sk, NULL, 0, 0);
+}
+
+/**
+ * l_checksum_update:
+ * @checksum: checksum object
+ * @data: data pointer
+ * @len: length of data
+ *
+ * Updates checksum from @data pointer with @len bytes.
+ *
+ * Returns: true if the operation succeeded, false otherwise.
+ **/
+LIB_EXPORT bool l_checksum_update(struct l_checksum *checksum,
+                                       const void *data, size_t len)
+{
+       ssize_t written;
+
+       if (unlikely(!checksum))
+               return false;
+
+       written = send(checksum->sk, data, len, MSG_MORE);
+       if (written < 0)
+               return false;
+
+       return true;
+}
+
+/**
+ * l_checksum_updatev:
+ * @checksum: checksum object
+ * @iov: iovec pointer
+ * @iov_len: Number of iovec entries
+ *
+ * This is a iovec based version of l_checksum_update; it updates the checksum
+ * based on contents of @iov and @iov_len.
+ *
+ * Returns: true if the operation succeeded, false otherwise.
+ **/
+LIB_EXPORT bool l_checksum_updatev(struct l_checksum *checksum,
+                                       const struct iovec *iov, size_t iov_len)
+{
+       struct msghdr msg;
+       ssize_t written;
+
+       if (unlikely(!checksum))
+               return false;
+
+       if (unlikely(!iov) || unlikely(!iov_len))
+               return false;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = (struct iovec *) iov;
+       msg.msg_iovlen = iov_len;
+
+       written = sendmsg(checksum->sk, &msg, MSG_MORE);
+       if (written < 0)
+               return false;
+
+       return true;
+}
+
+/**
+ * l_checksum_get_digest:
+ * @checksum: checksum object
+ * @digest: output data buffer
+ * @len: length of output buffer
+ *
+ * Writes the digest from @checksum as raw binary data into the provided
+ * buffer or, if the buffer is shorter, the initial @len bytes of the digest
+ * data.
+ *
+ * Returns: Number of bytes written, or negative value if an error occurred.
+ **/
+LIB_EXPORT ssize_t l_checksum_get_digest(struct l_checksum *checksum,
+                                               void *digest, size_t len)
+{
+       ssize_t result;
+
+       if (unlikely(!checksum))
+               return -EINVAL;
+
+       if (unlikely(!digest))
+               return -EFAULT;
+
+       if (unlikely(!len))
+               return -EINVAL;
+
+       result = recv(checksum->sk, digest, len, 0);
+       if (result < 0)
+               return -errno;
+
+       if ((size_t) result < len && result < checksum->alg_info->digest_len)
+               return -EIO;
+
+       return result;
+}
+
+/**
+ * l_checksum_get_string:
+ * @checksum: checksum object
+ *
+ * Gets the digest from @checksum as hex encoded string.
+ *
+ * Returns: a newly allocated hex string
+ **/
+LIB_EXPORT char *l_checksum_get_string(struct l_checksum *checksum)
+{
+       unsigned char digest[64];
+
+       if (unlikely(!checksum))
+               return NULL;
+
+       l_checksum_get_digest(checksum, digest, sizeof(digest));
+
+       return l_util_hexstring(digest, checksum->alg_info->digest_len);
+}
+
+static void init_supported()
+{
+       static bool initialized = false;
+       struct sockaddr_alg salg;
+       int sk;
+       unsigned int i, j;
+
+       if (likely(initialized))
+               return;
+
+       initialized = true;
+
+       sk = socket(PF_ALG, SOCK_SEQPACKET | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return;
+
+       memset(&salg, 0, sizeof(salg));
+       salg.salg_family = AF_ALG;
+       strcpy((char *) salg.salg_type, "hash");
+
+       for (i = 0; checksum_info_table[i].list; i++)
+               for (j = 0; j < checksum_info_table[i].n; j++) {
+                       struct checksum_info *info;
+
+                       info = &checksum_info_table[i].list[j];
+                       if (!info->name)
+                               continue;
+
+                       strcpy((char *) salg.salg_name, info->name);
+
+                       if (bind(sk, (struct sockaddr *) &salg,
+                                               sizeof(salg)) < 0)
+                               continue;
+
+                       info->supported = true;
+               }
+
+       close(sk);
+}
+
+LIB_EXPORT bool l_checksum_is_supported(enum l_checksum_type type,
+                                                       bool check_hmac)
+{
+       const struct checksum_info *list;
+
+       init_supported();
+
+       if (!check_hmac) {
+               if (!is_valid_index(checksum_algs, type))
+                       return false;
+
+               list = checksum_algs;
+       } else {
+               if (!is_valid_index(checksum_hmac_algs, type))
+                       return false;
+
+               list = checksum_hmac_algs;
+       }
+
+       return list[type].supported;
+}
+
+LIB_EXPORT bool l_checksum_cmac_aes_supported()
+{
+       init_supported();
+
+       return checksum_cmac_aes_alg.supported;
+}
+
+LIB_EXPORT ssize_t l_checksum_digest_length(enum l_checksum_type type)
+{
+       return is_valid_index(checksum_algs, type) ?
+               checksum_algs[type].digest_len : 0;
+}
diff --git a/ell/checksum.h b/ell/checksum.h
new file mode 100644 (file)
index 0000000..08d74b7
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_CHECKSUM_H
+#define __ELL_CHECKSUM_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/uio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_checksum;
+
+enum l_checksum_type {
+       L_CHECKSUM_NONE,
+       L_CHECKSUM_MD4,
+       L_CHECKSUM_MD5,
+       L_CHECKSUM_SHA1,
+       L_CHECKSUM_SHA224,
+       L_CHECKSUM_SHA256,
+       L_CHECKSUM_SHA384,
+       L_CHECKSUM_SHA512,
+};
+
+struct l_checksum *l_checksum_new(enum l_checksum_type type);
+struct l_checksum *l_checksum_new_cmac_aes(const void *key, size_t key_len);
+struct l_checksum *l_checksum_new_hmac(enum l_checksum_type type,
+                                       const void *key, size_t key_len);
+struct l_checksum *l_checksum_clone(struct l_checksum *checksum);
+
+void l_checksum_free(struct l_checksum *checksum);
+
+void l_checksum_reset(struct l_checksum *checksum);
+
+bool l_checksum_update(struct l_checksum *checksum,
+                                       const void *data, size_t len);
+bool l_checksum_updatev(struct l_checksum *checksum,
+                                       const struct iovec *iov,
+                                       size_t iov_len);
+ssize_t l_checksum_get_digest(struct l_checksum *checksum,
+                                       void *digest, size_t len);
+char *l_checksum_get_string(struct l_checksum *checksum);
+
+bool l_checksum_is_supported(enum l_checksum_type type, bool check_hmac);
+bool l_checksum_cmac_aes_supported();
+
+ssize_t l_checksum_digest_length(enum l_checksum_type type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_CHECKSUM_H */
diff --git a/ell/cipher.c b/ell/cipher.c
new file mode 100644 (file)
index 0000000..4a27b5e
--- /dev/null
@@ -0,0 +1,662 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <alloca.h>
+
+#include "util.h"
+#include "cipher.h"
+#include "private.h"
+#include "random.h"
+
+#ifndef HAVE_LINUX_IF_ALG_H
+#ifndef HAVE_LINUX_TYPES_H
+typedef uint8_t __u8;
+typedef uint16_t __u16;
+typedef uint32_t __u32;
+#else
+#include <linux/types.h>
+#endif
+
+#ifndef AF_ALG
+#define AF_ALG 38
+#define PF_ALG AF_ALG
+#endif
+
+struct sockaddr_alg {
+       __u16   salg_family;
+       __u8    salg_type[14];
+       __u32   salg_feat;
+       __u32   salg_mask;
+       __u8    salg_name[64];
+};
+
+struct af_alg_iv {
+       __u32   ivlen;
+       __u8    iv[0];
+};
+
+/* Socket options */
+#define ALG_SET_KEY    1
+#define ALG_SET_IV     2
+#define ALG_SET_OP     3
+
+/* Operations */
+#define ALG_OP_DECRYPT 0
+#define ALG_OP_ENCRYPT 1
+#else
+#include <linux/if_alg.h>
+#endif
+
+#ifndef SOL_ALG
+#define SOL_ALG 279
+#endif
+
+#ifndef ALG_SET_AEAD_ASSOCLEN
+#define ALG_SET_AEAD_ASSOCLEN  4
+#endif
+
+#ifndef ALG_SET_AEAD_AUTHSIZE
+#define ALG_SET_AEAD_AUTHSIZE  5
+#endif
+
+#define is_valid_type(type)  ((type) <= L_CIPHER_DES3_EDE_CBC)
+
+static uint32_t supported_ciphers;
+static uint32_t supported_aead_ciphers;
+
+struct l_cipher {
+       int type;
+       int encrypt_sk;
+       int decrypt_sk;
+};
+
+struct l_aead_cipher {
+       int type;
+       int sk;
+};
+
+static int create_alg(const char *alg_type, const char *alg_name,
+                       const void *key, size_t key_length, size_t tag_length)
+{
+       struct sockaddr_alg salg;
+       int sk;
+       int ret;
+
+       sk = socket(PF_ALG, SOCK_SEQPACKET | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return -errno;
+
+       memset(&salg, 0, sizeof(salg));
+       salg.salg_family = AF_ALG;
+       strcpy((char *) salg.salg_type, alg_type);
+       strcpy((char *) salg.salg_name, alg_name);
+
+       if (bind(sk, (struct sockaddr *) &salg, sizeof(salg)) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       if (setsockopt(sk, SOL_ALG, ALG_SET_KEY, key, key_length) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       if (tag_length && setsockopt(sk, SOL_ALG, ALG_SET_AEAD_AUTHSIZE, NULL,
+                                       tag_length)) {
+               close(sk);
+               return -1;
+       }
+
+       ret = accept4(sk, NULL, 0, SOCK_CLOEXEC);
+       close(sk);
+
+       return ret;
+}
+
+static const char *cipher_type_to_name(enum l_cipher_type type)
+{
+       switch (type) {
+       case L_CIPHER_AES:
+               return "ecb(aes)";
+       case L_CIPHER_AES_CBC:
+               return "cbc(aes)";
+       case L_CIPHER_AES_CTR:
+               return "ctr(aes)";
+       case L_CIPHER_ARC4:
+               return "ecb(arc4)";
+       case L_CIPHER_DES:
+               return "ecb(des)";
+       case L_CIPHER_DES_CBC:
+               return "cbc(des)";
+       case L_CIPHER_DES3_EDE_CBC:
+               return "cbc(des3_ede)";
+       }
+
+       return NULL;
+}
+
+LIB_EXPORT struct l_cipher *l_cipher_new(enum l_cipher_type type,
+                                               const void *key,
+                                               size_t key_length)
+{
+       struct l_cipher *cipher;
+       const char *uninitialized_var(alg_name);
+
+       if (unlikely(!key))
+               return NULL;
+
+       if (!is_valid_type(type))
+               return NULL;
+
+       cipher = l_new(struct l_cipher, 1);
+       cipher->type = type;
+       alg_name = cipher_type_to_name(type);
+
+       cipher->encrypt_sk = create_alg("skcipher", alg_name, key, key_length,
+                                       0);
+       if (cipher->encrypt_sk < 0)
+               goto error_free;
+
+       cipher->decrypt_sk = create_alg("skcipher", alg_name, key, key_length,
+                                       0);
+       if (cipher->decrypt_sk < 0)
+               goto error_close;
+
+       return cipher;
+
+error_close:
+       close(cipher->encrypt_sk);
+error_free:
+       l_free(cipher);
+       return NULL;
+}
+
+static const char *aead_cipher_type_to_name(enum l_aead_cipher_type type)
+{
+       switch (type) {
+       case L_AEAD_CIPHER_AES_CCM:
+               return "ccm(aes)";
+       case L_AEAD_CIPHER_AES_GCM:
+               return "gcm(aes)";
+       }
+
+       return NULL;
+}
+
+LIB_EXPORT struct l_aead_cipher *l_aead_cipher_new(enum l_aead_cipher_type type,
+                                                       const void *key,
+                                                       size_t key_length,
+                                                       size_t tag_length)
+{
+       struct l_aead_cipher *cipher;
+       const char *alg_name;
+
+       if (unlikely(!key))
+               return NULL;
+
+       if (type != L_AEAD_CIPHER_AES_CCM && type != L_AEAD_CIPHER_AES_GCM)
+               return NULL;
+
+       cipher = l_new(struct l_aead_cipher, 1);
+       cipher->type = type;
+       alg_name = aead_cipher_type_to_name(type);
+
+       cipher->sk = create_alg("aead", alg_name, key, key_length, tag_length);
+       if (cipher->sk >= 0)
+               return cipher;
+
+       l_free(cipher);
+       return NULL;
+}
+
+LIB_EXPORT void l_cipher_free(struct l_cipher *cipher)
+{
+       if (unlikely(!cipher))
+               return;
+
+       close(cipher->encrypt_sk);
+       close(cipher->decrypt_sk);
+
+       l_free(cipher);
+}
+
+LIB_EXPORT void l_aead_cipher_free(struct l_aead_cipher *cipher)
+{
+       if (unlikely(!cipher))
+               return;
+
+       close(cipher->sk);
+
+       l_free(cipher);
+}
+
+static ssize_t operate_cipher(int sk, __u32 operation,
+                               const void *in, size_t in_len,
+                               const void *ad, size_t ad_len,
+                               const void *iv, size_t iv_len,
+                               void *out, size_t out_len)
+{
+       char *c_msg_buf;
+       size_t c_msg_size;
+       struct msghdr msg;
+       struct cmsghdr *c_msg;
+       struct iovec iov[2];
+       ssize_t result;
+
+       c_msg_size = CMSG_SPACE(sizeof(operation));
+       c_msg_size += ad_len ? CMSG_SPACE(sizeof(uint32_t)) : 0;
+       c_msg_size += iv_len ?
+               CMSG_SPACE(sizeof(struct af_alg_iv) + iv_len) : 0;
+
+       c_msg_buf = alloca(c_msg_size);
+
+       memset(c_msg_buf, 0, c_msg_size);
+       memset(&msg, 0, sizeof(msg));
+
+       msg.msg_iov = iov;
+
+       msg.msg_control = c_msg_buf;
+       msg.msg_controllen = c_msg_size;
+
+       c_msg = CMSG_FIRSTHDR(&msg);
+       c_msg->cmsg_level = SOL_ALG;
+       c_msg->cmsg_type = ALG_SET_OP;
+       c_msg->cmsg_len = CMSG_LEN(sizeof(operation));
+       memcpy(CMSG_DATA(c_msg), &operation, sizeof(operation));
+
+       if (ad_len) {
+               uint32_t *ad_data;
+
+               c_msg = CMSG_NXTHDR(&msg, c_msg);
+               c_msg->cmsg_level = SOL_ALG;
+               c_msg->cmsg_type = ALG_SET_AEAD_ASSOCLEN;
+               c_msg->cmsg_len = CMSG_LEN(sizeof(*ad_data));
+               ad_data = (void *) CMSG_DATA(c_msg);
+               *ad_data = ad_len;
+
+               iov[0].iov_base = (void *) ad;
+               iov[0].iov_len = ad_len;
+               iov[1].iov_base = (void *) in;
+               iov[1].iov_len = in_len;
+               msg.msg_iovlen = 2;
+       } else {
+               iov[0].iov_base = (void *) in;
+               iov[0].iov_len = in_len;
+               msg.msg_iovlen = 1;
+       }
+
+       if (iv_len) {
+               struct af_alg_iv *algiv;
+
+               c_msg = CMSG_NXTHDR(&msg, c_msg);
+               c_msg->cmsg_level = SOL_ALG;
+               c_msg->cmsg_type = ALG_SET_IV;
+               c_msg->cmsg_len = CMSG_LEN(sizeof(*algiv) + iv_len);
+
+               algiv = (void *)CMSG_DATA(c_msg);
+               algiv->ivlen = iv_len;
+               memcpy(algiv->iv, iv, iv_len);
+       }
+
+       result = sendmsg(sk, &msg, 0);
+       if (result < 0)
+               return -errno;
+
+       if (ad_len) {
+               /*
+                * When AEAD additional data is passed to sendmsg() for
+                * use in computing the tag, those bytes also appear at
+                * the beginning of the encrypt or decrypt results.  Rather
+                * than force the caller to pad their result buffer with
+                * the correct number of bytes for the additional data,
+                * the necessary space is allocated here and then the
+                * duplicate AAD is discarded.
+                */
+               iov[0].iov_base = l_malloc(ad_len);
+               iov[0].iov_len = ad_len;
+               iov[1].iov_base = (void *) out;
+               iov[1].iov_len = out_len;
+               msg.msg_iovlen = 2;
+
+               msg.msg_control = NULL;
+               msg.msg_controllen = 0;
+
+               result = recvmsg(sk, &msg, 0);
+
+               if (result >= (ssize_t) ad_len)
+                       result -= ad_len;
+               else if (result > 0)
+                       result = 0;
+
+               l_free(iov[0].iov_base);
+       } else {
+               result = read(sk, out, out_len);
+       }
+
+       if (result < 0)
+               return -errno;
+
+       return result;
+}
+
+static ssize_t operate_cipherv(int sk, __u32 operation,
+                               const struct iovec *in, size_t in_cnt,
+                               const struct iovec *out, size_t out_cnt)
+{
+       char *c_msg_buf;
+       size_t c_msg_size;
+       struct msghdr msg;
+       struct cmsghdr *c_msg;
+       ssize_t result;
+
+       c_msg_size = CMSG_SPACE(sizeof(operation));
+       c_msg_buf = alloca(c_msg_size);
+
+       memset(c_msg_buf, 0, c_msg_size);
+       memset(&msg, 0, sizeof(msg));
+
+       msg.msg_iov = (struct iovec *) in;
+       msg.msg_iovlen = in_cnt;
+
+       msg.msg_control = c_msg_buf;
+       msg.msg_controllen = c_msg_size;
+
+       c_msg = CMSG_FIRSTHDR(&msg);
+       c_msg->cmsg_level = SOL_ALG;
+       c_msg->cmsg_type = ALG_SET_OP;
+       c_msg->cmsg_len = CMSG_LEN(sizeof(operation));
+       memcpy(CMSG_DATA(c_msg), &operation, sizeof(operation));
+
+       result = sendmsg(sk, &msg, 0);
+       if (result < 0)
+               return -errno;
+
+       result = readv(sk, out, out_cnt);
+
+       if (result < 0)
+               return -errno;
+
+       return result;
+}
+
+LIB_EXPORT bool l_cipher_encrypt(struct l_cipher *cipher,
+                                       const void *in, void *out, size_t len)
+{
+       if (unlikely(!cipher))
+               return false;
+
+       if (unlikely(!in) || unlikely(!out))
+               return false;
+
+       return operate_cipher(cipher->encrypt_sk, ALG_OP_ENCRYPT, in, len,
+                               NULL, 0, NULL, 0, out, len) >= 0;
+}
+
+LIB_EXPORT bool l_cipher_encryptv(struct l_cipher *cipher,
+                                       const struct iovec *in, size_t in_cnt,
+                                       const struct iovec *out, size_t out_cnt)
+{
+       if (unlikely(!cipher))
+               return false;
+
+       if (unlikely(!in) || unlikely(!out))
+               return false;
+
+       return operate_cipherv(cipher->encrypt_sk, ALG_OP_ENCRYPT, in, in_cnt,
+                               out, out_cnt) >= 0;
+}
+
+LIB_EXPORT bool l_cipher_decrypt(struct l_cipher *cipher,
+                                       const void *in, void *out, size_t len)
+{
+       if (unlikely(!cipher))
+               return false;
+
+       if (unlikely(!in) || unlikely(!out))
+               return false;
+
+       return operate_cipher(cipher->decrypt_sk, ALG_OP_DECRYPT, in, len,
+                               NULL, 0, NULL, 0, out, len) >= 0;
+}
+
+LIB_EXPORT bool l_cipher_decryptv(struct l_cipher *cipher,
+                                       const struct iovec *in, size_t in_cnt,
+                                       const struct iovec *out, size_t out_cnt)
+{
+       if (unlikely(!cipher))
+               return false;
+
+       if (unlikely(!in) || unlikely(!out))
+               return false;
+
+       return operate_cipherv(cipher->decrypt_sk, ALG_OP_DECRYPT, in, in_cnt,
+                               out, out_cnt) >= 0;
+}
+
+LIB_EXPORT bool l_cipher_set_iv(struct l_cipher *cipher, const uint8_t *iv,
+                               size_t iv_length)
+{
+       char c_msg_buf[CMSG_SPACE(4 + iv_length)];
+       struct msghdr msg;
+       struct cmsghdr *c_msg;
+       uint32_t len = iv_length;
+
+       if (unlikely(!cipher))
+               return false;
+
+       memset(&c_msg_buf, 0, sizeof(c_msg_buf));
+       memset(&msg, 0, sizeof(struct msghdr));
+
+       msg.msg_control = c_msg_buf;
+       msg.msg_controllen = sizeof(c_msg_buf);
+
+       c_msg = CMSG_FIRSTHDR(&msg);
+       c_msg->cmsg_level = SOL_ALG;
+       c_msg->cmsg_type = ALG_SET_IV;
+       c_msg->cmsg_len = CMSG_LEN(4 + iv_length);
+       memcpy(CMSG_DATA(c_msg) + 0, &len, 4);
+       memcpy(CMSG_DATA(c_msg) + 4, iv, iv_length);
+
+       msg.msg_iov = NULL;
+       msg.msg_iovlen = 0;
+
+       if (sendmsg(cipher->encrypt_sk, &msg, 0) < 0)
+               return false;
+
+       if (sendmsg(cipher->decrypt_sk, &msg, 0) < 0)
+               return false;
+
+       return true;
+}
+
+#define CCM_IV_SIZE 16
+
+static size_t l_aead_cipher_get_ivlen(struct l_aead_cipher *cipher)
+{
+       switch (cipher->type) {
+       case L_AEAD_CIPHER_AES_CCM:
+               return CCM_IV_SIZE;
+       case L_AEAD_CIPHER_AES_GCM:
+               return 12;
+       }
+
+       return 0;
+}
+
+/* RFC3610 Section 2.3 */
+static ssize_t build_ccm_iv(const void *nonce, uint8_t nonce_len,
+                               uint8_t (*iv)[CCM_IV_SIZE])
+{
+       const size_t iv_overhead = 2;
+       int lprime = 15 - nonce_len - 1;
+
+       if (unlikely(nonce_len + iv_overhead > CCM_IV_SIZE || lprime > 7))
+               return -EINVAL;
+
+       (*iv)[0] = lprime;
+       memcpy(*iv + 1, nonce, nonce_len);
+       memset(*iv + 1 + nonce_len, 0, lprime + 1);
+
+       return CCM_IV_SIZE;
+}
+
+LIB_EXPORT bool l_aead_cipher_encrypt(struct l_aead_cipher *cipher,
+                                       const void *in, size_t in_len,
+                                       const void *ad, size_t ad_len,
+                                       const void *nonce, size_t nonce_len,
+                                       void *out, size_t out_len)
+{
+       uint8_t ccm_iv[CCM_IV_SIZE];
+       const uint8_t *iv;
+       ssize_t iv_len;
+
+       if (unlikely(!cipher))
+               return false;
+
+       if (unlikely(!in) || unlikely(!out))
+               return false;
+
+       if (cipher->type == L_AEAD_CIPHER_AES_CCM) {
+               iv_len = build_ccm_iv(nonce, nonce_len, &ccm_iv);
+               if (unlikely(iv_len < 0))
+                       return false;
+
+               iv = ccm_iv;
+       } else {
+               if (unlikely(nonce_len != l_aead_cipher_get_ivlen(cipher)))
+                       return false;
+
+               iv = nonce;
+               iv_len = nonce_len;
+       }
+
+       return operate_cipher(cipher->sk, ALG_OP_ENCRYPT, in, in_len,
+                               ad, ad_len, iv, iv_len, out, out_len) ==
+                       (ssize_t)out_len;
+}
+
+LIB_EXPORT bool l_aead_cipher_decrypt(struct l_aead_cipher *cipher,
+                                       const void *in, size_t in_len,
+                                       const void *ad, size_t ad_len,
+                                       const void *nonce, size_t nonce_len,
+                                       void *out, size_t out_len)
+{
+       uint8_t ccm_iv[CCM_IV_SIZE];
+       const uint8_t *iv;
+       ssize_t iv_len;
+
+       if (unlikely(!cipher))
+               return false;
+
+       if (unlikely(!in) || unlikely(!out))
+               return false;
+
+       if (cipher->type == L_AEAD_CIPHER_AES_CCM) {
+               iv_len = build_ccm_iv(nonce, nonce_len, &ccm_iv);
+               if (unlikely(iv_len < 0))
+                       return false;
+
+               iv = ccm_iv;
+       } else {
+               if (unlikely(nonce_len != l_aead_cipher_get_ivlen(cipher)))
+                       return false;
+
+               iv = nonce;
+               iv_len = nonce_len;
+       }
+
+       return operate_cipher(cipher->sk, ALG_OP_DECRYPT, in, in_len,
+                               ad, ad_len, iv, iv_len, out, out_len) ==
+                       (ssize_t)out_len;
+}
+
+static void init_supported()
+{
+       static bool initialized = false;
+       struct sockaddr_alg salg;
+       int sk;
+       enum l_cipher_type c;
+       enum l_aead_cipher_type a;
+
+       if (likely(initialized))
+               return;
+
+       initialized = true;
+
+       sk = socket(PF_ALG, SOCK_SEQPACKET | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return;
+
+       memset(&salg, 0, sizeof(salg));
+       salg.salg_family = AF_ALG;
+       strcpy((char *) salg.salg_type, "skcipher");
+
+       for (c = L_CIPHER_AES; c <= L_CIPHER_DES3_EDE_CBC; c++) {
+               strcpy((char *) salg.salg_name, cipher_type_to_name(c));
+
+               if (bind(sk, (struct sockaddr *) &salg, sizeof(salg)) < 0)
+                       continue;
+
+               supported_ciphers |= 1 << c;
+       }
+
+       strcpy((char *) salg.salg_type, "aead");
+
+       for (a = L_AEAD_CIPHER_AES_CCM; a <= L_AEAD_CIPHER_AES_GCM; a++) {
+               strcpy((char *) salg.salg_name, aead_cipher_type_to_name(a));
+
+               if (bind(sk, (struct sockaddr *) &salg, sizeof(salg)) < 0)
+                       continue;
+
+               supported_aead_ciphers |= 1 << a;
+       }
+
+       close(sk);
+}
+
+LIB_EXPORT bool l_cipher_is_supported(enum l_cipher_type type)
+{
+       if (!is_valid_type(type))
+               return false;
+
+       init_supported();
+
+       return supported_ciphers & (1 << type);
+}
+
+LIB_EXPORT bool l_aead_cipher_is_supported(enum l_aead_cipher_type type)
+{
+       if (type != L_AEAD_CIPHER_AES_CCM && type != L_AEAD_CIPHER_AES_GCM)
+               return false;
+
+       init_supported();
+
+       return supported_aead_ciphers & (1 << type);
+}
diff --git a/ell/cipher.h b/ell/cipher.h
new file mode 100644 (file)
index 0000000..84f2988
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_CIPHER_H
+#define __ELL_CIPHER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_cipher;
+
+enum l_cipher_type {
+       L_CIPHER_AES = 0,
+       L_CIPHER_AES_CBC,
+       L_CIPHER_AES_CTR,
+       L_CIPHER_ARC4,
+       L_CIPHER_DES,
+       L_CIPHER_DES_CBC,
+       L_CIPHER_DES3_EDE_CBC,
+};
+
+struct l_cipher *l_cipher_new(enum l_cipher_type type,
+                               const void *key, size_t key_length);
+
+void l_cipher_free(struct l_cipher *cipher);
+
+bool l_cipher_encrypt(struct l_cipher *cipher,
+                       const void *in, void *out, size_t len);
+bool l_cipher_encryptv(struct l_cipher *cipher,
+                               const struct iovec *in, size_t in_cnt,
+                               const struct iovec *out, size_t out_cnt);
+
+bool l_cipher_decrypt(struct l_cipher *cipher,
+                       const void *in, void *out, size_t len);
+bool l_cipher_decryptv(struct l_cipher *cipher,
+                               const struct iovec *in, size_t in_cnt,
+                               const struct iovec *out, size_t out_cnt);
+
+bool l_cipher_set_iv(struct l_cipher *cipher, const uint8_t *iv,
+                       size_t iv_length);
+
+struct l_aead_cipher;
+
+enum l_aead_cipher_type {
+       L_AEAD_CIPHER_AES_CCM = 0,
+       L_AEAD_CIPHER_AES_GCM,
+};
+
+struct l_aead_cipher *l_aead_cipher_new(enum l_aead_cipher_type type,
+                                       const void *key, size_t key_length,
+                                       size_t tag_length);
+
+void l_aead_cipher_free(struct l_aead_cipher *cipher);
+
+bool l_aead_cipher_encrypt(struct l_aead_cipher *cipher,
+                               const void *in, size_t in_len,
+                               const void *ad, size_t ad_len,
+                               const void *nonce, size_t nonce_len,
+                               void *out, size_t out_len);
+
+bool l_aead_cipher_decrypt(struct l_aead_cipher *cipher,
+                               const void *in, size_t in_len,
+                               const void *ad, size_t ad_len,
+                               const void *nonce, size_t nonce_len,
+                               void *out, size_t out_len);
+
+bool l_cipher_is_supported(enum l_cipher_type type);
+bool l_aead_cipher_is_supported(enum l_aead_cipher_type type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_CIPHER_H */
diff --git a/ell/dbus-client.c b/ell/dbus-client.c
new file mode 100644 (file)
index 0000000..f735f33
--- /dev/null
@@ -0,0 +1,736 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2017  Codecoup. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "dbus.h"
+#include "dbus-client.h"
+#include "queue.h"
+#include "private.h"
+
+struct l_dbus_client {
+       struct l_dbus *dbus;
+       unsigned int watch;
+       unsigned int added_watch;
+       unsigned int removed_watch;
+       char *service;
+       uint32_t objects_call;
+
+       l_dbus_watch_func_t connect_cb;
+       void *connect_cb_data;
+       l_dbus_destroy_func_t connect_cb_data_destroy;
+
+       l_dbus_watch_func_t disconnect_cb;
+       void *disconnect_cb_data;
+       l_dbus_destroy_func_t disconnect_cb_data_destroy;
+
+       l_dbus_client_ready_func_t ready_cb;
+       void *ready_cb_data;
+       l_dbus_destroy_func_t ready_cb_data_destroy;
+
+       l_dbus_client_proxy_func_t proxy_added_cb;
+       l_dbus_client_proxy_func_t proxy_removed_cb;
+       l_dbus_client_property_function_t properties_changed_cb;
+       void *proxy_cb_data;
+       l_dbus_destroy_func_t proxy_cb_data_destroy;
+
+       struct l_queue *proxies;
+};
+
+struct proxy_property {
+       char *name;
+       struct l_dbus_message *msg;
+};
+
+struct l_dbus_proxy {
+       struct l_dbus_client *client;
+       char *interface;
+       char *path;
+       uint32_t properties_watch;
+       bool ready;
+
+       struct l_queue *properties;
+       struct l_queue *pending_calls;
+};
+
+LIB_EXPORT const char *l_dbus_proxy_get_path(struct l_dbus_proxy *proxy)
+{
+       if (unlikely(!proxy))
+               return NULL;
+
+       return proxy->path;
+}
+
+LIB_EXPORT const char *l_dbus_proxy_get_interface(struct l_dbus_proxy *proxy)
+{
+       if (unlikely(!proxy))
+               return NULL;
+
+       return proxy->interface;
+}
+
+static bool property_match_by_name(const void *a, const void *b)
+{
+       const struct proxy_property *prop = a;
+       const char *name = b;
+
+       return !strcmp(prop->name, name);
+}
+
+static struct proxy_property *find_property(struct l_dbus_proxy *proxy,
+                                                       const char *name)
+{
+       return l_queue_find(proxy->properties, property_match_by_name, name);
+}
+
+static struct proxy_property *get_property(struct l_dbus_proxy *proxy,
+                                                       const char *name)
+{
+       struct proxy_property *prop;
+
+       prop = find_property(proxy, name);
+       if (prop)
+               return prop;
+
+       prop = l_new(struct proxy_property, 1);
+       prop->name = l_strdup(name);
+
+       l_queue_push_tail(proxy->properties, prop);
+
+       return prop;
+}
+
+LIB_EXPORT bool l_dbus_proxy_get_property(struct l_dbus_proxy *proxy,
+                                               const char *name,
+                                               const char *signature, ...)
+{
+       struct proxy_property *prop;
+       va_list args;
+       bool res;
+
+       if (unlikely(!proxy))
+               return false;
+
+       prop = find_property(proxy, name);
+       if (!prop)
+               return false;
+
+       va_start(args, signature);
+       res = l_dbus_message_get_arguments_valist(prop->msg, signature, args);
+       va_end(args);
+
+       return res;
+}
+
+static void property_free(void *data)
+{
+       struct proxy_property *prop = data;
+
+       if (prop->msg)
+               l_dbus_message_unref(prop->msg);
+
+       l_free(prop->name);
+       l_free(prop);
+}
+
+static void cancel_pending_calls(struct l_dbus_proxy *proxy)
+{
+       const struct l_queue_entry *entry;
+
+       for (entry = l_queue_get_entries(proxy->pending_calls); entry;
+                                                       entry = entry->next) {
+               uint32_t call_id = L_PTR_TO_UINT(entry->data);
+
+               l_dbus_cancel(proxy->client->dbus, call_id);
+       }
+}
+
+static void dbus_proxy_destroy(struct l_dbus_proxy *proxy)
+{
+       if (unlikely(!proxy))
+               return;
+
+       if (proxy->properties_watch)
+               l_dbus_remove_signal_watch(proxy->client->dbus,
+                                               proxy->properties_watch);
+
+       cancel_pending_calls(proxy);
+       l_queue_destroy(proxy->pending_calls, NULL);
+       l_queue_destroy(proxy->properties, property_free);
+       l_free(proxy->interface);
+       l_free(proxy->path);
+       l_free(proxy);
+}
+
+struct method_call_request
+{
+       struct l_dbus_proxy *proxy;
+       uint32_t call_id;
+       l_dbus_message_func_t setup;
+       l_dbus_client_proxy_result_func_t result;
+       void *user_data;
+       l_dbus_destroy_func_t destroy;
+};
+
+static void method_call_request_free(void *user_data)
+{
+       struct method_call_request *req = user_data;
+
+       l_queue_remove(req->proxy->pending_calls, L_UINT_TO_PTR(req->call_id));
+
+       if (req->destroy)
+               req->destroy(req->user_data);
+
+       l_free(req);
+}
+
+static void method_call_setup(struct l_dbus_message *message, void *user_data)
+{
+       struct method_call_request *req = user_data;
+
+       if (req->setup)
+               req->setup(message, req->user_data);
+       else
+               l_dbus_message_set_arguments(message, "");
+}
+
+static void method_call_reply(struct l_dbus_message *message, void *user_data)
+{
+       struct method_call_request *req = user_data;
+
+       if (req->result)
+               req->result(req->proxy, message, req->user_data);
+}
+
+LIB_EXPORT bool l_dbus_proxy_set_property(struct l_dbus_proxy *proxy,
+                               l_dbus_client_proxy_result_func_t result,
+                               void *user_data, l_dbus_destroy_func_t destroy,
+                               const char *name, const char *signature, ...)
+{
+       struct l_dbus_client *client = proxy->client;
+       struct l_dbus_message_builder *builder;
+       struct method_call_request *req;
+       struct l_dbus_message *message;
+       struct proxy_property *prop;
+       va_list args;
+
+       if (unlikely(!proxy))
+               return false;
+
+       prop = find_property(proxy, name);
+       if (!prop)
+               return false;
+
+       if (strcmp(l_dbus_message_get_signature(prop->msg), signature))
+               return false;
+
+       message = l_dbus_message_new_method_call(client->dbus, client->service,
+                                               proxy->path,
+                                               L_DBUS_INTERFACE_PROPERTIES,
+                                               "Set");
+       if (!message)
+               return false;
+
+       builder = l_dbus_message_builder_new(message);
+       if (!builder) {
+               l_dbus_message_unref(message);
+               return false;
+       }
+
+       l_dbus_message_builder_append_basic(builder, 's', proxy->interface);
+       l_dbus_message_builder_append_basic(builder, 's', name);
+
+       l_dbus_message_builder_enter_variant(builder, signature);
+
+       va_start(args, signature);
+       l_dbus_message_builder_append_from_valist(builder, signature, args);
+       va_end(args);
+
+       l_dbus_message_builder_leave_variant(builder);
+
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+
+       req = l_new(struct method_call_request, 1);
+       req->proxy = proxy;
+       req->result = result;
+       req->user_data = user_data;
+       req->destroy = destroy;
+
+       req->call_id = l_dbus_send_with_reply(client->dbus, message,
+                                               method_call_reply, req,
+                                               method_call_request_free);
+       if (!req->call_id) {
+               l_free(req);
+               return false;
+       }
+
+       l_queue_push_tail(proxy->pending_calls, L_UINT_TO_PTR(req->call_id));
+
+       return true;
+}
+
+LIB_EXPORT uint32_t l_dbus_proxy_method_call(struct l_dbus_proxy *proxy,
+                                       const char *method,
+                                       l_dbus_message_func_t setup,
+                                       l_dbus_client_proxy_result_func_t reply,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy)
+{
+       struct method_call_request *req;
+
+       if (unlikely(!proxy))
+               return 0;
+
+       req = l_new(struct method_call_request, 1);
+       req->proxy = proxy;
+       req->setup = setup;
+       req->result = reply;
+       req->user_data = user_data;
+       req->destroy = destroy;
+
+       req->call_id = l_dbus_method_call(proxy->client->dbus,
+                                               proxy->client->service,
+                                               proxy->path, proxy->interface,
+                                               method, method_call_setup,
+                                               method_call_reply, req,
+                                               method_call_request_free);
+       if (!req->call_id) {
+               l_free(req);
+               return 0;
+       }
+
+       l_queue_push_tail(proxy->pending_calls, L_UINT_TO_PTR(req->call_id));
+
+       return req->call_id;
+}
+
+static void proxy_update_property(struct l_dbus_proxy *proxy,
+                                       const char *name,
+                                       struct l_dbus_message_iter *property)
+{
+       struct l_dbus_message_builder *builder;
+       struct proxy_property *prop = get_property(proxy, name);
+
+       l_dbus_message_unref(prop->msg);
+
+       if (!property) {
+               prop->msg = NULL;
+               goto done;
+       }
+
+       prop->msg = l_dbus_message_new_signal(proxy->client->dbus, proxy->path,
+                                                       proxy->interface, name);
+       if (!prop->msg)
+               return;
+
+       builder = l_dbus_message_builder_new(prop->msg);
+       l_dbus_message_builder_append_from_iter(builder, property);
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+
+done:
+       if (proxy->client->properties_changed_cb && proxy->ready)
+               proxy->client->properties_changed_cb(proxy, name, prop->msg,
+                                       proxy->client->proxy_cb_data);
+}
+
+static void proxy_invalidate_properties(struct l_dbus_proxy *proxy,
+                                       struct l_dbus_message_iter* props)
+{
+       const char *name;
+
+       while (l_dbus_message_iter_next_entry(props, &name))
+               proxy_update_property(proxy, name, NULL);
+}
+
+static void proxy_update_properties(struct l_dbus_proxy *proxy,
+                                       struct l_dbus_message_iter* props)
+{
+       struct l_dbus_message_iter variant;
+       const char *name;
+
+       while (l_dbus_message_iter_next_entry(props, &name, &variant))
+               proxy_update_property(proxy, name, &variant);
+}
+
+static void properties_changed_callback(struct l_dbus_message *message,
+                                                               void *user_data)
+{
+       struct l_dbus_proxy *proxy = user_data;
+       const char *interface;
+       struct l_dbus_message_iter changed;
+       struct l_dbus_message_iter invalidated;
+
+       if (!l_dbus_message_get_arguments(message, "sa{sv}as", &interface,
+                                                       &changed, &invalidated))
+               return;
+
+       proxy_update_properties(proxy, &changed);
+       proxy_invalidate_properties(proxy, &invalidated);
+}
+
+static struct l_dbus_proxy *dbus_proxy_new(struct l_dbus_client *client,
+                                       const char *path, const char *interface)
+{
+       struct l_dbus_proxy *proxy = l_new(struct l_dbus_proxy, 1);
+
+       proxy->properties_watch = l_dbus_add_signal_watch(client->dbus,
+                                               client->service, path,
+                                               L_DBUS_INTERFACE_PROPERTIES,
+                                               "PropertiesChanged",
+                                               L_DBUS_MATCH_ARGUMENT(0),
+                                               interface, L_DBUS_MATCH_NONE,
+                                               properties_changed_callback,
+                                               proxy);
+       if (!proxy->properties_watch) {
+               l_free(proxy);
+               return NULL;
+       }
+
+       proxy->client = client;
+       proxy->interface = l_strdup(interface);
+       proxy->path = l_strdup(path);
+       proxy->properties = l_queue_new();
+       proxy->pending_calls = l_queue_new();;
+
+       l_queue_push_tail(client->proxies, proxy);
+
+       return proxy;
+}
+
+static bool is_ignorable(const char *interface)
+{
+       static const struct {
+               const char *interface;
+       } interfaces_to_ignore[] = {
+               { L_DBUS_INTERFACE_OBJECT_MANAGER },
+               { L_DBUS_INTERFACE_INTROSPECTABLE },
+               { L_DBUS_INTERFACE_PROPERTIES },
+       };
+       size_t i;
+
+       for (i = 0; i < L_ARRAY_SIZE(interfaces_to_ignore); i++)
+               if (!strcmp(interfaces_to_ignore[i].interface, interface))
+                       return true;
+
+       return false;
+}
+
+static struct l_dbus_proxy *find_proxy(struct l_dbus_client *client,
+                                       const char *path, const char *interface)
+{
+       const struct l_queue_entry *entry;
+
+       for (entry = l_queue_get_entries(client->proxies); entry;
+                                                       entry = entry->next) {
+               struct l_dbus_proxy *proxy = entry->data;
+
+               if (!strcmp(proxy->interface, interface) &&
+                                               !strcmp(proxy->path, path))
+                       return proxy;
+       }
+
+       return NULL;
+}
+
+static void parse_interface(struct l_dbus_client *client, const char *path,
+                                       const char *interface,
+                                       struct l_dbus_message_iter *properties)
+{
+       struct l_dbus_proxy *proxy;
+
+       if (is_ignorable(interface))
+               return;
+
+       proxy = find_proxy(client, path, interface);
+       if (!proxy)
+               proxy = dbus_proxy_new(client, path, interface);
+
+       if (!proxy)
+               return;
+
+       proxy_update_properties(proxy, properties);
+
+       if (!proxy->ready) {
+               proxy->ready = true;
+
+               if (client->proxy_added_cb)
+                       client->proxy_added_cb(proxy, client->proxy_cb_data);
+       }
+}
+
+static void parse_object(struct l_dbus_client *client, const char *path,
+                                       struct l_dbus_message_iter *object)
+{
+       const char *interface;
+       struct l_dbus_message_iter properties;
+
+       if (!path)
+               return;
+
+       while (l_dbus_message_iter_next_entry(object, &interface, &properties))
+               parse_interface(client, path, interface, &properties);
+}
+
+static void interfaces_added_callback(struct l_dbus_message *message,
+                                                               void *user_data)
+{
+       struct l_dbus_client *client = user_data;
+       struct l_dbus_message_iter object;
+       const char *path;
+
+       if (!l_dbus_message_get_arguments(message, "oa{sa{sv}}", &path,
+                                                               &object))
+               return;
+
+       parse_object(client, path, &object);
+}
+
+static void interfaces_removed_callback(struct l_dbus_message *message,
+                                                               void *user_data)
+{
+       struct l_dbus_client *client = user_data;
+       struct l_dbus_message_iter interfaces;
+       const char *interface;
+       const char *path;
+
+       if (!l_dbus_message_get_arguments(message, "oas", &path, &interfaces))
+               return;
+
+       while (l_dbus_message_iter_next_entry(&interfaces, &interface)) {
+               struct l_dbus_proxy *proxy;
+
+               proxy = find_proxy(client, path, interface);
+               if (!proxy)
+                       continue;
+
+               l_queue_remove(proxy->client->proxies, proxy);
+
+               if (client->proxy_removed_cb)
+                       client->proxy_removed_cb(proxy, client->proxy_cb_data);
+
+               dbus_proxy_destroy(proxy);
+       }
+}
+
+static void get_managed_objects_reply(struct l_dbus_message *message,
+                                                               void *user_data)
+{
+       struct l_dbus_client *client = user_data;
+       struct l_dbus_message_iter objects;
+       struct l_dbus_message_iter object;
+       const char *path;
+
+       client->objects_call = 0;
+
+       if (l_dbus_message_is_error(message))
+               return;
+
+       if (!l_dbus_message_get_arguments(message, "a{oa{sa{sv}}}", &objects))
+               return;
+
+       while (l_dbus_message_iter_next_entry(&objects, &path, &object))
+               parse_object(client, path, &object);
+
+       client->added_watch = l_dbus_add_signal_watch(client->dbus,
+                                               client->service, "/",
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               "InterfacesAdded",
+                                               L_DBUS_MATCH_NONE,
+                                               interfaces_added_callback,
+                                               client);
+
+       client->removed_watch = l_dbus_add_signal_watch(client->dbus,
+                                               client->service, "/",
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               "InterfacesRemoved",
+                                               L_DBUS_MATCH_NONE,
+                                               interfaces_removed_callback,
+                                               client);
+
+       if (client->ready_cb)
+               client->ready_cb(client, client->ready_cb_data);
+}
+
+static void service_appeared_callback(struct l_dbus *dbus, void *user_data)
+{
+       struct l_dbus_client *client = user_data;
+
+       /* TODO should we allow to set different root? */
+       client->objects_call = l_dbus_method_call(dbus, client->service, "/",
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               "GetManagedObjects", NULL,
+                                               get_managed_objects_reply,
+                                               client, NULL);
+
+       if (client->connect_cb)
+               client->connect_cb(client->dbus, client->connect_cb_data);
+}
+
+static void service_disappeared_callback(struct l_dbus *dbus, void *user_data)
+{
+       struct l_dbus_client *client = user_data;
+
+       if (client->disconnect_cb)
+               client->disconnect_cb(client->dbus, client->disconnect_cb_data);
+
+       l_queue_clear(client->proxies,
+                               (l_queue_destroy_func_t)dbus_proxy_destroy);
+}
+
+LIB_EXPORT struct l_dbus_client *l_dbus_client_new(struct l_dbus *dbus,
+                                       const char *service, const char *path)
+{
+       struct l_dbus_client *client = l_new(struct l_dbus_client, 1);
+
+       client->dbus = dbus;
+
+       client->watch = l_dbus_add_service_watch(dbus, service,
+                                               service_appeared_callback,
+                                               service_disappeared_callback,
+                                               client, NULL);
+
+       if (!client->watch) {
+               l_free(client);
+               return NULL;
+       }
+
+       client->service = l_strdup(service);
+       client->proxies = l_queue_new();
+
+       return client;
+}
+
+LIB_EXPORT void l_dbus_client_destroy(struct l_dbus_client *client)
+{
+       if (unlikely(!client))
+               return;
+
+       if (client->watch)
+               l_dbus_remove_signal_watch(client->dbus, client->watch);
+
+       if (client->added_watch)
+               l_dbus_remove_signal_watch(client->dbus, client->added_watch);
+
+       if (client->removed_watch)
+               l_dbus_remove_signal_watch(client->dbus, client->removed_watch);
+
+       if (client->connect_cb_data_destroy)
+               client->connect_cb_data_destroy(client->connect_cb_data);
+
+       if (client->disconnect_cb_data_destroy)
+               client->disconnect_cb_data_destroy(client->disconnect_cb_data);
+
+       if (client->ready_cb_data_destroy)
+               client->ready_cb_data_destroy(client->ready_cb_data);
+
+       if (client->proxy_cb_data_destroy)
+               client->proxy_cb_data_destroy(client->proxy_cb_data);
+
+       if (client->objects_call)
+               l_dbus_cancel(client->dbus, client->objects_call);
+
+       l_queue_destroy(client->proxies,
+                               (l_queue_destroy_func_t)dbus_proxy_destroy);
+
+       l_free(client->service);
+       l_free(client);
+}
+
+LIB_EXPORT bool l_dbus_client_set_connect_handler(struct l_dbus_client *client,
+                                               l_dbus_watch_func_t function,
+                                               void *user_data,
+                                               l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (client->connect_cb_data_destroy)
+               client->connect_cb_data_destroy(client->connect_cb_data);
+
+       client->connect_cb = function;
+       client->connect_cb_data = user_data;
+       client->connect_cb_data_destroy = destroy;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_client_set_disconnect_handler(struct l_dbus_client *client,
+                                               l_dbus_watch_func_t function,
+                                               void *user_data,
+                                               l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!client))
+               return false;
+
+       if(client->disconnect_cb_data_destroy)
+               client->disconnect_cb_data_destroy(client->disconnect_cb_data);
+
+       client->disconnect_cb = function;
+       client->disconnect_cb_data = user_data;
+       client->disconnect_cb_data_destroy = destroy;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_client_set_ready_handler(struct l_dbus_client *client,
+                                       l_dbus_client_ready_func_t function,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (client->ready_cb_data_destroy)
+               client->ready_cb_data_destroy(client->ready_cb_data);
+
+       client->ready_cb = function;
+       client->ready_cb_data = user_data;
+       client->ready_cb_data_destroy = destroy;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_client_set_proxy_handlers(struct l_dbus_client *client,
+                       l_dbus_client_proxy_func_t proxy_added,
+                       l_dbus_client_proxy_func_t proxy_removed,
+                       l_dbus_client_property_function_t property_changed,
+                       void *user_data, l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (client->proxy_cb_data_destroy)
+               client->proxy_cb_data_destroy(client->proxy_cb_data);
+
+       client->proxy_added_cb = proxy_added;
+       client->proxy_removed_cb = proxy_removed;
+       client->properties_changed_cb = property_changed;
+       client->proxy_cb_data = user_data;
+       client->proxy_cb_data_destroy = destroy;
+
+       return true;
+}
diff --git a/ell/dbus-client.h b/ell/dbus-client.h
new file mode 100644 (file)
index 0000000..699d824
--- /dev/null
@@ -0,0 +1,98 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2017  Codecoup. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_DBUS_CLIENT_H
+#define __ELL_DBUS_CLIENT_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_dbus;
+struct l_dbus_message;
+struct l_dbus_client;
+struct l_dbus_proxy;
+
+typedef void (*l_dbus_client_ready_func_t)(struct l_dbus_client *client,
+                                                       void *user_data);
+typedef void (*l_dbus_client_proxy_func_t) (struct l_dbus_proxy *proxy,
+                                                       void *user_data);
+typedef void (*l_dbus_client_proxy_result_func_t) (struct l_dbus_proxy *proxy,
+                                               struct l_dbus_message *result,
+                                               void *user_data);
+typedef void (*l_dbus_client_property_function_t) (struct l_dbus_proxy *proxy,
+                                               const char *name,
+                                               struct l_dbus_message *msg,
+                                               void *user_data);
+
+struct l_dbus_client *l_dbus_client_new(struct l_dbus *dbus,
+                                       const char *service, const char *path);
+void l_dbus_client_destroy(struct l_dbus_client *client);
+
+bool l_dbus_client_set_connect_handler(struct l_dbus_client *client,
+                                               l_dbus_watch_func_t function,
+                                               void *user_data,
+                                               l_dbus_destroy_func_t destroy);
+
+bool l_dbus_client_set_disconnect_handler(struct l_dbus_client *client,
+                                               l_dbus_watch_func_t function,
+                                               void *user_data,
+                                               l_dbus_destroy_func_t destroy);
+
+bool l_dbus_client_set_ready_handler(struct l_dbus_client *client,
+                                       l_dbus_client_ready_func_t function,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy);
+
+bool l_dbus_client_set_proxy_handlers(struct l_dbus_client *client,
+                       l_dbus_client_proxy_func_t proxy_added,
+                       l_dbus_client_proxy_func_t proxy_removed,
+                       l_dbus_client_property_function_t property_changed,
+                       void *user_data, l_dbus_destroy_func_t destroy);
+
+const char *l_dbus_proxy_get_path(struct l_dbus_proxy *proxy);
+
+const char *l_dbus_proxy_get_interface(struct l_dbus_proxy *proxy);
+
+bool l_dbus_proxy_get_property(struct l_dbus_proxy *proxy, const char *name,
+                                               const char *signature, ...);
+
+bool l_dbus_proxy_set_property(struct l_dbus_proxy *proxy,
+                               l_dbus_client_proxy_result_func_t result,
+                               void *user_data, l_dbus_destroy_func_t destroy,
+                               const char *name, const char *signature, ...);
+
+uint32_t l_dbus_proxy_method_call(struct l_dbus_proxy *proxy,
+                                       const char *method,
+                                       l_dbus_message_func_t setup,
+                                       l_dbus_client_proxy_result_func_t reply,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_DBUS_CLIENT_H */
diff --git a/ell/dbus-filter.c b/ell/dbus-filter.c
new file mode 100644 (file)
index 0000000..5a2a428
--- /dev/null
@@ -0,0 +1,422 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "queue.h"
+#include "hashmap.h"
+#include "string.h"
+#include "dbus.h"
+#include "dbus-private.h"
+#include "gvariant-private.h"
+#include "private.h"
+
+#define NODE_TYPE_CALLBACK     L_DBUS_MATCH_NONE
+
+struct filter_node {
+       enum l_dbus_match_type type;
+       union {
+               struct {
+                       char *value;
+                       struct filter_node *children;
+                       bool remote_rule;
+               } match;
+               struct {
+                       l_dbus_message_func_t func;
+                       void *user_data;
+               } callback;
+       };
+       unsigned int id;
+       struct filter_node *next;
+};
+
+struct _dbus_filter {
+       struct l_dbus *dbus;
+       struct filter_node *root;
+       unsigned int signal_id;
+       unsigned int last_id;
+       const struct _dbus_filter_ops *driver;
+       struct _dbus_name_cache *name_cache;
+};
+
+static void filter_subtree_free(struct filter_node *node)
+{
+       struct filter_node *child, *next;
+
+       if (node->type == NODE_TYPE_CALLBACK) {
+               l_free(node);
+               return;
+       }
+
+       next = node->match.children;
+
+       l_free(node->match.value);
+       l_free(node);
+
+       while (next) {
+               child = next;
+               next = child->next;
+
+               filter_subtree_free(child);
+       }
+}
+
+static void dbus_filter_destroy(void *data)
+{
+       struct _dbus_filter *filter = data;
+
+       if (filter->root)
+               filter_subtree_free(filter->root);
+
+       l_free(filter);
+}
+
+static void filter_dispatch_match_recurse(struct _dbus_filter *filter,
+                                               struct filter_node *node,
+                                               struct l_dbus_message *message)
+{
+       const char *value = NULL;
+       const char *alt_value = NULL;
+       struct filter_node *child;
+
+       switch ((int) node->type) {
+       case NODE_TYPE_CALLBACK:
+               node->callback.func(message, node->callback.user_data);
+               return;
+
+       case L_DBUS_MATCH_SENDER:
+               value = l_dbus_message_get_sender(message);
+               break;
+
+       case L_DBUS_MATCH_TYPE:
+               value = _dbus_message_get_type_as_string(message);
+               break;
+
+       case L_DBUS_MATCH_PATH:
+               value = l_dbus_message_get_path(message);
+               break;
+
+       case L_DBUS_MATCH_INTERFACE:
+               value = l_dbus_message_get_interface(message);
+               break;
+
+       case L_DBUS_MATCH_MEMBER:
+               value = l_dbus_message_get_member(message);
+               break;
+
+       case L_DBUS_MATCH_ARG0...(L_DBUS_MATCH_ARG0 + 63):
+               value = _dbus_message_get_nth_string_argument(message,
+                                               node->type - L_DBUS_MATCH_ARG0);
+               break;
+       }
+
+       if (!value)
+               return;
+
+       if (node->type == L_DBUS_MATCH_SENDER && filter->name_cache)
+               alt_value = _dbus_name_cache_lookup(filter->name_cache,
+                                                       node->match.value);
+
+       if (strcmp(value, node->match.value) &&
+                       (!alt_value || strcmp(value, alt_value)))
+               return;
+
+       for (child = node->match.children; child; child = child->next)
+               filter_dispatch_match_recurse(filter, child, message);
+}
+
+void _dbus_filter_dispatch(struct l_dbus_message *message, void *user_data)
+{
+       struct _dbus_filter *filter = user_data;
+
+       filter_dispatch_match_recurse(filter, filter->root, message);
+}
+
+struct _dbus_filter *_dbus_filter_new(struct l_dbus *dbus,
+                                       const struct _dbus_filter_ops *driver,
+                                       struct _dbus_name_cache *name_cache)
+{
+       struct _dbus_filter *filter;
+
+       filter = l_new(struct _dbus_filter, 1);
+
+       filter->dbus = dbus;
+       filter->driver = driver;
+       filter->name_cache = name_cache;
+
+       if (!filter->driver->skip_register)
+               filter->signal_id = l_dbus_register(dbus, _dbus_filter_dispatch,
+                                                       filter,
+                                                       dbus_filter_destroy);
+
+       return filter;
+}
+
+void _dbus_filter_free(struct _dbus_filter *filter)
+{
+       if (!filter)
+               return;
+
+       if (!filter->driver->skip_register)
+               l_dbus_unregister(filter->dbus, filter->signal_id);
+       else
+               dbus_filter_destroy(filter);
+}
+
+static int condition_compare(const void *a, const void *b)
+{
+       const struct _dbus_filter_condition *condition_a = a, *condition_b = b;
+
+       return condition_a->type - condition_b->type;
+}
+
+static bool remove_recurse(struct _dbus_filter *filter,
+                               struct filter_node **node, unsigned int id)
+{
+       struct filter_node *tmp;
+
+       for (; *node; node = &(*node)->next) {
+               if ((*node)->type == NODE_TYPE_CALLBACK && (*node)->id == id)
+                       break;
+
+               if ((*node)->type != NODE_TYPE_CALLBACK &&
+                               remove_recurse(filter, &(*node)->match.children,
+                                               id))
+                       break;
+       }
+
+       if (!*node)
+               return false;
+
+       if ((*node)->type == NODE_TYPE_CALLBACK || !(*node)->match.children) {
+               tmp = *node;
+               *node = tmp->next;
+
+               if (tmp->match.remote_rule)
+                       filter->driver->remove_match(filter->dbus, tmp->id);
+
+               if (tmp->type == L_DBUS_MATCH_SENDER && filter->name_cache &&
+                               !_dbus_parse_unique_name(tmp->match.value,
+                                                               NULL))
+                       _dbus_name_cache_remove(filter->name_cache,
+                                               tmp->match.value);
+
+               filter_subtree_free(tmp);
+       }
+
+       return true;
+}
+
+unsigned int _dbus_filter_add_rule(struct _dbus_filter *filter,
+                               const struct _dbus_filter_condition *rule,
+                               int rule_len,
+                               l_dbus_message_func_t signal_func,
+                               void *user_data)
+{
+       struct filter_node **node_ptr = &filter->root;
+       struct filter_node *uninitialized_var(node);
+       struct filter_node *parent = filter->root;
+       bool remote_rule = false;
+       struct _dbus_filter_condition sorted[rule_len];
+       struct _dbus_filter_condition *unused;
+       struct _dbus_filter_condition *uninitialized_var(condition);
+       struct _dbus_filter_condition *end = sorted + rule_len;
+
+       memcpy(sorted, rule, sizeof(sorted));
+       qsort(sorted, rule_len, sizeof(*condition), condition_compare);
+
+       /*
+        * Find or create a path in the tree with a node for each
+        * condition in the rule, loop until all conditions have been
+        * used.
+        */
+       unused = sorted;
+       while (unused < end) {
+               /*
+                * Find a child of the node that matches any unused
+                * condition.  Note there could be multiple matches, we're
+                * happy with the first we can find.
+                */
+               while (*node_ptr) {
+                       node = *node_ptr;
+
+                       for (condition = unused; condition < end; condition++) {
+                               if (condition->type > node->type) {
+                                       condition = end;
+                                       break;
+                               }
+
+                               if (condition->type < node->type ||
+                                               condition->type ==
+                                               L_DBUS_MATCH_NONE)
+                                       continue;
+
+                               if (!strcmp(node->match.value,
+                                               condition->value))
+                                       break;
+                       }
+
+                       if (condition < end)
+                               break;
+
+                       node_ptr = &node->next;
+               }
+
+               /* Add a node */
+               if (!*node_ptr) {
+                       condition = unused;
+
+                       node = l_new(struct filter_node, 1);
+                       node->type = condition->type;
+                       node->match.value = l_strdup(condition->value);
+
+                       *node_ptr = node;
+
+                       if (node->type == L_DBUS_MATCH_SENDER &&
+                                       filter->name_cache &&
+                                       !_dbus_parse_unique_name(
+                                                       node->match.value,
+                                                       NULL))
+                               _dbus_name_cache_add(filter->name_cache,
+                                                       node->match.value);
+
+               }
+
+               /*
+                * Mark the condition used.  We do this by setting
+                * condition->type to an invalid value unless it is the
+                * first condition left in which case we can push the
+                * rule start.  Another option is to always push the rule
+                * start and memmove the still unused conditions by one
+                * if necessary.
+                */
+               condition->type = L_DBUS_MATCH_NONE;
+               while (unused < end && unused[0].type == L_DBUS_MATCH_NONE)
+                       unused++;
+
+               node_ptr = &node->match.children;
+
+               parent = node;
+
+               /*
+                * Only have to call AddMatch if none of the parent nodes
+                * have yet created an AddMatch rule on the server.
+                */
+               remote_rule |= node->match.remote_rule;
+       }
+
+       node = l_new(struct filter_node, 1);
+       node->type = NODE_TYPE_CALLBACK;
+       node->callback.func = signal_func;
+       node->callback.user_data = user_data;
+       node->id = ++filter->last_id;
+       node->next = *node_ptr;
+
+       *node_ptr = node;
+
+       if (!remote_rule) {
+               if (!filter->driver->add_match(filter->dbus, node->id,
+                                               rule, rule_len))
+                       goto err;
+
+               parent->id = node->id;
+               parent->match.remote_rule = true;
+       }
+
+       return node->id;
+
+err:
+       /* Remove all the nodes we may have added */
+       node->id = (unsigned int) -1;
+       remove_recurse(filter, &filter->root, node->id);
+
+       return 0;
+}
+
+bool _dbus_filter_remove_rule(struct _dbus_filter *filter, unsigned int id)
+{
+       return remove_recurse(filter, &filter->root, id);
+}
+
+char *_dbus_filter_rule_to_str(const struct _dbus_filter_condition *rule,
+                               int rule_len)
+{
+       struct l_string *str = l_string_new(63);
+       char *key, arg_buf[6];
+       const char *value, *endp;
+
+       for (; rule_len; rule++, rule_len--) {
+               switch ((int) rule->type) {
+               case L_DBUS_MATCH_SENDER:
+                       key = "sender";
+                       break;
+               case L_DBUS_MATCH_TYPE:
+                       key = "type";
+                       break;
+               case L_DBUS_MATCH_PATH:
+                       key = "path";
+                       break;
+               case L_DBUS_MATCH_INTERFACE:
+                       key = "interface";
+                       break;
+               case L_DBUS_MATCH_MEMBER:
+                       key = "member";
+                       break;
+               case L_DBUS_MATCH_ARG0...(L_DBUS_MATCH_ARG0 + 63):
+                       key = arg_buf;
+                       snprintf(arg_buf, sizeof(arg_buf), "arg%i",
+                                       rule->type - L_DBUS_MATCH_ARG0);
+                       break;
+               default:
+                       l_string_free(str);
+                       return NULL;
+               }
+
+               l_string_append(str, key);
+               l_string_append(str, "='");
+
+               /* We only need to escape single-quotes in the values */
+               value = rule->value;
+
+               while ((endp = strchr(value, '\''))) {
+                       l_string_append_fixed(str, value, endp - value);
+                       l_string_append(str, "'\\''");
+
+                       value = endp + 1;
+               }
+
+               l_string_append(str, value);
+               l_string_append_c(str, '\'');
+
+               if (rule_len > 1)
+                       l_string_append_c(str, ',');
+       }
+
+       return l_string_unwrap(str);
+}
diff --git a/ell/dbus-message.c b/ell/dbus-message.c
new file mode 100644 (file)
index 0000000..32f0428
--- /dev/null
@@ -0,0 +1,1989 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdarg.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "util.h"
+#include "private.h"
+#include "dbus.h"
+#include "dbus-private.h"
+#include "gvariant-private.h"
+
+#define DBUS_MESSAGE_LITTLE_ENDIAN     ('l')
+#define DBUS_MESSAGE_BIG_ENDIAN                ('B')
+
+#define DBUS_MESSAGE_PROTOCOL_VERSION  1
+
+#define DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED    0x01
+#define DBUS_MESSAGE_FLAG_NO_AUTO_START                0x02
+
+#define DBUS_MESSAGE_FIELD_PATH                1
+#define DBUS_MESSAGE_FIELD_INTERFACE   2
+#define DBUS_MESSAGE_FIELD_MEMBER      3
+#define DBUS_MESSAGE_FIELD_ERROR_NAME  4
+#define DBUS_MESSAGE_FIELD_REPLY_SERIAL        5
+#define DBUS_MESSAGE_FIELD_DESTINATION 6
+#define DBUS_MESSAGE_FIELD_SENDER      7
+#define DBUS_MESSAGE_FIELD_SIGNATURE   8
+#define DBUS_MESSAGE_FIELD_UNIX_FDS    9
+
+#define DBUS_MAX_NESTING       32
+
+struct l_dbus_message {
+       int refcount;
+       void *header;
+       size_t header_size;
+       size_t header_end;
+       char *signature;
+       void *body;
+       size_t body_size;
+       char *path;
+       char *interface;
+       char *member;
+       char *error_name;
+       uint32_t reply_serial;
+       char *destination;
+       char *sender;
+       int fds[16];
+       uint32_t num_fds;
+
+       bool sealed : 1;
+       bool signature_free : 1;
+};
+
+struct l_dbus_message_builder {
+       struct l_dbus_message *message;
+       struct dbus_builder *builder;
+       struct builder_driver *driver;
+};
+
+static inline bool _dbus_message_is_gvariant(struct l_dbus_message *msg)
+{
+       struct dbus_header *hdr = msg->header;
+
+       return hdr->version == 2;
+}
+
+void *_dbus_message_get_header(struct l_dbus_message *msg, size_t *out_size)
+{
+       if (out_size)
+               *out_size = msg->header_size;
+
+       return msg->header;
+}
+
+void *_dbus_message_get_body(struct l_dbus_message *msg, size_t *out_size)
+{
+       if (out_size)
+               *out_size = msg->body_size;
+
+       return msg->body;
+}
+
+/* Get a buffer containing the final message contents except the header */
+void *_dbus_message_get_footer(struct l_dbus_message *msg, size_t *out_size)
+{
+       size_t size;
+
+       if (_dbus_message_is_gvariant(msg)) {
+               size = _gvariant_message_finalize(msg->header_end,
+                                               msg->body, msg->body_size,
+                                               msg->signature);
+               size -= msg->header_size;
+       } else
+               size = msg->body_size;
+
+       if (out_size)
+               *out_size = size;
+
+       return msg->body;
+}
+
+int *_dbus_message_get_fds(struct l_dbus_message *msg, uint32_t *num_fds)
+{
+       *num_fds = msg->num_fds;
+
+       return msg->fds;
+}
+
+void _dbus_message_set_serial(struct l_dbus_message *msg, uint32_t serial)
+{
+       struct dbus_header *hdr = msg->header;
+
+       hdr->dbus1.serial = serial;
+}
+
+uint32_t _dbus_message_get_serial(struct l_dbus_message *msg)
+{
+       struct dbus_header *hdr = msg->header;
+
+       return hdr->dbus1.serial;
+}
+
+LIB_EXPORT bool l_dbus_message_set_no_reply(struct l_dbus_message *msg, bool on)
+{
+       struct dbus_header *hdr;
+
+       if (unlikely(!msg))
+               return false;
+
+       hdr = msg->header;
+
+       if (on)
+               hdr->flags |= DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED;
+       else
+               hdr->flags &= ~DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_message_get_no_reply(struct l_dbus_message *msg)
+{
+       struct dbus_header *hdr;
+
+       if (unlikely(!msg))
+               return false;
+
+       hdr = msg->header;
+
+       if (hdr->flags & DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED)
+               return true;
+
+       return false;
+}
+
+LIB_EXPORT bool l_dbus_message_set_no_autostart(struct l_dbus_message *msg,
+                                                       bool on)
+{
+       struct dbus_header *hdr;
+
+       if (unlikely(!msg))
+               return false;
+
+       hdr = msg->header;
+
+       if (on)
+               hdr->flags |= DBUS_MESSAGE_FLAG_NO_AUTO_START;
+       else
+               hdr->flags &= ~DBUS_MESSAGE_FLAG_NO_AUTO_START;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_message_get_no_autostart(struct l_dbus_message *msg)
+{
+       struct dbus_header *hdr;
+
+       if (unlikely(!msg))
+               return false;
+
+       hdr = msg->header;
+
+       if (hdr->flags & DBUS_MESSAGE_FLAG_NO_AUTO_START)
+               return true;
+
+       return false;
+
+}
+
+static struct l_dbus_message *message_new_common(uint8_t type, uint8_t flags,
+                                               uint8_t version)
+{
+       struct l_dbus_message *message;
+       struct dbus_header *hdr;
+
+       message = l_new(struct l_dbus_message, 1);
+       message->refcount = 1;
+
+       /*
+        * We allocate the header with the initial 12 bytes (up to the field
+        * length) so that we can store the basic information here.  For
+        * GVariant we need 16 bytes.
+        */
+       message->header_size = version == 1 ? 12 : 16;
+       message->header_end = message->header_size;
+       message->header = l_realloc(NULL, message->header_size);
+
+       hdr = message->header;
+       hdr->endian = DBUS_NATIVE_ENDIAN;
+       hdr->message_type = type;
+       hdr->flags = flags;
+       hdr->version = version;
+
+       return message;
+}
+
+struct l_dbus_message *_dbus_message_new_method_call(uint8_t version,
+                                                       const char *destination,
+                                                       const char *path,
+                                                       const char *interface,
+                                                       const char *method)
+{
+       struct l_dbus_message *message;
+
+       message = message_new_common(DBUS_MESSAGE_TYPE_METHOD_CALL, 0, version);
+
+       message->destination = l_strdup(destination);
+       message->path = l_strdup(path);
+       message->interface = l_strdup(interface);
+       message->member = l_strdup(method);
+
+       return message;
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_new_method_call(
+                                                       struct l_dbus *dbus,
+                                                       const char *destination,
+                                                       const char *path,
+                                                       const char *interface,
+                                                       const char *method)
+{
+       uint8_t version;
+
+       if (unlikely(!dbus))
+               return NULL;
+
+       version = _dbus_get_version(dbus);
+
+       return _dbus_message_new_method_call(version, destination, path,
+                                               interface, method);
+}
+
+struct l_dbus_message *_dbus_message_new_signal(uint8_t version,
+                                               const char *path,
+                                               const char *interface,
+                                               const char *name)
+{
+       struct l_dbus_message *message;
+
+       message = message_new_common(DBUS_MESSAGE_TYPE_SIGNAL,
+                                       DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED,
+                                       version);
+
+       message->path = l_strdup(path);
+       message->interface = l_strdup(interface);
+       message->member = l_strdup(name);
+
+       return message;
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_new_signal(struct l_dbus *dbus,
+                                                       const char *path,
+                                                       const char *interface,
+                                                       const char *name)
+{
+       uint8_t version;
+
+       if (unlikely(!dbus))
+               return NULL;
+
+       version = _dbus_get_version(dbus);
+
+       return _dbus_message_new_signal(version, path, interface, name);
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_new_method_return(
+                                       struct l_dbus_message *method_call)
+{
+       struct l_dbus_message *message;
+       struct dbus_header *hdr = method_call->header;
+       const char *sender;
+
+       message = message_new_common(DBUS_MESSAGE_TYPE_METHOD_RETURN,
+                                       DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED,
+                                       hdr->version);
+
+       if (!l_dbus_message_get_no_reply(method_call))
+               message->reply_serial = _dbus_message_get_serial(method_call);
+
+       sender = l_dbus_message_get_sender(method_call);
+       if (sender)
+               message->destination = l_strdup(sender);
+
+       return message;
+}
+
+struct l_dbus_message *_dbus_message_new_error(uint8_t version,
+                                               uint32_t reply_serial,
+                                               const char *destination,
+                                               const char *name,
+                                               const char *error)
+{
+       struct l_dbus_message *reply;
+
+       if (!_dbus_valid_interface(name))
+               return NULL;
+
+       reply = message_new_common(DBUS_MESSAGE_TYPE_ERROR,
+                                       DBUS_MESSAGE_FLAG_NO_REPLY_EXPECTED,
+                                       version);
+
+       reply->error_name = l_strdup(name);
+       reply->destination = l_strdup(destination);
+       reply->reply_serial = reply_serial;
+
+       if (!l_dbus_message_set_arguments(reply, "s", error)) {
+               l_dbus_message_unref(reply);
+               return NULL;
+       }
+
+       return reply;
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_new_error_valist(
+                                       struct l_dbus_message *method_call,
+                                       const char *name,
+                                       const char *format, va_list args)
+{
+       char str[1024];
+       struct dbus_header *hdr = method_call->header;
+       uint32_t reply_serial = 0;
+
+       vsnprintf(str, sizeof(str), format, args);
+
+       if (!l_dbus_message_get_no_reply(method_call))
+               reply_serial = _dbus_message_get_serial(method_call);
+
+       return _dbus_message_new_error(hdr->version, reply_serial,
+                                       l_dbus_message_get_sender(method_call),
+                                       name, str);
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_new_error(
+                                       struct l_dbus_message *method_call,
+                                       const char *name,
+                                       const char *format, ...)
+{
+       va_list args;
+       struct l_dbus_message *reply;
+
+       va_start(args, format);
+       reply = l_dbus_message_new_error_valist(method_call, name,
+                                                               format, args);
+       va_end(args);
+
+       return reply;
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_ref(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       __sync_fetch_and_add(&message->refcount, 1);
+
+       return message;
+}
+
+LIB_EXPORT void l_dbus_message_unref(struct l_dbus_message *message)
+{
+       unsigned int i;
+
+       if (unlikely(!message))
+               return;
+
+       if (__sync_sub_and_fetch(&message->refcount, 1))
+               return;
+
+       for (i = 0; i < message->num_fds; i++)
+               close(message->fds[i]);
+
+       if (!message->sealed) {
+               l_free(message->destination);
+               l_free(message->path);
+               l_free(message->interface);
+               l_free(message->member);
+               l_free(message->error_name);
+               l_free(message->sender);
+       }
+
+       if (message->signature_free)
+               l_free(message->signature);
+
+       l_free(message->header);
+       l_free(message->body);
+       l_free(message);
+}
+
+const char *_dbus_message_get_nth_string_argument(
+                                       struct l_dbus_message *message, int n)
+{
+       struct l_dbus_message_iter iter;
+       const char *signature, *value;
+       void *body;
+       size_t size;
+       char type;
+       bool (*skip_entry)(struct l_dbus_message_iter *);
+       bool (*get_basic)(struct l_dbus_message_iter *, char, void *);
+
+       signature = l_dbus_message_get_signature(message);
+       body = _dbus_message_get_body(message, &size);
+
+       if (!signature)
+               return NULL;
+
+       if (_dbus_message_is_gvariant(message)) {
+               if (!_gvariant_iter_init(&iter, message, signature, NULL,
+                                               body, size))
+                       return NULL;
+
+               skip_entry = _gvariant_iter_skip_entry;
+               get_basic = _gvariant_iter_next_entry_basic;
+       } else {
+               _dbus1_iter_init(&iter, message, signature, NULL, body, size);
+
+               skip_entry = _dbus1_iter_skip_entry;
+               get_basic = _dbus1_iter_next_entry_basic;
+       }
+
+       while (n--)
+               if (!skip_entry(&iter))
+                       return NULL;
+
+       if (!iter.sig_start)
+               return NULL;
+
+       type = iter.sig_start[iter.sig_pos];
+       if (!strchr("sog", type))
+               return NULL;
+
+       if (!get_basic(&iter, type, &value))
+               return NULL;
+
+       return value;
+}
+
+static bool message_iter_next_entry_valist(struct l_dbus_message_iter *orig,
+                                               va_list args)
+{
+       static const char *simple_types = "sogybnqiuxtd";
+       struct l_dbus_message_iter *iter = orig;
+       const char *signature = orig->sig_start + orig->sig_pos;
+       const char *end;
+       struct l_dbus_message_iter *sub_iter;
+       struct l_dbus_message_iter stack[DBUS_MAX_NESTING];
+       unsigned int indent = 0;
+       uint32_t uint32_val;
+       int fd;
+       void *arg;
+       bool (*get_basic)(struct l_dbus_message_iter *, char ,void *);
+       bool (*enter_struct)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+       bool (*enter_array)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+       bool (*enter_variant)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+
+       if (_dbus_message_is_gvariant(orig->message)) {
+               get_basic = _gvariant_iter_next_entry_basic;
+               enter_struct = _gvariant_iter_enter_struct;
+               enter_array = _gvariant_iter_enter_array;
+               enter_variant = _gvariant_iter_enter_variant;
+       } else {
+               get_basic = _dbus1_iter_next_entry_basic;
+               enter_struct = _dbus1_iter_enter_struct;
+               enter_array = _dbus1_iter_enter_array;
+               enter_variant = _dbus1_iter_enter_variant;
+       }
+
+       while (signature < orig->sig_start + orig->sig_len) {
+               if (strchr(simple_types, *signature)) {
+                       arg = va_arg(args, void *);
+                       if (!get_basic(iter, *signature, arg))
+                               return false;
+
+                       signature += 1;
+                       continue;
+               }
+
+               switch (*signature) {
+               case 'h':
+                       if (!get_basic(iter, 'h', &uint32_val))
+                               return false;
+
+                       if (uint32_val < iter->message->num_fds)
+                               fd = fcntl(iter->message->fds[uint32_val],
+                                               F_DUPFD_CLOEXEC, 3);
+                       else
+                               fd = -1;
+
+                       *va_arg(args, int *) = fd;
+                       signature += 1;
+                       break;
+               case '(':
+               case '{':
+                       signature += 1;
+                       indent += 1;
+
+                       if (indent > DBUS_MAX_NESTING)
+                               return false;
+
+                       if (!enter_struct(iter, &stack[indent - 1]))
+                               return false;
+
+                       iter = &stack[indent - 1];
+
+                       break;
+               case ')':
+               case '}':
+                       /*
+                        * Sanity check in case of an unmatched paren/brace
+                        * that isn't caught elsewhere.
+                        */
+                       if (unlikely(indent == 0))
+                               return false;
+
+                       signature += 1;
+                       indent -= 1;
+
+                       if (indent == 0)
+                               iter = orig;
+                       else
+                               iter = &stack[indent - 1];
+                       break;
+               case 'a':
+                       sub_iter = va_arg(args, void *);
+
+                       if (!enter_array(iter, sub_iter))
+                               return false;
+
+                       end = _dbus_signature_end(signature + 1);
+                       signature = end + 1;
+                       break;
+               case 'v':
+                       sub_iter = va_arg(args, void *);
+
+                       if (!enter_variant(iter, sub_iter))
+                               return false;
+
+                       signature += 1;
+                       break;
+               default:
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+static inline bool message_iter_next_entry(struct l_dbus_message_iter *iter,
+                                               ...)
+{
+       va_list args;
+       bool result;
+
+        va_start(args, iter);
+       result = message_iter_next_entry_valist(iter, args);
+       va_end(args);
+
+       return result;
+}
+
+static bool get_header_field_from_iter_valist(struct l_dbus_message *message,
+                                               uint8_t type, char data_type,
+                                               va_list args)
+{
+       struct l_dbus_message_iter header;
+       struct l_dbus_message_iter array, iter;
+       uint8_t endian, message_type, flags, version;
+       uint32_t body_length, serial;
+       bool found;
+
+       if (!message->sealed)
+               return false;
+
+       if (_dbus_message_is_gvariant(message)) {
+               uint64_t field_type;
+
+               if (!_gvariant_iter_init(&header, message, "a(tv)", NULL,
+                                               message->header + 16,
+                                               message->header_end - 16))
+                       return false;
+
+               if (!_gvariant_iter_enter_array(&header, &array))
+                       return false;
+
+               while ((found = message_iter_next_entry(&array,
+                                                       &field_type, &iter)))
+                       if (field_type == type)
+                               break;
+       } else {
+               uint8_t field_type;
+
+               _dbus1_iter_init(&header, message, "yyyyuua(yv)", NULL,
+                               message->header, message->header_size);
+
+               if (!message_iter_next_entry(&header, &endian,
+                                               &message_type, &flags, &version,
+                                               &body_length, &serial, &array))
+                       return false;
+
+               while ((found = message_iter_next_entry(&array,
+                                                       &field_type, &iter)))
+                       if (field_type == type)
+                               break;
+       }
+
+       if (!found)
+               return false;
+
+       if (iter.sig_start[iter.sig_pos] != data_type)
+               return false;
+
+       return message_iter_next_entry_valist(&iter, args);
+}
+
+static inline bool get_header_field(struct l_dbus_message *message,
+                                       uint8_t type, int data_type, ...)
+{
+       va_list args;
+       bool result;
+
+       va_start(args, data_type);
+       result = get_header_field_from_iter_valist(message, type, data_type,
+                                                       args);
+       va_end(args);
+
+       return result;
+}
+
+static bool valid_header(const struct dbus_header *hdr)
+{
+       if (hdr->endian != DBUS_MESSAGE_LITTLE_ENDIAN &&
+                       hdr->endian != DBUS_MESSAGE_BIG_ENDIAN)
+               return false;
+
+       if (hdr->message_type < DBUS_MESSAGE_TYPE_METHOD_CALL ||
+                       hdr->message_type > DBUS_MESSAGE_TYPE_SIGNAL)
+               return false;
+
+       if (hdr->version != 1 && hdr->version != 2)
+               return false;
+
+       if (hdr->version == 1) {
+               if (hdr->dbus1.serial == 0)
+                       return false;
+       }
+
+       return true;
+}
+
+unsigned int _dbus_message_unix_fds_from_header(const void *data, size_t size)
+{
+       struct l_dbus_message message;
+       uint32_t unix_fds;
+
+       message.header = (uint8_t *) data;
+       message.header_size = size;
+       message.body_size = 0;
+       message.sealed = true;
+
+       if (!get_header_field(&message, DBUS_MESSAGE_FIELD_UNIX_FDS,
+                               'u', &unix_fds))
+               return 0;
+
+       return unix_fds;
+}
+
+struct l_dbus_message *dbus_message_from_blob(const void *data, size_t size,
+                                               int fds[], uint32_t num_fds)
+{
+       const struct dbus_header *hdr = data;
+       struct l_dbus_message *message;
+       size_t body_pos;
+       unsigned int i;
+
+       if (unlikely(size < DBUS_HEADER_SIZE))
+               return NULL;
+
+       message = l_new(struct l_dbus_message, 1);
+
+       message->refcount = 1;
+
+       if (hdr->version == 1) {
+               message->header_size = align_len(DBUS_HEADER_SIZE +
+                                               hdr->dbus1.field_length, 8);
+               message->body_size = hdr->dbus1.body_length;
+
+               if (message->header_size + message->body_size < size)
+                       goto free;
+
+               body_pos = message->header_size;
+       } else {
+               struct l_dbus_message_iter iter;
+               struct l_dbus_message_iter header, variant, body;
+
+               /*
+                * GVariant message structure as per
+                * https://wiki.gnome.org/Projects/GLib/GDBus/Version2
+                * is "(yyyyuta{tv}v)".  As noted this is equivalent to
+                * some other types, this one lets us get iterators for
+                * the header and the body in the fewest steps.
+                */
+               if (!_gvariant_iter_init(&iter, message, "(yyyyuta{tv})v",
+                                               NULL, data, size))
+                       goto free;
+
+               if (!_gvariant_iter_enter_struct(&iter, &header))
+                       goto free;
+
+               if (!_gvariant_iter_enter_variant(&iter, &variant))
+                       goto free;
+
+               if (!_gvariant_iter_enter_struct(&variant, &body))
+                       goto free;
+
+               message->header_size = align_len(header.len - header.pos, 8);
+               message->body_size = body.len - body.pos;
+               message->signature = l_strndup(body.sig_start + body.sig_pos,
+                                               body.sig_len - body.sig_pos);
+               message->signature_free = true;
+               message->header_end = header.len;
+               body_pos = body.data + body.pos - data;
+       }
+
+       message->header = l_malloc(message->header_size);
+       message->body = l_malloc(message->body_size);
+
+       memcpy(message->header, data, message->header_size);
+       memcpy(message->body, data + body_pos, message->body_size);
+
+       message->sealed = true;
+
+       /* If the field is absent message->signature will remain NULL */
+       if (hdr->version == 1)
+               get_header_field(message, DBUS_MESSAGE_FIELD_SIGNATURE,
+                                       'g', &message->signature);
+
+       if (num_fds) {
+               uint32_t unix_fds, orig_fds = num_fds;
+
+               if (!get_header_field(message, DBUS_MESSAGE_FIELD_UNIX_FDS,
+                                       'u', &unix_fds))
+                       goto free;
+
+               if (num_fds > unix_fds)
+                       num_fds = unix_fds;
+
+               if (num_fds > L_ARRAY_SIZE(message->fds))
+                       num_fds = L_ARRAY_SIZE(message->fds);
+
+               for (i = num_fds; i < orig_fds; i++)
+                       close(fds[i]);
+
+               message->num_fds = num_fds;
+               memcpy(message->fds, fds, num_fds * sizeof(int));
+       }
+
+       return message;
+
+free:
+       l_dbus_message_unref(message);
+
+       return NULL;
+}
+
+struct l_dbus_message *dbus_message_build(void *header, size_t header_size,
+                                               void *body, size_t body_size,
+                                               int fds[], uint32_t num_fds)
+{
+       const struct dbus_header *hdr = header;
+       struct l_dbus_message *message;
+       unsigned int i;
+
+       if (unlikely(header_size < DBUS_HEADER_SIZE))
+               return NULL;
+
+       if (unlikely(!valid_header(hdr)))
+               return NULL;
+
+       /*
+        * With GVariant we need to know the signature, use
+        * dbus_message_from_blob instead.
+        */
+       if (unlikely(hdr->version != 1))
+               return NULL;
+
+       message = l_new(struct l_dbus_message, 1);
+
+       message->refcount = 1;
+       message->header_size = header_size;
+       message->header = header;
+       message->body_size = body_size;
+       message->body = body;
+       message->sealed = true;
+
+       if (num_fds) {
+               uint32_t unix_fds, orig_fds = num_fds;
+
+               if (!get_header_field(message, DBUS_MESSAGE_FIELD_UNIX_FDS,
+                                       'u', &unix_fds)) {
+                       l_free(message);
+                       return NULL;
+               }
+
+               if (num_fds > unix_fds)
+                       num_fds = unix_fds;
+
+               if (num_fds > L_ARRAY_SIZE(message->fds))
+                       num_fds = L_ARRAY_SIZE(message->fds);
+
+               for (i = num_fds; i < orig_fds; i++)
+                       close(fds[i]);
+
+               message->num_fds = num_fds;
+               memcpy(message->fds, fds, num_fds * sizeof(int));
+       }
+
+       /* If the field is absent message->signature will remain NULL */
+       get_header_field(message, DBUS_MESSAGE_FIELD_SIGNATURE, 'g',
+                                               &message->signature);
+
+       return message;
+}
+
+bool dbus_message_compare(struct l_dbus_message *message,
+                                       const void *data, size_t size)
+{
+       struct l_dbus_message *other;
+       bool ret = false;
+
+       other = dbus_message_from_blob(data, size, NULL, 0);
+
+       if (message->signature) {
+               if (!other->signature)
+                       goto done;
+
+               if (strcmp(message->signature, other->signature))
+                       goto done;
+       } else {
+               if (other->signature)
+                       goto done;
+       }
+
+       if (message->body_size != other->body_size)
+               goto done;
+
+       if (message->header_size != other->header_size)
+               goto done;
+
+       ret = !memcmp(message->body, other->body, message->body_size);
+
+done:
+       l_dbus_message_unref(other);
+
+       return ret;
+}
+
+struct builder_driver {
+       bool (*append_basic)(struct dbus_builder *, char, const void *);
+       bool (*enter_struct)(struct dbus_builder *, const char *);
+       bool (*leave_struct)(struct dbus_builder *);
+       bool (*enter_dict)(struct dbus_builder *, const char *);
+       bool (*leave_dict)(struct dbus_builder *);
+       bool (*enter_array)(struct dbus_builder *, const char *);
+       bool (*leave_array)(struct dbus_builder *);
+       bool (*enter_variant)(struct dbus_builder *, const char *);
+       bool (*leave_variant)(struct dbus_builder *);
+       char *(*finish)(struct dbus_builder *, void **, size_t *);
+       bool (*mark)(struct dbus_builder *);
+       bool (*rewind)(struct dbus_builder *);
+       struct dbus_builder *(*new)(void *, size_t);
+       void (*free)(struct dbus_builder *);
+};
+
+static struct builder_driver dbus1_driver = {
+       .append_basic = _dbus1_builder_append_basic,
+       .enter_struct = _dbus1_builder_enter_struct,
+       .leave_struct = _dbus1_builder_leave_struct,
+       .enter_dict = _dbus1_builder_enter_dict,
+       .leave_dict = _dbus1_builder_leave_dict,
+       .enter_variant = _dbus1_builder_enter_variant,
+       .leave_variant = _dbus1_builder_leave_variant,
+       .enter_array = _dbus1_builder_enter_array,
+       .leave_array = _dbus1_builder_leave_array,
+       .finish = _dbus1_builder_finish,
+       .mark = _dbus1_builder_mark,
+       .rewind = _dbus1_builder_rewind,
+       .new = _dbus1_builder_new,
+       .free = _dbus1_builder_free,
+};
+
+static struct builder_driver gvariant_driver = {
+       .append_basic = _gvariant_builder_append_basic,
+       .enter_struct = _gvariant_builder_enter_struct,
+       .leave_struct = _gvariant_builder_leave_struct,
+       .enter_dict = _gvariant_builder_enter_dict,
+       .leave_dict = _gvariant_builder_leave_dict,
+       .enter_variant = _gvariant_builder_enter_variant,
+       .leave_variant = _gvariant_builder_leave_variant,
+       .enter_array = _gvariant_builder_enter_array,
+       .leave_array = _gvariant_builder_leave_array,
+       .finish = _gvariant_builder_finish,
+       .mark = _gvariant_builder_mark,
+       .rewind = _gvariant_builder_rewind,
+       .new = _gvariant_builder_new,
+       .free = _gvariant_builder_free,
+};
+
+static void add_field(struct dbus_builder *builder,
+                       struct builder_driver *driver,
+                       uint8_t field, const char *type, const void *value)
+{
+       if (driver == &gvariant_driver) {
+               uint64_t long_field = field;
+
+               driver->enter_struct(builder, "tv");
+               driver->append_basic(builder, 't', &long_field);
+       } else {
+               driver->enter_struct(builder, "yv");
+               driver->append_basic(builder, 'y', &field);
+       }
+       driver->enter_variant(builder, type);
+       driver->append_basic(builder, type[0], value);
+       driver->leave_variant(builder);
+       driver->leave_struct(builder);
+}
+
+static void build_header(struct l_dbus_message *message, const char *signature)
+{
+       struct dbus_builder *builder;
+       struct builder_driver *driver;
+       char *generated_signature;
+       size_t header_size;
+       bool gvariant;
+
+       gvariant = _dbus_message_is_gvariant(message);
+
+       if (gvariant)
+               driver = &gvariant_driver;
+       else
+               driver = &dbus1_driver;
+
+       builder = driver->new(message->header, message->header_size);
+
+       driver->enter_array(builder, gvariant ? "(tv)" : "(yv)");
+
+       if (message->path) {
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_PATH,
+                                       "o", message->path);
+               l_free(message->path);
+               message->path = NULL;
+       }
+
+       if (message->member) {
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_MEMBER,
+                                       "s", message->member);
+               l_free(message->member);
+               message->member = NULL;
+       }
+
+       if (message->interface) {
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_INTERFACE,
+                                       "s", message->interface);
+               l_free(message->interface);
+               message->interface = NULL;
+       }
+
+       if (message->destination) {
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_DESTINATION,
+                                       "s", message->destination);
+               l_free(message->destination);
+               message->destination = NULL;
+       }
+
+       if (message->error_name != 0) {
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_ERROR_NAME,
+                                       "s", message->error_name);
+               l_free(message->error_name);
+               message->error_name = NULL;
+       }
+
+       if (message->reply_serial != 0) {
+               if (gvariant) {
+                       uint64_t reply_serial = message->reply_serial;
+
+                       add_field(builder, driver,
+                                       DBUS_MESSAGE_FIELD_REPLY_SERIAL,
+                                       "t", &reply_serial);
+               } else {
+                       add_field(builder, driver,
+                                       DBUS_MESSAGE_FIELD_REPLY_SERIAL,
+                                       "u", &message->reply_serial);
+               }
+
+               message->reply_serial = 0;
+       }
+
+       if (message->sender) {
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_SENDER,
+                                       "s", message->sender);
+               l_free(message->sender);
+               message->sender = NULL;
+       }
+
+       if (signature[0] != '\0' && !gvariant)
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_SIGNATURE,
+                               "g", signature);
+
+       if (message->num_fds)
+               add_field(builder, driver, DBUS_MESSAGE_FIELD_UNIX_FDS,
+                                       "u", &message->num_fds);
+
+       driver->leave_array(builder);
+
+       generated_signature = driver->finish(builder, &message->header,
+                                               &header_size);
+       l_free(generated_signature);
+
+       driver->free(builder);
+
+       if (!_dbus_message_is_gvariant(message)) {
+               struct dbus_header *hdr = message->header;
+
+               hdr->dbus1.body_length = message->body_size;
+       }
+
+       /* We must align the end of the header to an 8-byte boundary */
+       message->header_size = align_len(header_size, 8);
+       message->header = l_realloc(message->header, message->header_size);
+       memset(message->header + header_size, 0,
+                       message->header_size - header_size);
+       message->header_end = header_size;
+}
+
+struct container {
+       char type;
+       const char *sig_start;
+       const char *sig_end;
+       unsigned int n_items;
+};
+
+static bool append_arguments(struct l_dbus_message *message,
+                                       const char *signature, va_list args)
+{
+       struct l_dbus_message_builder *builder;
+       bool ret;
+
+       builder = l_dbus_message_builder_new(message);
+       if (!builder)
+               return false;
+
+       if (!l_dbus_message_builder_append_from_valist(builder, signature,
+                                                                       args)) {
+               l_dbus_message_builder_destroy(builder);
+               return false;
+       }
+
+       l_dbus_message_builder_finalize(builder);
+
+       ret = strcmp(signature, builder->message->signature) == 0;
+
+       l_dbus_message_builder_destroy(builder);
+
+       return ret;
+}
+
+LIB_EXPORT bool l_dbus_message_get_error(struct l_dbus_message *message,
+                                       const char **name, const char **text)
+{
+       struct dbus_header *hdr;
+       const char *str;
+
+       if (unlikely(!message))
+               return false;
+
+       hdr = message->header;
+
+       if (hdr->message_type != DBUS_MESSAGE_TYPE_ERROR)
+               return false;
+
+       if (!message->signature)
+               return false;
+
+       if (message->signature[0] != 's')
+               return false;
+
+       str = _dbus_message_get_nth_string_argument(message, 0);
+       if (!str)
+               return false;
+
+       if (!message->error_name)
+               get_header_field(message, DBUS_MESSAGE_FIELD_ERROR_NAME, 's',
+                                       &message->error_name);
+
+       if (name)
+               *name = message->error_name;
+
+       if (text)
+               *text = str;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_message_is_error(struct l_dbus_message *message)
+{
+       struct dbus_header *hdr;
+
+       if (unlikely(!message))
+               return false;
+
+       hdr = message->header;
+       return hdr->message_type == DBUS_MESSAGE_TYPE_ERROR;
+}
+
+LIB_EXPORT bool l_dbus_message_get_arguments_valist(
+                                       struct l_dbus_message *message,
+                                       const char *signature, va_list args)
+{
+       struct l_dbus_message_iter iter;
+
+       if (unlikely(!message))
+               return false;
+
+       if (!message->signature) {
+               /* An empty signature is valid */
+               if (!signature || *signature == '\0')
+                       return true;
+
+               return false;
+       }
+
+       if (!signature || strcmp(message->signature, signature))
+               return false;
+
+       if (_dbus_message_is_gvariant(message)) {
+               if (!_gvariant_iter_init(&iter, message, message->signature,
+                                               NULL, message->body,
+                                               message->body_size))
+                       return false;
+       } else
+               _dbus1_iter_init(&iter, message, message->signature, NULL,
+                               message->body, message->body_size);
+
+       return message_iter_next_entry_valist(&iter, args);
+}
+
+LIB_EXPORT bool l_dbus_message_get_arguments(struct l_dbus_message *message,
+                                               const char *signature, ...)
+{
+       va_list args;
+       bool result;
+
+       va_start(args, signature);
+       result = l_dbus_message_get_arguments_valist(message, signature, args);
+       va_end(args);
+
+       return result;
+}
+
+LIB_EXPORT bool l_dbus_message_set_arguments(struct l_dbus_message *message,
+                                               const char *signature, ...)
+{
+       va_list args;
+       bool result;
+
+       if (unlikely(!message))
+               return false;
+
+       if (unlikely(message->sealed))
+               return false;
+
+       if (!signature)
+               return true;
+
+       va_start(args, signature);
+       result = append_arguments(message, signature, args);
+       va_end(args);
+
+       return result;
+}
+
+LIB_EXPORT bool l_dbus_message_set_arguments_valist(
+                                       struct l_dbus_message *message,
+                                       const char *signature, va_list args)
+{
+       bool result;
+
+       if (unlikely(!message))
+               return false;
+
+       if (!signature)
+               return true;
+
+       result = append_arguments(message, signature, args);
+
+       return result;
+}
+
+LIB_EXPORT const char *l_dbus_message_get_path(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       if (!message->path && message->sealed)
+               get_header_field(message, DBUS_MESSAGE_FIELD_PATH, 'o',
+                                       &message->path);
+
+       return message->path;
+}
+
+LIB_EXPORT const char *l_dbus_message_get_interface(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       if (!message->interface && message->sealed)
+               get_header_field(message, DBUS_MESSAGE_FIELD_INTERFACE, 's',
+                                       &message->interface);
+
+       return message->interface;
+}
+
+LIB_EXPORT const char *l_dbus_message_get_member(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       if (!message->member && message->sealed)
+               get_header_field(message, DBUS_MESSAGE_FIELD_MEMBER, 's',
+                                       &message->member);
+
+       return message->member;
+}
+
+LIB_EXPORT const char *l_dbus_message_get_destination(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       if (!message->destination && message->sealed)
+               get_header_field(message, DBUS_MESSAGE_FIELD_DESTINATION, 's',
+                                                       &message->destination);
+
+       return message->destination;
+}
+
+LIB_EXPORT const char *l_dbus_message_get_sender(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       if (!message->sender && message->sealed)
+               get_header_field(message, DBUS_MESSAGE_FIELD_SENDER, 's',
+                                       &message->sender);
+
+       return message->sender;
+}
+
+LIB_EXPORT const char *l_dbus_message_get_signature(
+                                               struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return NULL;
+
+       return message->signature;
+}
+
+uint32_t _dbus_message_get_reply_serial(struct l_dbus_message *message)
+{
+       if (unlikely(!message))
+               return 0;
+
+       if (message->reply_serial == 0 && message->sealed) {
+               if (_dbus_message_is_gvariant(message)) {
+                       uint64_t reply_serial = 0;
+
+                       get_header_field(message,
+                                       DBUS_MESSAGE_FIELD_REPLY_SERIAL, 't',
+                                       &reply_serial);
+
+                       message->reply_serial = reply_serial;
+               } else
+                       get_header_field(message,
+                                       DBUS_MESSAGE_FIELD_REPLY_SERIAL, 'u',
+                                       &message->reply_serial);
+       }
+
+       return message->reply_serial;
+}
+
+enum dbus_message_type _dbus_message_get_type(struct l_dbus_message *message)
+{
+       struct dbus_header *header;
+
+       header = message->header;
+       return header->message_type;
+}
+
+const char * _dbus_message_get_type_as_string(struct l_dbus_message *message)
+{
+       struct dbus_header *header;
+
+       header = message->header;
+
+       switch (header->message_type) {
+       case DBUS_MESSAGE_TYPE_METHOD_CALL:
+               return "method_call";
+       case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+               return "method_return";
+       case DBUS_MESSAGE_TYPE_ERROR:
+               return "error";
+       case DBUS_MESSAGE_TYPE_SIGNAL:
+               return "signal";
+       }
+
+       return NULL;
+}
+
+uint8_t _dbus_message_get_endian(struct l_dbus_message *message)
+{
+       struct dbus_header *header = message->header;
+
+       return header->endian;
+}
+
+uint8_t _dbus_message_get_version(struct l_dbus_message *message)
+{
+       struct dbus_header *header = message->header;
+
+       return header->version;
+}
+
+LIB_EXPORT bool l_dbus_message_iter_next_entry(struct l_dbus_message_iter *iter,
+                                                                       ...)
+{
+       va_list args;
+       bool result;
+
+       if (unlikely(!iter))
+               return false;
+
+       va_start(args, iter);
+       result = message_iter_next_entry_valist(iter, args);
+       va_end(args);
+
+       return result;
+}
+
+LIB_EXPORT bool l_dbus_message_iter_get_variant(
+                                       struct l_dbus_message_iter *iter,
+                                       const char *signature, ...)
+{
+       va_list args;
+       bool result;
+
+       if (unlikely(!iter))
+               return false;
+
+       if (!iter->sig_start || strlen(signature) != iter->sig_len ||
+                       memcmp(iter->sig_start, signature, iter->sig_len))
+               return false;
+
+       va_start(args, signature);
+       result = message_iter_next_entry_valist(iter, args);
+       va_end(args);
+
+       return result;
+}
+
+LIB_EXPORT bool l_dbus_message_iter_get_fixed_array(
+                                       struct l_dbus_message_iter *iter,
+                                       void *out, uint32_t *n_elem)
+{
+       if (unlikely(!iter))
+               return false;
+
+       if (_dbus_message_is_gvariant(iter->message))
+               return false;
+
+       return _dbus1_iter_get_fixed_array(iter, out, n_elem);
+}
+
+void _dbus_message_set_sender(struct l_dbus_message *message,
+                                       const char *sender)
+{
+       if (!_dbus_message_is_gvariant(message))
+               return;
+
+       l_free(message->sender);
+
+       message->sender = l_strdup(sender);
+}
+
+void _dbus_message_set_destination(struct l_dbus_message *message,
+                                       const char *destination)
+{
+       if (!_dbus_message_is_gvariant(message))
+               return;
+
+       l_free(message->destination);
+
+       message->destination = l_strdup(destination);
+}
+
+LIB_EXPORT struct l_dbus_message_builder *l_dbus_message_builder_new(
+                                               struct l_dbus_message *message)
+{
+       struct l_dbus_message_builder *ret;
+
+       if (unlikely(!message))
+               return NULL;
+
+       if (message->sealed)
+               return NULL;
+
+       ret = l_new(struct l_dbus_message_builder, 1);
+       ret->message = l_dbus_message_ref(message);
+
+       if (_dbus_message_is_gvariant(message))
+               ret->driver = &gvariant_driver;
+       else
+               ret->driver = &dbus1_driver;
+
+       ret->builder = ret->driver->new(NULL, 0);
+
+       return ret;
+}
+
+LIB_EXPORT void l_dbus_message_builder_destroy(
+                                       struct l_dbus_message_builder *builder)
+{
+       if (unlikely(!builder))
+               return;
+
+       builder->driver->free(builder->builder);
+       l_dbus_message_unref(builder->message);
+
+       l_free(builder);
+}
+
+LIB_EXPORT bool l_dbus_message_builder_append_basic(
+                                       struct l_dbus_message_builder *builder,
+                                       char type, const void *value)
+{
+       if (unlikely(!builder))
+               return false;
+
+       return builder->driver->append_basic(builder->builder, type, value);
+}
+
+LIB_EXPORT bool l_dbus_message_builder_enter_container(
+                                       struct l_dbus_message_builder *builder,
+                                       char container_type,
+                                       const char *signature)
+{
+       if (unlikely(!builder))
+               return false;
+
+       switch (container_type) {
+       case DBUS_CONTAINER_TYPE_ARRAY:
+               return builder->driver->enter_array(builder->builder,
+                                                               signature);
+       case DBUS_CONTAINER_TYPE_DICT_ENTRY:
+               return builder->driver->enter_dict(builder->builder, signature);
+       case DBUS_CONTAINER_TYPE_STRUCT:
+               return builder->driver->enter_struct(builder->builder,
+                                                               signature);
+       case DBUS_CONTAINER_TYPE_VARIANT:
+               return builder->driver->enter_variant(builder->builder,
+                                                               signature);
+       default:
+               break;
+       }
+
+       return false;
+}
+
+LIB_EXPORT bool l_dbus_message_builder_leave_container(
+                                       struct l_dbus_message_builder *builder,
+                                       char container_type)
+{
+       if (unlikely(!builder))
+               return false;
+
+       switch (container_type) {
+       case DBUS_CONTAINER_TYPE_ARRAY:
+               return builder->driver->leave_array(builder->builder);
+       case DBUS_CONTAINER_TYPE_DICT_ENTRY:
+               return builder->driver->leave_dict(builder->builder);
+       case DBUS_CONTAINER_TYPE_STRUCT:
+               return builder->driver->leave_struct(builder->builder);
+       case DBUS_CONTAINER_TYPE_VARIANT:
+               return builder->driver->leave_variant(builder->builder);
+       default:
+               break;
+       }
+
+       return false;
+}
+
+LIB_EXPORT bool l_dbus_message_builder_enter_struct(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature)
+{
+       return l_dbus_message_builder_enter_container(builder, 'r', signature);
+}
+
+LIB_EXPORT bool l_dbus_message_builder_leave_struct(
+                                       struct l_dbus_message_builder *builder)
+{
+       return l_dbus_message_builder_leave_container(builder, 'r');
+}
+
+LIB_EXPORT bool l_dbus_message_builder_enter_array(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature)
+{
+       return l_dbus_message_builder_enter_container(builder, 'a', signature);
+}
+
+LIB_EXPORT bool l_dbus_message_builder_leave_array(
+                                       struct l_dbus_message_builder *builder)
+{
+       return l_dbus_message_builder_leave_container(builder, 'a');
+}
+
+LIB_EXPORT bool l_dbus_message_builder_enter_dict(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature)
+{
+       return l_dbus_message_builder_enter_container(builder, 'e', signature);
+}
+
+LIB_EXPORT bool l_dbus_message_builder_leave_dict(
+                                       struct l_dbus_message_builder *builder)
+{
+       return l_dbus_message_builder_leave_container(builder, 'e');
+}
+
+LIB_EXPORT bool l_dbus_message_builder_enter_variant(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature)
+{
+       return l_dbus_message_builder_enter_container(builder, 'v', signature);
+}
+
+LIB_EXPORT bool l_dbus_message_builder_leave_variant(
+                                       struct l_dbus_message_builder *builder)
+{
+       return l_dbus_message_builder_leave_container(builder, 'v');
+}
+
+/**
+ * l_dbus_message_builder_append_from_iter:
+ * @builder: message builder to receive a new value
+ * @from: message iterator to have its position moved by one value
+ *
+ * Copy one value from a message iterator onto a message builder.  The
+ * value's signature is also copied.
+ *
+ * Returns: whether the value was correctly copied.  On failure both
+ *          the @from iterator and the @builder may have their positions
+ *          moved to somewhere within the new value if it's of a
+ *          container type.
+ **/
+LIB_EXPORT bool l_dbus_message_builder_append_from_iter(
+                                       struct l_dbus_message_builder *builder,
+                                       struct l_dbus_message_iter *from)
+{
+       static const char *simple_types = "sogybnqiuxtd";
+       char type = from->sig_start[from->sig_pos];
+       char container_type;
+       char signature[256];
+       struct l_dbus_message_iter iter;
+       void *basic_ptr;
+       uint64_t basic;
+       uint32_t uint32_val;
+       bool (*get_basic)(struct l_dbus_message_iter *, char, void *);
+       bool (*enter_func)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+       bool (*enter_struct)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+       bool (*enter_array)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+       bool (*enter_variant)(struct l_dbus_message_iter *,
+                               struct l_dbus_message_iter *);
+
+       if (_dbus_message_is_gvariant(from->message)) {
+               get_basic = _gvariant_iter_next_entry_basic;
+               enter_struct = _gvariant_iter_enter_struct;
+               enter_array = _gvariant_iter_enter_array;
+               enter_variant = _gvariant_iter_enter_variant;
+       } else {
+               get_basic = _dbus1_iter_next_entry_basic;
+               enter_struct = _dbus1_iter_enter_struct;
+               enter_array = _dbus1_iter_enter_array;
+               enter_variant = _dbus1_iter_enter_variant;
+       }
+
+       if (strchr(simple_types, type)) {
+               if (strchr("sog", type)) {
+                       if (!get_basic(from, type, &basic_ptr))
+                               return false;
+               } else {
+                       basic_ptr = &basic;
+
+                       if (!get_basic(from, type, basic_ptr))
+                               return false;
+               }
+
+               if (!l_dbus_message_builder_append_basic(builder, type,
+                                                               basic_ptr))
+                       return false;
+
+               return true;
+       }
+
+       switch (type) {
+       case 'h':
+               if (!get_basic(from, type, &uint32_val))
+                       return false;
+
+               if (!l_dbus_message_builder_append_basic(builder, type,
+                                               &builder->message->num_fds))
+                       return false;
+
+               if (builder->message->num_fds <
+                               L_ARRAY_SIZE(builder->message->fds)) {
+                       int fd;
+
+                       if (uint32_val < from->message->num_fds)
+                               fd = fcntl(from->message->fds[uint32_val],
+                                               F_DUPFD_CLOEXEC, 3);
+                       else
+                               fd = -1;
+
+                       builder->message->fds[builder->message->num_fds++] = fd;
+               }
+
+               return true;
+       case '(':
+               enter_func = enter_struct;
+               container_type = DBUS_CONTAINER_TYPE_STRUCT;
+               break;
+       case '{':
+               enter_func = enter_struct;
+               container_type = DBUS_CONTAINER_TYPE_DICT_ENTRY;
+               break;
+       case 'a':
+               enter_func = enter_array;
+               container_type = DBUS_CONTAINER_TYPE_ARRAY;
+               break;
+       case 'v':
+               enter_func = enter_variant;
+               container_type = DBUS_CONTAINER_TYPE_VARIANT;
+               break;
+       default:
+               return false;
+       }
+
+       if (!enter_func(from, &iter))
+               return false;
+
+       memcpy(signature, iter.sig_start, iter.sig_len);
+       signature[iter.sig_len] = '\0';
+
+       if (!l_dbus_message_builder_enter_container(builder,
+                                               container_type, signature))
+               return false;
+
+       if (container_type == DBUS_CONTAINER_TYPE_ARRAY)
+               while(l_dbus_message_builder_append_from_iter(builder, &iter));
+       else
+               while (iter.sig_pos < iter.sig_len)
+                       if (!l_dbus_message_builder_append_from_iter(builder,
+                                                                       &iter))
+                               return false;
+
+       if (!l_dbus_message_builder_leave_container(builder,
+                                               container_type))
+               return false;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_message_builder_append_from_valist(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature, va_list args)
+{
+       struct builder_driver *driver;
+       char subsig[256];
+       const char *sigend;
+       /* Nesting requires an extra stack entry for the base level */
+       struct container stack[DBUS_MAX_NESTING + 1];
+       unsigned int stack_index = 0;
+
+       if (unlikely(!builder))
+               return false;
+
+       driver = builder->driver;
+
+       stack[stack_index].type = DBUS_CONTAINER_TYPE_STRUCT;
+       stack[stack_index].sig_start = signature;
+       stack[stack_index].sig_end = signature + strlen(signature);
+       stack[stack_index].n_items = 0;
+
+       while (stack_index != 0 || stack[0].sig_start != stack[0].sig_end) {
+               const char *s;
+               const char *str;
+
+               if (stack[stack_index].type == DBUS_CONTAINER_TYPE_ARRAY &&
+                               stack[stack_index].n_items == 0)
+                       stack[stack_index].sig_start =
+                               stack[stack_index].sig_end;
+
+               if (stack[stack_index].sig_start ==
+                               stack[stack_index].sig_end) {
+                       bool ret;
+
+                       /*
+                        * Sanity check in case of an invalid signature that
+                        * isn't caught elsewhere.
+                        */
+                       if (unlikely(stack_index == 0))
+                               return false;
+
+                       switch (stack[stack_index].type) {
+                       case DBUS_CONTAINER_TYPE_STRUCT:
+                               ret = driver->leave_struct(builder->builder);
+                               break;
+                       case DBUS_CONTAINER_TYPE_DICT_ENTRY:
+                               ret = driver->leave_dict(builder->builder);
+                               break;
+                       case DBUS_CONTAINER_TYPE_VARIANT:
+                               ret = driver->leave_variant(builder->builder);
+                               break;
+                       case DBUS_CONTAINER_TYPE_ARRAY:
+                               ret = driver->leave_array(builder->builder);
+                               break;
+                       default:
+                               ret = false;
+                       }
+
+                       if (!ret)
+                               return false;
+
+                       stack_index -= 1;
+                       continue;
+               }
+
+               s = stack[stack_index].sig_start;
+
+               if (stack[stack_index].type != DBUS_CONTAINER_TYPE_ARRAY)
+                       stack[stack_index].sig_start += 1;
+               else
+                       stack[stack_index].n_items -= 1;
+
+               switch (*s) {
+               case 'o':
+               case 's':
+               case 'g':
+                       str = va_arg(args, const char *);
+
+                       if (!driver->append_basic(builder->builder, *s, str))
+                               return false;
+                       break;
+               case 'b':
+               case 'y':
+               {
+                       uint8_t y = (uint8_t) va_arg(args, int);
+
+                       if (!driver->append_basic(builder->builder, *s, &y))
+                               return false;
+
+                       break;
+               }
+               case 'n':
+               case 'q':
+               {
+                       uint16_t n = (uint16_t) va_arg(args, int);
+
+                       if (!driver->append_basic(builder->builder, *s, &n))
+                               return false;
+
+                       break;
+               }
+               case 'i':
+               case 'u':
+               {
+                       uint32_t u = va_arg(args, uint32_t);
+
+                       if (!driver->append_basic(builder->builder, *s, &u))
+                               return false;
+
+                       break;
+               }
+               case 'h':
+               {
+                       int fd = va_arg(args, int);
+                       struct l_dbus_message *message = builder->message;
+
+                       if (!driver->append_basic(builder->builder, *s,
+                                                       &message->num_fds))
+                               return false;
+
+                       if (message->num_fds < L_ARRAY_SIZE(message->fds))
+                               message->fds[message->num_fds++] =
+                                       fcntl(fd, F_DUPFD_CLOEXEC, 3);
+
+                       break;
+               }
+               case 'x':
+               case 't':
+               {
+                       uint64_t x = va_arg(args, uint64_t);
+
+                       if (!driver->append_basic(builder->builder, *s, &x))
+                               return false;
+                       break;
+               }
+               case 'd':
+               {
+                       double d = va_arg(args, double);
+
+                       if (!driver->append_basic(builder->builder, *s, &d))
+                               return false;
+                       break;
+               }
+               case '(':
+               case '{':
+                       if (stack_index == DBUS_MAX_NESTING)
+                               return false;
+
+                       sigend = _dbus_signature_end(s);
+                       memcpy(subsig, s + 1, sigend - s - 1);
+                       subsig[sigend - s - 1] = '\0';
+
+                       if (*s == '(' && !driver->enter_struct(builder->builder,
+                                                                       subsig))
+                               return false;
+
+                       if (*s == '{' && !driver->enter_dict(builder->builder,
+                                                                       subsig))
+                               return false;
+
+                       if (stack[stack_index].type !=
+                                       DBUS_CONTAINER_TYPE_ARRAY)
+                               stack[stack_index].sig_start = sigend + 1;
+
+                       stack_index += 1;
+                       stack[stack_index].sig_start = s + 1;
+                       stack[stack_index].sig_end = sigend;
+                       stack[stack_index].n_items = 0;
+                       stack[stack_index].type = *s == '(' ?
+                                               DBUS_CONTAINER_TYPE_STRUCT :
+                                               DBUS_CONTAINER_TYPE_DICT_ENTRY;
+
+                       break;
+               case 'v':
+                       if (stack_index == DBUS_MAX_NESTING)
+                               return false;
+
+                       str = va_arg(args, const char *);
+
+                       if (!str)
+                               return false;
+
+                       if (!driver->enter_variant(builder->builder, str))
+                               return false;
+
+                       stack_index += 1;
+                       stack[stack_index].type = DBUS_CONTAINER_TYPE_VARIANT;
+                       stack[stack_index].sig_start = str;
+                       stack[stack_index].sig_end = str + strlen(str);
+                       stack[stack_index].n_items = 0;
+
+                       break;
+               case 'a':
+                       if (stack_index == DBUS_MAX_NESTING)
+                               return false;
+
+                       sigend = _dbus_signature_end(s + 1) + 1;
+                       memcpy(subsig, s + 1, sigend - s - 1);
+                       subsig[sigend - s - 1] = '\0';
+
+                       if (!driver->enter_array(builder->builder, subsig))
+                               return false;
+
+                       if (stack[stack_index].type !=
+                                       DBUS_CONTAINER_TYPE_ARRAY)
+                               stack[stack_index].sig_start = sigend;
+
+                       stack_index += 1;
+                       stack[stack_index].sig_start = s + 1;
+                       stack[stack_index].sig_end = sigend;
+                       stack[stack_index].n_items = va_arg(args, unsigned int);
+                       stack[stack_index].type = DBUS_CONTAINER_TYPE_ARRAY;
+
+                       break;
+               default:
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+LIB_EXPORT struct l_dbus_message *l_dbus_message_builder_finalize(
+                                       struct l_dbus_message_builder *builder)
+{
+       char *generated_signature;
+
+       if (unlikely(!builder))
+               return NULL;
+
+       generated_signature = builder->driver->finish(builder->builder,
+                                               &builder->message->body,
+                                               &builder->message->body_size);
+
+       build_header(builder->message, generated_signature);
+       builder->message->sealed = true;
+       builder->message->signature = generated_signature;
+       builder->message->signature_free = true;
+
+       return builder->message;
+}
+
+bool _dbus_message_builder_mark(struct l_dbus_message_builder *builder)
+{
+       if (unlikely(!builder))
+               return false;
+
+       return builder->driver->mark(builder->builder);
+}
+
+bool _dbus_message_builder_rewind(struct l_dbus_message_builder *builder)
+{
+       if (unlikely(!builder))
+               return false;
+
+       return builder->driver->rewind(builder->builder);
+}
diff --git a/ell/dbus-name-cache.c b/ell/dbus-name-cache.c
new file mode 100644 (file)
index 0000000..cb6a516
--- /dev/null
@@ -0,0 +1,305 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "util.h"
+#include "hashmap.h"
+#include "idle.h"
+#include "dbus.h"
+#include "dbus-private.h"
+
+struct _dbus_name_cache {
+       struct l_dbus *bus;
+       struct l_hashmap *names;
+       const struct _dbus_name_ops *driver;
+       unsigned int last_watch_id;
+       struct l_idle *watch_remove_work;
+};
+
+struct service_watch {
+       l_dbus_watch_func_t connect_func;
+       l_dbus_watch_func_t disconnect_func;
+       l_dbus_destroy_func_t destroy;
+       void *user_data;
+       unsigned int id;
+       bool removed;
+       struct service_watch *next;
+};
+
+struct name_cache_entry {
+       int ref_count;
+       char *unique_name;
+       struct service_watch *watches;
+};
+
+struct _dbus_name_cache *_dbus_name_cache_new(struct l_dbus *bus,
+                                       const struct _dbus_name_ops *driver)
+{
+       struct _dbus_name_cache *cache;
+
+       cache = l_new(struct _dbus_name_cache, 1);
+
+       cache->bus = bus;
+       cache->driver = driver;
+
+       return cache;
+}
+
+static void service_watch_destroy(void *data)
+{
+       struct service_watch *watch = data;
+
+       if (watch->destroy)
+               watch->destroy(watch->user_data);
+
+       l_free(watch);
+}
+
+static void name_cache_entry_destroy(void *data)
+{
+       struct name_cache_entry *entry = data;
+       struct service_watch *watch;
+
+       while (entry->watches) {
+               watch = entry->watches;
+               entry->watches = watch->next;
+
+               service_watch_destroy(watch);
+       }
+
+       l_free(entry->unique_name);
+
+       l_free(entry);
+}
+
+void _dbus_name_cache_free(struct _dbus_name_cache *cache)
+{
+       if (!cache)
+               return;
+
+       if (cache->watch_remove_work)
+               l_idle_remove(cache->watch_remove_work);
+
+       l_hashmap_destroy(cache->names, name_cache_entry_destroy);
+
+       l_free(cache);
+}
+
+bool _dbus_name_cache_add(struct _dbus_name_cache *cache, const char *name)
+{
+       struct name_cache_entry *entry;
+
+       if (!_dbus_valid_bus_name(name))
+               return false;
+
+       if (!cache->names)
+               cache->names = l_hashmap_string_new();
+
+       entry = l_hashmap_lookup(cache->names, name);
+
+       if (!entry) {
+               entry = l_new(struct name_cache_entry, 1);
+
+               l_hashmap_insert(cache->names, name, entry);
+
+               cache->driver->get_name_owner(cache->bus, name);
+       }
+
+       entry->ref_count++;
+
+       return true;
+}
+
+bool _dbus_name_cache_remove(struct _dbus_name_cache *cache, const char *name)
+{
+       struct name_cache_entry *entry;
+
+       entry = l_hashmap_lookup(cache->names, name);
+
+       if (!entry)
+               return false;
+
+       if (--entry->ref_count)
+               return true;
+
+       l_hashmap_remove(cache->names, name);
+
+       name_cache_entry_destroy(entry);
+
+       return true;
+}
+
+const char *_dbus_name_cache_lookup(struct _dbus_name_cache *cache,
+                                       const char *name)
+{
+       struct name_cache_entry *entry;
+
+       entry = l_hashmap_lookup(cache->names, name);
+
+       if (!entry)
+               return NULL;
+
+       return entry->unique_name;
+}
+
+void _dbus_name_cache_notify(struct _dbus_name_cache *cache,
+                               const char *name, const char *owner)
+{
+       struct name_cache_entry *entry;
+       struct service_watch *watch;
+       bool prev_connected, connected;
+
+       if (!cache)
+               return;
+
+       entry = l_hashmap_lookup(cache->names, name);
+
+       if (!entry)
+               return;
+
+       prev_connected = !!entry->unique_name;
+       connected = owner && *owner != '\0';
+
+       l_free(entry->unique_name);
+
+       entry->unique_name = connected ? l_strdup(owner) : NULL;
+
+       /*
+        * This check also means we notify all watchers who have a connected
+        * callback when we first learn that the service is in fact connected.
+        */
+       if (connected == prev_connected)
+               return;
+
+       for (watch = entry->watches; watch; watch = watch->next)
+               if (connected && watch->connect_func)
+                       watch->connect_func(cache->bus, watch->user_data);
+               else if (!connected && watch->disconnect_func)
+                       watch->disconnect_func(cache->bus, watch->user_data);
+}
+
+unsigned int _dbus_name_cache_add_watch(struct _dbus_name_cache *cache,
+                                       const char *name,
+                                       l_dbus_watch_func_t connect_func,
+                                       l_dbus_watch_func_t disconnect_func,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy)
+{
+       struct name_cache_entry *entry;
+       struct service_watch *watch;
+
+       if (!_dbus_name_cache_add(cache, name))
+               return 0;
+
+       watch = l_new(struct service_watch, 1);
+       watch->id = ++cache->last_watch_id;
+       watch->connect_func = connect_func;
+       watch->disconnect_func = disconnect_func;
+       watch->user_data = user_data;
+       watch->destroy = destroy;
+
+       entry = l_hashmap_lookup(cache->names, name);
+
+       watch->next = entry->watches;
+       entry->watches = watch;
+
+       if (entry->unique_name && connect_func)
+               watch->connect_func(cache->bus, watch->user_data);
+
+       return watch->id;
+}
+
+static bool service_watch_remove(const void *key, void *value, void *user_data)
+{
+       struct name_cache_entry *entry = value;
+       struct service_watch **watch, *tmp;
+
+       for (watch = &entry->watches; *watch;) {
+               if (!(*watch)->removed) {
+                       watch = &(*watch)->next;
+                       continue;
+               }
+
+               tmp = *watch;
+               *watch = tmp->next;
+
+               service_watch_destroy(tmp);
+
+               entry->ref_count--;
+       }
+
+       if (entry->ref_count)
+               return false;
+
+       name_cache_entry_destroy(entry);
+
+       return true;
+}
+
+static void service_watch_remove_all(struct l_idle *idle, void *user_data)
+{
+       struct _dbus_name_cache *cache = user_data;
+
+       l_idle_remove(cache->watch_remove_work);
+       cache->watch_remove_work = NULL;
+
+       l_hashmap_foreach_remove(cache->names, service_watch_remove, cache);
+}
+
+static void service_watch_mark(const void *key, void *value, void *user_data)
+{
+       struct name_cache_entry *entry = value;
+       struct service_watch *watch;
+       unsigned int *id = user_data;
+
+       for (watch = entry->watches; watch; watch = watch->next)
+               if (watch->id == *id) {
+                       watch->removed = true;
+                       watch->connect_func = NULL;
+                       watch->disconnect_func = NULL;
+                       *id = 0;
+                       break;
+               }
+}
+
+bool _dbus_name_cache_remove_watch(struct _dbus_name_cache *cache,
+                                       unsigned int id)
+{
+       l_hashmap_foreach(cache->names, service_watch_mark, &id);
+
+       if (id)
+               return false;
+
+       if (!cache->watch_remove_work)
+               cache->watch_remove_work = l_idle_create(
+                                               service_watch_remove_all,
+                                               cache, NULL);
+
+       return true;
+}
diff --git a/ell/dbus-private.h b/ell/dbus-private.h
new file mode 100644 (file)
index 0000000..be62691
--- /dev/null
@@ -0,0 +1,308 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <endian.h>
+
+enum dbus_message_type {
+       DBUS_MESSAGE_TYPE_METHOD_CALL   = 1,
+       DBUS_MESSAGE_TYPE_METHOD_RETURN = 2,
+       DBUS_MESSAGE_TYPE_ERROR         = 3,
+       DBUS_MESSAGE_TYPE_SIGNAL        = 4,
+};
+
+enum dbus_container_type {
+       DBUS_CONTAINER_TYPE_ARRAY       = 'a',
+       DBUS_CONTAINER_TYPE_STRUCT      = 'r',
+       DBUS_CONTAINER_TYPE_VARIANT     = 'v',
+       DBUS_CONTAINER_TYPE_DICT_ENTRY  = 'e',
+};
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define DBUS_NATIVE_ENDIAN 'l'
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define DBUS_NATIVE_ENDIAN 'B'
+#else
+#error "Unknown byte order"
+#endif
+
+struct dbus_header {
+       uint8_t  endian;
+       uint8_t  message_type;
+       uint8_t  flags;
+       uint8_t  version;
+
+       union {
+               struct {
+                       uint32_t body_length;
+                       uint32_t serial;
+                       uint32_t field_length;
+               } __attribute__ ((packed)) dbus1;
+       };
+} __attribute__ ((packed));
+#define DBUS_HEADER_SIZE 16
+
+struct dbus_builder;
+struct l_string;
+struct l_dbus_interface;
+struct _dbus_method;
+struct _dbus_signal;
+struct _dbus_property;
+struct l_dbus_message_iter;
+struct l_dbus_message;
+struct l_dbus;
+struct _dbus_filter;
+struct _dbus_filter_condition;
+struct _dbus_filter_ops;
+
+void _dbus1_iter_init(struct l_dbus_message_iter *iter,
+                       struct l_dbus_message *message,
+                       const char *sig_start, const char *sig_end,
+                       const void *data, size_t len);
+bool _dbus1_iter_next_entry_basic(struct l_dbus_message_iter *iter, char type,
+                                       void *out);
+bool _dbus1_iter_get_fixed_array(struct l_dbus_message_iter *iter,
+                                       void *out, uint32_t *n_elem);
+bool _dbus1_iter_enter_struct(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *structure);
+bool _dbus1_iter_enter_variant(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *variant);
+bool _dbus1_iter_enter_array(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *array);
+bool _dbus1_iter_skip_entry(struct l_dbus_message_iter *iter);
+
+struct dbus_builder *_dbus1_builder_new(void *body, size_t body_size);
+void _dbus1_builder_free(struct dbus_builder *builder);
+bool _dbus1_builder_append_basic(struct dbus_builder *builder,
+                                       char type, const void *value);
+bool _dbus1_builder_enter_struct(struct dbus_builder *builder,
+                                       const char *signature);
+bool _dbus1_builder_leave_struct(struct dbus_builder *builder);
+bool _dbus1_builder_enter_dict(struct dbus_builder *builder,
+                                       const char *signature);
+bool _dbus1_builder_leave_dict(struct dbus_builder *builder);
+bool _dbus1_builder_enter_variant(struct dbus_builder *builder,
+                                       const char *signature);
+bool _dbus1_builder_leave_variant(struct dbus_builder *builder);
+bool _dbus1_builder_enter_array(struct dbus_builder *builder,
+                                       const char *signature);
+bool _dbus1_builder_leave_array(struct dbus_builder *builder);
+char *_dbus1_builder_finish(struct dbus_builder *builder,
+                               void **body, size_t *body_size);
+bool _dbus1_builder_mark(struct dbus_builder *builder);
+bool _dbus1_builder_rewind(struct dbus_builder *builder);
+
+void *_dbus_message_get_body(struct l_dbus_message *msg, size_t *out_size);
+void *_dbus_message_get_header(struct l_dbus_message *msg, size_t *out_size);
+void *_dbus_message_get_footer(struct l_dbus_message *msg, size_t *out_size);
+int *_dbus_message_get_fds(struct l_dbus_message *msg, uint32_t *num_fds);
+void _dbus_message_set_serial(struct l_dbus_message *msg, uint32_t serial);
+uint32_t _dbus_message_get_serial(struct l_dbus_message *msg);
+uint32_t _dbus_message_get_reply_serial(struct l_dbus_message *message);
+
+void _dbus_message_set_sender(struct l_dbus_message *message,
+                                       const char *sender);
+void _dbus_message_set_destination(struct l_dbus_message *message,
+                                       const char *destination);
+
+enum dbus_message_type _dbus_message_get_type(struct l_dbus_message *message);
+const char * _dbus_message_get_type_as_string(struct l_dbus_message *message);
+uint8_t _dbus_message_get_version(struct l_dbus_message *message);
+uint8_t _dbus_message_get_endian(struct l_dbus_message *message);
+const char *_dbus_message_get_nth_string_argument(
+                                       struct l_dbus_message *message, int n);
+
+struct l_dbus_message *_dbus_message_new_method_call(uint8_t version,
+                                                       const char *destination,
+                                                       const char *path,
+                                                       const char *interface,
+                                                       const char *method);
+struct l_dbus_message *_dbus_message_new_signal(uint8_t version,
+                                               const char *path,
+                                               const char *interface,
+                                               const char *name);
+struct l_dbus_message *_dbus_message_new_error(uint8_t version,
+                                               uint32_t reply_serial,
+                                               const char *destination,
+                                               const char *name,
+                                               const char *error);
+
+struct l_dbus_message *dbus_message_from_blob(const void *data, size_t size,
+                                               int fds[], uint32_t num_fds);
+struct l_dbus_message *dbus_message_build(void *header, size_t header_size,
+                                               void *body, size_t body_size,
+                                               int fds[], uint32_t num_fds);
+bool dbus_message_compare(struct l_dbus_message *message,
+                                       const void *data, size_t size);
+
+bool _dbus_message_builder_mark(struct l_dbus_message_builder *builder);
+bool _dbus_message_builder_rewind(struct l_dbus_message_builder *builder);
+
+unsigned int _dbus_message_unix_fds_from_header(const void *data, size_t size);
+
+const char *_dbus_signature_end(const char *signature);
+
+bool _dbus_valid_object_path(const char *path);
+bool _dbus_valid_signature(const char *sig);
+int _dbus_num_children(const char *sig);
+bool _dbus_valid_interface(const char *interface);
+bool _dbus_valid_method(const char *method);
+bool _dbus_parse_unique_name(const char *name, uint64_t *out_id);
+bool _dbus_valid_bus_name(const char *bus_name);
+
+bool _dbus1_header_is_valid(void *data, size_t size);
+
+void _dbus_method_introspection(struct _dbus_method *info,
+                                       struct l_string *buf);
+void _dbus_signal_introspection(struct _dbus_signal *info,
+                                       struct l_string *buf);
+void _dbus_property_introspection(struct _dbus_property *info,
+                                               struct l_string *buf);
+void _dbus_interface_introspection(struct l_dbus_interface *interface,
+                                               struct l_string *buf);
+
+struct l_dbus_interface *_dbus_interface_new(const char *interface);
+void _dbus_interface_free(struct l_dbus_interface *interface);
+
+struct _dbus_method *_dbus_interface_find_method(struct l_dbus_interface *i,
+                                                       const char *method);
+struct _dbus_signal *_dbus_interface_find_signal(struct l_dbus_interface *i,
+                                                       const char *signal);
+struct _dbus_property *_dbus_interface_find_property(struct l_dbus_interface *i,
+                                               const char *property);
+
+struct _dbus_object_tree *_dbus_object_tree_new();
+void _dbus_object_tree_free(struct _dbus_object_tree *tree);
+
+struct object_node *_dbus_object_tree_makepath(struct _dbus_object_tree *tree,
+                                               const char *path);
+struct object_node *_dbus_object_tree_lookup(struct _dbus_object_tree *tree,
+                                               const char *path);
+void _dbus_object_tree_prune_node(struct object_node *node);
+
+struct object_node *_dbus_object_tree_new_object(struct _dbus_object_tree *tree,
+                                               const char *path,
+                                               void *user_data,
+                                               void (*destroy) (void *));
+bool _dbus_object_tree_object_destroy(struct _dbus_object_tree *tree,
+                                               const char *path);
+
+bool _dbus_object_tree_register_interface(struct _dbus_object_tree *tree,
+                               const char *interface,
+                               void (*setup_func)(struct l_dbus_interface *),
+                               void (*destroy) (void *),
+                               bool old_style_properties);
+bool _dbus_object_tree_unregister_interface(struct _dbus_object_tree *tree,
+                                               const char *interface);
+
+bool _dbus_object_tree_add_interface(struct _dbus_object_tree *tree,
+                                       const char *path, const char *interface,
+                                       void *user_data);
+bool _dbus_object_tree_remove_interface(struct _dbus_object_tree *tree,
+                                       const char *path,
+                                       const char *interface);
+void *_dbus_object_tree_get_interface_data(struct _dbus_object_tree *tree,
+                                               const char *path,
+                                               const char *interface);
+
+void _dbus_object_tree_introspect(struct _dbus_object_tree *tree,
+                                       const char *path, struct l_string *buf);
+bool _dbus_object_tree_dispatch(struct _dbus_object_tree *tree,
+                                       struct l_dbus *dbus,
+                                       struct l_dbus_message *message);
+struct l_dbus_message *_dbus_object_tree_get_objects(
+                                       struct _dbus_object_tree *tree,
+                                       struct l_dbus *dbus,
+                                       const char *path,
+                                       struct l_dbus_message *message);
+
+bool _dbus_object_tree_property_changed(struct l_dbus *dbus,
+                                       const char *path,
+                                       const char *interface_name,
+                                       const char *property_name);
+
+void _dbus_object_tree_signals_flush(struct l_dbus *dbus, const char *path);
+
+typedef void (*_dbus_name_owner_change_func_t)(const char *name,
+                                               uint64_t old_owner,
+                                               uint64_t new_owner,
+                                               void *user_data);
+
+uint8_t _dbus_get_version(struct l_dbus *dbus);
+int _dbus_get_fd(struct l_dbus *dbus);
+struct _dbus_object_tree *_dbus_get_tree(struct l_dbus *dbus);
+
+struct _dbus_name_ops {
+       bool (*get_name_owner)(struct l_dbus *bus, const char *name);
+};
+
+struct _dbus_name_cache;
+
+struct _dbus_name_cache *_dbus_name_cache_new(struct l_dbus *bus,
+                                       const struct _dbus_name_ops *driver);
+void _dbus_name_cache_free(struct _dbus_name_cache *cache);
+
+bool _dbus_name_cache_add(struct _dbus_name_cache *cache, const char *name);
+bool _dbus_name_cache_remove(struct _dbus_name_cache *cache, const char *name);
+const char *_dbus_name_cache_lookup(struct _dbus_name_cache *cache,
+                                       const char *name);
+
+void _dbus_name_cache_notify(struct _dbus_name_cache *cache,
+                               const char *name, const char *owner);
+
+unsigned int _dbus_name_cache_add_watch(struct _dbus_name_cache *cache,
+                                       const char *name,
+                                       l_dbus_watch_func_t connect_func,
+                                       l_dbus_watch_func_t disconnect_func,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy);
+bool _dbus_name_cache_remove_watch(struct _dbus_name_cache *cache,
+                                       unsigned int id);
+
+struct _dbus_filter_condition {
+       enum l_dbus_match_type type;
+       const char *value;
+};
+
+struct _dbus_filter_ops {
+       bool skip_register;
+       bool (*add_match)(struct l_dbus *bus, unsigned int id,
+                               const struct _dbus_filter_condition *rule,
+                               int rule_len);
+       bool (*remove_match)(struct l_dbus *bus, unsigned int id);
+};
+
+struct _dbus_filter *_dbus_filter_new(struct l_dbus *dbus,
+                                       const struct _dbus_filter_ops *driver,
+                                       struct _dbus_name_cache *name_cache);
+void _dbus_filter_free(struct _dbus_filter *filter);
+
+unsigned int _dbus_filter_add_rule(struct _dbus_filter *filter,
+                               const struct _dbus_filter_condition *rule,
+                               int rule_len,
+                               l_dbus_message_func_t signal_func,
+                               void *user_data);
+bool _dbus_filter_remove_rule(struct _dbus_filter *filter, unsigned int id);
+
+char *_dbus_filter_rule_to_str(const struct _dbus_filter_condition *rule,
+                               int rule_len);
+
+void _dbus_filter_dispatch(struct l_dbus_message *message, void *user_data);
diff --git a/ell/dbus-service.c b/ell/dbus-service.c
new file mode 100644 (file)
index 0000000..e60eafc
--- /dev/null
@@ -0,0 +1,2127 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "util.h"
+#include "queue.h"
+#include "string.h"
+#include "hashmap.h"
+#include "dbus.h"
+#include "dbus-service.h"
+#include "dbus-private.h"
+#include "private.h"
+#include "idle.h"
+
+#define XML_ID "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+#define XML_DTD "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
+#define XML_HEAD "<!DOCTYPE node PUBLIC \""XML_ID"\"\n\""XML_DTD"\">\n"
+
+static const char *static_introspectable =
+               "\t<interface name=\"org.freedesktop.DBus.Introspectable\">\n"
+               "\t\t<method name=\"Introspect\">\n"
+               "\t\t\t<arg name=\"xml\" type=\"s\" direction=\"out\"/>\n"
+               "\t\t</method>\n\t</interface>\n";
+
+struct _dbus_method {
+       l_dbus_interface_method_cb_t cb;
+       uint32_t flags;
+       unsigned char name_len;
+       char metainfo[];
+};
+
+struct _dbus_signal {
+       uint32_t flags;
+       unsigned char name_len;
+       char metainfo[];
+};
+
+struct _dbus_property {
+       l_dbus_property_get_cb_t getter;
+       l_dbus_property_set_cb_t setter;
+       uint32_t flags;
+       unsigned char name_len;
+       char metainfo[];
+};
+
+struct l_dbus_interface {
+       struct l_queue *methods;
+       struct l_queue *signals;
+       struct l_queue *properties;
+       bool handle_old_style_properties;
+       void (*instance_destroy)(void *);
+       char name[];
+};
+
+struct child_node {
+       struct object_node *node;
+       struct child_node *next;
+       char subpath[];
+};
+
+struct interface_instance {
+       struct l_dbus_interface *interface;
+       void *user_data;
+};
+
+struct object_node {
+       struct object_node *parent;
+       struct l_queue *instances;
+       struct child_node *children;
+       void *user_data;
+       void (*destroy) (void *);
+};
+
+struct object_manager {
+       char *path;
+       struct l_dbus *dbus;
+       struct l_queue *announce_added;
+       struct l_queue *announce_removed;
+};
+
+struct interface_add_record {
+       char *path;
+       struct object_node *object;
+       struct l_queue *instances;
+};
+
+struct interface_remove_record {
+       char *path;
+       struct object_node *object;
+       struct l_queue *interface_names;
+};
+
+struct property_change_record {
+       char *path;
+       struct object_node *object;
+       struct interface_instance *instance;
+       struct l_queue *properties;
+};
+
+struct _dbus_object_tree {
+       struct l_hashmap *interfaces;
+       struct l_hashmap *objects;
+       struct object_node *root;
+       struct l_queue *object_managers;
+       struct l_queue *property_changes;
+       struct l_idle *emit_signals_work;
+       bool flushing;
+};
+
+void _dbus_method_introspection(struct _dbus_method *info,
+                                       struct l_string *buf)
+{
+       const char *sig;
+       const char *end;
+       const char *pname;
+       unsigned int offset = info->name_len + 1;
+
+       l_string_append_printf(buf, "\t\t<method name=\"%s\">\n",
+                               info->metainfo);
+
+       sig = info->metainfo + offset;
+       offset += strlen(sig) + 1;
+
+       for (; *sig; sig++) {
+               end = _dbus_signature_end(sig);
+               pname = info->metainfo + offset;
+
+               l_string_append_printf(buf, "\t\t\t<arg name=\"%s\" "
+                                       "type=\"%.*s\" direction=\"in\"/>\n",
+                                       pname, (int) (end - sig + 1), sig);
+               sig = end;
+               offset += strlen(pname) + 1;
+       }
+
+       sig = info->metainfo + offset;
+       offset += strlen(sig) + 1;
+
+       for (; *sig; sig++) {
+               end = _dbus_signature_end(sig);
+               pname = info->metainfo + offset;
+
+               l_string_append_printf(buf, "\t\t\t<arg name=\"%s\" "
+                                       "type=\"%.*s\" direction=\"out\"/>\n",
+                                       pname, (int) (end - sig + 1), sig);
+               sig = end;
+               offset += strlen(pname) + 1;
+       }
+
+       if (info->flags & L_DBUS_METHOD_FLAG_DEPRECATED)
+               l_string_append(buf, "\t\t\t<annotation name=\""
+                               "org.freedesktop.DBus.Deprecated\" "
+                               "value=\"true\"/>\n");
+
+       if (info->flags & L_DBUS_METHOD_FLAG_NOREPLY)
+               l_string_append(buf, "\t\t\t<annotation name=\""
+                               "org.freedesktop.DBus.Method.NoReply\" "
+                               "value=\"true\"/>\n");
+
+       l_string_append(buf, "\t\t</method>\n");
+}
+
+void _dbus_signal_introspection(struct _dbus_signal *info,
+                                       struct l_string *buf)
+{
+       const char *sig;
+       const char *end;
+       const char *pname;
+       unsigned int offset = info->name_len + 1;
+
+       l_string_append_printf(buf, "\t\t<signal name=\"%s\">\n",
+                               info->metainfo);
+
+       sig = info->metainfo + offset;
+       offset += strlen(sig) + 1;
+
+       for (; *sig; sig++) {
+               end = _dbus_signature_end(sig);
+               pname = info->metainfo + offset;
+
+               l_string_append_printf(buf, "\t\t\t<arg name=\"%s\" "
+                                       "type=\"%.*s\"/>\n",
+                                       pname, (int) (end - sig + 1), sig);
+               sig = end;
+               offset += strlen(pname) + 1;
+       }
+
+       if (info->flags & L_DBUS_SIGNAL_FLAG_DEPRECATED)
+               l_string_append(buf, "\t\t\t<annotation name=\""
+                               "org.freedesktop.DBus.Deprecated\" "
+                               "value=\"true\"/>\n");
+
+       l_string_append(buf, "\t\t</signal>\n");
+}
+
+void _dbus_property_introspection(struct _dbus_property *info,
+                                               struct l_string *buf)
+{
+       unsigned int offset = info->name_len + 1;
+       const char *signature = info->metainfo + offset;
+
+       l_string_append_printf(buf, "\t\t<property name=\"%s\" type=\"%s\" ",
+                               info->metainfo, signature);
+
+       if (info->setter)
+               l_string_append(buf, "access=\"readwrite\"");
+       else
+               l_string_append(buf, "access=\"read\"");
+
+       if (info->flags & L_DBUS_METHOD_FLAG_DEPRECATED) {
+               l_string_append(buf, ">\n");
+               l_string_append(buf, "\t\t\t<annotation name=\""
+                               "org.freedesktop.DBus.Deprecated\" "
+                               "value=\"true\"/>\n");
+               l_string_append(buf, "\t\t</property>\n");
+       } else
+               l_string_append(buf, "/>\n");
+}
+
+void _dbus_interface_introspection(struct l_dbus_interface *interface,
+                                               struct l_string *buf)
+{
+       l_string_append_printf(buf, "\t<interface name=\"%s\">\n",
+                               interface->name);
+
+       l_queue_foreach(interface->methods,
+               (l_queue_foreach_func_t) _dbus_method_introspection, buf);
+       l_queue_foreach(interface->signals,
+               (l_queue_foreach_func_t) _dbus_signal_introspection, buf);
+       l_queue_foreach(interface->properties,
+               (l_queue_foreach_func_t) _dbus_property_introspection, buf);
+
+       l_string_append(buf, "\t</interface>\n");
+}
+
+#define COPY_PARAMS(dest, signature, args)     \
+       do {    \
+               const char *pname;      \
+               const char *sig;        \
+               dest = stpcpy(dest, signature) + 1;     \
+               for (sig = signature; *sig; sig++) {    \
+                       sig = _dbus_signature_end(sig); \
+                       pname = va_arg(args, const char *);     \
+                       dest = stpcpy(dest, pname) + 1; \
+               }       \
+       } while(0)
+
+#define SIZE_PARAMS(signature, args)   \
+       ({      \
+               unsigned int len = strlen(signature) + 1;       \
+               const char *pname;      \
+               const char *sig;        \
+               for (sig = signature; *sig; sig++) {    \
+                       sig = _dbus_signature_end(sig); \
+                       if (!sig) {     \
+                               len = 0;        \
+                               break;  \
+                       }       \
+                       pname = va_arg(args, const char *);     \
+                       len += strlen(pname) + 1;       \
+               }       \
+               len;    \
+       })
+
+LIB_EXPORT bool l_dbus_interface_method(struct l_dbus_interface *interface,
+                                       const char *name, uint32_t flags,
+                                       l_dbus_interface_method_cb_t cb,
+                                       const char *return_sig,
+                                       const char *param_sig, ...)
+{
+       va_list args;
+       unsigned int return_info_len;
+       unsigned int param_info_len;
+       struct _dbus_method *info;
+       char *p;
+
+       if (!_dbus_valid_method(name))
+               return false;
+
+       if (unlikely(!return_sig || !param_sig))
+               return false;
+
+       if (return_sig[0] && !_dbus_valid_signature(return_sig))
+               return false;
+
+       if (param_sig[0] && !_dbus_valid_signature(param_sig))
+               return false;
+
+       /* Pre-calculate the needed meta-info length */
+       va_start(args, param_sig);
+
+       return_info_len = SIZE_PARAMS(return_sig, args);
+       param_info_len = SIZE_PARAMS(param_sig, args);
+
+       va_end(args);
+
+       if (!return_info_len || !param_info_len)
+               return false;
+
+       info = l_malloc(sizeof(*info) + return_info_len +
+                                       param_info_len + strlen(name) + 1);
+       info->cb = cb;
+       info->flags = flags;
+       info->name_len = strlen(name);
+       strcpy(info->metainfo, name);
+
+       va_start(args, param_sig);
+
+       /*
+        * We store param signature + parameter names first, to speed up
+        * lookups during the message dispatch procedures.
+        */
+       p = info->metainfo + info->name_len + param_info_len + 1;
+       COPY_PARAMS(p, return_sig, args);
+
+       p = info->metainfo + info->name_len + 1;
+       COPY_PARAMS(p, param_sig, args);
+
+       va_end(args);
+
+       l_queue_push_tail(interface->methods, info);
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_interface_signal(struct l_dbus_interface *interface,
+                                       const char *name, uint32_t flags,
+                                       const char *signature, ...)
+{
+       va_list args;
+       unsigned int metainfo_len;
+       struct _dbus_signal *info;
+       char *p;
+
+       if (!_dbus_valid_method(name))
+               return false;
+
+       if (unlikely(!signature))
+               return false;
+
+       if (signature[0] && !_dbus_valid_signature(signature))
+               return false;
+
+       /* Pre-calculate the needed meta-info length */
+       va_start(args, signature);
+       metainfo_len = SIZE_PARAMS(signature, args);
+       va_end(args);
+
+       if (!metainfo_len)
+               return false;
+
+       metainfo_len += strlen(name) + 1;
+
+       info = l_malloc(sizeof(*info) + metainfo_len);
+       info->flags = flags;
+       info->name_len = strlen(name);
+
+       p = stpcpy(info->metainfo, name) + 1;
+
+       va_start(args, signature);
+       COPY_PARAMS(p, signature, args);
+       va_end(args);
+
+       l_queue_push_tail(interface->signals, info);
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_interface_property(struct l_dbus_interface *interface,
+                                       const char *name, uint32_t flags,
+                                       const char *signature,
+                                       l_dbus_property_get_cb_t getter,
+                                       l_dbus_property_set_cb_t setter)
+{
+       unsigned int metainfo_len;
+       struct _dbus_property *info;
+       char *p;
+
+       if (!_dbus_valid_method(name))
+               return false;
+
+       if (unlikely(!signature || !getter))
+               return false;
+
+       if (_dbus_num_children(signature) != 1)
+               return false;
+
+       /* Pre-calculate the needed meta-info length */
+       metainfo_len = strlen(name) + 1;
+       metainfo_len += strlen(signature) + 1;
+
+       info = l_malloc(sizeof(*info) + metainfo_len);
+       info->flags = flags;
+       info->name_len = strlen(name);
+       info->getter = getter;
+       info->setter = setter;
+
+       p = stpcpy(info->metainfo, name) + 1;
+       strcpy(p, signature);
+
+       l_queue_push_tail(interface->properties, info);
+
+       return true;
+}
+
+struct l_dbus_interface *_dbus_interface_new(const char *name)
+{
+       struct l_dbus_interface *interface;
+
+       interface = l_malloc(sizeof(*interface) + strlen(name) + 1);
+
+       interface->methods = l_queue_new();
+       interface->signals = l_queue_new();
+       interface->properties = l_queue_new();
+
+       strcpy(interface->name, name);
+
+       return interface;
+}
+
+void _dbus_interface_free(struct l_dbus_interface *interface)
+{
+       l_queue_destroy(interface->methods, l_free);
+       l_queue_destroy(interface->signals, l_free);
+       l_queue_destroy(interface->properties, l_free);
+
+       l_free(interface);
+}
+
+static bool match_method(const void *a, const void *b)
+{
+       const struct _dbus_method *method = a;
+       const char *name = b;
+
+       if (!strcmp(method->metainfo, name))
+               return true;
+
+       return false;
+}
+
+struct _dbus_method *_dbus_interface_find_method(struct l_dbus_interface *i,
+                                                       const char *method)
+{
+       return l_queue_find(i->methods, match_method, (char *) method);
+}
+
+static bool match_signal(const void *a, const void *b)
+{
+       const struct _dbus_signal *signal = a;
+       const char *name = b;
+
+       if (!strcmp(signal->metainfo, name))
+               return true;
+
+       return false;
+}
+
+struct _dbus_signal *_dbus_interface_find_signal(struct l_dbus_interface *i,
+                                                       const char *signal)
+{
+       return l_queue_find(i->signals, match_signal, (char *) signal);
+}
+
+static bool match_property(const void *a, const void *b)
+{
+       const struct _dbus_property *property = a;
+       const char *name = b;
+
+       if (!strcmp(property->metainfo, name))
+               return true;
+
+       return false;
+}
+
+struct _dbus_property *_dbus_interface_find_property(struct l_dbus_interface *i,
+                                                       const char *property)
+{
+       return l_queue_find(i->properties, match_property, (char *) property);
+}
+
+static void interface_instance_free(struct interface_instance *instance)
+{
+       if (instance->interface->instance_destroy)
+               instance->interface->instance_destroy(instance->user_data);
+
+       l_free(instance);
+}
+
+static bool match_interface_instance(const void *a, const void *b)
+{
+       const struct interface_instance *instance = a;
+       const char *name = b;
+
+       if (!strcmp(instance->interface->name, name))
+               return true;
+
+       return false;
+}
+
+static bool match_interface_instance_ptr(const void *a, const void *b)
+{
+       const struct interface_instance *instance = a;
+
+       return instance->interface == b;
+}
+
+static void interface_add_record_free(void *data)
+{
+       struct interface_add_record *rec = data;
+
+       l_free(rec->path);
+       l_queue_destroy(rec->instances, NULL);
+       l_free(rec);
+}
+
+static void interface_removed_record_free(void *data)
+{
+       struct interface_remove_record *rec = data;
+
+       l_free(rec->path);
+       l_queue_destroy(rec->interface_names, l_free);
+       l_free(rec);
+}
+
+static void property_change_record_free(void *data)
+{
+       struct property_change_record *rec = data;
+
+       l_free(rec->path);
+       l_queue_destroy(rec->properties, NULL);
+       l_free(rec);
+}
+
+static void properties_setup_func(struct l_dbus_interface *);
+static void object_manager_setup_func(struct l_dbus_interface *);
+
+struct _dbus_object_tree *_dbus_object_tree_new()
+{
+       struct _dbus_object_tree *tree;
+
+       tree = l_new(struct _dbus_object_tree, 1);
+
+       tree->interfaces = l_hashmap_new();
+       l_hashmap_set_hash_function(tree->interfaces, l_str_hash);
+       l_hashmap_set_compare_function(tree->interfaces,
+                                       (l_hashmap_compare_func_t)strcmp);
+
+       tree->objects = l_hashmap_string_new();
+
+       tree->root = l_new(struct object_node, 1);
+
+       tree->property_changes = l_queue_new();
+
+       _dbus_object_tree_register_interface(tree, L_DBUS_INTERFACE_PROPERTIES,
+                                               properties_setup_func, NULL,
+                                               false);
+
+       tree->object_managers = l_queue_new();
+
+       _dbus_object_tree_register_interface(tree,
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               object_manager_setup_func, NULL,
+                                               false);
+
+       return tree;
+}
+
+static void subtree_free(struct object_node *node)
+{
+       struct child_node *child;
+
+       while (node->children) {
+               child = node->children;
+               node->children = child->next;
+
+               subtree_free(child->node);
+               l_free(child);
+       }
+
+       l_queue_destroy(node->instances,
+                       (l_queue_destroy_func_t) interface_instance_free);
+
+       if (node->destroy)
+               node->destroy(node->user_data);
+
+       l_free(node);
+}
+
+static void object_manager_free(void *data)
+{
+       struct object_manager *manager = data;
+
+       l_free(manager->path);
+       l_queue_destroy(manager->announce_added, interface_add_record_free);
+       l_queue_destroy(manager->announce_removed,
+                                               interface_removed_record_free);
+       l_free(manager);
+}
+
+void _dbus_object_tree_free(struct _dbus_object_tree *tree)
+{
+       subtree_free(tree->root);
+
+       l_hashmap_destroy(tree->interfaces,
+                       (l_hashmap_destroy_func_t) _dbus_interface_free);
+       l_hashmap_destroy(tree->objects, NULL);
+
+       l_queue_destroy(tree->object_managers, object_manager_free);
+
+       l_queue_destroy(tree->property_changes, property_change_record_free);
+
+       if (tree->emit_signals_work)
+               l_idle_remove(tree->emit_signals_work);
+
+       l_free(tree);
+}
+
+static struct object_node *makepath_recurse(struct object_node *node,
+                                               const char *path)
+{
+       const char *end;
+       struct child_node *child;
+
+       if (*path == '\0')
+               return node;
+
+       path += 1;
+       end = strchrnul(path, '/');
+       child = node->children;
+
+       while (child) {
+               if (!strncmp(child->subpath, path, end - path) &&
+                               child->subpath[end - path] == '\0')
+                       goto done;
+
+               child = child->next;
+       }
+
+       child = l_malloc(sizeof(*child) + end - path + 1);
+       child->node = l_new(struct object_node, 1);
+       child->node->parent = node;
+       memcpy(child->subpath, path, end - path);
+       child->subpath[end-path] = '\0';
+       child->next = node->children;
+       node->children = child;
+
+done:
+       return makepath_recurse(child->node, end);
+}
+
+struct object_node *_dbus_object_tree_makepath(struct _dbus_object_tree *tree,
+                                               const char *path)
+{
+       if (path[0] == '/' && path[1] == '\0')
+               return tree->root;
+
+       return makepath_recurse(tree->root, path);
+}
+
+static struct object_node *lookup_recurse(struct object_node *node,
+                                               const char *path)
+{
+       const char *end;
+       struct child_node *child;
+
+       if (*path == '\0')
+               return node;
+
+       path += 1;
+       end = strchrnul(path, '/');
+       child = node->children;
+
+       while (child) {
+               if (!strncmp(child->subpath, path, end - path) &&
+                               child->subpath[end - path] == '\0')
+                       return lookup_recurse(child->node, end);
+
+               child = child->next;
+       }
+
+       return NULL;
+}
+
+struct object_node *_dbus_object_tree_lookup(struct _dbus_object_tree *tree,
+                                               const char *path)
+{
+       if (path[0] == '/' && path[1] == '\0')
+               return tree->root;
+
+       return lookup_recurse(tree->root, path);
+}
+
+void _dbus_object_tree_prune_node(struct object_node *node)
+{
+       struct object_node *parent = node->parent;
+       struct child_node *p = NULL, *c;
+
+       while (parent) {
+               for (c = parent->children, p = NULL; c; p = c, c = c->next) {
+                       if (c->node != node)
+                               continue;
+
+                       if (p)
+                               p->next = c->next;
+                       else
+                               parent->children = c->next;
+
+                       subtree_free(c->node);
+                       l_free(c);
+
+                       break;
+               }
+
+               if (parent->children != NULL)
+                       return;
+
+               if (parent->instances)
+                       return;
+
+               node = parent;
+               parent = node->parent;
+       }
+}
+
+struct object_node *_dbus_object_tree_new_object(struct _dbus_object_tree *tree,
+                                               const char *path,
+                                               void *user_data,
+                                               void (*destroy) (void *))
+{
+       struct object_node *node;
+
+       if (!_dbus_valid_object_path(path))
+               return NULL;
+
+       if (l_hashmap_lookup(tree->objects, path))
+               return NULL;
+
+       node = _dbus_object_tree_makepath(tree, path);
+       node->user_data = user_data;
+       node->destroy = destroy;
+
+       /*
+        * Registered objects in the tree are marked by being present in the
+        * tree->objects hash and having non-null node->instances.  Remaining
+        * nodes are intermediate path elements added and removed
+        * automatically.
+        */
+       node->instances = l_queue_new();
+
+       l_hashmap_insert(tree->objects, path, node);
+
+       return node;
+}
+
+bool _dbus_object_tree_object_destroy(struct _dbus_object_tree *tree,
+                                       const char *path)
+{
+       struct object_node *node;
+       const struct l_queue_entry *entry;
+       const struct interface_instance *instance;
+
+       node = l_hashmap_lookup(tree->objects, path);
+       if (!node)
+               return false;
+
+       while ((entry = l_queue_get_entries(node->instances))) {
+               instance = entry->data;
+
+               if (!_dbus_object_tree_remove_interface(tree, path,
+                                               instance->interface->name))
+                       return false;
+       }
+
+       l_hashmap_remove(tree->objects, path);
+
+       l_queue_destroy(node->instances, NULL);
+       node->instances = NULL;
+
+       if (node->destroy) {
+               node->destroy(node->user_data);
+               node->destroy = NULL;
+       }
+
+       if (!node->children)
+               _dbus_object_tree_prune_node(node);
+
+       return true;
+}
+
+static bool get_properties_dict(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               const struct l_dbus_interface *interface,
+                               void *user_data)
+{
+       const struct l_queue_entry *entry;
+       const struct _dbus_property *property;
+       const char *signature;
+
+       l_dbus_message_builder_enter_array(builder, "{sv}");
+       _dbus_message_builder_mark(builder);
+
+       for (entry = l_queue_get_entries(interface->properties); entry;
+                       entry = entry->next) {
+               property = entry->data;
+               signature = property->metainfo + strlen(property->metainfo) + 1;
+
+               l_dbus_message_builder_enter_dict(builder, "sv");
+               l_dbus_message_builder_append_basic(builder, 's',
+                                                       property->metainfo);
+               l_dbus_message_builder_enter_variant(builder, signature);
+
+               if (!property->getter(dbus, message, builder, user_data)) {
+                       if (!_dbus_message_builder_rewind(builder))
+                               return false;
+
+                       continue;
+               }
+
+               l_dbus_message_builder_leave_variant(builder);
+               l_dbus_message_builder_leave_dict(builder);
+               _dbus_message_builder_mark(builder);
+       }
+
+       l_dbus_message_builder_leave_array(builder);
+
+       return true;
+}
+
+static struct l_dbus_message *build_interfaces_removed_signal(
+                               const struct object_manager *manager,
+                               const struct interface_remove_record *rec)
+{
+       struct l_dbus_message *signal;
+       struct l_dbus_message_builder *builder;
+       const struct l_queue_entry *entry;
+
+       signal = l_dbus_message_new_signal(manager->dbus, manager->path,
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               "InterfacesRemoved");
+
+       builder = l_dbus_message_builder_new(signal);
+
+       l_dbus_message_builder_append_basic(builder, 'o', rec->path);
+       l_dbus_message_builder_enter_array(builder, "s");
+
+       for (entry = l_queue_get_entries(rec->interface_names); entry;
+                       entry = entry->next)
+               l_dbus_message_builder_append_basic(builder, 's', entry->data);
+
+       l_dbus_message_builder_leave_array(builder);
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+
+       return signal;
+}
+
+static struct l_dbus_message *build_interfaces_added_signal(
+                                       const struct object_manager *manager,
+                                       const struct interface_add_record *rec)
+{
+       struct l_dbus_message *signal;
+       struct l_dbus_message_builder *builder;
+       const struct l_queue_entry *entry;
+       const struct interface_instance *instance;
+
+       signal = l_dbus_message_new_signal(manager->dbus, manager->path,
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               "InterfacesAdded");
+
+       builder = l_dbus_message_builder_new(signal);
+
+       l_dbus_message_builder_append_basic(builder, 'o', rec->path);
+       l_dbus_message_builder_enter_array(builder, "{sa{sv}}");
+
+       for (entry = l_queue_get_entries(rec->instances); entry;
+                       entry = entry->next) {
+               instance = entry->data;
+
+               l_dbus_message_builder_enter_dict(builder, "sa{sv}");
+               l_dbus_message_builder_append_basic(builder, 's',
+                                               instance->interface->name);
+
+               if (!get_properties_dict(manager->dbus, signal, builder,
+                                               instance->interface,
+                                               instance->user_data)) {
+                       l_dbus_message_builder_destroy(builder);
+                       l_dbus_message_unref(signal);
+
+                       return NULL;
+               }
+
+               l_dbus_message_builder_leave_dict(builder);
+       }
+
+       l_dbus_message_builder_leave_array(builder);
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+
+       return signal;
+}
+
+static struct l_dbus_message *build_old_property_changed_signal(
+                               struct l_dbus *dbus,
+                               const struct property_change_record *rec,
+                               const struct _dbus_property *property)
+{
+       struct l_dbus_message *signal;
+       struct l_dbus_message_builder *builder;
+       const char *signature;
+
+       signature = property->metainfo + strlen(property->metainfo) + 1;
+
+       signal = l_dbus_message_new_signal(dbus, rec->path,
+                                               rec->instance->interface->name,
+                                               "PropertyChanged");
+
+       builder = l_dbus_message_builder_new(signal);
+
+       l_dbus_message_builder_append_basic(builder, 's', property->metainfo);
+       l_dbus_message_builder_enter_variant(builder, signature);
+
+       if (!property->getter(dbus, signal, builder,
+                               rec->instance->user_data)) {
+               l_dbus_message_builder_destroy(builder);
+               l_dbus_message_unref(signal);
+
+               return NULL;
+       }
+
+       l_dbus_message_builder_leave_variant(builder);
+
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+
+       return signal;
+}
+
+static struct l_dbus_message *build_properties_changed_signal(
+                               struct l_dbus *dbus,
+                               const struct property_change_record *rec)
+{
+       struct l_dbus_message *signal;
+       struct l_dbus_message_builder *builder;
+       const struct l_queue_entry *entry;
+       const struct _dbus_property *property;
+       const char *signature;
+       struct l_queue *invalidated;
+
+       signal = l_dbus_message_new_signal(dbus, rec->path,
+                                               L_DBUS_INTERFACE_PROPERTIES,
+                                               "PropertiesChanged");
+
+       builder = l_dbus_message_builder_new(signal);
+
+       invalidated = l_queue_new();
+
+       l_dbus_message_builder_append_basic(builder, 's',
+                                               rec->instance->interface->name);
+       l_dbus_message_builder_enter_array(builder, "{sv}");
+
+       for (entry = l_queue_get_entries(rec->properties); entry;
+                       entry = entry->next) {
+               property = entry->data;
+               signature = property->metainfo + strlen(property->metainfo) + 1;
+
+               _dbus_message_builder_mark(builder);
+
+               l_dbus_message_builder_enter_dict(builder, "sv");
+               l_dbus_message_builder_append_basic(builder, 's',
+                                                       property->metainfo);
+               l_dbus_message_builder_enter_variant(builder, signature);
+
+               if (!property->getter(dbus, signal, builder,
+                                       rec->instance->user_data)) {
+                       if (!_dbus_message_builder_rewind(builder)) {
+                               l_dbus_message_unref(signal);
+                               signal = NULL;
+
+                               goto done;
+                       }
+
+                       l_queue_push_tail(invalidated, (void *) property);
+
+                       continue;
+               }
+
+               l_dbus_message_builder_leave_variant(builder);
+               l_dbus_message_builder_leave_dict(builder);
+       }
+
+       l_dbus_message_builder_leave_array(builder);
+       l_dbus_message_builder_enter_array(builder, "s");
+
+       while ((property = l_queue_pop_head(invalidated)))
+               l_dbus_message_builder_append_basic(builder, 's',
+                                                       property->metainfo);
+
+       l_dbus_message_builder_leave_array(builder);
+       l_dbus_message_builder_finalize(builder);
+
+done:
+       l_dbus_message_builder_destroy(builder);
+
+       l_queue_destroy(invalidated, NULL);
+
+       return signal;
+}
+
+struct emit_signals_data {
+       struct l_dbus *dbus;
+       struct object_manager *manager;
+       struct object_node *node;
+};
+
+static bool emit_interfaces_removed(void *data, void *user_data)
+{
+       struct interface_remove_record *rec = data;
+       struct emit_signals_data *es = user_data;
+       struct l_dbus_message *signal;
+
+       if (es->node && rec->object != es->node)
+               return false;
+
+       signal = build_interfaces_removed_signal(es->manager, rec);
+       interface_removed_record_free(rec);
+
+       if (signal)
+               l_dbus_send(es->manager->dbus, signal);
+
+       return true;
+}
+
+static bool emit_interfaces_added(void *data, void *user_data)
+{
+       struct interface_add_record *rec = data;
+       struct emit_signals_data *es = user_data;
+       struct l_dbus_message *signal;
+
+       if (es->node && rec->object != es->node)
+               return false;
+
+       signal = build_interfaces_added_signal(es->manager, rec);
+       interface_add_record_free(rec);
+
+       if (signal)
+               l_dbus_send(es->manager->dbus, signal);
+
+       return true;
+}
+
+static bool emit_properties_changed(void *data, void *user_data)
+{
+       struct property_change_record *rec = data;
+       struct emit_signals_data *es = user_data;
+       struct l_dbus_message *signal;
+       const struct l_queue_entry *entry;
+
+       if (es->node && rec->object != es->node)
+               return false;
+
+       if (rec->instance->interface->handle_old_style_properties)
+               for (entry = l_queue_get_entries(rec->properties);
+                               entry; entry = entry->next) {
+                       signal = build_old_property_changed_signal(es->dbus,
+                                                       rec, entry->data);
+                       if (signal)
+                               l_dbus_send(es->dbus, signal);
+               }
+
+       if (l_queue_find(rec->object->instances, match_interface_instance,
+                               L_DBUS_INTERFACE_PROPERTIES)) {
+               signal = build_properties_changed_signal(es->dbus, rec);
+               if (signal)
+                       l_dbus_send(es->dbus, signal);
+       }
+
+       property_change_record_free(rec);
+
+       return true;
+}
+
+void _dbus_object_tree_signals_flush(struct l_dbus *dbus, const char *path)
+{
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+       const struct l_queue_entry *entry;
+       struct emit_signals_data data;
+       bool all_done = true;
+
+       if (!tree->emit_signals_work || tree->flushing)
+               return;
+
+       tree->flushing = true;
+
+       data.dbus = dbus;
+       data.node = path ? _dbus_object_tree_lookup(tree, path) : NULL;
+
+       for (entry = l_queue_get_entries(tree->object_managers); entry;
+                       entry = entry->next) {
+               data.manager = entry->data;
+
+               l_queue_foreach_remove(data.manager->announce_removed,
+                                       emit_interfaces_removed, &data);
+
+               if (!l_queue_isempty(data.manager->announce_removed))
+                       all_done = false;
+
+               l_queue_foreach_remove(data.manager->announce_added,
+                                       emit_interfaces_added, &data);
+
+               if (!l_queue_isempty(data.manager->announce_added))
+                       all_done = false;
+       }
+
+       l_queue_foreach_remove(tree->property_changes,
+                               emit_properties_changed, &data);
+
+       if (!l_queue_isempty(tree->property_changes))
+               all_done = false;
+
+       if (all_done) {
+               l_idle_remove(tree->emit_signals_work);
+               tree->emit_signals_work = NULL;
+       }
+
+       tree->flushing = false;
+}
+
+static void emit_signals(struct l_idle *idle, void *user_data)
+{
+       struct l_dbus *dbus = user_data;
+
+       _dbus_object_tree_signals_flush(dbus, NULL);
+}
+
+static void schedule_emit_signals(struct l_dbus *dbus)
+{
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+
+       if (tree->emit_signals_work)
+               return;
+
+       tree->emit_signals_work = l_idle_create(emit_signals, dbus, NULL);
+}
+
+static bool match_property_changes_instance(const void *a, const void *b)
+{
+       const struct property_change_record *rec = a;
+
+       return rec->instance == b;
+}
+
+static bool match_pointer(const void *a, const void *b)
+{
+       return a == b;
+}
+
+bool _dbus_object_tree_property_changed(struct l_dbus *dbus,
+                                       const char *path,
+                                       const char *interface_name,
+                                       const char *property_name)
+{
+       struct property_change_record *rec;
+       struct object_node *object;
+       struct interface_instance *instance;
+       struct _dbus_property *property;
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+
+       object = l_hashmap_lookup(tree->objects, path);
+       if (!object)
+               return false;
+
+       instance = l_queue_find(object->instances, match_interface_instance,
+                               interface_name);
+       if (!instance)
+               return false;
+
+       property = _dbus_interface_find_property(instance->interface,
+                                                       property_name);
+       if (!property)
+               return false;
+
+       rec = l_queue_find(tree->property_changes,
+                               match_property_changes_instance, instance);
+
+       if (rec) {
+               if (l_queue_find(rec->properties, match_pointer, property))
+                       return true;
+       } else {
+               rec = l_new(struct property_change_record, 1);
+               rec->path = l_strdup(path);
+               rec->object = object;
+               rec->instance = instance;
+               rec->properties = l_queue_new();
+
+               l_queue_push_tail(tree->property_changes, rec);
+       }
+
+       l_queue_push_tail(rec->properties, property);
+
+       schedule_emit_signals(dbus);
+
+       return true;
+}
+
+static void pending_property_set_done_common(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message *reply,
+                                       bool auto_emit)
+{
+       const char *member;
+       const char *interface_name;
+       const char *property_name;
+       struct l_dbus_message_iter variant;
+
+       if (!reply) {
+               reply = l_dbus_message_new_method_return(message);
+               l_dbus_message_set_arguments(reply, "");
+       }
+
+       l_dbus_send(dbus, l_dbus_message_ref(reply));
+
+       member = l_dbus_message_get_member(message);
+       if (!strcmp(member, "SetProperty")) {
+               if (!l_dbus_message_get_arguments(message, "sv",
+                                               &property_name, &variant))
+                       goto done;
+
+               interface_name = l_dbus_message_get_interface(message);
+       } else if (strcmp(member, "Set") ||
+                       !l_dbus_message_get_arguments(message, "ssv",
+                                                       &interface_name,
+                                                       &property_name,
+                                                       &variant))
+               goto done;
+
+       if (auto_emit)
+               _dbus_object_tree_property_changed(dbus,
+                                       l_dbus_message_get_path(message),
+                                       interface_name, property_name);
+done:
+       l_dbus_message_unref(message);
+       l_dbus_message_unref(reply);
+}
+
+static void pending_property_set_done_emit(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message *reply)
+{
+       pending_property_set_done_common(dbus, message, reply, true);
+}
+
+static void pending_property_set_done(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message *reply)
+{
+       pending_property_set_done_common(dbus, message, reply, false);
+}
+
+static struct l_dbus_message *old_set_property(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       struct l_dbus_interface *interface;
+       const char *property_name;
+       const struct _dbus_property *property;
+       struct l_dbus_message_iter variant;
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+       struct l_dbus_message *reply;
+       l_dbus_property_complete_cb_t complete_cb;
+
+       interface = l_hashmap_lookup(tree->interfaces,
+                                       l_dbus_message_get_interface(message));
+       /* If we got here the interface must exist */
+
+       if (!l_dbus_message_get_arguments(message, "sv", &property_name,
+                                               &variant))
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Invalid arguments");
+
+       property = _dbus_interface_find_property(interface, property_name);
+       if (!property)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Unknown Property %s",
+                                               property_name);
+
+       if (!property->setter)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Property %s is read-only",
+                                               property_name);
+
+       if (property->flags & L_DBUS_PROPERTY_FLAG_AUTO_EMIT)
+               complete_cb = pending_property_set_done_emit;
+       else
+               complete_cb = pending_property_set_done;
+
+       reply = property->setter(dbus, l_dbus_message_ref(message), &variant,
+                                       complete_cb, user_data);
+
+       if (reply)
+               complete_cb(dbus, message, reply);
+
+       return NULL;
+}
+
+static struct l_dbus_message *old_get_properties(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       const struct l_dbus_interface *interface;
+       struct l_dbus_message *reply;
+       struct l_dbus_message_builder *builder;
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+
+       interface = l_hashmap_lookup(tree->interfaces,
+                                       l_dbus_message_get_interface(message));
+       /* If we got here the interface must exist */
+
+       reply = l_dbus_message_new_method_return(message);
+       builder = l_dbus_message_builder_new(reply);
+
+       if (!get_properties_dict(dbus, message, builder, interface,
+                                       user_data)) {
+               l_dbus_message_unref(reply);
+
+               reply = l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "Failed",
+                                               "Getting properties failed");
+       } else
+               l_dbus_message_builder_finalize(builder);
+
+       l_dbus_message_builder_destroy(builder);
+
+       return reply;
+}
+
+bool _dbus_object_tree_register_interface(struct _dbus_object_tree *tree,
+                               const char *interface,
+                               void (*setup_func)(struct l_dbus_interface *),
+                               void (*destroy) (void *),
+                               bool old_style_properties)
+{
+       struct l_dbus_interface *dbi;
+
+       if (!_dbus_valid_interface(interface))
+               return false;
+
+       /*
+        * Check to make sure we do not have this interface already
+        * registered
+        */
+       dbi = l_hashmap_lookup(tree->interfaces, interface);
+       if (dbi)
+               return false;
+
+       dbi = _dbus_interface_new(interface);
+       dbi->instance_destroy = destroy;
+       dbi->handle_old_style_properties = old_style_properties;
+
+       /* Add our methods first so we don't have to check for conflicts. */
+       if (old_style_properties) {
+               l_dbus_interface_method(dbi, "SetProperty", 0,
+                                       old_set_property, "", "sv",
+                                       "name", "value");
+               l_dbus_interface_method(dbi, "GetProperties", 0,
+                                       old_get_properties, "a{sv}", "",
+                                       "properties");
+
+               l_dbus_interface_signal(dbi, "PropertyChanged", 0, "sv",
+                                       "name", "value");
+       }
+
+       setup_func(dbi);
+
+       l_hashmap_insert(tree->interfaces, dbi->name, dbi);
+
+       return true;
+}
+
+struct interface_check {
+       struct _dbus_object_tree *tree;
+       const char *interface;
+};
+
+static void check_interface_used(const void *key, void *value, void *user_data)
+{
+       const char *path = key;
+       struct object_node *node = value;
+       struct interface_check *state = user_data;
+
+       if (!l_queue_find(node->instances, match_interface_instance,
+                               (char *) state->interface))
+               return;
+
+       _dbus_object_tree_remove_interface(state->tree, path, state->interface);
+}
+
+bool _dbus_object_tree_unregister_interface(struct _dbus_object_tree *tree,
+                                               const char *interface_name)
+{
+       struct l_dbus_interface *interface;
+       struct interface_check state = { tree, interface_name };
+
+       interface = l_hashmap_lookup(tree->interfaces, interface_name);
+       if (!interface)
+               return false;
+
+       /* Check that the interface is not in use */
+       l_hashmap_foreach(tree->objects, check_interface_used, &state);
+
+       l_hashmap_remove(tree->interfaces, interface_name);
+
+       _dbus_interface_free(interface);
+
+       return true;
+}
+
+static void collect_instances(struct object_node *node,
+                               const char *path,
+                               struct l_queue *announce)
+{
+       const struct l_queue_entry *entry;
+       struct interface_add_record *change_rec;
+       const struct child_node *child;
+
+       if (!node->instances)
+               goto recurse;
+
+       change_rec = l_new(struct interface_add_record, 1);
+       change_rec->path = l_strdup(path);
+       change_rec->object = node;
+       change_rec->instances = l_queue_new();
+
+       for (entry = l_queue_get_entries(node->instances); entry;
+                       entry = entry->next)
+               l_queue_push_tail(change_rec->instances, entry->data);
+
+       l_queue_push_tail(announce, change_rec);
+
+recurse:
+       if (!strcmp(path, "/"))
+               path = "";
+
+       for (child = node->children; child; child = child->next) {
+               char *child_path;
+
+               child_path = l_strdup_printf("%s/%s", path, child->subpath);
+
+               collect_instances(child->node, child_path, announce);
+
+               l_free(child_path);
+       }
+}
+
+static bool match_interfaces_added_object(const void *a, const void *b)
+{
+       const struct interface_add_record *rec = a;
+
+       return rec->object == b;
+}
+
+static bool match_interfaces_removed_object(const void *a, const void *b)
+{
+       const struct interface_remove_record *rec = a;
+
+       return rec->object == b;
+}
+
+bool _dbus_object_tree_add_interface(struct _dbus_object_tree *tree,
+                                       const char *path, const char *interface,
+                                       void *user_data)
+{
+       struct object_node *object;
+       struct l_dbus_interface *dbi;
+       struct interface_instance *instance;
+       const struct l_queue_entry *entry;
+       struct object_manager *manager;
+       size_t path_len;
+       struct interface_add_record *change_rec;
+
+       dbi = l_hashmap_lookup(tree->interfaces, interface);
+       if (!dbi)
+               return false;
+
+       object = l_hashmap_lookup(tree->objects, path);
+       if (!object) {
+               object = _dbus_object_tree_new_object(tree, path, NULL, NULL);
+
+               if (!object)
+                       return false;
+       }
+
+       /*
+        * Check to make sure we do not have this interface already
+        * registered for this object
+        */
+       if (l_queue_find(object->instances, match_interface_instance_ptr, dbi))
+               return false;
+
+       instance = l_new(struct interface_instance, 1);
+       instance->interface = dbi;
+       instance->user_data = user_data;
+
+       l_queue_push_tail(object->instances, instance);
+
+       for (entry = l_queue_get_entries(tree->object_managers); entry;
+                       entry = entry->next) {
+               manager = entry->data;
+               path_len = strlen(manager->path);
+
+               if (strncmp(path, manager->path, path_len) ||
+                               (path[path_len] != '\0' &&
+                                path[path_len] != '/' && path_len > 1))
+                       continue;
+
+               change_rec = l_queue_find(manager->announce_added,
+                                               match_interfaces_added_object,
+                                               object);
+               if (!change_rec) {
+                       change_rec = l_new(struct interface_add_record, 1);
+                       change_rec->path = l_strdup(path);
+                       change_rec->object = object;
+                       change_rec->instances = l_queue_new();
+
+                       l_queue_push_tail(manager->announce_added, change_rec);
+               }
+
+               /* No need to check for duplicates here */
+               l_queue_push_tail(change_rec->instances, instance);
+
+               schedule_emit_signals(manager->dbus);
+       }
+
+       if (!strcmp(interface, L_DBUS_INTERFACE_OBJECT_MANAGER)) {
+               manager = l_new(struct object_manager, 1);
+               manager->path = l_strdup(path);
+               manager->dbus = instance->user_data;
+               manager->announce_added = l_queue_new();
+               manager->announce_removed = l_queue_new();
+
+               l_queue_push_tail(tree->object_managers, manager);
+
+               /* Emit InterfacesAdded for interfaces added before OM */
+               collect_instances(object, path, manager->announce_added);
+
+               if (manager->dbus && !l_queue_isempty(manager->announce_added))
+                       schedule_emit_signals(manager->dbus);
+       }
+
+       return true;
+}
+
+void *_dbus_object_tree_get_interface_data(struct _dbus_object_tree *tree,
+                                               const char *path,
+                                               const char *interface)
+{
+       struct object_node *object;
+       struct interface_instance *instance;
+
+       object = l_hashmap_lookup(tree->objects, path);
+       if (!object)
+               return NULL;
+
+       instance = l_queue_find(object->instances, match_interface_instance,
+                               (char *) interface);
+       if (!instance)
+               return NULL;
+
+       return instance->user_data;
+}
+
+static bool match_object_manager_path(const void *a, const void *b)
+{
+       const struct object_manager *manager = a;
+
+       return !strcmp(manager->path, b);
+}
+
+bool _dbus_object_tree_remove_interface(struct _dbus_object_tree *tree,
+                                       const char *path, const char *interface)
+{
+       struct object_node *node;
+       struct interface_instance *instance;
+       const struct l_queue_entry *entry;
+       struct object_manager *manager;
+       size_t path_len;
+       struct interface_add_record *interfaces_added_rec;
+       struct interface_remove_record *interfaces_removed_rec;
+       struct property_change_record *property_change_rec;
+
+       node = l_hashmap_lookup(tree->objects, path);
+       if (!node)
+               return false;
+
+       instance = l_queue_remove_if(node->instances,
+                       match_interface_instance, (char *) interface);
+       if (!instance)
+               return false;
+
+       if (!strcmp(interface, L_DBUS_INTERFACE_OBJECT_MANAGER)) {
+               manager = l_queue_remove_if(tree->object_managers,
+                                               match_object_manager_path,
+                                               (char *) path);
+
+               if (manager)
+                       object_manager_free(manager);
+       }
+
+       for (entry = l_queue_get_entries(tree->object_managers); entry;
+                       entry = entry->next) {
+               manager = entry->data;
+               path_len = strlen(manager->path);
+
+               if (strncmp(path, manager->path, path_len) ||
+                               (path[path_len] != '\0' &&
+                                path[path_len] != '/' && path_len > 1))
+                       continue;
+
+               interfaces_added_rec = l_queue_find(manager->announce_added,
+                                               match_interfaces_added_object,
+                                               node);
+               if (interfaces_added_rec && l_queue_remove(
+                                               interfaces_added_rec->instances,
+                                               instance)) {
+                       if (l_queue_isempty(interfaces_added_rec->instances))
+                               l_queue_remove(manager->announce_added,
+                                               interfaces_added_rec);
+
+                       interface_add_record_free(interfaces_added_rec);
+
+                       continue;
+               }
+
+               interfaces_removed_rec = l_queue_find(manager->announce_removed,
+                                               match_interfaces_removed_object,
+                                               node);
+               if (!interfaces_removed_rec) {
+                       interfaces_removed_rec =
+                               l_new(struct interface_remove_record, 1);
+                       interfaces_removed_rec->path = l_strdup(path);
+                       interfaces_removed_rec->object = node;
+                       interfaces_removed_rec->interface_names =
+                               l_queue_new();
+                       l_queue_push_tail(manager->announce_removed,
+                                               interfaces_removed_rec);
+               }
+
+               /* No need to check for duplicates here */
+               l_queue_push_tail(interfaces_removed_rec->interface_names,
+                                       l_strdup(interface));
+
+               schedule_emit_signals(manager->dbus);
+       }
+
+       property_change_rec = l_queue_remove_if(tree->property_changes,
+                                               match_property_changes_instance,
+                                               instance);
+       if (property_change_rec)
+               property_change_record_free(property_change_rec);
+
+       interface_instance_free(instance);
+
+       return true;
+}
+
+static void generate_interface_instance(void *data, void *user)
+{
+       struct interface_instance *instance = data;
+       struct l_string *buf = user;
+
+       _dbus_interface_introspection(instance->interface, buf);
+}
+
+void _dbus_object_tree_introspect(struct _dbus_object_tree *tree,
+                                       const char *path, struct l_string *buf)
+{
+       struct object_node *node;
+       struct child_node *child;
+
+       node = l_hashmap_lookup(tree->objects, path);
+       if (!node)
+               node = _dbus_object_tree_lookup(tree, path);
+
+       l_string_append(buf, XML_HEAD);
+       l_string_append(buf, "<node>\n");
+
+       if (node) {
+               l_string_append(buf, static_introspectable);
+               l_queue_foreach(node->instances,
+                                       generate_interface_instance, buf);
+
+               for (child = node->children; child; child = child->next)
+                       l_string_append_printf(buf, "\t<node name=\"%s\"/>\n",
+                                               child->subpath);
+       }
+
+       l_string_append(buf, "</node>\n");
+}
+
+bool _dbus_object_tree_dispatch(struct _dbus_object_tree *tree,
+                                       struct l_dbus *dbus,
+                                       struct l_dbus_message *message)
+{
+       const char *path;
+       const char *interface;
+       const char *member;
+       const char *msg_sig;
+       const char *sig;
+       struct object_node *node;
+       struct interface_instance *instance;
+       struct _dbus_method *method;
+       struct l_dbus_message *reply;
+
+       path = l_dbus_message_get_path(message);
+       interface = l_dbus_message_get_interface(message);
+       member = l_dbus_message_get_member(message);
+       msg_sig = l_dbus_message_get_signature(message);
+
+       if (!msg_sig)
+               msg_sig = "";
+
+       if (!strcmp(interface, "org.freedesktop.DBus.Introspectable") &&
+                       !strcmp(member, "Introspect") &&
+                       !strcmp(msg_sig, "")) {
+               struct l_string *buf;
+               char *xml;
+
+               buf = l_string_new(0);
+               _dbus_object_tree_introspect(tree, path, buf);
+               xml = l_string_unwrap(buf);
+
+               reply = l_dbus_message_new_method_return(message);
+               l_dbus_message_set_arguments(reply, "s", xml);
+               l_dbus_send(dbus, reply);
+
+               l_free(xml);
+
+               return true;
+       }
+
+       node = l_hashmap_lookup(tree->objects, path);
+       if (!node)
+               return false;
+
+       instance = l_queue_find(node->instances,
+                               match_interface_instance, (char *) interface);
+       if (!instance)
+               return false;
+
+       method = _dbus_interface_find_method(instance->interface, member);
+       if (!method)
+               return false;
+
+       sig = method->metainfo + method->name_len + 1;
+
+       if (strcmp(msg_sig, sig))
+               return false;
+
+       reply = method->cb(dbus, message, instance->user_data);
+       if (reply)
+               l_dbus_send(dbus, reply);
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_property_changed(struct l_dbus *dbus, const char *path,
+                                       const char *interface,
+                                       const char *property)
+{
+       return _dbus_object_tree_property_changed(dbus, path, interface,
+                                                       property);
+}
+
+static struct l_dbus_message *properties_get(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       const struct interface_instance *instance;
+       const char *interface_name, *property_name, *signature;
+       const struct _dbus_property *property;
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+       const struct object_node *object;
+       struct l_dbus_message *reply;
+       struct l_dbus_message_builder *builder;
+
+       if (!l_dbus_message_get_arguments(message, "ss", &interface_name,
+                                               &property_name))
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Invalid arguments");
+
+       object = l_hashmap_lookup(tree->objects,
+                                       l_dbus_message_get_path(message));
+       /* If we got here the object must exist */
+
+       instance = l_queue_find(object->instances,
+                               match_interface_instance,
+                               (char *) interface_name);
+       if (!instance)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Object has no interface %s",
+                                               interface_name);
+
+       property = _dbus_interface_find_property(instance->interface,
+                                                       property_name);
+       if (!property)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Unknown Property %s",
+                                               property_name);
+
+
+       reply = l_dbus_message_new_method_return(message);
+       builder = l_dbus_message_builder_new(reply);
+
+       signature = property->metainfo + strlen(property->metainfo) + 1;
+
+       l_dbus_message_builder_enter_variant(builder, signature);
+
+       if (property->getter(dbus, message, builder, instance->user_data)) {
+               l_dbus_message_builder_leave_variant(builder);
+               l_dbus_message_builder_finalize(builder);
+       } else {
+               l_dbus_message_unref(reply);
+
+               reply = l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "Failed",
+                                               "Getting property value "
+                                               "failed");
+       }
+
+       l_dbus_message_builder_destroy(builder);
+
+       return reply;
+}
+
+static struct l_dbus_message *properties_set(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       struct l_dbus_interface *interface;
+       const struct interface_instance *instance;
+       const char *interface_name, *property_name;
+       const struct _dbus_property *property;
+       struct l_dbus_message_iter variant;
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+       const struct object_node *object;
+       struct l_dbus_message *reply;
+       l_dbus_property_complete_cb_t complete_cb;
+
+       if (!l_dbus_message_get_arguments(message, "ssv", &interface_name,
+                                               &property_name, &variant))
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Invalid arguments");
+
+       interface = l_hashmap_lookup(tree->interfaces, interface_name);
+       if (!interface)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Unknown Interface %s",
+                                               interface_name);
+
+       property = _dbus_interface_find_property(interface, property_name);
+       if (!property)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Unknown Property %s",
+                                               property_name);
+
+       if (!property->setter)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Property %s is read-only",
+                                               property_name);
+
+       object = l_hashmap_lookup(tree->objects,
+                                       l_dbus_message_get_path(message));
+       /* If we got here the object must exist */
+
+       instance = l_queue_find(object->instances,
+                               match_interface_instance_ptr, interface);
+       if (!instance)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Object has no interface %s",
+                                               interface_name);
+
+       if (property->flags & L_DBUS_PROPERTY_FLAG_AUTO_EMIT)
+               complete_cb = pending_property_set_done_emit;
+       else
+               complete_cb = pending_property_set_done;
+
+       reply = property->setter(dbus, l_dbus_message_ref(message), &variant,
+                                       complete_cb, instance->user_data);
+
+       if (reply)
+               complete_cb(dbus, message, reply);
+
+       return NULL;
+}
+
+static struct l_dbus_message *properties_get_all(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       const struct interface_instance *instance;
+       const char *interface_name;
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+       const struct object_node *object;
+       struct l_dbus_message *reply;
+       struct l_dbus_message_builder *builder;
+
+       if (!l_dbus_message_get_arguments(message, "s", &interface_name))
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Invalid arguments");
+
+       object = l_hashmap_lookup(tree->objects,
+                                       l_dbus_message_get_path(message));
+       /* If we got here the object must exist */
+
+       instance = l_queue_find(object->instances,
+                               match_interface_instance,
+                               (char *) interface_name);
+       if (!instance)
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "InvalidArgs",
+                                               "Object has no interface %s",
+                                               interface_name);
+
+       reply = l_dbus_message_new_method_return(message);
+       builder = l_dbus_message_builder_new(reply);
+
+       if (!get_properties_dict(dbus, message, builder, instance->interface,
+                                       instance->user_data)) {
+               l_dbus_message_unref(reply);
+
+               reply = l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "Failed",
+                                               "Getting property values "
+                                               "failed");
+       } else
+               l_dbus_message_builder_finalize(builder);
+
+       l_dbus_message_builder_destroy(builder);
+
+       return reply;
+}
+
+static void properties_setup_func(struct l_dbus_interface *interface)
+{
+       l_dbus_interface_method(interface, "Get", 0,
+                               properties_get, "v", "ss",
+                               "value", "interface_name", "property_name");
+       l_dbus_interface_method(interface, "Set", 0,
+                               properties_set, "", "ssv",
+                               "interface_name", "property_name", "value");
+       l_dbus_interface_method(interface, "GetAll", 0,
+                               properties_get_all, "a{sv}", "s",
+                               "props", "interface_name");
+
+       l_dbus_interface_signal(interface, "PropertiesChanged", 0, "sa{sv}as",
+                               "interface_name", "changed_properties",
+                               "invalidated_properties");
+}
+
+static bool collect_objects(struct l_dbus *dbus, struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               const struct object_node *node,
+                               const char *path)
+{
+       const struct l_queue_entry *entry;
+       const struct child_node *child;
+       char *child_path;
+       const struct interface_instance *instance;
+       bool r;
+
+       if (!node->instances)
+               goto recurse;
+
+       l_dbus_message_builder_enter_dict(builder, "oa{sa{sv}}");
+       l_dbus_message_builder_append_basic(builder, 'o', path);
+       l_dbus_message_builder_enter_array(builder, "{sa{sv}}");
+
+       for (entry = l_queue_get_entries(node->instances); entry;
+                       entry = entry->next) {
+               instance = entry->data;
+
+               l_dbus_message_builder_enter_dict(builder, "sa{sv}");
+               l_dbus_message_builder_append_basic(builder, 's',
+                                               instance->interface->name);
+
+               if (!get_properties_dict(dbus, message, builder,
+                                               instance->interface,
+                                               instance->user_data))
+                       return false;
+
+               l_dbus_message_builder_leave_dict(builder);
+       }
+
+       l_dbus_message_builder_leave_array(builder);
+       l_dbus_message_builder_leave_dict(builder);
+
+recurse:
+       if (!strcmp(path, "/"))
+               path = "";
+
+       for (child = node->children; child; child = child->next) {
+               child_path = l_strdup_printf("%s/%s", path, child->subpath);
+
+               r = collect_objects(dbus, message, builder,
+                                       child->node, child_path);
+
+               l_free(child_path);
+
+               if (!r)
+                       return false;
+       }
+
+       return true;
+}
+
+struct l_dbus_message *_dbus_object_tree_get_objects(
+                                               struct _dbus_object_tree *tree,
+                                               struct l_dbus *dbus,
+                                               const char *path,
+                                               struct l_dbus_message *message)
+{
+       const struct object_node *node;
+       struct l_dbus_message *reply;
+       struct l_dbus_message_builder *builder;
+
+       node = l_hashmap_lookup(tree->objects, path);
+
+       reply = l_dbus_message_new_method_return(message);
+       builder = l_dbus_message_builder_new(reply);
+
+       l_dbus_message_builder_enter_array(builder, "{oa{sa{sv}}}");
+
+       if (!collect_objects(dbus, message, builder, node, path)) {
+               l_dbus_message_builder_destroy(builder);
+               l_dbus_message_unref(reply);
+
+               return l_dbus_message_new_error(message,
+                                               "org.freedesktop.DBus.Error."
+                                               "Failed",
+                                               "Getting property values "
+                                               "failed");
+       }
+
+       l_dbus_message_builder_leave_array(builder);
+
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+
+       return reply;
+}
+
+static struct l_dbus_message *get_managed_objects(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       struct _dbus_object_tree *tree = _dbus_get_tree(dbus);
+       const char *path = l_dbus_message_get_path(message);
+
+       return _dbus_object_tree_get_objects(tree, dbus, path, message);
+}
+
+static void object_manager_setup_func(struct l_dbus_interface *interface)
+{
+       l_dbus_interface_method(interface, "GetManagedObjects", 0,
+                               get_managed_objects, "a{oa{sa{sv}}}", "",
+                               "objpath_interfaces_and_properties");
+
+       l_dbus_interface_signal(interface, "InterfacesAdded", 0, "oa{sa{sv}}",
+                               "object_path", "interfaces_and_properties");
+       l_dbus_interface_signal(interface, "InterfacesRemoved", 0, "oas",
+                               "object_path", "interfaces");
+}
diff --git a/ell/dbus-service.h b/ell/dbus-service.h
new file mode 100644 (file)
index 0000000..1a15049
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_SERVICE_H
+#define __ELL_SERVICE_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_dbus;
+struct l_dbus_interface;
+struct l_dbus_message;
+
+enum l_dbus_method_flag {
+       L_DBUS_METHOD_FLAG_DEPRECATED = 1,
+       L_DBUS_METHOD_FLAG_NOREPLY =    2,
+       L_DBUS_METHOD_FLAG_ASYNC =      4,
+};
+
+enum l_dbus_signal_flag {
+       L_DBUS_SIGNAL_FLAG_DEPRECATED = 1,
+};
+
+enum l_dbus_property_flag {
+       L_DBUS_PROPERTY_FLAG_DEPRECATED = 1,
+       L_DBUS_PROPERTY_FLAG_AUTO_EMIT  = 2,
+};
+
+typedef struct l_dbus_message *(*l_dbus_interface_method_cb_t) (struct l_dbus *,
+                                               struct l_dbus_message *message,
+                                               void *user_data);
+
+typedef void (*l_dbus_property_complete_cb_t) (struct l_dbus *,
+                                               struct l_dbus_message *,
+                                               struct l_dbus_message *error);
+
+typedef struct l_dbus_message *(*l_dbus_property_set_cb_t) (struct l_dbus *,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_iter *new_value,
+                                       l_dbus_property_complete_cb_t complete,
+                                       void *user_data);
+
+typedef bool (*l_dbus_property_get_cb_t) (struct l_dbus *,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_builder *builder,
+                                       void *user_data);
+
+bool l_dbus_interface_method(struct l_dbus_interface *interface,
+                               const char *name, uint32_t flags,
+                               l_dbus_interface_method_cb_t cb,
+                               const char *return_sig, const char *param_sig,
+                               ...);
+
+bool l_dbus_interface_signal(struct l_dbus_interface *interface,
+                               const char *name, uint32_t flags,
+                               const char *signature, ...);
+
+bool l_dbus_interface_property(struct l_dbus_interface *interface,
+                               const char *name, uint32_t flags,
+                               const char *signature,
+                               l_dbus_property_get_cb_t getter,
+                               l_dbus_property_set_cb_t setter);
+
+bool l_dbus_property_changed(struct l_dbus *dbus, const char *path,
+                               const char *interface, const char *property);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_DBUS_SERVICE_H */
diff --git a/ell/dbus-util.c b/ell/dbus-util.c
new file mode 100644 (file)
index 0000000..acf428c
--- /dev/null
@@ -0,0 +1,1303 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdbool.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include "dbus.h"
+#include "private.h"
+#include "dbus-private.h"
+#include "string.h"
+#include "queue.h"
+
+#define DBUS_MAX_INTERFACE_LEN 255
+#define DBUS_MAX_METHOD_LEN 255
+
+static const char *simple_types = "sogybnqiuxtdh";
+
+static int get_alignment(const char type)
+{
+       switch (type) {
+       case 'b':
+               return 4;
+       case 'y':
+               return 1;
+       case 'n':
+       case 'q':
+               return 2;
+       case 'u':
+       case 'i':
+               return 4;
+       case 'x':
+       case 't':
+       case 'd':
+               return 8;
+       case 's':
+       case 'o':
+               return 4;
+       case 'g':
+               return 1;
+       case 'a':
+               return 4;
+       case '(':
+       case '{':
+               return 8;
+       case 'v':
+               return 1;
+       case 'h':
+               return 4;
+       default:
+               return 0;
+       }
+}
+
+static int get_basic_size(const char type)
+{
+       switch (type) {
+       case 'b':
+               return 4;
+       case 'y':
+               return 1;
+       case 'n':
+       case 'q':
+               return 2;
+       case 'i':
+       case 'u':
+               return 4;
+       case 'x':
+       case 't':
+               return 8;
+       case 'd':
+               return 8;
+       case 'h':
+               return 4;
+       default:
+               return 0;
+       }
+}
+
+static inline bool is_valid_character(const char c, bool bus_name)
+{
+       if (c >= 'a' && c <= 'z')
+               return true;
+
+       if (c >= 'A' && c <= 'Z')
+               return true;
+
+       if (c >= '0' && c <= '9')
+               return true;
+
+       if (c == '_')
+               return true;
+
+       if (c == '-' && bus_name)
+               return true;
+
+       return false;
+}
+
+bool _dbus_valid_object_path(const char *path)
+{
+       unsigned int i;
+       char c = '\0';
+
+       if (path == NULL)
+               return false;
+
+       if (path[0] == '\0')
+               return false;
+
+       if (path[0] && !path[1] && path[0] == '/')
+               return true;
+
+       if (path[0] != '/')
+               return false;
+
+       for (i = 0; path[i]; i++) {
+               if (path[i] == '/' && c == '/')
+                       return false;
+
+               c = path[i];
+
+               if (is_valid_character(path[i], false) || path[i] == '/')
+                       continue;
+
+               return false;
+       }
+
+       if (path[i-1] == '/')
+               return false;
+
+       return true;
+}
+
+static const char *validate_next_type(const char *sig)
+{
+       char s = *sig;
+
+       if (s == '\0')
+               return NULL;
+
+       if (strchr(simple_types, s) || s == 'v')
+               return sig + 1;
+
+       switch (s) {
+       case 'a':
+               s = *++sig;
+
+               if (s == '{') {
+                       s = *++sig;
+
+                       /* Dictionary keys can only be simple types */
+                       if (!strchr(simple_types, s))
+                               return NULL;
+
+                       sig = validate_next_type(sig + 1);
+
+                       if (!sig)
+                               return NULL;
+
+                       if (*sig != '}')
+                               return NULL;
+
+                       return sig + 1;
+               }
+
+               return validate_next_type(sig);
+
+       case '(':
+               sig++;
+
+               do
+                       sig = validate_next_type(sig);
+               while (sig && *sig != ')');
+
+               if (!sig)
+                       return NULL;
+
+               return sig + 1;
+       }
+
+       return NULL;
+}
+
+static bool valid_dict_signature(const char *sig)
+{
+       char s = *sig;
+
+       if (s != '{')
+               return false;
+
+       s = *++sig;
+
+       if (!strchr(simple_types, s))
+               return false;
+
+       sig = validate_next_type(sig + 1);
+       if (!sig)
+               return false;
+
+       if (sig[0] != '}')
+               return false;
+
+       if (sig[1] != '\0')
+               return false;
+
+       return true;
+}
+
+bool _dbus_valid_signature(const char *sig)
+{
+       const char *s = sig;
+
+       do {
+               s = validate_next_type(s);
+
+               if (!s)
+                       return false;
+       } while (*s);
+
+       return true;
+}
+
+int _dbus_num_children(const char *sig)
+{
+       const char *s = sig;
+       int num_children = 0;
+
+       do {
+               s = validate_next_type(s);
+
+               if (!s)
+                       return -1;
+
+               num_children += 1;
+       } while (*s);
+
+       return num_children;
+}
+
+static bool valid_member_name(const char *start, const char *end,
+                               bool bus_name)
+{
+       const char *p;
+
+       if ((end - start) < 1)
+               return false;
+
+       if (*start >= '0' && *start <= '9')
+               return false;
+
+       for (p = start; p < end; p++)
+               if (!is_valid_character(*p, bus_name))
+                       return false;
+
+       return true;
+}
+
+bool _dbus_valid_method(const char *method)
+{
+       unsigned int i;
+
+       if (!method)
+               return false;
+
+       if (method[0] == '\0' || strlen(method) > DBUS_MAX_METHOD_LEN)
+               return false;
+
+       if (method[0] >= '0' && method[0] <= '9')
+               return false;
+
+       for (i = 0; method[i]; i++)
+               if (!is_valid_character(method[i], false))
+                       return false;
+
+       return true;
+}
+
+bool _dbus_valid_interface(const char *interface)
+{
+       const char *sep;
+
+       if (!interface)
+               return false;
+
+       if (interface[0] == '\0' || strlen(interface) > DBUS_MAX_INTERFACE_LEN)
+               return false;
+
+       sep = strchrnul(interface, '.');
+       if (*sep == '\0')
+               return false;
+
+       while (true) {
+               if (!valid_member_name(interface, sep, false))
+                       return false;
+
+               if (*sep == '\0')
+                       break;
+
+               interface = sep + 1;
+               sep = strchrnul(interface, '.');
+       }
+
+       return true;
+}
+
+bool _dbus_parse_unique_name(const char *name, uint64_t *out_id)
+{
+       char *endp = NULL;
+       uint64_t r;
+
+       if (!l_str_has_prefix(name, ":1."))
+               return false;
+
+       errno = 0;
+       r = strtoull(name + 3, &endp, 10);
+       if (!endp || endp == name || *endp || errno)
+               return false;
+
+       if (out_id)
+               *out_id = r;
+
+       return true;
+}
+
+bool _dbus_valid_bus_name(const char *bus_name)
+{
+       const char *sep;
+
+       if (!bus_name)
+               return false;
+
+       if (bus_name[0] == '\0' || strlen(bus_name) > DBUS_MAX_INTERFACE_LEN)
+               return false;
+
+       if (_dbus_parse_unique_name(bus_name, NULL))
+               return true;
+
+       sep = strchrnul(bus_name, '.');
+       if (*sep == '\0')
+               return false;
+
+       while (true) {
+               if (!valid_member_name(bus_name, sep, true))
+                       return false;
+
+               if (*sep == '\0')
+                       break;
+
+               bus_name = sep + 1;
+               sep = strchrnul(bus_name, '.');
+       }
+
+       return true;
+}
+
+const char *_dbus_signature_end(const char *signature)
+{
+       const char *ptr = signature;
+       unsigned int indent = 0;
+       char expect;
+
+       switch (*signature) {
+       case '(':
+               expect = ')';
+               break;
+       case '{':
+               expect = '}';
+               break;
+       case 'a':
+               return _dbus_signature_end(signature + 1);
+       default:
+               return signature;
+       }
+
+       for (ptr = signature; *ptr != '\0'; ptr++) {
+               if (*ptr == *signature)
+                       indent++;
+               else if (*ptr == expect)
+                       if (!--indent)
+                               return ptr;
+       }
+
+       return NULL;
+}
+
+bool _dbus1_header_is_valid(void *data, size_t size)
+{
+       struct dbus_header *hdr;
+       size_t header_len;
+
+       if (size < sizeof(struct dbus_header))
+               return false;
+
+       hdr = data;
+
+       if (hdr->endian != DBUS_NATIVE_ENDIAN)
+               header_len = bswap_32(hdr->dbus1.field_length);
+       else
+               header_len = hdr->dbus1.field_length;
+
+       header_len += sizeof(struct dbus_header);
+       return size >= header_len;
+}
+
+static inline void dbus1_iter_init_internal(struct l_dbus_message_iter *iter,
+                                               struct l_dbus_message *message,
+                                               enum dbus_container_type type,
+                                               const char *sig_start,
+                                               const char *sig_end,
+                                               const void *data, size_t len,
+                                               size_t pos)
+{
+       size_t sig_len;
+
+       iter->message = message;
+
+       if (sig_end)
+               sig_len = sig_end - sig_start;
+       else
+               sig_len = strlen(sig_start);
+
+       iter->sig_start = sig_start;
+       iter->sig_len = sig_len;
+       iter->sig_pos = 0;
+       iter->data = data;
+       iter->len = pos + len;
+       iter->pos = pos;
+       iter->container_type = type;
+}
+
+void _dbus1_iter_init(struct l_dbus_message_iter *iter,
+                       struct l_dbus_message *message,
+                       const char *sig_start, const char *sig_end,
+                       const void *data, size_t len)
+{
+       dbus1_iter_init_internal(iter, message, DBUS_CONTAINER_TYPE_STRUCT,
+                                       sig_start, sig_end, data, len, 0);
+}
+
+static const char *calc_len_next_item(const char *signature, const void *data,
+                                       size_t data_pos, size_t data_len,
+                                       size_t *out_len)
+{
+       unsigned int alignment;
+       size_t pos;
+       size_t len;
+       const char *sig_end;
+       const char *var_sig;
+
+       alignment = get_alignment(*signature);
+       if (alignment == 0)
+               return NULL;
+
+       pos = align_len(data_pos, alignment);
+       if (pos > data_len)
+               return NULL;
+
+       switch (*signature) {
+       case 'o':
+       case 's':
+               if (pos + 5 > data_len)
+                       return NULL;
+
+               pos += l_get_u32(data + pos) + 5;
+               break;
+       case 'g':
+               if (pos + 2 > data_len)
+                       return NULL;
+
+               pos += l_get_u8(data + pos) + 2;
+               break;
+       case 'y':
+               pos += 1;
+               break;
+       case 'n':
+       case 'q':
+               pos += 2;
+               break;
+       case 'b':
+       case 'i':
+       case 'u':
+       case 'h':
+               pos += 4;
+               break;
+       case 'x':
+       case 't':
+       case 'd':
+               pos += 8;
+               break;
+       case 'a':
+               if (pos + 4 > data_len)
+                       return NULL;
+
+               len = l_get_u32(data + pos);
+               pos += 4;
+
+               alignment = get_alignment(signature[1]);
+               pos = align_len(pos, alignment);
+               pos += len;
+
+               sig_end = _dbus_signature_end(signature) + 1;
+               goto done;
+       case '(':
+               sig_end = signature + 1;
+
+               while (*sig_end != ')') {
+                       sig_end = calc_len_next_item(sig_end, data, pos,
+                                                       data_len, &len);
+
+                       if (!sig_end)
+                               return NULL;
+
+                       pos += len;
+               }
+
+               sig_end += 1;
+               goto done;
+       case '{':
+               sig_end = calc_len_next_item(signature + 1, data, pos,
+                                               data_len, &len);
+
+               if (!sig_end)
+                       return NULL;
+
+               pos += len;
+
+               sig_end = calc_len_next_item(sig_end, data, pos,
+                                               data_len, &len);
+
+               if (!sig_end)
+                       return NULL;
+
+               pos += len;
+               sig_end += 1;
+               goto done;
+       case 'v':
+               if (!calc_len_next_item("g", data, pos, data_len, &len))
+                       return NULL;
+
+               var_sig = data + pos + 1;
+               pos += len;
+
+               if (!calc_len_next_item(var_sig, data, pos, data_len, &len))
+                       return NULL;
+
+               pos += len;
+               break;
+       default:
+               return NULL;
+       }
+
+       sig_end = signature + 1;
+
+done:
+       if (pos > data_len)
+               return NULL;
+
+       *out_len = pos - data_pos;
+       return sig_end;
+}
+
+bool _dbus1_iter_next_entry_basic(struct l_dbus_message_iter *iter,
+                                       char type, void *out)
+{
+       const char *str_val;
+       uint8_t uint8_val;
+       uint16_t uint16_val;
+       uint32_t uint32_val;
+       uint64_t uint64_val;
+       int16_t int16_val;
+       int32_t int32_val;
+       int64_t int64_val;
+       size_t pos;
+
+       if (iter->pos >= iter->len)
+               return false;
+
+       pos = align_len(iter->pos, get_alignment(type));
+
+       switch (type) {
+       case 'o':
+       case 's':
+               if (pos + 5 > iter->len)
+                       return false;
+               uint32_val = l_get_u32(iter->data + pos);
+               str_val = iter->data + pos + 4;
+               *(const void **) out = str_val;
+               iter->pos = pos + uint32_val + 5;
+               break;
+       case 'g':
+               if (pos + 2 > iter->len)
+                       return false;
+               uint8_val = l_get_u8(iter->data + pos);
+               str_val = iter->data + pos + 1;
+               *(const void **) out = str_val;
+               iter->pos = pos + uint8_val + 2;
+               break;
+       case 'b':
+               if (pos + 4 > iter->len)
+                       return false;
+               uint32_val = l_get_u32(iter->data + pos);
+               *(bool *) out = !!uint32_val;
+               iter->pos = pos + 4;
+               break;
+       case 'y':
+               if (pos + 1 > iter->len)
+                       return false;
+               uint8_val = l_get_u8(iter->data + pos);
+               *(uint8_t *) out = uint8_val;
+               iter->pos = pos + 1;
+               break;
+       case 'n':
+               if (pos + 2 > iter->len)
+                       return false;
+               int16_val = l_get_s16(iter->data + pos);
+               *(int16_t *) out = int16_val;
+               iter->pos = pos + 2;
+               break;
+       case 'q':
+               if (pos + 2 > iter->len)
+                       return false;
+               uint16_val = l_get_u16(iter->data + pos);
+               *(uint16_t *) out = uint16_val;
+               iter->pos = pos + 2;
+               break;
+       case 'i':
+               if (pos + 4 > iter->len)
+                       return false;
+               int32_val = l_get_s32(iter->data + pos);
+               *(int32_t *) out = int32_val;
+               iter->pos = pos + 4;
+               break;
+       case 'u':
+       case 'h':
+               if (pos + 4 > iter->len)
+                       return false;
+               uint32_val = l_get_u32(iter->data + pos);
+               *(uint32_t *) out = uint32_val;
+               iter->pos = pos + 4;
+               break;
+       case 'x':
+               if (pos + 8 > iter->len)
+                       return false;
+               int64_val = l_get_s64(iter->data + pos);
+               *(int64_t *) out= int64_val;
+               iter->pos = pos + 8;
+               break;
+       case 't':
+       case 'd':
+               if (pos + 8 > iter->len)
+                       return false;
+               uint64_val = l_get_u64(iter->data + pos);
+               *(uint64_t *) out = uint64_val;
+               iter->pos = pos + 8;
+               break;
+       default:
+               return false;
+       }
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY)
+               iter->sig_pos += 1;
+
+       return true;
+}
+
+bool _dbus1_iter_get_fixed_array(struct l_dbus_message_iter *iter,
+                                       void *out, uint32_t *n_elem)
+{
+       char type;
+       uint32_t size;
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY)
+               return false;
+
+       type = iter->sig_start[iter->sig_pos];
+       size = get_basic_size(type);
+
+       /* Fail if the array is not a fixed size or contains file descriptors */
+       if (!size || type == 'n')
+               return false;
+
+       /*
+        * enter_array should already align us to our container type, so
+        * there is no need to align pos here
+        */
+       *(const void **) out = iter->data + iter->pos;
+       *n_elem = (iter->len - iter->pos) / size;
+
+       return true;
+}
+
+bool _dbus1_iter_enter_struct(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *structure)
+{
+       size_t len;
+       size_t pos;
+       const char *sig_start;
+       const char *sig_end;
+       bool is_dict = iter->sig_start[iter->sig_pos] == '{';
+       bool is_struct = iter->sig_start[iter->sig_pos] == '(';
+
+       if (!is_dict && !is_struct)
+               return false;
+
+       pos = align_len(iter->pos, 8);
+       if (pos >= iter->len)
+               return false;
+
+       sig_start = iter->sig_start + iter->sig_pos + 1;
+       sig_end = _dbus_signature_end(iter->sig_start + iter->sig_pos);
+
+       if (!calc_len_next_item(iter->sig_start + iter->sig_pos,
+                               iter->data, pos, iter->len, &len))
+               return false;
+
+       dbus1_iter_init_internal(structure, iter->message,
+                                       DBUS_CONTAINER_TYPE_STRUCT,
+                                       sig_start, sig_end, iter->data,
+                                       len, pos);
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY)
+               iter->sig_pos += sig_end - sig_start + 2;
+
+       iter->pos = pos + len;
+
+       return true;
+}
+
+bool _dbus1_iter_enter_variant(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *variant)
+{
+       size_t pos;
+       uint8_t sig_len;
+       size_t len;
+       const char *sig_start;
+
+       if (iter->sig_start[iter->sig_pos] != 'v')
+               return false;
+
+       pos = align_len(iter->pos, 1);
+       if (pos + 2 > iter->len)
+               return false;
+
+       sig_len = l_get_u8(iter->data + pos);
+       sig_start = iter->data + pos + 1;
+
+       if (!calc_len_next_item(sig_start, iter->data, pos + sig_len + 2,
+                                       iter->len, &len))
+               return false;
+
+       dbus1_iter_init_internal(variant, iter->message,
+                                       DBUS_CONTAINER_TYPE_VARIANT,
+                                       sig_start, NULL, iter->data,
+                                       len, pos + sig_len + 2);
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY)
+               iter->sig_pos += 1;
+
+       iter->pos = pos + sig_len + 2 + len;
+
+       return true;
+}
+
+bool _dbus1_iter_enter_array(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *array)
+{
+       size_t pos;
+       size_t len;
+       const char *sig_start;
+       const char *sig_end;
+
+       if (iter->sig_start[iter->sig_pos] != 'a')
+               return false;
+
+       sig_start = iter->sig_start + iter->sig_pos + 1;
+       sig_end = _dbus_signature_end(sig_start) + 1;
+
+       pos = align_len(iter->pos, 4);
+       if (pos + 4 > iter->len)
+               return false;
+
+       len = l_get_u32(iter->data + pos);
+       pos += 4;
+
+       pos = align_len(pos, get_alignment(*sig_start));
+       dbus1_iter_init_internal(array, iter->message,
+                                       DBUS_CONTAINER_TYPE_ARRAY,
+                                       sig_start, sig_end,
+                                       iter->data, len, pos);
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY)
+               iter->sig_pos += sig_end - sig_start + 1;
+
+       iter->pos = pos + len;
+
+       return true;
+}
+
+bool _dbus1_iter_skip_entry(struct l_dbus_message_iter *iter)
+{
+       size_t len;
+       const char *sig_end;
+
+       sig_end = calc_len_next_item(iter->sig_start + iter->sig_pos,
+                                       iter->data, iter->pos, iter->len, &len);
+       if (!sig_end)
+               return false;
+
+       iter->pos += len;
+       iter->sig_pos = sig_end - iter->sig_start;
+
+       return true;
+}
+
+struct dbus_builder {
+       struct l_string *signature;
+       void *body;
+       size_t body_size;
+       size_t body_pos;
+       struct l_queue *containers;
+       struct {
+               struct container *container;
+               int sig_end;
+               size_t body_pos;
+       } mark;
+};
+
+struct container {
+       size_t start;
+       enum dbus_container_type type;
+       char signature[256];
+       uint8_t sigindex;
+};
+
+static struct container *container_new(enum dbus_container_type type,
+                                       const char *signature, size_t start)
+{
+       struct container *ret;
+
+       ret = l_new(struct container, 1);
+
+       ret->type = type;
+       strcpy(ret->signature, signature);
+       ret->start = start;
+
+       return ret;
+}
+
+static void container_free(struct container *container)
+{
+       l_free(container);
+}
+
+static inline size_t grow_body(struct dbus_builder *builder,
+                                       size_t len, unsigned int alignment)
+{
+       size_t size = align_len(builder->body_pos, alignment);
+
+       if (size + len > builder->body_size) {
+               builder->body = l_realloc(builder->body, size + len);
+               builder->body_size = size + len;
+       }
+
+       if (size - builder->body_pos > 0)
+               memset(builder->body + builder->body_pos, 0,
+                                       size - builder->body_pos);
+
+       builder->body_pos = size + len;
+
+       return size;
+}
+
+struct dbus_builder *_dbus1_builder_new(void *body, size_t body_size)
+{
+       struct dbus_builder *builder;
+       struct container *root;
+
+       builder = l_new(struct dbus_builder, 1);
+       builder->signature = l_string_new(63);
+
+       builder->containers = l_queue_new();
+       root = container_new(DBUS_CONTAINER_TYPE_STRUCT, "", 0);
+       l_queue_push_head(builder->containers, root);
+
+       builder->body = body;
+       builder->body_size = body_size;
+       builder->body_pos = body_size;
+
+       builder->mark.container = root;
+       builder->mark.sig_end = 0;
+       builder->mark.body_pos = 0;
+
+       return builder;
+}
+
+void _dbus1_builder_free(struct dbus_builder *builder)
+{
+       if (unlikely(!builder))
+               return;
+
+       l_string_free(builder->signature);
+       l_queue_destroy(builder->containers,
+                               (l_queue_destroy_func_t) container_free);
+       l_free(builder->body);
+
+       l_free(builder);
+}
+
+bool _dbus1_builder_append_basic(struct dbus_builder *builder,
+                                       char type, const void *value)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+       unsigned int alignment;
+       size_t len;
+
+       if (unlikely(!builder))
+               return false;
+
+       if (unlikely(!strchr(simple_types, type)))
+               return false;
+
+       alignment = get_alignment(type);
+       if (!alignment)
+               return false;
+
+       if (l_queue_length(builder->containers) == 1)
+               l_string_append_c(builder->signature, type);
+       else if (container->signature[container->sigindex] != type)
+               return false;
+
+       len = get_basic_size(type);
+
+       if (len) {
+               uint32_t b;
+
+               start = grow_body(builder, len, alignment);
+
+               if (type == 'b') {
+                       b = *(bool *)value;
+                       memcpy(builder->body + start, &b, len);
+               } else
+                       memcpy(builder->body + start, value, len);
+
+               if (container->type != DBUS_CONTAINER_TYPE_ARRAY)
+                       container->sigindex += 1;
+
+               return true;
+       }
+
+       len = strlen(value);
+
+       if (type == 'g') {
+               start = grow_body(builder, len + 2, 1);
+               l_put_u8(len, builder->body + start);
+               strcpy(builder->body + start + 1, value);
+       } else {
+               start = grow_body(builder, len + 5, 4);
+               l_put_u32(len, builder->body + start);
+               strcpy(builder->body + start + 4, value);
+       }
+
+       if (container->type != DBUS_CONTAINER_TYPE_ARRAY)
+               container->sigindex += 1;
+
+       return true;
+}
+
+static bool enter_struct_dict_common(struct dbus_builder *builder,
+                                       const char *signature,
+                                       enum dbus_container_type type,
+                                       const char open,
+                                       const char close)
+{
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+
+       if (qlen == 1) {
+               if (l_string_length(builder->signature) +
+                               strlen(signature) + 2 > 255)
+                       return false;
+       } else {
+               /* Verify Signatures Match */
+               char expect[256];
+               const char *start;
+               const char *end;
+
+               start = container->signature + container->sigindex;
+               end = _dbus_signature_end(start);
+
+               if (*start != open || *end != close)
+                       return false;
+
+               memcpy(expect, start + 1, end - start - 1);
+               expect[end - start - 1] = '\0';
+
+               if (strcmp(expect, signature))
+                       return false;
+       }
+
+       start = grow_body(builder, 0, 8);
+
+       container = container_new(type, signature, start);
+       l_queue_push_head(builder->containers, container);
+
+       return true;
+}
+
+bool _dbus1_builder_enter_struct(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       if (!_dbus_valid_signature(signature))
+               return false;
+
+       return enter_struct_dict_common(builder, signature,
+                                       DBUS_CONTAINER_TYPE_STRUCT, '(', ')');
+}
+
+bool _dbus1_builder_enter_dict(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       if (_dbus_num_children(signature) != 2)
+               return false;
+
+       if (!strchr(simple_types, signature[0]))
+               return false;
+
+       return enter_struct_dict_common(builder, signature,
+                                       DBUS_CONTAINER_TYPE_DICT_ENTRY,
+                                       '{', '}');
+}
+
+static bool leave_struct_dict_common(struct dbus_builder *builder,
+                                       enum dbus_container_type type,
+                                       const char open,
+                                       const char close)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *parent;
+
+       if (unlikely(qlen <= 1))
+               return false;
+
+       if (unlikely(container->type != type))
+               return false;
+
+       l_queue_pop_head(builder->containers);
+       qlen -= 1;
+       parent = l_queue_peek_head(builder->containers);
+
+       if (qlen == 1)
+               l_string_append_printf(builder->signature, "%c%s%c",
+                                               open,
+                                               container->signature,
+                                               close);
+       else if (parent->type != DBUS_CONTAINER_TYPE_ARRAY)
+               parent->sigindex += strlen(container->signature) + 2;
+
+       container_free(container);
+
+       return true;
+}
+
+bool _dbus1_builder_leave_struct(struct dbus_builder *builder)
+{
+       return leave_struct_dict_common(builder, DBUS_CONTAINER_TYPE_STRUCT,
+                                       '(', ')');
+}
+
+bool _dbus1_builder_leave_dict(struct dbus_builder *builder)
+{
+       return leave_struct_dict_common(builder,
+                                       DBUS_CONTAINER_TYPE_DICT_ENTRY,
+                                       '{', '}');
+}
+
+bool _dbus1_builder_enter_variant(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+       size_t siglen;
+
+       if (_dbus_num_children(signature) != 1)
+               return false;
+
+       if (qlen == 1) {
+               if (l_string_length(builder->signature) + 1 > 255)
+                       return false;
+       } else if (container->signature[container->sigindex] != 'v')
+               return false;
+
+       siglen = strlen(signature);
+       start = grow_body(builder, siglen + 2, 1);
+       l_put_u8(siglen, builder->body + start);
+       strcpy(builder->body + start + 1, signature);
+
+       container = container_new(DBUS_CONTAINER_TYPE_VARIANT,
+                                       signature, start);
+       l_queue_push_head(builder->containers, container);
+
+       return true;
+}
+
+bool _dbus1_builder_leave_variant(struct dbus_builder *builder)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *parent;
+
+       if (unlikely(qlen <= 1))
+               return false;
+
+       if (unlikely(container->type != DBUS_CONTAINER_TYPE_VARIANT))
+               return false;
+
+       l_queue_pop_head(builder->containers);
+       qlen -= 1;
+       parent = l_queue_peek_head(builder->containers);
+
+       if (qlen == 1)
+               l_string_append_c(builder->signature, 'v');
+       else if (parent->type != DBUS_CONTAINER_TYPE_ARRAY)
+               parent->sigindex += 1;
+
+       container_free(container);
+
+       return true;
+}
+
+bool _dbus1_builder_enter_array(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+       int alignment;
+
+       if (_dbus_num_children(signature) != 1 &&
+                       !valid_dict_signature(signature))
+               return false;
+
+       if (qlen == 1) {
+               if (l_string_length(builder->signature) +
+                               strlen(signature) + 1 > 255)
+                       return false;
+       } else {
+               /* Verify Signatures Match */
+               char expect[256];
+               const char *start;
+               const char *end;
+
+               start = container->signature + container->sigindex;
+               end = validate_next_type(start);
+
+               if (*start != 'a')
+                       return false;
+
+               memcpy(expect, start + 1, end - start - 1);
+               expect[end - start - 1] = '\0';
+
+               if (strcmp(expect, signature))
+                       return false;
+       }
+
+       /* First grow the body enough to cover preceding length */
+       start = grow_body(builder, 4, 4);
+
+       /* Now align to element alignment */
+       alignment = get_alignment(*signature);
+       grow_body(builder, 0, alignment);
+
+       container = container_new(DBUS_CONTAINER_TYPE_ARRAY, signature, start);
+       l_queue_push_head(builder->containers, container);
+
+       return true;
+}
+
+bool _dbus1_builder_leave_array(struct dbus_builder *builder)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *parent;
+       size_t alignment;
+       size_t array_start;
+
+       if (unlikely(qlen <= 1))
+               return false;
+
+       if (unlikely(container->type != DBUS_CONTAINER_TYPE_ARRAY))
+               return false;
+
+       l_queue_pop_head(builder->containers);
+       qlen -= 1;
+       parent = l_queue_peek_head(builder->containers);
+
+       if (qlen == 1)
+               l_string_append_printf(builder->signature, "a%s",
+                                                       container->signature);
+       else if (parent->type != DBUS_CONTAINER_TYPE_ARRAY)
+               parent->sigindex += strlen(container->signature) + 1;
+
+       /* Update array length */
+       alignment = get_alignment(container->signature[0]);
+       array_start = align_len(container->start + 4, alignment);
+
+       l_put_u32(builder->body_pos - array_start,
+                       builder->body + container->start);
+
+       container_free(container);
+
+       return true;
+}
+
+bool _dbus1_builder_mark(struct dbus_builder *builder)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+
+       builder->mark.container = container;
+
+       if (l_queue_length(builder->containers) == 1)
+               builder->mark.sig_end = l_string_length(builder->signature);
+       else
+               builder->mark.sig_end = container->sigindex;
+
+       builder->mark.body_pos = builder->body_pos;
+
+       return true;
+}
+
+bool _dbus1_builder_rewind(struct dbus_builder *builder)
+{
+       struct container *container;
+
+       while ((container = l_queue_peek_head(builder->containers)) !=
+                               builder->mark.container) {
+               container_free(container);
+               l_queue_pop_head(builder->containers);
+       }
+
+       builder->body_pos = builder->mark.body_pos;
+
+       if (l_queue_length(builder->containers) == 1)
+               l_string_truncate(builder->signature, builder->mark.sig_end);
+       else
+               container->sigindex = builder->mark.sig_end;
+
+       return true;
+}
+
+char *_dbus1_builder_finish(struct dbus_builder *builder,
+                               void **body, size_t *body_size)
+{
+       char *signature;
+
+       if (unlikely(!builder))
+               return NULL;
+
+       if (unlikely(l_queue_length(builder->containers) != 1))
+               return NULL;
+
+       signature = l_string_unwrap(builder->signature);
+       builder->signature = NULL;
+
+       *body = builder->body;
+       *body_size = builder->body_pos;
+       builder->body = NULL;
+       builder->body_size = 0;
+
+       return signature;
+}
diff --git a/ell/dbus.c b/ell/dbus.c
new file mode 100644 (file)
index 0000000..845ccb3
--- /dev/null
@@ -0,0 +1,1812 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <errno.h>
+
+#include "util.h"
+#include "io.h"
+#include "idle.h"
+#include "queue.h"
+#include "hashmap.h"
+#include "dbus.h"
+#include "private.h"
+#include "dbus-private.h"
+
+#define DEFAULT_SYSTEM_BUS_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
+
+#define DBUS_SERVICE_DBUS      "org.freedesktop.DBus"
+
+#define DBUS_PATH_DBUS         "/org/freedesktop/DBus"
+
+#define DBUS_MAXIMUM_MATCH_RULE_LENGTH 1024
+
+enum auth_state {
+       WAITING_FOR_OK,
+       WAITING_FOR_AGREE_UNIX_FD,
+       SETUP_DONE
+};
+
+struct l_dbus_ops {
+       char version;
+       bool (*send_message)(struct l_dbus *bus,
+                               struct l_dbus_message *message);
+       struct l_dbus_message *(*recv_message)(struct l_dbus *bus);
+       void (*free)(struct l_dbus *bus);
+       struct _dbus_name_ops name_ops;
+       struct _dbus_filter_ops filter_ops;
+       uint32_t (*name_acquire)(struct l_dbus *dbus, const char *name,
+                               bool allow_replacement, bool replace_existing,
+                               bool queue, l_dbus_name_acquire_func_t callback,
+                               void *user_data);
+};
+
+struct l_dbus {
+       struct l_io *io;
+       char *guid;
+       bool negotiate_unix_fd;
+       bool support_unix_fd;
+       bool is_ready;
+       char *unique_name;
+       unsigned int next_id;
+       uint32_t next_serial;
+       struct l_queue *message_queue;
+       struct l_hashmap *message_list;
+       struct l_hashmap *signal_list;
+       l_dbus_ready_func_t ready_handler;
+       l_dbus_destroy_func_t ready_destroy;
+       void *ready_data;
+       l_dbus_disconnect_func_t disconnect_handler;
+       l_dbus_destroy_func_t disconnect_destroy;
+       void *disconnect_data;
+       l_dbus_debug_func_t debug_handler;
+       l_dbus_destroy_func_t debug_destroy;
+       void *debug_data;
+       struct _dbus_object_tree *tree;
+       struct _dbus_name_cache *name_cache;
+       struct _dbus_filter *filter;
+       bool name_notify_enabled;
+
+       const struct l_dbus_ops *driver;
+};
+
+struct l_dbus_classic {
+       struct l_dbus super;
+       void *auth_command;
+       enum auth_state auth_state;
+       struct l_hashmap *match_strings;
+       int *fd_buf;
+       unsigned int num_fds;
+};
+
+struct message_callback {
+       uint32_t serial;
+       struct l_dbus_message *message;
+       l_dbus_message_func_t callback;
+       l_dbus_destroy_func_t destroy;
+       void *user_data;
+};
+
+struct signal_callback {
+       unsigned int id;
+       l_dbus_message_func_t callback;
+       l_dbus_destroy_func_t destroy;
+       void *user_data;
+};
+
+static void message_queue_destroy(void *data)
+{
+       struct message_callback *callback = data;
+
+       l_dbus_message_unref(callback->message);
+
+       if (callback->destroy)
+               callback->destroy(callback->user_data);
+
+       l_free(callback);
+}
+
+static void message_list_destroy(void *value)
+{
+       message_queue_destroy(value);
+}
+
+static void signal_list_destroy(void *value)
+{
+       struct signal_callback *callback = value;
+
+       if (callback->destroy)
+               callback->destroy(callback->user_data);
+
+       l_free(callback);
+}
+
+static bool message_write_handler(struct l_io *io, void *user_data)
+{
+       struct l_dbus *dbus = user_data;
+       struct l_dbus_message *message;
+       struct message_callback *callback;
+       const void *header, *body;
+       size_t header_size, body_size;
+
+       callback = l_queue_pop_head(dbus->message_queue);
+       if (!callback)
+               return false;
+
+       message = callback->message;
+       if (_dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL &&
+                       callback->callback == NULL)
+               l_dbus_message_set_no_reply(message, true);
+
+       _dbus_message_set_serial(message, callback->serial);
+
+       if (!dbus->driver->send_message(dbus, message)) {
+               message_queue_destroy(callback);
+               return false;
+       }
+
+       header = _dbus_message_get_header(message, &header_size);
+       body = _dbus_message_get_body(message, &body_size);
+       l_util_hexdump_two(false, header, header_size, body, body_size,
+                               dbus->debug_handler, dbus->debug_data);
+
+       if (callback->callback == NULL) {
+               message_queue_destroy(callback);
+               goto done;
+       }
+
+       l_hashmap_insert(dbus->message_list,
+                               L_UINT_TO_PTR(callback->serial), callback);
+
+done:
+       if (l_queue_isempty(dbus->message_queue))
+               return false;
+
+       /* Only continue sending messges if the connection is ready */
+       return dbus->is_ready;
+}
+
+static void handle_method_return(struct l_dbus *dbus,
+                                       struct l_dbus_message *message)
+{
+       struct message_callback *callback;
+       uint32_t reply_serial;
+
+       reply_serial = _dbus_message_get_reply_serial(message);
+       if (reply_serial == 0)
+               return;
+
+       callback = l_hashmap_remove(dbus->message_list,
+                                       L_UINT_TO_PTR(reply_serial));
+       if (!callback)
+               return;
+
+       if (callback->callback)
+               callback->callback(message, callback->user_data);
+
+       message_queue_destroy(callback);
+}
+
+static void handle_error(struct l_dbus *dbus, struct l_dbus_message *message)
+{
+       struct message_callback *callback;
+       uint32_t reply_serial;
+
+       reply_serial = _dbus_message_get_reply_serial(message);
+       if (reply_serial == 0)
+               return;
+
+       callback = l_hashmap_remove(dbus->message_list,
+                                       L_UINT_TO_PTR(reply_serial));
+       if (!callback)
+               return;
+
+       if (callback->callback)
+               callback->callback(message, callback->user_data);
+
+       message_queue_destroy(callback);
+}
+
+static void process_signal(const void *key, void *value, void *user_data)
+{
+       struct signal_callback *callback = value;
+       struct l_dbus_message *message = user_data;
+
+       if (callback->callback)
+               callback->callback(message, callback->user_data);
+}
+
+static void handle_signal(struct l_dbus *dbus, struct l_dbus_message *message)
+{
+       l_hashmap_foreach(dbus->signal_list, process_signal, message);
+}
+
+static bool message_read_handler(struct l_io *io, void *user_data)
+{
+       struct l_dbus *dbus = user_data;
+       struct l_dbus_message *message;
+       const void *header, *body;
+       size_t header_size, body_size;
+       enum dbus_message_type msgtype;
+
+       message = dbus->driver->recv_message(dbus);
+       if (!message)
+               return true;
+
+       header = _dbus_message_get_header(message, &header_size);
+       body = _dbus_message_get_body(message, &body_size);
+       l_util_hexdump_two(true, header, header_size, body, body_size,
+                               dbus->debug_handler, dbus->debug_data);
+
+       msgtype = _dbus_message_get_type(message);
+
+       switch (msgtype) {
+       case DBUS_MESSAGE_TYPE_METHOD_RETURN:
+               handle_method_return(dbus, message);
+               break;
+       case DBUS_MESSAGE_TYPE_ERROR:
+               handle_error(dbus, message);
+               break;
+       case DBUS_MESSAGE_TYPE_SIGNAL:
+               handle_signal(dbus, message);
+               break;
+       case DBUS_MESSAGE_TYPE_METHOD_CALL:
+               if (!_dbus_object_tree_dispatch(dbus->tree, dbus, message)) {
+                       struct l_dbus_message *error;
+
+                       error = l_dbus_message_new_error(message,
+                                       "org.freedesktop.DBus.Error.NotFound",
+                                       "No matching method found");
+                       l_dbus_send(dbus, error);
+               }
+
+               break;
+       }
+
+       l_dbus_message_unref(message);
+
+       return true;
+}
+
+static uint32_t send_message(struct l_dbus *dbus, bool priority,
+                               struct l_dbus_message *message,
+                               l_dbus_message_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy)
+{
+       struct message_callback *callback;
+       enum dbus_message_type type;
+       const char *path;
+
+       type = _dbus_message_get_type(message);
+
+       if ((type == DBUS_MESSAGE_TYPE_METHOD_RETURN ||
+                               type == DBUS_MESSAGE_TYPE_ERROR) &&
+                       _dbus_message_get_reply_serial(message) == 0) {
+               l_dbus_message_unref(message);
+               return 0;
+       }
+
+       /* Default empty signature for method return messages */
+       if (type == DBUS_MESSAGE_TYPE_METHOD_RETURN &&
+                       !l_dbus_message_get_signature(message))
+               l_dbus_message_set_arguments(message, "");
+
+       callback = l_new(struct message_callback, 1);
+
+       callback->serial = dbus->next_serial++;
+       callback->message = message;
+       callback->callback = function;
+       callback->destroy = destroy;
+       callback->user_data = user_data;
+
+       if (priority) {
+               l_queue_push_head(dbus->message_queue, callback);
+
+               l_io_set_write_handler(dbus->io, message_write_handler,
+                                                       dbus, NULL);
+
+               return callback->serial;
+       }
+
+       path = l_dbus_message_get_path(message);
+       if (path)
+               _dbus_object_tree_signals_flush(dbus, path);
+
+       l_queue_push_tail(dbus->message_queue, callback);
+
+       if (dbus->is_ready)
+               l_io_set_write_handler(dbus->io, message_write_handler,
+                                                       dbus, NULL);
+
+       return callback->serial;
+}
+
+static void bus_ready(struct l_dbus *dbus)
+{
+       dbus->is_ready = true;
+
+       if (dbus->ready_handler)
+               dbus->ready_handler(dbus->ready_data);
+
+       l_io_set_read_handler(dbus->io, message_read_handler, dbus, NULL);
+
+       /* Check for messages added before the connection was ready */
+       if (l_queue_isempty(dbus->message_queue))
+               return;
+
+       l_io_set_write_handler(dbus->io, message_write_handler, dbus, NULL);
+}
+
+static void hello_callback(struct l_dbus_message *message, void *user_data)
+{
+       struct l_dbus *dbus = user_data;
+       const char *signature;
+       const char *unique_name;
+
+       signature = l_dbus_message_get_signature(message);
+       if (!signature || strcmp(signature, "s")) {
+               close(l_io_get_fd(dbus->io));
+               return;
+       }
+
+       if (!l_dbus_message_get_arguments(message, "s", &unique_name)) {
+               close(l_io_get_fd(dbus->io));
+               return;
+       }
+
+       dbus->unique_name = l_strdup(unique_name);
+
+       bus_ready(dbus);
+}
+
+static bool auth_write_handler(struct l_io *io, void *user_data)
+{
+       struct l_dbus_classic *classic = user_data;
+       struct l_dbus *dbus = &classic->super;
+       ssize_t written, len;
+       int fd;
+
+       fd = l_io_get_fd(io);
+
+       if (!classic->auth_command)
+               return false;
+
+       len = strlen(classic->auth_command);
+       if (!len)
+               return false;
+
+       written = L_TFR(send(fd, classic->auth_command, len, 0));
+       if (written < 0)
+               return false;
+
+       l_util_hexdump(false, classic->auth_command, written,
+                                       dbus->debug_handler, dbus->debug_data);
+
+       if (written < len) {
+               memmove(classic->auth_command, classic->auth_command + written,
+                               len + 1 - written);
+               return true;
+       }
+
+       l_free(classic->auth_command);
+       classic->auth_command = NULL;
+
+       if (classic->auth_state == SETUP_DONE) {
+               struct l_dbus_message *message;
+
+               l_io_set_read_handler(dbus->io, message_read_handler,
+                                                       dbus, NULL);
+
+               message = l_dbus_message_new_method_call(dbus,
+                                                       DBUS_SERVICE_DBUS,
+                                                       DBUS_PATH_DBUS,
+                                                       L_DBUS_INTERFACE_DBUS,
+                                                       "Hello");
+               l_dbus_message_set_arguments(message, "");
+
+               send_message(dbus, true, message, hello_callback, dbus, NULL);
+
+               return true;
+       }
+
+       return false;
+}
+
+static bool auth_read_handler(struct l_io *io, void *user_data)
+{
+       struct l_dbus_classic *classic = user_data;
+       struct l_dbus *dbus = &classic->super;
+       char buffer[64];
+       char *ptr, *end;
+       ssize_t offset, len;
+       int fd;
+
+       fd = l_io_get_fd(io);
+
+       ptr = buffer;
+       offset = 0;
+
+       while (1) {
+               len = L_TFR(recv(fd, ptr + offset,
+                                               sizeof(buffer) - offset,
+                                               MSG_DONTWAIT));
+               if (len < 0) {
+                       if (errno != EAGAIN)
+                               return false;
+
+                       break;
+               }
+
+               offset += len;
+       }
+
+       ptr = buffer;
+       len = offset;
+
+       if (!ptr || len < 3)
+               return true;
+
+       end = strstr(ptr, "\r\n");
+       if (!end)
+               return true;
+
+       if (end - ptr + 2 != len)
+               return true;
+
+       l_util_hexdump(true, ptr, len, dbus->debug_handler, dbus->debug_data);
+
+       *end = '\0';
+
+       switch (classic->auth_state) {
+       case WAITING_FOR_OK:
+               if (!strncmp(ptr, "OK ", 3)) {
+                       enum auth_state state;
+                       const char *command;
+
+                       if (dbus->negotiate_unix_fd) {
+                               command = "NEGOTIATE_UNIX_FD\r\n";
+                               state = WAITING_FOR_AGREE_UNIX_FD;
+                       } else {
+                               command = "BEGIN\r\n";
+                               state = SETUP_DONE;
+                       }
+
+                       l_free(dbus->guid);
+                       dbus->guid = l_strdup(ptr + 3);
+
+                       classic->auth_command = l_strdup(command);
+                       classic->auth_state = state;
+                       break;
+               } else if (!strncmp(ptr, "REJECTED ", 9)) {
+                       static const char *command = "AUTH ANONYMOUS\r\n";
+
+                       dbus->negotiate_unix_fd = true;
+
+                       classic->auth_command = l_strdup(command);
+                       classic->auth_state = WAITING_FOR_OK;
+               }
+               break;
+
+       case WAITING_FOR_AGREE_UNIX_FD:
+               if (!strncmp(ptr, "AGREE_UNIX_FD", 13)) {
+                       static const char *command = "BEGIN\r\n";
+
+                       dbus->support_unix_fd = true;
+
+                       classic->auth_command = l_strdup(command);
+                       classic->auth_state = SETUP_DONE;
+                       break;
+               } else if (!strncmp(ptr, "ERROR", 5)) {
+                       static const char *command = "BEGIN\r\n";
+
+                       dbus->support_unix_fd = false;
+
+                       classic->auth_command = l_strdup(command);
+                       classic->auth_state = SETUP_DONE;
+                       break;
+               }
+               break;
+
+       case SETUP_DONE:
+               break;
+       }
+
+       l_io_set_write_handler(io, auth_write_handler, dbus, NULL);
+
+       return true;
+}
+
+static void disconnect_handler(struct l_io *io, void *user_data)
+{
+       struct l_dbus *dbus = user_data;
+
+       dbus->is_ready = false;
+
+       l_util_debug(dbus->debug_handler, dbus->debug_data, "disconnect");
+
+       if (dbus->disconnect_handler)
+               dbus->disconnect_handler(dbus->disconnect_data);
+}
+
+static void dbus_init(struct l_dbus *dbus, int fd)
+{
+       dbus->io = l_io_new(fd);
+       l_io_set_close_on_destroy(dbus->io, true);
+       l_io_set_disconnect_handler(dbus->io, disconnect_handler, dbus, NULL);
+
+       dbus->is_ready = false;
+       dbus->next_id = 1;
+       dbus->next_serial = 1;
+
+       dbus->message_queue = l_queue_new();
+       dbus->message_list = l_hashmap_new();
+       dbus->signal_list = l_hashmap_new();
+
+       dbus->tree = _dbus_object_tree_new();
+}
+
+static void classic_free(struct l_dbus *dbus)
+{
+       struct l_dbus_classic *classic =
+               l_container_of(dbus, struct l_dbus_classic, super);
+       unsigned int i;
+
+       for (i = 0; i < classic->num_fds; i++)
+               close(classic->fd_buf[i]);
+       l_free(classic->fd_buf);
+
+       l_free(classic->auth_command);
+       l_hashmap_destroy(classic->match_strings, l_free);
+       l_free(classic);
+}
+
+static bool classic_send_message(struct l_dbus *dbus,
+                                       struct l_dbus_message *message)
+{
+       int fd = l_io_get_fd(dbus->io);
+       struct msghdr msg;
+       struct iovec iov[2], *iovpos;
+       ssize_t r;
+       int *fds = NULL;
+       uint32_t num_fds = 0;
+       struct cmsghdr *cmsg;
+       int iovlen;
+
+       iov[0].iov_base = _dbus_message_get_header(message, &iov[0].iov_len);
+       iov[1].iov_base = _dbus_message_get_body(message, &iov[1].iov_len);
+
+       if (dbus->support_unix_fd)
+               fds = _dbus_message_get_fds(message, &num_fds);
+
+       iovpos = iov;
+       iovlen = 2;
+
+       while (1) {
+               memset(&msg, 0, sizeof(msg));
+               msg.msg_iov = iovpos;
+               msg.msg_iovlen = iovlen;
+
+               if (num_fds) {
+                       msg.msg_control =
+                               alloca(CMSG_SPACE(num_fds * sizeof(int)));
+                       msg.msg_controllen = CMSG_LEN(num_fds * sizeof(int));
+
+                       cmsg = CMSG_FIRSTHDR(&msg);
+                       cmsg->cmsg_len = msg.msg_controllen;
+                       cmsg->cmsg_level = SOL_SOCKET;
+                       cmsg->cmsg_type = SCM_RIGHTS;
+                       memcpy(CMSG_DATA(cmsg), fds, num_fds * sizeof(int));
+               }
+
+               r = L_TFR(sendmsg(fd, &msg, 0));
+               if (r < 0)
+                       return false;
+
+               while ((size_t) r >= iovpos->iov_len) {
+                       r -= iovpos->iov_len;
+                       iovpos++;
+                       iovlen--;
+
+                       if (!iovlen)
+                               break;
+               }
+
+               if (!iovlen)
+                       break;
+
+               iovpos->iov_base += r;
+               iovpos->iov_len -= r;
+
+               /* The FDs have been transmitted, don't retransmit */
+               num_fds = 0;
+       }
+
+       return true;
+}
+
+static struct l_dbus_message *classic_recv_message(struct l_dbus *dbus)
+{
+       struct l_dbus_classic *classic =
+               l_container_of(dbus, struct l_dbus_classic, super);
+       int fd = l_io_get_fd(dbus->io);
+       struct dbus_header hdr;
+       struct msghdr msg;
+       struct iovec iov[2], *iovpos;
+       struct cmsghdr *cmsg;
+       ssize_t len, r;
+       void *header, *body;
+       size_t header_size, body_size;
+       union {
+               uint8_t bytes[CMSG_SPACE(16 * sizeof(int))];
+               struct cmsghdr align;
+       } fd_buf;
+       int *fds = NULL;
+       uint32_t num_fds = 0;
+       int iovlen;
+       struct l_dbus_message *message;
+       unsigned int i;
+
+       len = recv(fd, &hdr, DBUS_HEADER_SIZE, MSG_PEEK | MSG_DONTWAIT);
+       if (len != DBUS_HEADER_SIZE)
+               return NULL;
+
+       header_size = align_len(DBUS_HEADER_SIZE + hdr.dbus1.field_length, 8);
+       header = l_malloc(header_size);
+
+       body_size = hdr.dbus1.body_length;
+       body = l_malloc(body_size);
+
+       iov[0].iov_base = header;
+       iov[0].iov_len  = header_size;
+       iov[1].iov_base = body;
+       iov[1].iov_len  = body_size;
+
+       iovpos = iov;
+       iovlen = 2;
+
+       while (1) {
+               memset(&msg, 0, sizeof(msg));
+               msg.msg_iov = iovpos;
+               msg.msg_iovlen = iovlen;
+               msg.msg_control = &fd_buf;
+               msg.msg_controllen = sizeof(fd_buf);
+
+               r = L_TFR(recvmsg(fd, &msg,
+                                       MSG_CMSG_CLOEXEC | MSG_WAITALL));
+               if (r < 0)
+                       goto cmsg_fail;
+
+               for (cmsg = CMSG_FIRSTHDR(&msg); cmsg;
+                               cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+                       if (cmsg->cmsg_level != SOL_SOCKET ||
+                                       cmsg->cmsg_type != SCM_RIGHTS)
+                               continue;
+
+                       num_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
+                       fds = (void *) CMSG_DATA(cmsg);
+
+                       /* Set FD_CLOEXEC on all file descriptors */
+                       for (i = 0; i < num_fds; i++) {
+                               long flags;
+
+                               flags = fcntl(fds[i], F_GETFD, NULL);
+                               if (flags < 0)
+                                       continue;
+
+                               if (!(flags & FD_CLOEXEC))
+                                       fcntl(fds[i], F_SETFD,
+                                               flags | FD_CLOEXEC);
+                       }
+
+                       classic->fd_buf = l_realloc(classic->fd_buf,
+                                               (classic->num_fds + num_fds) *
+                                               sizeof(int));
+                       memcpy(classic->fd_buf + classic->num_fds, fds,
+                               num_fds * sizeof(int));
+                       classic->num_fds += num_fds;
+               }
+
+               while ((size_t) r >= iovpos->iov_len) {
+                       r -= iovpos->iov_len;
+                       iovpos++;
+                       iovlen--;
+
+                       if (!iovlen)
+                               break;
+               }
+
+               if (!iovlen)
+                       break;
+
+               iovpos->iov_base += r;
+               iovpos->iov_len -= r;
+       }
+
+       if (hdr.endian != DBUS_NATIVE_ENDIAN) {
+               l_util_debug(dbus->debug_handler,
+                               dbus->debug_data, "Endianness incorrect");
+               goto bad_msg;
+       }
+
+       if (hdr.version != 1) {
+               l_util_debug(dbus->debug_handler,
+                               dbus->debug_data, "Protocol version incorrect");
+               goto bad_msg;
+       }
+
+       num_fds = _dbus_message_unix_fds_from_header(header, header_size);
+       if (num_fds > classic->num_fds)
+               goto bad_msg;
+
+       message = dbus_message_build(header, header_size, body, body_size,
+                                       classic->fd_buf, num_fds);
+
+       if (message && num_fds) {
+               if (classic->num_fds > num_fds) {
+                       memmove(classic->fd_buf, classic->fd_buf + num_fds,
+                               (classic->num_fds - num_fds) * sizeof(int));
+                       classic->num_fds -= num_fds;
+               } else {
+                       l_free(classic->fd_buf);
+
+                       classic->fd_buf = NULL;
+                       classic->num_fds = 0;
+               }
+       }
+
+       if (message)
+               return message;
+
+bad_msg:
+cmsg_fail:
+       for (i = 0; i < classic->num_fds; i++)
+               close(classic->fd_buf[i]);
+
+       l_free(classic->fd_buf);
+
+       classic->fd_buf = NULL;
+       classic->num_fds = 0;
+
+       l_free(header);
+       l_free(body);
+
+       return NULL;
+}
+
+static bool classic_add_match(struct l_dbus *dbus, unsigned int id,
+                               const struct _dbus_filter_condition *rule,
+                               int rule_len)
+{
+       struct l_dbus_classic *classic =
+               l_container_of(dbus, struct l_dbus_classic, super);
+       char *match_str;
+       struct l_dbus_message *message;
+
+       match_str = _dbus_filter_rule_to_str(rule, rule_len);
+
+       l_hashmap_insert(classic->match_strings, L_UINT_TO_PTR(id), match_str);
+
+       message = l_dbus_message_new_method_call(dbus,
+                                               DBUS_SERVICE_DBUS,
+                                               DBUS_PATH_DBUS,
+                                               L_DBUS_INTERFACE_DBUS,
+                                               "AddMatch");
+
+       l_dbus_message_set_arguments(message, "s", match_str);
+
+       send_message(dbus, false, message, NULL, NULL, NULL);
+
+       return true;
+}
+
+static bool classic_remove_match(struct l_dbus *dbus, unsigned int id)
+{
+       struct l_dbus_classic *classic =
+               l_container_of(dbus, struct l_dbus_classic, super);
+       char *match_str = l_hashmap_remove(classic->match_strings,
+                                               L_UINT_TO_PTR(id));
+       struct l_dbus_message *message;
+
+       if (!match_str)
+               return false;
+
+       message = l_dbus_message_new_method_call(dbus,
+                                               DBUS_SERVICE_DBUS,
+                                               DBUS_PATH_DBUS,
+                                               L_DBUS_INTERFACE_DBUS,
+                                               "RemoveMatch");
+
+       l_dbus_message_set_arguments(message, "s", match_str);
+
+       send_message(dbus, false, message, NULL, NULL, NULL);
+
+       l_free(match_str);
+
+       return true;
+}
+
+static void name_owner_changed_cb(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus *dbus = user_data;
+       char *name, *old, *new;
+
+       if (!l_dbus_message_get_arguments(message, "sss", &name, &old, &new))
+               return;
+
+       _dbus_name_cache_notify(dbus->name_cache, name, new);
+}
+
+struct get_name_owner_request {
+       struct l_dbus_message *message;
+       struct l_dbus *dbus;
+};
+
+static void get_name_owner_reply_cb(struct l_dbus_message *reply,
+                                       void *user_data)
+{
+       struct get_name_owner_request *req = user_data;
+       const char *name, *owner;
+
+       /* No name owner yet */
+       if (l_dbus_message_is_error(reply))
+               return;
+
+       /* Shouldn't happen */
+       if (!l_dbus_message_get_arguments(reply, "s", &owner))
+               return;
+
+       /* Shouldn't happen */
+       if (!l_dbus_message_get_arguments(req->message, "s", &name))
+               return;
+
+       _dbus_name_cache_notify(req->dbus->name_cache, name, owner);
+}
+
+static bool classic_get_name_owner(struct l_dbus *bus, const char *name)
+{
+       struct get_name_owner_request *req;
+
+       /* Name resolution is not performed for DBUS_SERVICE_DBUS */
+       if (!strcmp(name, DBUS_SERVICE_DBUS))
+               return false;
+
+       req = l_new(struct get_name_owner_request, 1);
+       req->dbus = bus;
+       req->message = l_dbus_message_new_method_call(bus,
+                                                       DBUS_SERVICE_DBUS,
+                                                       DBUS_PATH_DBUS,
+                                                       L_DBUS_INTERFACE_DBUS,
+                                                       "GetNameOwner");
+
+       l_dbus_message_set_arguments(req->message, "s", name);
+
+       send_message(bus, false, req->message, get_name_owner_reply_cb,
+                       req, l_free);
+
+       if (!bus->name_notify_enabled) {
+               static struct _dbus_filter_condition rule[] = {
+                       { L_DBUS_MATCH_TYPE,            "signal" },
+                       { L_DBUS_MATCH_SENDER,          DBUS_SERVICE_DBUS },
+                       { L_DBUS_MATCH_PATH,            DBUS_PATH_DBUS },
+                       { L_DBUS_MATCH_INTERFACE,       L_DBUS_INTERFACE_DBUS },
+                       { L_DBUS_MATCH_MEMBER,          "NameOwnerChanged" },
+               };
+
+               if (!bus->filter)
+                       bus->filter = _dbus_filter_new(bus,
+                                               &bus->driver->filter_ops,
+                                               bus->name_cache);
+
+               _dbus_filter_add_rule(bus->filter, rule, L_ARRAY_SIZE(rule),
+                                       name_owner_changed_cb, bus);
+
+               bus->name_notify_enabled = true;
+       }
+
+       return true;
+}
+
+struct name_request {
+       l_dbus_name_acquire_func_t callback;
+       void *user_data;
+       struct l_dbus *dbus;
+};
+
+enum dbus_name_flag {
+       DBUS_NAME_FLAG_ALLOW_REPLACEMENT        = 0x1,
+       DBUS_NAME_FLAG_REPLACE_EXISTING         = 0x2,
+       DBUS_NAME_FLAG_DO_NOT_QUEUE             = 0x4,
+};
+
+enum dbus_name_reply {
+       DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER   = 1,
+       DBUS_REQUEST_NAME_REPLY_IN_QUEUE        = 2,
+       DBUS_REQUEST_NAME_REPLY_EXISTS          = 3,
+       DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER   = 4,
+};
+
+static void request_name_reply_cb(struct l_dbus_message *reply, void *user_data)
+{
+       struct name_request *req = user_data;
+       bool success = false, queued = false;
+       uint32_t retval;
+
+       if (!req->callback)
+               return;
+
+       /* No name owner yet */
+       if (l_dbus_message_is_error(reply))
+               goto call_back;
+
+       /* Shouldn't happen */
+       if (!l_dbus_message_get_arguments(reply, "u", &retval))
+               goto call_back;
+
+       success = (retval == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) ||
+               (retval == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER) ||
+               (retval == DBUS_REQUEST_NAME_REPLY_IN_QUEUE);
+       queued = (retval == DBUS_REQUEST_NAME_REPLY_IN_QUEUE);
+
+call_back:
+       req->callback(req->dbus, success, queued, req->user_data);
+}
+
+static uint32_t classic_name_acquire(struct l_dbus *dbus, const char *name,
+                                       bool allow_replacement,
+                                       bool replace_existing, bool queue,
+                                       l_dbus_name_acquire_func_t callback,
+                                       void *user_data)
+{
+       struct name_request *req;
+       struct l_dbus_message *message;
+       uint32_t flags = 0;
+
+       req = l_new(struct name_request, 1);
+       req->dbus = dbus;
+       req->user_data = user_data;
+       req->callback = callback;
+
+       message = l_dbus_message_new_method_call(dbus, DBUS_SERVICE_DBUS,
+                                                       DBUS_PATH_DBUS,
+                                                       L_DBUS_INTERFACE_DBUS,
+                                                       "RequestName");
+
+       if (allow_replacement)
+               flags |= DBUS_NAME_FLAG_ALLOW_REPLACEMENT;
+
+       if (replace_existing)
+               flags |= DBUS_NAME_FLAG_REPLACE_EXISTING;
+
+       if (!queue)
+               flags |= DBUS_NAME_FLAG_DO_NOT_QUEUE;
+
+       l_dbus_message_set_arguments(message, "su", name, flags);
+
+       return send_message(dbus, false, message, request_name_reply_cb,
+                               req, free);
+}
+
+static const struct l_dbus_ops classic_ops = {
+       .version = 1,
+       .send_message = classic_send_message,
+       .recv_message = classic_recv_message,
+       .free = classic_free,
+       .name_ops = {
+               .get_name_owner = classic_get_name_owner,
+       },
+       .filter_ops = {
+               .add_match = classic_add_match,
+               .remove_match = classic_remove_match,
+       },
+       .name_acquire = classic_name_acquire,
+};
+
+static struct l_dbus *setup_dbus1(int fd, const char *guid)
+{
+       static const unsigned char creds = 0x00;
+       char uid[6], hexuid[12], *ptr = hexuid;
+       struct l_dbus *dbus;
+       struct l_dbus_classic *classic;
+       ssize_t written;
+       unsigned int i;
+
+       if (snprintf(uid, sizeof(uid), "%d", geteuid()) < 1) {
+               close(fd);
+               return NULL;
+       }
+
+       for (i = 0; i < strlen(uid); i++)
+               ptr += sprintf(ptr, "%02x", uid[i]);
+
+       /* Send special credentials-passing nul byte */
+       written = L_TFR(send(fd, &creds, 1, 0));
+       if (written < 1) {
+               close(fd);
+               return NULL;
+       }
+
+       classic = l_new(struct l_dbus_classic, 1);
+       dbus = &classic->super;
+       dbus->driver = &classic_ops;
+
+       classic->match_strings = l_hashmap_new();
+
+       dbus_init(dbus, fd);
+       dbus->guid = l_strdup(guid);
+
+       classic->auth_command = l_strdup_printf("AUTH EXTERNAL %s\r\n", hexuid);
+       classic->auth_state = WAITING_FOR_OK;
+
+       dbus->negotiate_unix_fd = true;
+       dbus->support_unix_fd = false;
+
+       l_io_set_read_handler(dbus->io, auth_read_handler, dbus, NULL);
+       l_io_set_write_handler(dbus->io, auth_write_handler, dbus, NULL);
+
+       return dbus;
+}
+
+static struct l_dbus *setup_unix(char *params)
+{
+       char *path = NULL, *guid = NULL;
+       bool abstract = false;
+       struct sockaddr_un addr;
+       size_t len;
+       int fd;
+
+       while (params) {
+               char *key = strsep(&params, ",");
+               char *value;
+
+               if (!key)
+                       break;
+
+               value = strchr(key, '=');
+               if (!value)
+                       continue;
+
+               *value++ = '\0';
+
+               if (!strcmp(key, "path")) {
+                       path = value;
+                       abstract = false;
+               } else if (!strcmp(key, "abstract")) {
+                       path = value;
+                       abstract = true;
+               } else if (!strcmp(key, "guid"))
+                       guid = value;
+       }
+
+       if (!path)
+               return NULL;
+
+       fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+       if (fd < 0)
+               return NULL;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+
+       len = strlen(path);
+
+       if (abstract) {
+               if (len > sizeof(addr.sun_path) - 1) {
+                       close(fd);
+                       return NULL;
+               }
+
+               addr.sun_path[0] = '\0';
+               strncpy(addr.sun_path + 1, path, sizeof(addr.sun_path) - 2);
+               len++;
+       } else {
+               if (len > sizeof(addr.sun_path)) {
+                       close(fd);
+                       return NULL;
+               }
+
+               strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
+       }
+
+       if (connect(fd, (struct sockaddr *) &addr,
+                               sizeof(addr.sun_family) + len) < 0) {
+               close(fd);
+               return NULL;
+       }
+
+       return setup_dbus1(fd, guid);
+}
+
+static struct l_dbus *setup_address(const char *address)
+{
+       struct l_dbus *dbus = NULL;
+       char *address_copy;
+
+       address_copy = strdupa(address);
+
+       while (address_copy) {
+               char *transport = strsep(&address_copy, ";");
+               char *params;
+
+               if (!transport)
+                       break;
+
+               params = strchr(transport, ':');
+               if (params)
+                       *params++ = '\0';
+
+               if (!strcmp(transport, "unix")) {
+                       /* Function will modify params string */
+                       dbus = setup_unix(params);
+                       break;
+               }
+       }
+
+       return dbus;
+}
+
+LIB_EXPORT struct l_dbus *l_dbus_new(const char *address)
+{
+       if (unlikely(!address))
+               return NULL;
+
+       return setup_address(address);
+}
+
+LIB_EXPORT struct l_dbus *l_dbus_new_default(enum l_dbus_bus bus)
+{
+       const char *address;
+
+       switch (bus) {
+       case L_DBUS_SYSTEM_BUS:
+               address = getenv("DBUS_SYSTEM_BUS_ADDRESS");
+               if (!address)
+                       address = DEFAULT_SYSTEM_BUS_ADDRESS;
+               break;
+       case L_DBUS_SESSION_BUS:
+               address = getenv("DBUS_SESSION_BUS_ADDRESS");
+               if (!address)
+                       return NULL;
+               break;
+       default:
+               return NULL;
+       }
+
+       return setup_address(address);
+}
+
+LIB_EXPORT void l_dbus_destroy(struct l_dbus *dbus)
+{
+       if (unlikely(!dbus))
+               return;
+
+       if (dbus->ready_destroy)
+               dbus->ready_destroy(dbus->ready_data);
+
+       _dbus_filter_free(dbus->filter);
+
+       _dbus_name_cache_free(dbus->name_cache);
+
+       l_hashmap_destroy(dbus->signal_list, signal_list_destroy);
+       l_hashmap_destroy(dbus->message_list, message_list_destroy);
+       l_queue_destroy(dbus->message_queue, message_queue_destroy);
+
+       l_io_destroy(dbus->io);
+
+       if (dbus->disconnect_destroy)
+               dbus->disconnect_destroy(dbus->disconnect_data);
+
+       if (dbus->debug_destroy)
+               dbus->debug_destroy(dbus->debug_data);
+
+       l_free(dbus->guid);
+       l_free(dbus->unique_name);
+
+       _dbus_object_tree_free(dbus->tree);
+
+       dbus->driver->free(dbus);
+}
+
+LIB_EXPORT bool l_dbus_set_ready_handler(struct l_dbus *dbus,
+                               l_dbus_ready_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (dbus->ready_destroy)
+               dbus->ready_destroy(dbus->ready_data);
+
+       dbus->ready_handler = function;
+       dbus->ready_destroy = destroy;
+       dbus->ready_data = user_data;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_set_disconnect_handler(struct l_dbus *dbus,
+                               l_dbus_disconnect_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (dbus->disconnect_destroy)
+               dbus->disconnect_destroy(dbus->disconnect_data);
+
+       dbus->disconnect_handler = function;
+       dbus->disconnect_destroy = destroy;
+       dbus->disconnect_data = user_data;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dbus_set_debug(struct l_dbus *dbus,
+                               l_dbus_debug_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (dbus->debug_destroy)
+               dbus->debug_destroy(dbus->debug_data);
+
+       dbus->debug_handler = function;
+       dbus->debug_destroy = destroy;
+       dbus->debug_data = user_data;
+
+       /* l_io_set_debug(dbus->io, function, user_data, NULL); */
+
+       return true;
+}
+
+LIB_EXPORT uint32_t l_dbus_send_with_reply(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               l_dbus_message_func_t function,
+                                               void *user_data,
+                                               l_dbus_destroy_func_t destroy)
+{
+       if (unlikely(!dbus || !message))
+               return 0;
+
+       return send_message(dbus, false, message, function, user_data, destroy);
+}
+
+LIB_EXPORT uint32_t l_dbus_send(struct l_dbus *dbus,
+                               struct l_dbus_message *message)
+{
+       if (unlikely(!dbus || !message))
+               return 0;
+
+       return send_message(dbus, false, message, NULL, NULL, NULL);
+}
+
+static bool remove_entry(void *data, void *user_data)
+{
+       struct message_callback *callback = data;
+       uint32_t serial = L_PTR_TO_UINT(user_data);
+
+       if (callback->serial == serial) {
+               message_queue_destroy(callback);
+               return true;
+       }
+
+       return false;
+}
+
+LIB_EXPORT bool l_dbus_cancel(struct l_dbus *dbus, uint32_t serial)
+{
+       struct message_callback *callback;
+       unsigned int count;
+
+       if (unlikely(!dbus || !serial))
+               return false;
+
+       callback = l_hashmap_remove(dbus->message_list, L_UINT_TO_PTR(serial));
+        if (callback) {
+               message_queue_destroy(callback);
+               return true;
+       }
+
+       count = l_queue_foreach_remove(dbus->message_queue, remove_entry,
+                                                       L_UINT_TO_PTR(serial));
+       if (!count)
+               return false;
+
+       return true;
+}
+
+LIB_EXPORT unsigned int l_dbus_register(struct l_dbus *dbus,
+                               l_dbus_message_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy)
+{
+       struct signal_callback *callback;
+
+       if (unlikely(!dbus))
+               return 0;
+
+       callback = l_new(struct signal_callback, 1);
+
+       callback->id = dbus->next_id++;
+       callback->callback = function;
+       callback->destroy = destroy;
+       callback->user_data = user_data;
+
+       l_hashmap_insert(dbus->signal_list,
+                               L_UINT_TO_PTR(callback->id), callback);
+
+       return callback->id;
+}
+
+LIB_EXPORT bool l_dbus_unregister(struct l_dbus *dbus, unsigned int id)
+{
+       struct signal_callback *callback;
+
+       if (unlikely(!dbus || !id))
+               return false;
+
+       callback = l_hashmap_remove(dbus->signal_list, L_UINT_TO_PTR(id));
+       if (!callback)
+               return false;
+
+       signal_list_destroy(callback);
+
+       return true;
+}
+
+LIB_EXPORT uint32_t l_dbus_method_call(struct l_dbus *dbus,
+                               const char *destination, const char *path,
+                               const char *interface, const char *method,
+                               l_dbus_message_func_t setup,
+                               l_dbus_message_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy)
+{
+       struct l_dbus_message *message;
+
+       if (unlikely(!dbus))
+               return 0;
+
+       message = l_dbus_message_new_method_call(dbus, destination, path,
+                                                       interface, method);
+
+       if (setup)
+               setup(message, user_data);
+       else
+               l_dbus_message_set_arguments(message, "");
+
+       return send_message(dbus, false, message, function, user_data, destroy);
+}
+
+uint8_t _dbus_get_version(struct l_dbus *dbus)
+{
+       return dbus->driver->version;
+}
+
+int _dbus_get_fd(struct l_dbus *dbus)
+{
+       return l_io_get_fd(dbus->io);
+}
+
+struct _dbus_object_tree *_dbus_get_tree(struct l_dbus *dbus)
+{
+       return dbus->tree;
+}
+
+/**
+ * l_dbus_register_interface:
+ * @dbus: D-Bus connection as returned by @l_dbus_new*
+ * @interface: interface name string
+ * @setup_func: function that sets up the methods, signals and properties by
+ *              using the #dbus-service.h API.
+ * @destroy: optional destructor to be called every time an instance of this
+ *           interface is being removed from an object on this bus.
+ * @handle_old_style_properties: whether to automatically handle SetProperty and
+ *                               GetProperties for any properties registered by
+ *                               @setup_func.
+ *
+ * Registers an interface.  If successful the interface can then be added
+ * to any number of objects with @l_dbus_object_add_interface.
+ *
+ * Returns: whether the interface was successfully registered
+ **/
+LIB_EXPORT bool l_dbus_register_interface(struct l_dbus *dbus,
+                               const char *interface,
+                               l_dbus_interface_setup_func_t setup_func,
+                               l_dbus_destroy_func_t destroy,
+                               bool handle_old_style_properties)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_register_interface(dbus->tree, interface,
+                                               setup_func, destroy,
+                                               handle_old_style_properties);
+}
+
+LIB_EXPORT bool l_dbus_unregister_interface(struct l_dbus *dbus,
+                                               const char *interface)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_unregister_interface(dbus->tree, interface);
+}
+
+/**
+ * l_dbus_register_object:
+ * @dbus: D-Bus connection
+ * @path: new object path
+ * @user_data: user pointer to be passed to @destroy if any
+ * @destroy: optional destructor to be called when object dropped from the tree
+ * @...: NULL-terminated list of 0 or more interfaces to be present on the
+ *       object from the moment of creation.  For every interface the interface
+ *       name string is expected followed by the @user_data pointer same as
+ *       would be passed as @l_dbus_object_add_interface's last two parameters.
+ *
+ * Create a new D-Bus object on the tree visible to D-Bus peers.  For example:
+ *     success = l_dbus_register_object(bus, "/org/example/ExampleManager",
+ *                                             NULL, NULL,
+ *                                             "org.example.Manager",
+ *                                             manager_data,
+ *                                             NULL);
+ *
+ * Returns: whether the object path was successfully registered
+ **/
+LIB_EXPORT bool l_dbus_register_object(struct l_dbus *dbus, const char *path,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy, ...)
+{
+       va_list args;
+       const char *interface;
+       void *if_user_data;
+       bool r = true;;
+
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       if (!_dbus_object_tree_new_object(dbus->tree, path, user_data, destroy))
+               return false;
+
+       va_start(args, destroy);
+       while ((interface = va_arg(args, const char *))) {
+               if_user_data = va_arg(args, void *);
+
+               if (!_dbus_object_tree_add_interface(dbus->tree, path,
+                                                       interface,
+                                                       if_user_data)) {
+                       _dbus_object_tree_object_destroy(dbus->tree, path);
+                       r = false;
+
+                       break;
+               }
+       }
+       va_end(args);
+
+       return r;
+}
+
+LIB_EXPORT bool l_dbus_unregister_object(struct l_dbus *dbus,
+                                               const char *object)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_object_destroy(dbus->tree, object);
+}
+
+/**
+ * l_dbus_object_add_interface:
+ * @dbus: D-Bus connection
+ * @object: object path as passed to @l_dbus_register_object
+ * @interface: interface name as passed to @l_dbus_register_interface
+ * @user_data: user data pointer to be passed to any method and property
+ *             callbacks provided by the @setup_func and to the @destroy
+ *             callback as passed to @l_dbus_register_interface
+ *
+ * Creates an instance of given interface at the given path in the
+ * connection's object tree.  If no object was registered at this path
+ * before @l_dbus_register_object gets called automatically.
+ *
+ * The addition of an interface to the object may trigger a query of
+ * all the properties on this interface and
+ * #org.freedesktop.DBus.ObjectManager.InterfacesAdded signals.
+ *
+ * Returns: whether the interface was successfully added.
+ **/
+LIB_EXPORT bool l_dbus_object_add_interface(struct l_dbus *dbus,
+                                               const char *object,
+                                               const char *interface,
+                                               void *user_data)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_add_interface(dbus->tree, object, interface,
+                                               user_data);
+}
+
+LIB_EXPORT bool l_dbus_object_remove_interface(struct l_dbus *dbus,
+                                               const char *object,
+                                               const char *interface)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_remove_interface(dbus->tree, object,
+                                                       interface);
+}
+
+LIB_EXPORT void *l_dbus_object_get_data(struct l_dbus *dbus, const char *object,
+                                       const char *interface)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_get_interface_data(dbus->tree, object,
+                                                       interface);
+}
+
+LIB_EXPORT bool l_dbus_object_manager_enable(struct l_dbus *dbus,
+                                               const char *root)
+{
+       if (unlikely(!dbus))
+               return false;
+
+       if (unlikely(!dbus->tree))
+               return false;
+
+       return _dbus_object_tree_add_interface(dbus->tree, root,
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               dbus);
+}
+
+LIB_EXPORT unsigned int l_dbus_add_disconnect_watch(struct l_dbus *dbus,
+                                       const char *name,
+                                       l_dbus_watch_func_t disconnect_func,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy)
+{
+       return l_dbus_add_service_watch(dbus, name, NULL, disconnect_func,
+                                       user_data, destroy);
+}
+
+LIB_EXPORT unsigned int l_dbus_add_service_watch(struct l_dbus *dbus,
+                                       const char *name,
+                                       l_dbus_watch_func_t connect_func,
+                                       l_dbus_watch_func_t disconnect_func,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy)
+{
+       if (!name)
+               return 0;
+
+       if (!dbus->name_cache)
+               dbus->name_cache = _dbus_name_cache_new(dbus,
+                                               &dbus->driver->name_ops);
+
+       return _dbus_name_cache_add_watch(dbus->name_cache, name, connect_func,
+                                               disconnect_func, user_data,
+                                               destroy);
+}
+
+LIB_EXPORT bool l_dbus_remove_watch(struct l_dbus *dbus, unsigned int id)
+{
+       if (!dbus->name_cache)
+               return false;
+
+       return _dbus_name_cache_remove_watch(dbus->name_cache, id);
+}
+
+/**
+ * l_dbus_add_signal_watch:
+ * @dbus: D-Bus connection
+ * @sender: bus name to match the signal sender against or NULL to
+ *          match any sender
+ * @path: object path to match the signal path against or NULL to
+ *        match any path
+ * @interface: interface name to match the signal interface against
+ *             or NULL to match any interface
+ * @member: name to match the signal name against or NULL to match any
+ *          signal
+ * @...: a list of further conditions to be met by the signal followed
+ *       by three more mandatory parameters:
+ *       enum l_dbus_match_type list_end_marker,
+ *       l_dbus_message_func callback,
+ *       void *user_data,
+ *       The value L_DBUS_MATCH_NONE must be passed as the end of list
+ *       marker, followed by the signal match callback and user_data.
+ *       In the list, every condition is a pair of parameters:
+ *       enum l_dbus_match_type match_type, const char *value.
+ *
+ * Subscribe to a group of signals based on a set of conditions that
+ * compare the signal's header fields and string arguments against given
+ * values.  For example:
+ *     signal_id = l_dbus_add_signal_watch(bus, "org.example", "/"
+ *                                             "org.example.Manager",
+ *                                             "PropertyChanged",
+ *                                             L_DBUS_MATCH_ARGUMENT(0),
+ *                                             "ExampleProperty",
+ *                                             L_DBUS_MATCH_NONE
+ *                                             manager_property_change_cb,
+ *                                             NULL);
+  *
+ * Returns: a non-zero signal filter identifier that can be passed to
+ *          l_dbus_remove_signal_watch to remove this filter rule, or
+ *          zero on failure.
+ **/
+LIB_EXPORT unsigned int l_dbus_add_signal_watch(struct l_dbus *dbus,
+                                               const char *sender,
+                                               const char *path,
+                                               const char *interface,
+                                               const char *member, ...)
+{
+       struct _dbus_filter_condition *rule;
+       int rule_len;
+       va_list args;
+       const char *value;
+       l_dbus_message_func_t signal_func;
+       enum l_dbus_match_type type;
+       void *user_data;
+       unsigned int id;
+
+       va_start(args, member);
+
+       rule_len = 0;
+       while ((type = va_arg(args, enum l_dbus_match_type)) !=
+                       L_DBUS_MATCH_NONE)
+               rule_len++;
+
+       va_end(args);
+
+       rule = l_new(struct _dbus_filter_condition, rule_len + 5);
+
+       rule_len = 0;
+
+       rule[rule_len].type = L_DBUS_MATCH_TYPE;
+       rule[rule_len++].value = "signal";
+
+       if (sender) {
+               rule[rule_len].type = L_DBUS_MATCH_SENDER;
+               rule[rule_len++].value = sender;
+       }
+
+       if (path) {
+               rule[rule_len].type = L_DBUS_MATCH_PATH;
+               rule[rule_len++].value = path;
+       }
+
+       if (interface) {
+               rule[rule_len].type = L_DBUS_MATCH_INTERFACE;
+               rule[rule_len++].value = interface;
+       }
+
+       if (member) {
+               rule[rule_len].type = L_DBUS_MATCH_MEMBER;
+               rule[rule_len++].value = member;
+       }
+
+       va_start(args, member);
+
+       while (true) {
+               type = va_arg(args, enum l_dbus_match_type);
+               if (type == L_DBUS_MATCH_NONE)
+                       break;
+
+               value = va_arg(args, const char *);
+
+               rule[rule_len].type = type;
+               rule[rule_len++].value = value;
+       }
+
+       signal_func = va_arg(args, l_dbus_message_func_t);
+       user_data = va_arg(args, void *);
+
+       va_end(args);
+
+       if (!dbus->filter) {
+               if (!dbus->name_cache)
+                       dbus->name_cache = _dbus_name_cache_new(dbus,
+                                               &dbus->driver->name_ops);
+
+               dbus->filter = _dbus_filter_new(dbus,
+                                               &dbus->driver->filter_ops,
+                                               dbus->name_cache);
+       }
+
+       id = _dbus_filter_add_rule(dbus->filter, rule, rule_len,
+                                       signal_func, user_data);
+
+       l_free(rule);
+
+       return id;
+}
+
+LIB_EXPORT bool l_dbus_remove_signal_watch(struct l_dbus *dbus, unsigned int id)
+{
+       if (!dbus->filter)
+               return false;
+
+       return _dbus_filter_remove_rule(dbus->filter, id);
+}
+
+/**
+ * l_dbus_name_acquire:
+ * @dbus: D-Bus connection
+ * @name: Well-known bus name to be acquired
+ * @allow_replacement: Whether to allow another peer's name request to
+ *                     take the name ownership away from this connection
+ * @replace_existing: Whether to allow D-Bus to take the name's ownership
+ *                    away from another peer in case the name is already
+ *                    owned and allows replacement.  Ignored if name is
+ *                    currently free.
+ * @queue: Whether to allow the name request to be queued by D-Bus in
+ *         case it cannot be acquired now, rather than to return a failure.
+ * @callback: Callback to receive the request result when done.
+ *
+ * Acquire a well-known bus name (service name) on the bus.
+ *
+ * Returns: a non-zero request serial that can be passed to l_dbus_cancel
+ *          while waiting for the callback or zero if the callback has
+ *          has happened while l_dbus_name_acquire was running.
+ **/
+LIB_EXPORT uint32_t l_dbus_name_acquire(struct l_dbus *dbus, const char *name,
+                               bool allow_replacement, bool replace_existing,
+                               bool queue, l_dbus_name_acquire_func_t callback,
+                               void *user_data)
+{
+       return dbus->driver->name_acquire(dbus, name, allow_replacement,
+                                               replace_existing, queue,
+                                               callback, user_data);
+}
diff --git a/ell/dbus.h b/ell/dbus.h
new file mode 100644 (file)
index 0000000..cbfb0b0
--- /dev/null
@@ -0,0 +1,277 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_DBUS_H
+#define __ELL_DBUS_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define L_DBUS_INTERFACE_DBUS          "org.freedesktop.DBus"
+#define L_DBUS_INTERFACE_INTROSPECTABLE        "org.freedesktop.DBus.Introspectable"
+#define L_DBUS_INTERFACE_PROPERTIES    "org.freedesktop.DBus.Properties"
+#define L_DBUS_INTERFACE_OBJECT_MANAGER        "org.freedesktop.DBus.ObjectManager"
+
+enum l_dbus_bus {
+       L_DBUS_SYSTEM_BUS,
+       L_DBUS_SESSION_BUS,
+};
+
+enum l_dbus_match_type {
+       L_DBUS_MATCH_NONE = 0,
+       L_DBUS_MATCH_TYPE,
+       L_DBUS_MATCH_SENDER,
+       L_DBUS_MATCH_PATH,
+       L_DBUS_MATCH_INTERFACE,
+       L_DBUS_MATCH_MEMBER,
+       L_DBUS_MATCH_ARG0,
+};
+
+#define L_DBUS_MATCH_ARGUMENT(i)       (L_DBUS_MATCH_ARG0 + (i))
+
+struct l_dbus;
+struct l_dbus_interface;
+struct l_dbus_message_builder;
+
+typedef void (*l_dbus_ready_func_t) (void *user_data);
+typedef void (*l_dbus_disconnect_func_t) (void *user_data);
+
+typedef void (*l_dbus_debug_func_t) (const char *str, void *user_data);
+typedef void (*l_dbus_destroy_func_t) (void *user_data);
+typedef void (*l_dbus_interface_setup_func_t) (struct l_dbus_interface *);
+
+typedef void (*l_dbus_watch_func_t) (struct l_dbus *dbus, void *user_data);
+
+typedef void (*l_dbus_name_acquire_func_t) (struct l_dbus *dbus, bool success,
+                                               bool queued, void *user_data);
+
+struct l_dbus *l_dbus_new(const char *address);
+struct l_dbus *l_dbus_new_default(enum l_dbus_bus bus);
+void l_dbus_destroy(struct l_dbus *dbus);
+
+bool l_dbus_set_ready_handler(struct l_dbus *dbus, l_dbus_ready_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy);
+bool l_dbus_set_disconnect_handler(struct l_dbus *dbus,
+                               l_dbus_disconnect_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy);
+
+bool l_dbus_set_debug(struct l_dbus *dbus, l_dbus_debug_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy);
+
+struct l_dbus_message;
+
+struct l_dbus_message_iter {
+       struct l_dbus_message *message;
+       const char *sig_start;
+       uint8_t sig_len;
+       uint8_t sig_pos;
+       const void *data;
+       size_t len;
+       size_t pos;
+       char container_type;
+       const void *offsets;
+};
+
+struct l_dbus_message *l_dbus_message_new_method_call(struct l_dbus *dbus,
+                                                       const char *destination,
+                                                       const char *path,
+                                                       const char *interface,
+                                                       const char *method);
+
+struct l_dbus_message *l_dbus_message_new_signal(struct l_dbus *dbus,
+                                                       const char *path,
+                                                       const char *interface,
+                                                       const char *name);
+
+struct l_dbus_message *l_dbus_message_new_method_return(
+                                       struct l_dbus_message *method_call);
+
+struct l_dbus_message *l_dbus_message_new_error_valist(
+                                       struct l_dbus_message *method_call,
+                                       const char *name,
+                                       const char *format, va_list args);
+struct l_dbus_message *l_dbus_message_new_error(
+                                       struct l_dbus_message *method_call,
+                                       const char *name,
+                                       const char *format, ...)
+                                       __attribute__((format(printf, 3, 4)));
+
+struct l_dbus_message *l_dbus_message_ref(struct l_dbus_message *message);
+void l_dbus_message_unref(struct l_dbus_message *message);
+
+const char *l_dbus_message_get_path(struct l_dbus_message *message);
+const char *l_dbus_message_get_interface(struct l_dbus_message *message);
+const char *l_dbus_message_get_member(struct l_dbus_message *message);
+const char *l_dbus_message_get_destination(struct l_dbus_message *message);
+const char *l_dbus_message_get_sender(struct l_dbus_message *message);
+const char *l_dbus_message_get_signature(struct l_dbus_message *message);
+
+bool l_dbus_message_set_no_reply(struct l_dbus_message *message, bool on);
+bool l_dbus_message_get_no_reply(struct l_dbus_message *message);
+
+bool l_dbus_message_set_no_autostart(struct l_dbus_message *message, bool on);
+bool l_dbus_message_get_no_autostart(struct l_dbus_message *message);
+
+typedef void (*l_dbus_message_func_t) (struct l_dbus_message *message,
+                                                       void *user_data);
+
+uint32_t l_dbus_send_with_reply(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               l_dbus_message_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy);
+uint32_t l_dbus_send(struct l_dbus *dbus,
+                               struct l_dbus_message *message);
+bool l_dbus_cancel(struct l_dbus *dbus, uint32_t serial);
+
+unsigned int l_dbus_register(struct l_dbus *dbus,
+                               l_dbus_message_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy);
+bool l_dbus_unregister(struct l_dbus *dbus, unsigned int id);
+
+uint32_t l_dbus_method_call(struct l_dbus *dbus,
+                               const char *destination, const char *path,
+                               const char *interface, const char *method,
+                               l_dbus_message_func_t setup,
+                               l_dbus_message_func_t function,
+                               void *user_data, l_dbus_destroy_func_t destroy);
+
+bool l_dbus_message_is_error(struct l_dbus_message *message);
+bool l_dbus_message_get_error(struct l_dbus_message *message,
+                                       const char **name, const char **text);
+bool l_dbus_message_get_arguments(struct l_dbus_message *message,
+                                               const char *signature, ...);
+bool l_dbus_message_get_arguments_valist(struct l_dbus_message *message,
+                                       const char *signature, va_list args);
+
+bool l_dbus_message_iter_next_entry(struct l_dbus_message_iter *iter, ...);
+bool l_dbus_message_iter_get_variant(struct l_dbus_message_iter *iter,
+                                               const char *signature, ...);
+bool l_dbus_message_iter_get_fixed_array(struct l_dbus_message_iter *iter,
+                                               void *out, uint32_t *n_elem);
+
+bool l_dbus_message_set_arguments(struct l_dbus_message *message,
+                                               const char *signature, ...);
+bool l_dbus_message_set_arguments_valist(struct l_dbus_message *message,
+                                        const char *signature, va_list args);
+
+struct l_dbus_message_builder *l_dbus_message_builder_new(
+                                               struct l_dbus_message *message);
+void l_dbus_message_builder_destroy(struct l_dbus_message_builder *builder);
+
+bool l_dbus_message_builder_append_basic(struct l_dbus_message_builder *builder,
+                                       char type, const void *value);
+
+bool l_dbus_message_builder_enter_container(
+                                       struct l_dbus_message_builder *builder,
+                                       char container_type,
+                                       const char *signature);
+bool l_dbus_message_builder_leave_container(
+                                       struct l_dbus_message_builder *builder,
+                                       char container_type);
+
+bool l_dbus_message_builder_enter_struct(struct l_dbus_message_builder *builder,
+                                               const char *signature);
+bool l_dbus_message_builder_leave_struct(
+                                       struct l_dbus_message_builder *builder);
+
+bool l_dbus_message_builder_enter_dict(struct l_dbus_message_builder *builder,
+                                       const char *signature);
+bool l_dbus_message_builder_leave_dict(struct l_dbus_message_builder *builder);
+
+bool l_dbus_message_builder_enter_array(struct l_dbus_message_builder *builder,
+                                       const char *signature);
+bool l_dbus_message_builder_leave_array(struct l_dbus_message_builder *builder);
+
+bool l_dbus_message_builder_enter_variant(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature);
+bool l_dbus_message_builder_leave_variant(
+                                       struct l_dbus_message_builder *builder);
+
+bool l_dbus_message_builder_append_from_iter(
+                                       struct l_dbus_message_builder *builder,
+                                       struct l_dbus_message_iter *from);
+
+bool l_dbus_message_builder_append_from_valist(
+                                       struct l_dbus_message_builder *builder,
+                                       const char *signature, va_list args);
+
+struct l_dbus_message *l_dbus_message_builder_finalize(
+                                       struct l_dbus_message_builder *builder);
+
+bool l_dbus_register_interface(struct l_dbus *dbus, const char *interface,
+                               l_dbus_interface_setup_func_t setup_func,
+                               l_dbus_destroy_func_t destroy,
+                               bool handle_old_style_properties);
+bool l_dbus_unregister_interface(struct l_dbus *dbus, const char *interface);
+
+bool l_dbus_register_object(struct l_dbus *dbus, const char *path,
+                               void *user_data, l_dbus_destroy_func_t destroy,
+                               ...);
+bool l_dbus_unregister_object(struct l_dbus *dbus, const char *object);
+
+bool l_dbus_object_add_interface(struct l_dbus *dbus, const char *object,
+                                       const char *interface, void *user_data);
+bool l_dbus_object_remove_interface(struct l_dbus *dbus, const char *object,
+                                       const char *interface);
+void *l_dbus_object_get_data(struct l_dbus *dbus, const char *object,
+                               const char *interface);
+
+bool l_dbus_object_manager_enable(struct l_dbus *dbus, const char *root);
+
+unsigned int l_dbus_add_service_watch(struct l_dbus *dbus,
+                                       const char *name,
+                                       l_dbus_watch_func_t connect_func,
+                                       l_dbus_watch_func_t disconnect_func,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy);
+
+unsigned int l_dbus_add_disconnect_watch(struct l_dbus *dbus,
+                                       const char *name,
+                                       l_dbus_watch_func_t disconnect_func,
+                                       void *user_data,
+                                       l_dbus_destroy_func_t destroy);
+bool l_dbus_remove_watch(struct l_dbus *dbus, unsigned int id);
+
+unsigned int l_dbus_add_signal_watch(struct l_dbus *dbus,
+                                       const char *sender,
+                                       const char *path,
+                                       const char *interface,
+                                       const char *member, ...);
+bool l_dbus_remove_signal_watch(struct l_dbus *dbus, unsigned int id);
+
+uint32_t l_dbus_name_acquire(struct l_dbus *dbus, const char *name,
+                               bool allow_replacement, bool replace_existing,
+                               bool queue, l_dbus_name_acquire_func_t callback,
+                               void *user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_DBUS_H */
diff --git a/ell/dhcp-lease.c b/ell/dhcp-lease.c
new file mode 100644 (file)
index 0000000..4d49190
--- /dev/null
@@ -0,0 +1,271 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <linux/types.h>
+#include <netinet/ip.h>
+#include <arpa/inet.h>
+
+#include "private.h"
+#include "dhcp.h"
+#include "dhcp-private.h"
+#include "utf8.h"
+#include "net.h"
+
+struct l_dhcp_lease *_dhcp_lease_new(void)
+{
+       struct l_dhcp_lease *ret = l_new(struct l_dhcp_lease, 1);
+
+       return ret;
+}
+
+void _dhcp_lease_free(struct l_dhcp_lease *lease)
+{
+       if (!lease)
+               return;
+
+       l_free(lease->dns);
+       l_free(lease->domain_name);
+
+       l_free(lease);
+}
+
+struct l_dhcp_lease *_dhcp_lease_parse_options(struct dhcp_message_iter *iter)
+{
+       struct l_dhcp_lease *lease = _dhcp_lease_new();
+       uint8_t t, l;
+       const void *v;
+
+       while (_dhcp_message_iter_next(iter, &t, &l, &v)) {
+               switch (t) {
+               case L_DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
+                       if (l == 4)
+                               lease->lifetime = l_get_be32(v);
+                       break;
+               case L_DHCP_OPTION_SERVER_IDENTIFIER:
+                       if (l == 4)
+                               lease->server_address = l_get_u32(v);
+                       break;
+               case L_DHCP_OPTION_SUBNET_MASK:
+                       if (l == 4)
+                               lease->subnet_mask = l_get_u32(v);
+                       break;
+               case L_DHCP_OPTION_ROUTER:
+                       if (l == 4)
+                               lease->router = l_get_u32(v);
+                       break;
+               case L_DHCP_OPTION_RENEWAL_T1_TIME:
+                       if (l == 4)
+                               lease->t1 = l_get_be32(v);
+                       break;
+               case L_DHCP_OPTION_REBINDING_T2_TIME:
+                       if (l == 4)
+                               lease->t2 = l_get_be32(v);
+                       break;
+               case L_DHCP_OPTION_BROADCAST_ADDRESS:
+                       if (l == 4)
+                               lease->broadcast = l_get_u32(v);
+                       break;
+               case L_DHCP_OPTION_DOMAIN_NAME_SERVER:
+                       if (l >= 4 && !(l % 4)) {
+                               unsigned i = 0;
+
+                               lease->dns = l_new(uint32_t, l / 4 + 1);
+
+                               while (l >= 4) {
+                                       lease->dns[i] = l_get_u32(v + i * 4);
+                                       l -= 4;
+
+                                       if (lease->dns[i])
+                                               i++;
+                               }
+                       }
+                       break;
+               case L_DHCP_OPTION_DOMAIN_NAME:
+                       if (l < 1 || l > 253)
+                               goto error;
+
+                       /* Disallow embedded NUL bytes. */
+                       if (memchr(v, 0, l - 1))
+                               goto error;
+
+                       if (!l_utf8_validate(v, l, NULL))
+                               goto error;
+
+                       lease->domain_name = l_new(char, l + 1);
+
+                       memcpy(lease->domain_name, v, l);
+
+                       if (l_net_hostname_is_root(lease->domain_name))
+                               goto error;
+
+                       if (l_net_hostname_is_localhost(lease->domain_name))
+                               goto error;
+
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       if (!lease->server_address || !lease->lifetime)
+               goto error;
+
+       if (lease->lifetime < 10)
+               goto error;
+
+       /*
+        * RFC2131, Section 3.3:
+        * "Throughout the protocol, times are to be represented in units of
+        * seconds.  The time value of 0xffffffff is reserved to represent
+        * "infinity"."
+        *
+        * Don't bother checking t1/t2 for infinite leases
+        */
+       if (lease->lifetime == 0xffffffffu)
+               return lease;
+
+       if (!lease->t1)
+               lease->t1 = lease->lifetime / 2;
+
+       if (!lease->t2)
+               lease->t2 = lease->lifetime * 7 / 8;
+
+       if (lease->t1 > lease->t2)
+               goto error;
+
+       if (lease->t2 > lease->lifetime)
+               goto error;
+
+       return lease;
+error:
+       _dhcp_lease_free(lease);
+       return NULL;
+}
+
+static inline char *get_ip(uint32_t ip)
+{
+       struct in_addr addr;
+
+       if (ip == 0)
+               return NULL;
+
+       addr.s_addr = ip;
+       return l_strdup(inet_ntoa(addr));
+}
+
+LIB_EXPORT char *l_dhcp_lease_get_address(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return NULL;
+
+       return get_ip(lease->address);
+}
+
+LIB_EXPORT char *l_dhcp_lease_get_gateway(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return NULL;
+
+       return get_ip(lease->router);
+}
+
+LIB_EXPORT char *l_dhcp_lease_get_netmask(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return NULL;
+
+       return get_ip(lease->subnet_mask);
+}
+
+LIB_EXPORT char *l_dhcp_lease_get_broadcast(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return NULL;
+
+       return get_ip(lease->broadcast);
+}
+
+LIB_EXPORT char *l_dhcp_lease_get_server_id(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return NULL;
+
+       return get_ip(lease->server_address);
+}
+
+LIB_EXPORT char **l_dhcp_lease_get_dns(const struct l_dhcp_lease *lease)
+{
+       unsigned i;
+       char **dns_list;
+
+       if (unlikely(!lease))
+               return NULL;
+
+       if (!lease->dns)
+               return NULL;
+
+       for (i = 0; lease->dns[i]; i++)
+               ;
+
+       dns_list = l_new(char *, i + 1);
+
+       for (i = 0; lease->dns[i]; i++)
+               dns_list[i] = get_ip(lease->dns[i]);
+
+       return dns_list;
+}
+
+LIB_EXPORT char *l_dhcp_lease_get_domain_name(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return NULL;
+
+       return l_strdup(lease->domain_name);
+}
+
+LIB_EXPORT uint32_t l_dhcp_lease_get_t1(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return 0;
+
+       return lease->t1;
+}
+
+LIB_EXPORT uint32_t l_dhcp_lease_get_t2(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return 0;
+
+       return lease->t2;
+}
+
+LIB_EXPORT uint32_t l_dhcp_lease_get_lifetime(const struct l_dhcp_lease *lease)
+{
+       if (unlikely(!lease))
+               return 0;
+
+       return lease->lifetime;
+}
diff --git a/ell/dhcp-private.h b/ell/dhcp-private.h
new file mode 100644 (file)
index 0000000..a75bb8b
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+struct l_dhcp_client;
+
+enum {
+       DHCP_PORT_SERVER = 67,
+       DHCP_PORT_CLIENT = 68,
+};
+
+/* RFC 2131, Table 1 */
+enum dhcp_op_code {
+       DHCP_OP_CODE_BOOTREQUEST = 1,
+       DHCP_OP_CODE_BOOTREPLY = 2,
+};
+
+#define DHCP_MAGIC 0x63825363
+
+/* RFC 2131, Figure 1 */
+struct dhcp_message {
+       uint8_t op;
+       uint8_t htype;
+       uint8_t hlen;
+       uint8_t hops;
+       __be32 xid;
+       __be16 secs;
+       __be16 flags;
+       uint32_t ciaddr;
+       uint32_t yiaddr;
+       uint32_t siaddr;
+       uint32_t giaddr;
+       uint8_t chaddr[16];
+       uint8_t sname[64];
+       uint8_t file[128];
+       __be32 magic;
+       uint8_t options[0];
+} __attribute__ ((packed));
+
+struct dhcp_message_iter {
+       const struct dhcp_message *message;
+       size_t message_len;
+       const uint8_t *options;
+       uint16_t pos;
+       uint16_t max;
+       bool can_overload : 1;
+       bool overload_sname : 1;
+       bool overload_file : 1;
+};
+
+const char *_dhcp_message_type_to_string(uint8_t type);
+const char *_dhcp_option_to_string(uint8_t option);
+
+uint16_t _dhcp_checksum(const void *buf, size_t len);
+uint16_t _dhcp_checksumv(const struct iovec *iov, size_t iov_cnt);
+
+typedef void (*dhcp_transport_rx_cb_t)(const void *, size_t, void *);
+
+struct dhcp_transport {
+       int (*open)(struct dhcp_transport *s, uint32_t xid);
+       int (*broadcast)(struct dhcp_transport *transport,
+                                               uint32_t saddr, uint16_t sport,
+                                               uint32_t daddr, uint16_t dport,
+                                               const void *data, size_t len);
+       int (*bind)(struct dhcp_transport *transport, uint32_t saddr);
+       int (*send)(struct dhcp_transport *transport,
+                                       const struct sockaddr_in *dest,
+                                       const void *data, size_t len);
+       void (*close)(struct dhcp_transport *transport);
+       uint32_t ifindex;
+       dhcp_transport_rx_cb_t rx_cb;
+       void *rx_data;
+};
+
+struct dhcp_transport *_dhcp_default_transport_new(uint32_t ifindex,
+                                                       const char *ifname,
+                                                       uint16_t port);
+void _dhcp_transport_free(struct dhcp_transport *transport);
+void _dhcp_transport_set_rx_callback(struct dhcp_transport *transport,
+                                       dhcp_transport_rx_cb_t rx_cb,
+                                       void *userdata);
+
+bool _dhcp_message_iter_init(struct dhcp_message_iter *iter,
+                               const struct dhcp_message *message, size_t len);
+bool _dhcp_message_iter_next(struct dhcp_message_iter *iter, uint8_t *type,
+                               uint8_t *len, const void **data);
+
+int _dhcp_option_append(uint8_t **buf, size_t *buflen, uint8_t code,
+                                       size_t optlen, const void *optval);
+
+bool _dhcp_client_set_transport(struct l_dhcp_client *client,
+                                       struct dhcp_transport *transport);
+void _dhcp_client_override_xid(struct l_dhcp_client *client, uint32_t xid);
+
+struct l_dhcp_lease {
+       uint32_t address;
+       uint32_t server_address;
+       uint32_t subnet_mask;
+       uint32_t broadcast;
+       uint32_t lifetime;
+       uint32_t t1;
+       uint32_t t2;
+       uint32_t router;
+       uint32_t *dns;
+       char *domain_name;
+};
+
+struct l_dhcp_lease *_dhcp_lease_new(void);
+void _dhcp_lease_free(struct l_dhcp_lease *lease);
+struct l_dhcp_lease *_dhcp_lease_parse_options(struct dhcp_message_iter *iter);
diff --git a/ell/dhcp-transport.c b/ell/dhcp-transport.c
new file mode 100644 (file)
index 0000000..56db9dd
--- /dev/null
@@ -0,0 +1,527 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <linux/types.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stddef.h>
+#include <net/if.h>
+#include <linux/if_packet.h>
+#include <netinet/udp.h>
+#include <netinet/ip.h>
+#include <linux/if_ether.h>
+#include <linux/filter.h>
+#include <net/if_arp.h>
+
+#include "io.h"
+#include "util.h"
+#include "private.h"
+#include "dhcp-private.h"
+
+struct dhcp_default_transport {
+       struct dhcp_transport super;
+       struct l_io *io;
+       int udp_fd;
+       char ifname[IFNAMSIZ];
+       uint16_t port;
+};
+
+struct dhcp_packet {
+       struct iphdr ip;
+       struct udphdr udp;
+       struct dhcp_message dhcp;
+} __attribute__ ((packed));
+
+/*
+ * For efficiency and simplicity of implementation, this function assumes that
+ * only the last buffer can have an odd number of bytes
+ */
+uint16_t _dhcp_checksumv(const struct iovec *iov, size_t iov_cnt)
+{
+       uint32_t sum = 0;
+       size_t i, j;
+       size_t len = 0;
+
+       for (j = 0; j < iov_cnt; j++) {
+               const uint16_t *check = iov[j].iov_base;
+
+               len += iov[j].iov_len;
+
+               for (i = 0; i < iov[j].iov_len / 2; i++)
+                       sum += check[i];
+       }
+
+       j--;
+
+       if (len & 0x01) {
+               const uint8_t *odd = iov[j].iov_base;
+               sum += odd[iov[j].iov_len - 1];
+       }
+
+       while (sum >> 16)
+               sum = (sum & 0xffff) + (sum >> 16);
+
+       return ~sum;
+}
+
+uint16_t _dhcp_checksum(const void *buf, size_t len)
+{
+       struct iovec iov[1];
+
+       iov[0].iov_base = (void *) buf;
+       iov[0].iov_len = len;
+
+       return _dhcp_checksumv(iov, 1);
+}
+
+static bool _dhcp_default_transport_read_handler(struct l_io *io,
+                                                       void *userdata)
+{
+       struct dhcp_default_transport *transport = userdata;
+       int fd = l_io_get_fd(io);
+       char buf[2048];
+       ssize_t len;
+       struct dhcp_packet *p;
+       uint16_t c;
+
+       len = read(fd, buf, sizeof(buf));
+       if (len < 0)
+               return false;
+
+       p = (struct dhcp_packet *) buf;
+
+       if (len < L_BE16_TO_CPU(p->ip.tot_len))
+               return true;
+
+       if (len < (ssize_t) (L_BE16_TO_CPU(p->udp.len) + sizeof(struct iphdr)))
+               return true;
+
+       c = p->ip.check;
+       p->ip.check = 0;
+
+       if (c != _dhcp_checksum(&p->ip, sizeof(struct iphdr)))
+               return true;
+
+       /* only compute if the UDP checksum is present, e.g. non-zero */
+       if (p->udp.check) {
+               c = p->udp.check;
+               p->ip.check = p->udp.len;
+               p->ip.ttl = 0;
+               p->udp.check = 0;
+
+               /*
+                * We fake the UDP pseudo-header by reusing bits of
+                * the IP header
+                */
+               if (c != _dhcp_checksum(&p->ip.ttl,
+                                       L_BE16_TO_CPU(p->udp.len) + 12))
+                       return true;
+       }
+
+       len -= sizeof(struct udphdr) - sizeof(struct iphdr);
+
+       if (transport->super.rx_cb)
+               transport->super.rx_cb(&p->dhcp, len, transport->super.rx_data);
+
+       return true;
+}
+
+static void dhcp_set_ip_udp_headers(struct iphdr *ip, struct udphdr *udp,
+                                       uint32_t saddr, uint16_t sport,
+                                       uint32_t daddr, uint16_t dport,
+                                       const void *data, size_t len)
+{
+       struct iovec iov[3];
+
+       memset(ip, 0, sizeof(*ip));
+       memset(udp, 0, sizeof(*udp));
+
+       ip->version = IPVERSION;
+       ip->ihl = sizeof(struct iphdr) / 4;
+       ip->tot_len = L_CPU_TO_BE16(len + sizeof(*ip) + sizeof(*udp));
+
+       ip->protocol = IPPROTO_UDP;
+       ip->saddr = L_CPU_TO_BE32(saddr);
+       ip->daddr = L_CPU_TO_BE32(daddr);
+
+       udp->source = L_CPU_TO_BE16(sport);
+       udp->dest = L_CPU_TO_BE16(dport);
+
+       udp->len = L_CPU_TO_BE16(len + sizeof(*udp));
+
+       ip->check = udp->len;
+
+       iov[0].iov_base = &ip->ttl;
+       iov[0].iov_len = sizeof(*ip) - 8;
+       iov[1].iov_base = udp;
+       iov[1].iov_len = sizeof(*udp);
+       iov[2].iov_base = (void *) data;
+       iov[2].iov_len = len;
+       udp->check = _dhcp_checksumv(iov, 3);
+
+       ip->ttl = IPDEFTTL;
+       ip->check = 0;
+
+       iov[0].iov_base = ip;
+       iov[0].iov_len = sizeof(*ip);
+       ip->check = _dhcp_checksumv(iov, 1);
+}
+
+static int _dhcp_default_transport_broadcast(struct dhcp_transport *s,
+                                               uint32_t saddr, uint16_t sport,
+                                               uint32_t daddr, uint16_t dport,
+                                               const void *data, size_t len)
+{
+       struct dhcp_default_transport *transport =
+               l_container_of(s, struct dhcp_default_transport, super);
+       struct sockaddr_ll addr;
+       struct iovec iov[3];
+       struct iphdr ip;
+       struct udphdr udp;
+       struct msghdr msg;
+
+       dhcp_set_ip_udp_headers(&ip, &udp,
+                                       saddr, sport, daddr, dport, data, len);
+       iov[0].iov_base = &ip;
+       iov[0].iov_len = sizeof(ip);
+       iov[1].iov_base = &udp;
+       iov[1].iov_len = sizeof(udp);
+       iov[2].iov_base = (void *) data;
+       iov[2].iov_len = len;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sll_family = AF_PACKET;
+       addr.sll_protocol = htons(ETH_P_IP);
+       addr.sll_ifindex = s->ifindex;
+       addr.sll_halen = ETH_ALEN;
+       memset(addr.sll_addr, 0xff, ETH_ALEN);
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_name = &addr;
+       msg.msg_namelen = sizeof(addr);
+       msg.msg_iov = iov;
+       msg.msg_iovlen = 3;
+
+       if (sendmsg(l_io_get_fd(transport->io), &msg, 0) < 0)
+               goto error;
+
+       errno = 0;
+
+error:
+       return -errno;
+}
+
+static int _dhcp_default_transport_send(struct dhcp_transport *s,
+                                       const struct sockaddr_in *dest,
+                                       const void *data, size_t len)
+{
+       struct dhcp_default_transport *transport =
+               l_container_of(s, struct dhcp_default_transport, super);
+       int err;
+
+       err = sendto(transport->udp_fd, data, len, 0,
+                       (const struct sockaddr *) dest, sizeof(*dest));
+
+       if (err < 0)
+               return -errno;
+
+       return 0;
+}
+
+static int kernel_udp_socket_open(const char *ifname,
+                                       uint32_t addr, uint16_t port)
+{
+       int s;
+       int err;
+       int one = 1;
+       struct sockaddr_in saddr;
+       struct sock_filter filter[] = {
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+       };
+       struct sock_fprog fprog = {
+               .len = L_ARRAY_SIZE(filter),
+               .filter = filter
+       };
+
+       s = socket(AF_INET, SOCK_DGRAM, 0);
+       if (s < 0)
+               return -errno;
+
+       if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER,
+                                               &fprog, sizeof(fprog)) < 0)
+               goto error;
+
+       if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0)
+               goto error;
+
+       if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE,
+                                       ifname, strlen(ifname) + 1) < 0)
+               goto error;
+
+       /*
+        * Just in case we need to bind the address prior to it being
+        * configured via rtnl
+        */
+       if (setsockopt(s, IPPROTO_IP, IP_FREEBIND, &one, sizeof(one)) < 0)
+               goto error;
+
+       memset(&saddr, 0, sizeof(saddr));
+       saddr.sin_family = AF_INET;
+       saddr.sin_port = L_CPU_TO_BE16(port);
+       saddr.sin_addr.s_addr = addr;
+
+       err = bind(s, (struct sockaddr *) &saddr, sizeof(struct sockaddr_in));
+       if (err < 0)
+               goto error;
+
+       return s;
+
+error:
+       L_TFR(close(s));
+       return -errno;
+}
+
+static int _dhcp_default_transport_bind(struct dhcp_transport *s,
+                                                       uint32_t saddr)
+{
+       struct dhcp_default_transport *transport =
+               l_container_of(s, struct dhcp_default_transport, super);
+       int fd;
+
+       if (!transport->io)
+               return -EIO;
+
+       fd = kernel_udp_socket_open(transport->ifname, saddr, transport->port);
+       if (fd < 0)
+               return fd;
+
+       transport->udp_fd = fd;
+
+       return 0;
+}
+
+static int kernel_raw_socket_open(uint32_t ifindex, uint16_t port, uint32_t xid)
+{
+       int s;
+       struct sockaddr_ll addr;
+       struct sock_filter filter[] = {
+               /* A <- packet length */
+               BPF_STMT(BPF_LD + BPF_W + BPF_LEN, 0),
+               /* A >= sizeof(dhcp_packet) ? */
+               BPF_JUMP(BPF_JMP + BPF_JGE + BPF_K,
+                                       sizeof(struct dhcp_packet), 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- IP version + Header length */
+               BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 0),
+               /* A <- A & 0xf0 (Mask off version */
+               BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0xf0),
+               /* A == IPVERSION (shifted left 4) ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPVERSION << 4, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- IP version + Header length */
+               BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 0),
+               /* A <- A & 0x0f (Mask off IP Header Length */
+               BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0x0f),
+               /* A == 5 ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 5, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- IP protocol */
+               BPF_STMT(BPF_LD + BPF_B + BPF_ABS,
+                               offsetof(struct dhcp_packet, ip.protocol)),
+               /* IP protocol == UDP ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- Flags + Fragment offset */
+               BPF_STMT(BPF_LD + BPF_H + BPF_ABS,
+                               offsetof(struct dhcp_packet, ip.frag_off)),
+               /* A <- A & 0x3fff (fragment flag + fragment offset) */
+               BPF_STMT(BPF_ALU + BPF_AND + BPF_K, 0x3fff),
+               /* A == 0 ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 0, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- UDP destination port */
+               BPF_STMT(BPF_LD + BPF_H + BPF_ABS,
+                               offsetof(struct dhcp_packet, udp.dest)),
+               /* UDP destination port == DHCP client port ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, port, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- DHCP op */
+               BPF_STMT(BPF_LD + BPF_B + BPF_ABS,
+                               offsetof(struct dhcp_packet, dhcp.op)),
+               /* op == BOOTREPLY ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K,
+                               DHCP_OP_CODE_BOOTREPLY, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- DHCP header type */
+               BPF_STMT(BPF_LD + BPF_B + BPF_ABS,
+                               offsetof(struct dhcp_packet, dhcp.htype)),
+               /* header type == arp_type ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ARPHRD_ETHER, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- client identifier */
+               BPF_STMT(BPF_LD + BPF_W + BPF_ABS,
+                               offsetof(struct dhcp_packet, dhcp.xid)),
+               /* client identifier == xid ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, xid, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- MAC address length */
+               BPF_STMT(BPF_LD + BPF_B + BPF_ABS,
+                               offsetof(struct dhcp_packet, dhcp.hlen)),
+               /* address length == dhcp_hlen ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETH_ALEN, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* A <- DHCP magic cookie */
+               BPF_STMT(BPF_LD + BPF_W + BPF_ABS,
+                               offsetof(struct dhcp_packet, dhcp.magic)),
+               /* cookie == DHCP magic cookie ? */
+               BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, DHCP_MAGIC, 1, 0),
+               /* ignore */
+               BPF_STMT(BPF_RET + BPF_K, 0),
+               /* return all */
+               BPF_STMT(BPF_RET + BPF_K, 65535),
+       };
+       const struct sock_fprog fprog = {
+               .len = L_ARRAY_SIZE(filter),
+               .filter = filter
+       };
+
+       s = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (s < 0)
+               return -errno;
+
+       if (setsockopt(s, SOL_SOCKET, SO_ATTACH_FILTER,
+                                               &fprog, sizeof(fprog)) < 0)
+               goto error;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sll_family = AF_PACKET;
+       addr.sll_protocol = htons(ETH_P_IP);
+       addr.sll_ifindex = ifindex;
+       addr.sll_halen = ETH_ALEN;
+       memset(addr.sll_addr, 0xff, ETH_ALEN);
+
+       if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+               goto error;
+
+       return s;
+
+error:
+       L_TFR(close(s));
+       return -errno;
+}
+
+static int _dhcp_default_transport_open(struct dhcp_transport *s, uint32_t xid)
+{
+       struct dhcp_default_transport *transport =
+               l_container_of(s, struct dhcp_default_transport, super);
+       int fd;
+
+       if (transport->io)
+               return -EALREADY;
+
+       fd = kernel_raw_socket_open(s->ifindex, transport->port, xid);
+       if (fd < 0)
+               return fd;
+
+       transport->io = l_io_new(fd);
+       l_io_set_close_on_destroy(transport->io, true);
+       l_io_set_read_handler(transport->io,
+                                       _dhcp_default_transport_read_handler,
+                                       transport, NULL);
+
+       return 0;
+}
+
+static void _dhcp_default_transport_close(struct dhcp_transport *s)
+{
+       struct dhcp_default_transport *transport =
+               l_container_of(s, struct dhcp_default_transport, super);
+
+       l_io_destroy(transport->io);
+       transport->io = NULL;
+
+       if (transport->udp_fd >= 0) {
+               L_TFR(close(transport->udp_fd));
+               transport->udp_fd = -1;
+       }
+}
+
+struct dhcp_transport *_dhcp_default_transport_new(uint32_t ifindex,
+                                                       const char *ifname,
+                                                       uint16_t port)
+{
+       struct dhcp_default_transport *transport;
+       transport = l_new(struct dhcp_default_transport, 1);
+
+       transport->super.open = _dhcp_default_transport_open;
+       transport->super.bind = _dhcp_default_transport_bind;
+       transport->super.close = _dhcp_default_transport_close;
+       transport->super.send = _dhcp_default_transport_send;
+       transport->super.broadcast = _dhcp_default_transport_broadcast;
+
+       transport->super.ifindex = ifindex;
+       l_strlcpy(transport->ifname, ifname, IFNAMSIZ);
+       transport->port = port;
+
+       return &transport->super;
+}
+
+void _dhcp_transport_free(struct dhcp_transport *transport)
+{
+       if (!transport)
+               return;
+
+       if (transport->close)
+               transport->close(transport);
+
+       l_free(transport);
+}
+
+void _dhcp_transport_set_rx_callback(struct dhcp_transport *transport,
+                                       dhcp_transport_rx_cb_t rx_cb,
+                                       void *userdata)
+{
+       if (!transport)
+               return;
+
+       transport->rx_cb = rx_cb;
+       transport->rx_data = userdata;
+}
diff --git a/ell/dhcp.c b/ell/dhcp.c
new file mode 100644 (file)
index 0000000..f1e1595
--- /dev/null
@@ -0,0 +1,1301 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <netinet/ip.h>
+#include <net/ethernet.h>
+#include <linux/types.h>
+#include <net/if_arp.h>
+#include <errno.h>
+
+#include "private.h"
+#include "random.h"
+#include "time.h"
+#include "net.h"
+#include "timeout.h"
+#include "dhcp.h"
+#include "dhcp-private.h"
+
+#define CLIENT_DEBUG(fmt, args...)                                     \
+       l_util_debug(client->debug_handler, client->debug_data,         \
+                       "%s:%i " fmt, __func__, __LINE__, ## args)
+#define CLIENT_ENTER_STATE(s)                                          \
+       l_util_debug(client->debug_handler, client->debug_data,         \
+                       "%s:%i Entering state: " #s,                    \
+                       __func__, __LINE__);                            \
+       client->state = (s)
+
+#define BITS_PER_LONG (sizeof(unsigned long) * 8)
+
+#define DHCP_OPTION_PAD 0 /* RFC 2132, Section 3.1 */
+#define DHCP_OPTION_END 255 /* RFC 2132, Section 3.2 */
+
+/* RFC 2132, Section 9.3. Option Overload */
+#define DHCP_OPTION_OVERLOAD 52
+enum dhcp_option_overload {
+       DHCP_OVERLOAD_FILE = 1,
+       DHCP_OVERLOAD_SNAME = 2,
+       DHCP_OVERLOAD_BOTH = 3,
+};
+
+/* RFC 2132, Section 9.6. DHCP Message Type */
+#define DHCP_OPTION_MESSAGE_TYPE 53
+enum dhcp_message_type {
+       DHCP_MESSAGE_TYPE_DISCOVER = 1,
+       DHCP_MESSAGE_TYPE_OFFER = 2,
+       DHCP_MESSAGE_TYPE_REQUEST = 3,
+       DHCP_MESSAGE_TYPE_DECLINE = 4,
+       DHCP_MESSAGE_TYPE_ACK = 5,
+       DHCP_MESSAGE_TYPE_NAK = 6,
+       DHCP_MESSAGE_TYPE_RELEASE = 7,
+       DHCP_MESSAGE_TYPE_INFORM = 8,
+};
+
+#define DHCP_OPTION_PARAMETER_REQUEST_LIST 55 /* Section 9.8 */
+#define DHCP_OPTION_MAXIMUM_MESSAGE_SIZE 57 /* Section 9.10 */
+#define DHCP_OPTION_CLIENT_IDENTIFIER 61 /* Section 9.14 */
+
+enum dhcp_state {
+       DHCP_STATE_INIT,
+       DHCP_STATE_SELECTING,
+       DHCP_STATE_INIT_REBOOT,
+       DHCP_STATE_REBOOTING,
+       DHCP_STATE_REQUESTING,
+       DHCP_STATE_BOUND,
+       DHCP_STATE_RENEWING,
+       DHCP_STATE_REBINDING,
+};
+
+const char *_dhcp_message_type_to_string(uint8_t type)
+{
+       switch(type) {
+       case DHCP_MESSAGE_TYPE_DISCOVER:
+               return "DHCPDISCOVER";
+       case DHCP_MESSAGE_TYPE_OFFER:
+               return "DHCPOFFER";
+       case DHCP_MESSAGE_TYPE_REQUEST:
+               return "DHCPREQUEST";
+       case DHCP_MESSAGE_TYPE_DECLINE:
+               return "DHCPDECLINE";
+       case DHCP_MESSAGE_TYPE_ACK:
+               return "DHCPACK";
+       case DHCP_MESSAGE_TYPE_NAK:
+               return "DHCPNAK";
+       case DHCP_MESSAGE_TYPE_RELEASE:
+               return "DHCPRELEASE";
+       default:
+               return "unknown";
+       }
+}
+
+const char *_dhcp_option_to_string(uint8_t option)
+{
+       switch (option) {
+       case DHCP_OPTION_PAD:
+               return "Pad";
+       case L_DHCP_OPTION_SUBNET_MASK:
+               return "Subnet Mask";
+       case L_DHCP_OPTION_ROUTER:
+               return "Router";
+       case L_DHCP_OPTION_DOMAIN_NAME_SERVER:
+               return "Domain Name Server";
+       case L_DHCP_OPTION_HOST_NAME:
+               return "Host Name";
+       case L_DHCP_OPTION_DOMAIN_NAME:
+               return "Domain Name";
+       case L_DHCP_OPTION_BROADCAST_ADDRESS:
+               return "Broadcast Address";
+       case L_DHCP_OPTION_NTP_SERVERS:
+               return "NTP Servers";
+       case L_DHCP_OPTION_REQUESTED_IP_ADDRESS:
+               return "IP Address";
+       case L_DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
+               return "IP Address Lease Time";
+       case DHCP_OPTION_OVERLOAD:
+               return "Overload";
+       case DHCP_OPTION_MESSAGE_TYPE:
+               return "DHCP Message Type";
+       case L_DHCP_OPTION_SERVER_IDENTIFIER:
+               return "Server Identifier";
+       case DHCP_OPTION_PARAMETER_REQUEST_LIST:
+               return "Parameter Request List";
+       case DHCP_OPTION_MAXIMUM_MESSAGE_SIZE:
+               return "Maximum Message Size";
+       case L_DHCP_OPTION_RENEWAL_T1_TIME:
+               return "Renewal Time";
+       case L_DHCP_OPTION_REBINDING_T2_TIME:
+               return "Rebinding Time";
+       case DHCP_OPTION_CLIENT_IDENTIFIER:
+               return "Client Identifier";
+       case DHCP_OPTION_END:
+               return "End";
+       default:
+               return "unknown";
+       };
+}
+
+bool _dhcp_message_iter_init(struct dhcp_message_iter *iter,
+                               const struct dhcp_message *message, size_t len)
+{
+       if (!message)
+               return false;
+
+       if (len < sizeof(struct dhcp_message))
+               return false;
+
+       if (L_BE32_TO_CPU(message->magic) != DHCP_MAGIC)
+               return false;
+
+       memset(iter, 0, sizeof(*iter));
+       iter->message = message;
+       iter->message_len = len;
+       iter->max = len - sizeof(struct dhcp_message);
+       iter->options = message->options;
+       iter->can_overload = true;
+
+       return true;
+}
+
+static bool next_option(struct dhcp_message_iter *iter,
+                               uint8_t *t, uint8_t *l, const void **v)
+{
+       uint8_t type;
+       uint8_t len;
+
+       while (iter->pos < iter->max) {
+               type = iter->options[iter->pos];
+
+               switch (type) {
+               case DHCP_OPTION_PAD:
+                       iter->pos += 1;
+                       continue;
+               case DHCP_OPTION_END:
+                       return false;
+               default:
+                       break;
+               }
+
+               if (iter->pos + 2 >= iter->max)
+                       return false;
+
+               len = iter->options[iter->pos + 1];
+
+               if (iter->pos + 2 + len > iter->max)
+                       return false;
+
+               *t = type;
+               *l = len;
+               *v = &iter->options[iter->pos + 2];
+
+               iter->pos += 2 + len;
+               return true;
+       }
+
+       return false;
+}
+
+bool _dhcp_message_iter_next(struct dhcp_message_iter *iter, uint8_t *type,
+                               uint8_t *len, const void **data)
+{
+       bool r;
+       uint8_t t, l;
+       const void *v;
+
+       do {
+               r = next_option(iter, &t, &l, &v);
+               if (!r) {
+                       iter->can_overload = false;
+
+                       if (iter->overload_file) {
+                               iter->options = iter->message->file;
+                               iter->pos = 0;
+                               iter->max = sizeof(iter->message->file);
+                               iter->overload_file = false;
+                               continue;
+                       }
+
+                       if (iter->overload_sname) {
+                               iter->options = iter->message->sname;
+                               iter->pos = 0;
+                               iter->max = sizeof(iter->message->sname);
+                               iter->overload_sname = false;
+                               continue;
+                       }
+
+                       return r;
+               }
+
+               switch (t) {
+               case DHCP_OPTION_OVERLOAD:
+                       if (l != 1)
+                               continue;
+
+                       if (!iter->can_overload)
+                               continue;
+
+                       if (l_get_u8(v) & DHCP_OVERLOAD_FILE)
+                               iter->overload_file = true;
+
+                       if (l_get_u8(v) & DHCP_OVERLOAD_SNAME)
+                               iter->overload_sname = true;
+
+                       continue;
+               default:
+                       if (type)
+                               *type = t;
+
+                       if (len)
+                               *len = l;
+
+                       if (data)
+                               *data = v;
+                       return r;
+               }
+       } while (true);
+
+       return false;
+}
+
+int _dhcp_option_append(uint8_t **buf, size_t *buflen, uint8_t code,
+                                       size_t optlen, const void *optval)
+{
+       if (!buf || !buflen)
+               return -EINVAL;
+
+       switch (code) {
+
+       case DHCP_OPTION_PAD:
+       case DHCP_OPTION_END:
+               if (*buflen < 1)
+                       return -ENOBUFS;
+
+               (*buf)[0] = code;
+               *buf += 1;
+               *buflen -= 1;
+               break;
+
+       default:
+               if (*buflen < optlen + 2)
+                       return -ENOBUFS;
+
+               if (!optval)
+                       return -EINVAL;
+
+               (*buf)[0] = code;
+               (*buf)[1] = optlen;
+               memcpy(&(*buf)[2], optval, optlen);
+
+               *buf += optlen + 2;
+               *buflen -= (optlen + 2);
+
+               break;
+       }
+
+       return 0;
+}
+
+static int dhcp_append_prl(const unsigned long *reqopts,
+                                       uint8_t **buf, size_t *buflen)
+{
+       uint8_t optlen = 0;
+       unsigned int i;
+       unsigned int j;
+
+       if (!buf || !buflen)
+               return -EINVAL;
+
+       for (i = 0; i < 256 / BITS_PER_LONG; i++)
+               optlen += __builtin_popcountl(reqopts[i]);
+
+       /*
+        * This function assumes that there's enough space to put the PRL
+        * into the buffer without resorting to file or sname overloading
+        */
+       if (*buflen < optlen + 2U)
+               return -ENOBUFS;
+
+       i = 0;
+       (*buf)[i++] = DHCP_OPTION_PARAMETER_REQUEST_LIST;
+       (*buf)[i++] = optlen;
+
+       for (j = 0; j < 256; j++) {
+               if (reqopts[j / BITS_PER_LONG] & 1UL << (j % BITS_PER_LONG))
+                       (*buf)[i++] = j;
+       }
+
+       *buf += optlen + 2;
+       *buflen -= (optlen + 2);
+
+       return 0;
+}
+
+static int dhcp_message_init(struct dhcp_message *message,
+                               enum dhcp_op_code op,
+                               uint8_t type, uint32_t xid,
+                               uint8_t **opt, size_t *optlen)
+{
+       int err;
+
+       message->op = op;
+       message->xid = L_CPU_TO_BE32(xid);
+       message->magic = L_CPU_TO_BE32(DHCP_MAGIC);
+       *opt = (uint8_t *)(message + 1);
+
+       err = _dhcp_option_append(opt, optlen,
+                                       DHCP_OPTION_MESSAGE_TYPE, 1, &type);
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
+static void dhcp_message_set_address_type(struct dhcp_message *message,
+                                               uint8_t addr_type,
+                                               uint8_t addr_len)
+{
+       message->htype = addr_type;
+
+       switch (addr_type) {
+       case ARPHRD_ETHER:
+               message->hlen = addr_len;
+               break;
+       default:
+               message->hlen = 0;
+       }
+}
+
+static inline int dhcp_message_optimize(struct dhcp_message *message,
+                                       const uint8_t *end)
+{
+       /*
+        * Don't bother sending a full sized dhcp_message as it is most likely
+        * mostly zeros.  Instead truncate it at DHCP_OPTION_END and align to
+        * the nearest 4 byte boundary.  Many implementations expect a packet
+        * of a certain size or it is filtered, so we cap the length in
+        * accordance to RFC 1542:
+        * "The IP Total Length and UDP Length must be large enough to contain
+        * the minimal BOOTP header of 300 octets"
+        */
+       size_t len = align_len(end - (uint8_t *) message, 4);
+       if (len < 300)
+               len = 300;
+
+       return len;
+}
+
+#define DHCP_MIN_OPTIONS_SIZE 312
+
+struct l_dhcp_client {
+       enum dhcp_state state;
+       unsigned long request_options[256 / BITS_PER_LONG];
+       uint32_t ifindex;
+       char *ifname;
+       uint8_t addr[6];
+       uint8_t addr_len;
+       uint8_t addr_type;
+       char *hostname;
+       uint32_t xid;
+       struct dhcp_transport *transport;
+       uint64_t start_t;
+       struct l_timeout *timeout_resend;
+       struct l_timeout *timeout_lease;
+       struct l_dhcp_lease *lease;
+       uint8_t attempt;
+       l_dhcp_client_event_cb_t event_handler;
+       void *event_data;
+       l_dhcp_destroy_cb_t event_destroy;
+       l_dhcp_debug_cb_t debug_handler;
+       l_dhcp_destroy_cb_t debug_destroy;
+       void *debug_data;
+       bool have_addr : 1;
+       bool override_xid : 1;
+};
+
+static inline void dhcp_enable_option(struct l_dhcp_client *client,
+                                                               uint8_t option)
+{
+       client->request_options[option / BITS_PER_LONG] |=
+                                               1UL << (option % BITS_PER_LONG);
+}
+
+static uint16_t dhcp_attempt_secs(uint64_t start)
+{
+       uint64_t now = l_time_now();
+       uint64_t elapsed = l_time_to_secs(now - start);
+
+       if (elapsed == 0)
+               return 1;
+
+       if (elapsed > UINT16_MAX)
+               return UINT16_MAX;
+
+       return elapsed;
+}
+
+/*
+ * Takes a time in seconds and produces a fuzzed value that can be directly
+ * used by l_timeout_modify_ms
+ */
+static uint64_t dhcp_fuzz_secs(uint32_t secs)
+{
+       uint64_t ms = secs * 1000ULL;
+       uint32_t r = l_getrandom_uint32();
+
+       /*
+        * RFC2132, Section 4.1:
+        * DHCP clients are responsible for all message retransmission.  The
+        * client MUST adopt a retransmission strategy that incorporates a
+        * randomized exponential backoff algorithm to determine the delay
+        * between retransmissions.
+        *
+        * and later in the same paragraph:
+        * For example, in a 10Mb/sec Ethernet internetwork, the delay before
+        * the first retransmission SHOULD be 4 seconds randomized by the
+        * value of a uniform random number chosen from the range -1 to +1.
+        * Clients with clocks that provide resolution granularity of less than
+        * one second may choose a non-integer randomization value.
+        */
+       if (r & 0x80000000)
+               ms += r & 0x3ff;
+       else
+               ms -= r & 0x3ff;
+
+       return ms;
+}
+
+/*
+ * Takes a time in milliseconds and produces a fuzzed value that can be directly
+ * used by l_timeout_modify_ms. The fluctuation of the random noise added is
+ * from -63 to 63 milliseconds.
+ */
+static uint64_t dhcp_fuzz_msecs(uint64_t ms)
+{
+       uint32_t r = l_getrandom_uint32();
+
+       if (r & 0x80000000)
+               ms += r & 0x3f;
+       else
+               ms -= r & 0x3f;
+
+       return ms;
+}
+
+static uint32_t dhcp_rebind_renew_retry_time(uint64_t start_t, uint32_t expiry)
+{
+       uint64_t now = l_time_now();
+       uint32_t relative_now;
+       uint32_t retry_time;
+
+       /*
+        * RFC 2131, Section 4.4.5:
+        * "   In both RENEWING and REBINDING states, if the client receives no
+        * response to its DHCPREQUEST message, the client SHOULD wait one-half
+        * of the remaining time until T2 (in RENEWING state) and one-half of
+        * the remaining lease time (in REBINDING state), down to a minimum of
+        * 60 seconds, before retransmitting the DHCPREQUEST message.
+        */
+       relative_now = l_time_to_secs(now - start_t);
+       retry_time = (expiry - relative_now) / 2;
+
+       if (retry_time < 60)
+               retry_time = 60;
+
+       return retry_time;
+}
+
+static int client_message_init(struct l_dhcp_client *client,
+                                       struct dhcp_message *message,
+                                       uint8_t type,
+                                       uint8_t **opt, size_t *optlen)
+{
+       int err;
+       uint16_t max_size;
+
+       err = dhcp_message_init(message, DHCP_OP_CODE_BOOTREQUEST,
+                               type, client->xid, opt, optlen);
+       if (err < 0)
+               return err;
+
+       dhcp_message_set_address_type(message, client->addr_type,
+                                                       client->addr_len);
+       /*
+        * RFC2132 section 4.1.1:
+        * The client MUST include its hardware address in the â€™chaddr’ field,
+        * if necessary for delivery of DHCP reply messages.  Non-Ethernet
+        * interfaces will leave 'chaddr' empty and use the client identifier
+        * instead
+        */
+       if (client->addr_type == ARPHRD_ETHER)
+               memcpy(message->chaddr, &client->addr, client->addr_len);
+
+       /*
+        * Althrough RFC 2131 says that secs should be initialized to 0,
+        * some servers refuse to give us a lease unless we set this to a
+        * non-zero value
+        */
+       message->secs = L_CPU_TO_BE16(dhcp_attempt_secs(client->start_t));
+
+       err = dhcp_append_prl(client->request_options, opt, optlen);
+       if (err < 0)
+               return err;
+
+       /*
+        * Set the maximum DHCP message size to the minimum legal value.  This
+        * helps some buggy DHCP servers to not send bigger packets
+        */
+       max_size = L_CPU_TO_BE16(576);
+       err = _dhcp_option_append(opt, optlen,
+                                       DHCP_OPTION_MAXIMUM_MESSAGE_SIZE,
+                                       2, &max_size);
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
+static void dhcp_client_event_notify(struct l_dhcp_client *client,
+                                               enum l_dhcp_client_event event)
+{
+       if (client->event_handler)
+               client->event_handler(client, event, client->event_data);
+}
+
+static int dhcp_client_send_discover(struct l_dhcp_client *client)
+{
+       uint8_t *opt;
+       size_t optlen = DHCP_MIN_OPTIONS_SIZE;
+       size_t len = sizeof(struct dhcp_message) + optlen;
+       L_AUTO_FREE_VAR(struct dhcp_message *, discover);
+       int err;
+
+       CLIENT_DEBUG("");
+
+       discover = (struct dhcp_message *) l_new(uint8_t, len);
+
+       err = client_message_init(client, discover,
+                                       DHCP_MESSAGE_TYPE_DISCOVER,
+                                       &opt, &optlen);
+       if (err < 0)
+               return err;
+
+       if (client->hostname) {
+               err = _dhcp_option_append(&opt, &optlen,
+                                               L_DHCP_OPTION_HOST_NAME,
+                                               strlen(client->hostname),
+                                               client->hostname);
+               if (err < 0)
+                       return err;
+       }
+
+       err = _dhcp_option_append(&opt, &optlen, DHCP_OPTION_END, 0, NULL);
+       if (err < 0)
+               return err;
+
+       len = dhcp_message_optimize(discover, opt);
+
+       return client->transport->broadcast(client->transport,
+                                       INADDR_ANY, DHCP_PORT_CLIENT,
+                                       INADDR_BROADCAST, DHCP_PORT_SERVER,
+                                       discover, len);
+}
+
+static int dhcp_client_send_request(struct l_dhcp_client *client)
+{
+       uint8_t *opt;
+       size_t optlen = DHCP_MIN_OPTIONS_SIZE;
+       size_t len = sizeof(struct dhcp_message) + optlen;
+       L_AUTO_FREE_VAR(struct dhcp_message *, request);
+       int err;
+
+       CLIENT_DEBUG("");
+
+       request = (struct dhcp_message *) l_new(uint8_t, len);
+
+       err = client_message_init(client, request,
+                                       DHCP_MESSAGE_TYPE_REQUEST,
+                                       &opt, &optlen);
+       if (err < 0)
+               return err;
+
+       switch (client->state) {
+       case DHCP_STATE_REQUESTING:
+               /*
+                * RFC 2131, Section 4.3.2:
+                * "If the DHCPREQUEST message contains a 'server identifier'
+                * option, the message is in response to a DHCPOFFER message."
+                *
+                * and
+                *
+                * "DHCPREQUEST generated during SELECTING state:
+                * Client inserts the address of the selected server in
+                * 'server identifier', 'ciaddr' MUST be zero, 'requested IP
+                * address' MUST be filled in with the yiaddr value from the
+                * chosen DHCPOFFER."
+                *
+                * NOTE: 'SELECTING' is meant to be 'REQUESTING' in the RFC
+                */
+               err = _dhcp_option_append(&opt, &optlen,
+                                       L_DHCP_OPTION_SERVER_IDENTIFIER,
+                                       4, &client->lease->server_address);
+               if (err < 0)
+                       return err;
+
+               err = _dhcp_option_append(&opt, &optlen,
+                                       L_DHCP_OPTION_REQUESTED_IP_ADDRESS,
+                                       4, &client->lease->address);
+               if (err < 0)
+                       return err;
+               break;
+       case DHCP_STATE_RENEWING:
+       case DHCP_STATE_REBINDING:
+               request->ciaddr = client->lease->address;
+               break;
+
+       case DHCP_STATE_INIT:
+       case DHCP_STATE_SELECTING:
+       case DHCP_STATE_INIT_REBOOT:
+       case DHCP_STATE_REBOOTING:
+       case DHCP_STATE_BOUND:
+               return -EINVAL;
+       }
+
+       if (client->hostname) {
+               err = _dhcp_option_append(&opt, &optlen,
+                                               L_DHCP_OPTION_HOST_NAME,
+                                               strlen(client->hostname),
+                                               client->hostname);
+               if (err < 0)
+                       return err;
+       }
+
+       err = _dhcp_option_append(&opt, &optlen, DHCP_OPTION_END, 0, NULL);
+       if (err < 0)
+               return err;
+
+       len = dhcp_message_optimize(request, opt);
+
+       /*
+        * RFC2131, Section 4.1:
+        * "DHCP clients MUST use the IP address provided in the
+        * 'server identifier' option for any unicast requests to the DHCP
+        * server.
+        */
+       if (client->state == DHCP_STATE_RENEWING) {
+               struct sockaddr_in si;
+               memset(&si, 0, sizeof(si));
+               si.sin_family = AF_INET;
+               si.sin_port = L_CPU_TO_BE16(DHCP_PORT_SERVER);
+               si.sin_addr.s_addr = client->lease->server_address;
+               return client->transport->send(client->transport,
+                                                       &si, request, len);
+       }
+
+       return client->transport->broadcast(client->transport,
+                                       INADDR_ANY, DHCP_PORT_CLIENT,
+                                       INADDR_BROADCAST, DHCP_PORT_SERVER,
+                                       request, len);
+}
+
+static void dhcp_client_timeout_resend(struct l_timeout *timeout,
+                                                               void *user_data)
+{
+       struct l_dhcp_client *client = user_data;
+       unsigned int next_timeout = 0;
+
+       CLIENT_DEBUG("");
+
+       switch (client->state) {
+       case DHCP_STATE_SELECTING:
+               if (dhcp_client_send_discover(client) < 0)
+                       goto error;
+               break;
+       case DHCP_STATE_RENEWING:
+       case DHCP_STATE_REQUESTING:
+       case DHCP_STATE_REBINDING:
+               if (dhcp_client_send_request(client) < 0)
+                       goto error;
+               break;
+       case DHCP_STATE_INIT:
+       case DHCP_STATE_INIT_REBOOT:
+       case DHCP_STATE_REBOOTING:
+       case DHCP_STATE_BOUND:
+               break;
+       }
+
+       switch (client->state) {
+       case DHCP_STATE_RENEWING:
+               next_timeout = dhcp_rebind_renew_retry_time(client->start_t,
+                                                       client->lease->t2);
+               break;
+       case DHCP_STATE_REBINDING:
+               next_timeout = dhcp_rebind_renew_retry_time(client->start_t,
+                                               client->lease->lifetime);
+               break;
+       case DHCP_STATE_REQUESTING:
+       case DHCP_STATE_SELECTING:
+               /*
+                * RFC 2131 Section 4.1:
+                * "The retransmission delay SHOULD be doubled with subsequent
+                * retransmissions up to a maximum of 64 seconds.
+                */
+               client->attempt += 1;
+               next_timeout = minsize(2 << client->attempt, 64);
+               break;
+       case DHCP_STATE_INIT:
+       case DHCP_STATE_INIT_REBOOT:
+       case DHCP_STATE_REBOOTING:
+       case DHCP_STATE_BOUND:
+               break;
+       };
+
+       if (next_timeout)
+               l_timeout_modify_ms(timeout, dhcp_fuzz_secs(next_timeout));
+
+       return;
+
+error:
+       l_dhcp_client_stop(client);
+}
+
+static void dhcp_client_lease_expired(struct l_timeout *timeout,
+                                                       void *user_data)
+{
+       struct l_dhcp_client *client = user_data;
+
+       CLIENT_DEBUG("");
+
+       l_dhcp_client_stop(client);
+       dhcp_client_event_notify(client, L_DHCP_CLIENT_EVENT_NO_LEASE);
+}
+
+static void dhcp_client_t2_expired(struct l_timeout *timeout, void *user_data)
+{
+       struct l_dhcp_client *client = user_data;
+       uint32_t next_timeout = client->lease->lifetime - client->lease->t2;
+
+       CLIENT_DEBUG("");
+
+       /*
+        * If we got here, then resend_timeout is active, with a timeout
+        * set originally for ~60 seconds.  So we simply set the new state
+        * and wait for the timer to fire
+        */
+       CLIENT_ENTER_STATE(DHCP_STATE_REBINDING);
+
+       l_timeout_modify_ms(client->timeout_lease,
+                               dhcp_fuzz_secs(next_timeout));
+       l_timeout_set_callback(client->timeout_lease,
+                               dhcp_client_lease_expired, client, NULL);
+}
+
+static void dhcp_client_t1_expired(struct l_timeout *timeout, void *user_data)
+{
+       struct l_dhcp_client *client = user_data;
+       uint32_t next_timeout;
+
+       CLIENT_DEBUG("");
+
+       CLIENT_ENTER_STATE(DHCP_STATE_RENEWING);
+       client->attempt = 1;
+
+       if (dhcp_client_send_request(client) < 0)
+               goto error;
+
+       next_timeout = client->lease->t2 - client->lease->t1;
+       l_timeout_modify_ms(client->timeout_lease,
+                                               dhcp_fuzz_secs(next_timeout));
+       l_timeout_set_callback(client->timeout_lease, dhcp_client_t2_expired,
+                               client, NULL);
+
+       next_timeout = dhcp_rebind_renew_retry_time(client->start_t,
+                                                       client->lease->t2);
+       client->timeout_resend =
+               l_timeout_create_ms(dhcp_fuzz_secs(next_timeout),
+                                       dhcp_client_timeout_resend,
+                                       client, NULL);
+       return;
+
+error:
+       l_dhcp_client_stop(client);
+}
+
+static int dhcp_client_receive_ack(struct l_dhcp_client *client,
+                                       const struct dhcp_message *ack,
+                                       size_t len)
+{
+       struct dhcp_message_iter iter;
+       struct l_dhcp_lease *lease;
+       int r;
+
+       CLIENT_DEBUG("");
+
+       if (ack->yiaddr == 0)
+               return -ENOMSG;
+
+       if (!_dhcp_message_iter_init(&iter, ack, len))
+               return -EINVAL;
+
+       lease = _dhcp_lease_parse_options(&iter);
+       if (!lease) {
+               CLIENT_DEBUG("Failed to parse DHCP options.");
+
+               return -ENOMSG;
+       }
+
+       lease->address = ack->yiaddr;
+
+       r = L_DHCP_CLIENT_EVENT_LEASE_RENEWED;
+
+       if (client->lease) {
+               if (client->lease->subnet_mask != lease->subnet_mask ||
+                               client->lease->address != lease->address ||
+                               client->lease->router != lease->router)
+                       r = L_DHCP_CLIENT_EVENT_IP_CHANGED;
+
+               _dhcp_lease_free(client->lease);
+       }
+
+       client->lease = lease;
+
+       /* In case this is an initial request, override to LEASE_OBTAINED */
+       if (client->state == DHCP_STATE_REQUESTING ||
+                       client->state == DHCP_STATE_REBOOTING)
+               r = L_DHCP_CLIENT_EVENT_LEASE_OBTAINED;
+
+       return r;
+}
+
+static int dhcp_client_receive_offer(struct l_dhcp_client *client,
+                                       const struct dhcp_message *offer,
+                                       size_t len)
+{
+       struct dhcp_message_iter iter;
+
+       CLIENT_DEBUG("");
+
+       if (offer->yiaddr == 0)
+               return -ENOMSG;
+
+       if (!_dhcp_message_iter_init(&iter, offer, len))
+               return -EINVAL;
+
+       client->lease = _dhcp_lease_parse_options(&iter);
+       if (!client->lease)
+               return -ENOMSG;
+
+       client->lease->address = offer->yiaddr;
+
+       return 0;
+}
+
+static void dhcp_client_rx_message(const void *data, size_t len, void *userdata)
+{
+       struct l_dhcp_client *client = userdata;
+       const struct dhcp_message *message = data;
+       struct dhcp_message_iter iter;
+       uint8_t msg_type = 0;
+       uint8_t t, l;
+       const void *v;
+       int r;
+
+       CLIENT_DEBUG("");
+
+       if (len < sizeof(struct dhcp_message))
+               return;
+
+       if (message->op != DHCP_OP_CODE_BOOTREPLY)
+               return;
+
+       if (L_BE32_TO_CPU(message->xid) != client->xid)
+               return;
+
+       if (memcmp(message->chaddr, client->addr, client->addr_len))
+               return;
+
+       if (!_dhcp_message_iter_init(&iter, message, len))
+               return;
+
+       while (_dhcp_message_iter_next(&iter, &t, &l, &v) && !msg_type) {
+               switch (t) {
+               case DHCP_OPTION_MESSAGE_TYPE:
+                       if (l == 1)
+                               msg_type = l_get_u8(v);
+                       break;
+               }
+       }
+
+       switch (client->state) {
+       case DHCP_STATE_INIT:
+               return;
+       case DHCP_STATE_SELECTING:
+               if (msg_type != DHCP_MESSAGE_TYPE_OFFER)
+                       return;
+
+               if (dhcp_client_receive_offer(client, message, len) < 0)
+                       return;
+
+               CLIENT_ENTER_STATE(DHCP_STATE_REQUESTING);
+               client->attempt = 1;
+
+               if (dhcp_client_send_request(client) < 0) {
+                       l_dhcp_client_stop(client);
+
+                       return;
+               }
+
+               l_timeout_modify_ms(client->timeout_resend, dhcp_fuzz_secs(4));
+               break;
+       case DHCP_STATE_REQUESTING:
+       case DHCP_STATE_RENEWING:
+       case DHCP_STATE_REBINDING:
+               if (msg_type == DHCP_MESSAGE_TYPE_NAK) {
+                       l_dhcp_client_stop(client);
+
+                       dhcp_client_event_notify(client,
+                                       L_DHCP_CLIENT_EVENT_NO_LEASE);
+                       return;
+               }
+
+               if (msg_type != DHCP_MESSAGE_TYPE_ACK)
+                       return;
+
+               r = dhcp_client_receive_ack(client, message, len);
+               if (r < 0)
+                       return;
+
+               CLIENT_ENTER_STATE(DHCP_STATE_BOUND);
+               l_timeout_remove(client->timeout_resend);
+               client->timeout_resend = NULL;
+
+               if (client->transport->bind)
+                       client->transport->bind(client->transport,
+                                               client->lease->address);
+
+               dhcp_client_event_notify(client, r);
+
+               /*
+                * Start T1, once it expires we will start the T2 timer.  If
+                * we renew the lease, we will end up back here.
+                *
+                * RFC2131, Section 4.4.5 states:
+                * "Times T1 and T2 SHOULD be chosen with some random "fuzz"
+                * around a fixed value, to avoid synchronization of client
+                * reacquisition."
+                */
+               l_timeout_remove(client->timeout_lease);
+
+               /* Infinite lease, no need to start t1 */
+               if (client->lease->lifetime != 0xffffffffu) {
+                       uint32_t next_timeout =
+                                       dhcp_fuzz_secs(client->lease->t1);
+
+                       client->timeout_lease =
+                               l_timeout_create_ms(next_timeout,
+                                                       dhcp_client_t1_expired,
+                                                       client, NULL);
+               }
+               break;
+       case DHCP_STATE_INIT_REBOOT:
+       case DHCP_STATE_REBOOTING:
+       case DHCP_STATE_BOUND:
+               break;
+       }
+}
+
+LIB_EXPORT struct l_dhcp_client *l_dhcp_client_new(uint32_t ifindex)
+{
+       struct l_dhcp_client *client;
+
+       client = l_new(struct l_dhcp_client, 1);
+
+       client->state = DHCP_STATE_INIT;
+       client->ifindex = ifindex;
+
+       /* Enable these options by default */
+       dhcp_enable_option(client, L_DHCP_OPTION_SUBNET_MASK);
+       dhcp_enable_option(client, L_DHCP_OPTION_ROUTER);
+       dhcp_enable_option(client, L_DHCP_OPTION_HOST_NAME);
+       dhcp_enable_option(client, L_DHCP_OPTION_DOMAIN_NAME);
+       dhcp_enable_option(client, L_DHCP_OPTION_DOMAIN_NAME_SERVER);
+       dhcp_enable_option(client, L_DHCP_OPTION_NTP_SERVERS);
+
+       return client;
+}
+
+LIB_EXPORT void l_dhcp_client_destroy(struct l_dhcp_client *client)
+{
+       if (unlikely(!client))
+               return;
+
+       l_dhcp_client_stop(client);
+
+       if (client->event_destroy)
+               client->event_destroy(client->event_data);
+
+       _dhcp_transport_free(client->transport);
+       l_free(client->ifname);
+       l_free(client->hostname);
+
+       l_free(client);
+}
+
+LIB_EXPORT bool l_dhcp_client_add_request_option(struct l_dhcp_client *client,
+                                                               uint8_t option)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (unlikely(client->state != DHCP_STATE_INIT))
+               return false;
+
+       switch (option) {
+       case DHCP_OPTION_PAD:
+       case DHCP_OPTION_END:
+       case DHCP_OPTION_OVERLOAD:
+       case DHCP_OPTION_MESSAGE_TYPE:
+       case DHCP_OPTION_PARAMETER_REQUEST_LIST:
+               return false;
+       }
+
+       dhcp_enable_option(client, option);
+
+       return true;
+}
+
+LIB_EXPORT bool l_dhcp_client_set_address(struct l_dhcp_client *client,
+                                               uint8_t type,
+                                               const uint8_t *addr,
+                                               size_t addr_len)
+{
+       if (unlikely(!client))
+               return false;
+
+       switch (type) {
+       case ARPHRD_ETHER:
+               if (addr_len != ETH_ALEN)
+                       return false;
+               break;
+       default:
+               return false;
+       }
+
+       client->addr_len = addr_len;
+       memcpy(client->addr, addr, addr_len);
+       client->addr_type = type;
+
+       client->have_addr = true;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dhcp_client_set_interface_name(struct l_dhcp_client *client,
+                                                       const char *ifname)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (unlikely(client->state != DHCP_STATE_INIT))
+               return false;
+
+       l_free(client->ifname);
+       client->ifname = l_strdup(ifname);
+
+       return true;
+}
+
+LIB_EXPORT bool l_dhcp_client_set_hostname(struct l_dhcp_client *client,
+                                               const char *hostname)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (unlikely(client->state != DHCP_STATE_INIT))
+               return false;
+
+       if (!hostname)
+               goto done;
+
+       if (client->hostname && !strcmp(client->hostname, hostname))
+               return true;
+
+done:
+       l_free(client->hostname);
+       client->hostname = l_strdup(hostname);
+
+       return true;
+}
+
+bool _dhcp_client_set_transport(struct l_dhcp_client *client,
+                                       struct dhcp_transport *transport)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (unlikely(client->state != DHCP_STATE_INIT))
+               return false;
+
+       if (client->transport)
+               _dhcp_transport_free(client->transport);
+
+       client->transport = transport;
+       return true;
+}
+
+void _dhcp_client_override_xid(struct l_dhcp_client *client, uint32_t xid)
+{
+       client->override_xid = true;
+       client->xid = xid;
+}
+
+LIB_EXPORT const struct l_dhcp_lease *l_dhcp_client_get_lease(
+                                       const struct l_dhcp_client *client)
+{
+       if (unlikely(!client))
+               return NULL;
+
+       return client->lease;
+}
+
+LIB_EXPORT bool l_dhcp_client_start(struct l_dhcp_client *client)
+{
+       int err;
+
+       if (unlikely(!client))
+               return false;
+
+       if (unlikely(client->state != DHCP_STATE_INIT))
+               return false;
+
+       if (!client->have_addr) {
+               uint8_t mac[6];
+
+               if (!l_net_get_mac_address(client->ifindex, mac))
+                       return false;
+
+               l_dhcp_client_set_address(client, ARPHRD_ETHER, mac, 6);
+       }
+
+       if (!client->ifname) {
+               client->ifname = l_net_get_name(client->ifindex);
+
+               if (!client->ifname)
+                       return false;
+       }
+
+       if (!client->transport) {
+               client->transport =
+                       _dhcp_default_transport_new(client->ifindex,
+                                                       client->ifname,
+                                                       DHCP_PORT_CLIENT);
+
+               if (!client->transport)
+                       return false;
+       }
+
+       if (!client->override_xid)
+               l_getrandom(&client->xid, sizeof(client->xid));
+
+       if (client->transport->open)
+               if (client->transport->open(client->transport,
+                                                       client->xid) < 0)
+                       return false;
+
+       _dhcp_transport_set_rx_callback(client->transport,
+                                               dhcp_client_rx_message,
+                                               client);
+
+       client->start_t = l_time_now();
+
+       err = dhcp_client_send_discover(client);
+       if (err < 0)
+               return false;
+
+       client->timeout_resend = l_timeout_create_ms(dhcp_fuzz_msecs(600),
+                                               dhcp_client_timeout_resend,
+                                               client, NULL);
+       CLIENT_ENTER_STATE(DHCP_STATE_SELECTING);
+       client->attempt = 1;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dhcp_client_stop(struct l_dhcp_client *client)
+{
+       if (unlikely(!client))
+               return false;
+
+       l_timeout_remove(client->timeout_resend);
+       client->timeout_resend = NULL;
+
+       l_timeout_remove(client->timeout_lease);
+       client->timeout_lease = NULL;
+
+       if (client->transport && client->transport->close)
+               client->transport->close(client->transport);
+
+       client->start_t = 0;
+       CLIENT_ENTER_STATE(DHCP_STATE_INIT);
+
+       _dhcp_lease_free(client->lease);
+       client->lease = NULL;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dhcp_client_set_event_handler(struct l_dhcp_client *client,
+                                       l_dhcp_client_event_cb_t handler,
+                                       void *userdata,
+                                       l_dhcp_destroy_cb_t destroy)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (client->event_destroy)
+               client->event_destroy(client->event_data);
+
+       client->event_handler = handler;
+       client->event_data = userdata;
+       client->event_destroy = destroy;
+
+       return true;
+}
+
+LIB_EXPORT bool l_dhcp_client_set_debug(struct l_dhcp_client *client,
+                                               l_dhcp_debug_cb_t function,
+                                               void *user_data,
+                                               l_dhcp_destroy_cb_t destroy)
+{
+       if (unlikely(!client))
+               return false;
+
+       if (client->debug_destroy)
+               client->debug_destroy(client->debug_data);
+
+       client->debug_handler = function;
+       client->debug_destroy = destroy;
+       client->debug_data = user_data;
+
+       return true;
+}
diff --git a/ell/dhcp.h b/ell/dhcp.h
new file mode 100644 (file)
index 0000000..b8a5b41
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_DHCP_H
+#define __ELL_DHCP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+
+struct l_dhcp_client;
+struct l_dhcp_lease;
+
+/* RFC 2132 */
+enum l_dhcp_option {
+       L_DHCP_OPTION_SUBNET_MASK = 1, /* Section 3.3  */
+       L_DHCP_OPTION_ROUTER = 3, /* Section 3.5 */
+       L_DHCP_OPTION_DOMAIN_NAME_SERVER = 6, /* Section 3.8 */
+       L_DHCP_OPTION_HOST_NAME = 12, /* Section 3.14 */
+       L_DHCP_OPTION_DOMAIN_NAME = 15, /* Section 3.17 */
+       L_DHCP_OPTION_BROADCAST_ADDRESS = 28, /* Section 5.3 */
+       L_DHCP_OPTION_NTP_SERVERS = 42, /* Section 8.3 */
+       L_DHCP_OPTION_REQUESTED_IP_ADDRESS = 50, /* Section 9.1 */
+       L_DHCP_OPTION_IP_ADDRESS_LEASE_TIME = 51, /* Section 9.2 */
+       L_DHCP_OPTION_RENEWAL_T1_TIME = 58, /* Section 9.11 */
+       L_DHCP_OPTION_REBINDING_T2_TIME = 59, /* Section 9.12 */
+       L_DHCP_OPTION_SERVER_IDENTIFIER = 54, /* Section 9.7 */
+};
+
+enum l_dhcp_client_event {
+       L_DHCP_CLIENT_EVENT_LEASE_OBTAINED = 0,
+       L_DHCP_CLIENT_EVENT_IP_CHANGED,
+       L_DHCP_CLIENT_EVENT_LEASE_EXPIRED,
+       L_DHCP_CLIENT_EVENT_LEASE_RENEWED,
+       L_DHCP_CLIENT_EVENT_NO_LEASE,
+};
+
+typedef void (*l_dhcp_client_event_cb_t)(struct l_dhcp_client *client,
+                                               enum l_dhcp_client_event event,
+                                               void *userdata);
+typedef void (*l_dhcp_debug_cb_t)(const char *str, void *user_data);
+typedef void (*l_dhcp_destroy_cb_t)(void *userdata);
+
+struct l_dhcp_client *l_dhcp_client_new(uint32_t ifindex);
+bool l_dhcp_client_add_request_option(struct l_dhcp_client *client,
+                                                               uint8_t option);
+void l_dhcp_client_destroy(struct l_dhcp_client *client);
+
+bool l_dhcp_client_set_address(struct l_dhcp_client *client, uint8_t type,
+                                       const uint8_t *addr, size_t addr_len);
+bool l_dhcp_client_set_interface_name(struct l_dhcp_client *client,
+                                                       const char *ifname);
+bool l_dhcp_client_set_hostname(struct l_dhcp_client *client,
+                                                       const char *hostname);
+
+const struct l_dhcp_lease *l_dhcp_client_get_lease(
+                                       const struct l_dhcp_client *client);
+
+bool l_dhcp_client_start(struct l_dhcp_client *client);
+bool l_dhcp_client_stop(struct l_dhcp_client *client);
+
+bool l_dhcp_client_set_event_handler(struct l_dhcp_client *client,
+                                       l_dhcp_client_event_cb_t handler,
+                                       void *userdata,
+                                       l_dhcp_destroy_cb_t destroy);
+
+bool l_dhcp_client_set_debug(struct l_dhcp_client *client,
+                               l_dhcp_debug_cb_t function,
+                               void *user_data, l_dhcp_destroy_cb_t destroy);
+
+char *l_dhcp_lease_get_address(const struct l_dhcp_lease *lease);
+char *l_dhcp_lease_get_gateway(const struct l_dhcp_lease *lease);
+char *l_dhcp_lease_get_netmask(const struct l_dhcp_lease *lease);
+char *l_dhcp_lease_get_broadcast(const struct l_dhcp_lease *lease);
+char *l_dhcp_lease_get_server_id(const struct l_dhcp_lease *lease);
+char **l_dhcp_lease_get_dns(const struct l_dhcp_lease *lease);
+char *l_dhcp_lease_get_domain_name(const struct l_dhcp_lease *lease);
+
+uint32_t l_dhcp_lease_get_t1(const struct l_dhcp_lease *lease);
+uint32_t l_dhcp_lease_get_t2(const struct l_dhcp_lease *lease);
+uint32_t l_dhcp_lease_get_lifetime(const struct l_dhcp_lease *lease);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_DHCP_H */
diff --git a/ell/dir.c b/ell/dir.c
new file mode 100644 (file)
index 0000000..04ef4bb
--- /dev/null
+++ b/ell/dir.c
@@ -0,0 +1,352 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <dirent.h>
+#include <limits.h>
+#include <sys/inotify.h>
+
+#include "private.h"
+#include "queue.h"
+#include "io.h"
+#include "dir.h"
+
+struct l_dir_watch {
+       struct watch_desc *desc;
+       l_dir_watch_event_func_t function;
+       void *user_data;
+       l_dir_watch_destroy_func_t destroy;
+};
+
+struct watch_desc {
+       int wd;
+       char *pathname;
+       struct l_queue *events;
+       struct l_queue *callbacks;
+};
+
+struct watch_event {
+       char *pathname;
+       uint32_t mask;
+};
+
+static struct l_io *inotify_io = NULL;
+static struct l_queue *watch_list = NULL;
+
+static void free_event(void *user_data)
+{
+       struct watch_event *event = user_data;
+
+       l_free(event->pathname);
+       l_free(event);
+}
+
+static bool desc_match_wd(const void *a, const void *b)
+{
+       const struct watch_desc *desc = a;
+       int wd = L_PTR_TO_INT(b);
+
+       return (desc->wd == wd);
+}
+
+static bool desc_match_pathname(const void *a, const void *b)
+{
+       const struct watch_desc *desc = a;
+       const char *pathname = b;
+
+       return !strcmp(desc->pathname, pathname);
+}
+
+static bool event_match_pathname(const void *a, const void *b)
+{
+       const struct watch_event *event = a;
+       const char *pathname = b;
+
+       return !strcmp(event->pathname, pathname);
+}
+
+static void handle_callback(struct watch_desc *desc, const char *pathname,
+                                               enum l_dir_watch_event event)
+{
+       const struct l_queue_entry *entry;
+
+       for (entry = l_queue_get_entries(desc->callbacks); entry;
+                                                       entry = entry->next) {
+               struct l_dir_watch *watch = entry->data;
+
+               if (watch->function)
+                       watch->function(pathname, event, watch->user_data);
+       }
+}
+
+static void process_event(struct watch_desc *desc, const char *pathname,
+                                                               uint32_t mask)
+{
+       struct watch_event *event;
+
+       if (!pathname)
+               return;
+
+       if (mask & (IN_ACCESS | IN_MODIFY | IN_OPEN | IN_CREATE)) {
+               event = l_queue_find(desc->events, event_match_pathname,
+                                                               pathname);
+               if (!event) {
+                       /*
+                        * When the event for a given pathname is not yet
+                        * created and it is from type IN_MODIFY, then it
+                        * might have been caused by a truncate() system
+                        * call that does not open() the file. However
+                        * treat this as modified as well.
+                        */
+                       if (mask & IN_MODIFY) {
+                               handle_callback(desc, pathname,
+                                               L_DIR_WATCH_EVENT_MODIFIED);
+                       } else {
+                               event = l_new(struct watch_event, 1);
+                               event->pathname = l_strdup(pathname);
+                               event->mask = mask;
+
+                               l_queue_push_tail(desc->events, event);
+                       }
+               } else {
+                       event->mask |= mask;
+               }
+       } else if (mask & (IN_CLOSE_WRITE)) {
+               event = l_queue_remove_if(desc->events, event_match_pathname,
+                                                               pathname);
+               if (event) {
+                       /*
+                        * Creation of a new file is treated differently,
+                        * then modification, but for that the original
+                        * system call needs to be looked at.
+                        */
+                       if (event->mask & IN_CREATE)
+                               handle_callback(desc, pathname,
+                                               L_DIR_WATCH_EVENT_CREATED);
+                       else
+                               handle_callback(desc, pathname,
+                                               L_DIR_WATCH_EVENT_MODIFIED);
+
+                       free_event(event);
+               } else {
+                       handle_callback(desc, pathname,
+                                       L_DIR_WATCH_EVENT_MODIFIED);
+               }
+       } else if (mask & (IN_CLOSE_NOWRITE)) {
+               event = l_queue_remove_if(desc->events, event_match_pathname,
+                                                               pathname);
+               if (event) {
+                       if (event->mask & IN_ACCESS)
+                               handle_callback(desc, pathname,
+                                               L_DIR_WATCH_EVENT_ACCESSED);
+                       free_event(event);
+               }
+       } else if (mask & (IN_MOVED_FROM | IN_DELETE)) {
+               handle_callback(desc, pathname, L_DIR_WATCH_EVENT_REMOVED);
+       } else if (mask & (IN_MOVED_TO)) {
+               handle_callback(desc, pathname, L_DIR_WATCH_EVENT_CREATED);
+       } else if (mask & (IN_ATTRIB)) {
+               handle_callback(desc, pathname, L_DIR_WATCH_EVENT_ATTRIB);
+       }
+}
+
+static bool inotify_read_cb(struct l_io *io, void *user_data)
+{
+       int fd = l_io_get_fd(io);
+       uint8_t buf[sizeof(struct inotify_event) + NAME_MAX + 1]
+               __attribute__ ((aligned(__alignof__(struct inotify_event))));
+       const void *ptr = buf;
+       ssize_t len;
+
+       len = L_TFR(read(fd, buf, sizeof(buf)));
+       if (len <= 0)
+               return true;
+
+       while (len > 0) {
+               const struct inotify_event *event = ptr;
+               const char *name = event->len ? event->name : NULL;
+               struct watch_desc *desc;
+
+               desc = l_queue_find(watch_list, desc_match_wd,
+                                               L_INT_TO_PTR(event->wd));
+               if (desc)
+                       process_event(desc, name, event->mask);
+
+               ptr += sizeof(struct inotify_event) + event->len;
+               len -= sizeof(struct inotify_event) + event->len;
+       }
+
+       return true;
+}
+
+static int setup_inotify(void)
+{
+       struct l_io *io;
+       int fd;
+
+       if (inotify_io)
+               goto done;
+
+       fd = inotify_init1(IN_CLOEXEC);
+       if (fd < 0)
+               return -1;
+
+       io = l_io_new(fd);
+       if (!io) {
+               close(fd);
+               return -1;
+       }
+
+       l_io_set_close_on_destroy(io, true);
+
+       if (!l_io_set_read_handler(io, inotify_read_cb, NULL, NULL)) {
+               l_io_destroy(io);
+               return -1;
+       }
+
+       watch_list = l_queue_new();
+       inotify_io = io;
+
+done:
+       return l_io_get_fd(inotify_io);
+}
+
+static void shutdown_inotify(void)
+{
+       if (!inotify_io)
+               return;
+
+       if (l_queue_isempty(watch_list)) {
+               l_io_destroy(inotify_io);
+               inotify_io = NULL;
+
+               l_queue_destroy(watch_list, NULL);
+               watch_list = NULL;
+       }
+}
+
+LIB_EXPORT struct l_dir_watch *l_dir_watch_new(const char *pathname,
+                                       l_dir_watch_event_func_t function,
+                                       void *user_data,
+                                       l_dir_watch_destroy_func_t destroy)
+{
+       struct l_dir_watch *watch;
+       struct watch_desc *desc;
+       int fd;
+
+       if (!pathname)
+               return NULL;
+
+       watch = l_new(struct l_dir_watch, 1);
+       watch->function = function;
+       watch->user_data = user_data;
+       watch->destroy = destroy;
+
+       desc = l_queue_find(watch_list, desc_match_pathname, pathname);
+       if (desc)
+               goto done;
+
+       /*
+        * Returns the inotify file descriptor. It will create a new one
+        * if it doesn't exist yet or return the already opened one.
+        */
+       fd = setup_inotify();
+       if (fd < 0) {
+               l_free(watch);
+               return NULL;
+       }
+
+       desc = l_new(struct watch_desc, 1);
+
+       desc->wd = inotify_add_watch(fd, pathname, IN_ALL_EVENTS |
+                                                       IN_ONLYDIR |
+                                                       IN_DONT_FOLLOW |
+                                                       IN_EXCL_UNLINK);
+       if (desc->wd < 0) {
+               /*
+                * If the setup_inotify() created the inotify file descriptor,
+                * then this will close it. Otherwise it will do nothing.
+                */
+               shutdown_inotify();
+               l_free(desc);
+               l_free(watch);
+               return NULL;
+       }
+
+       desc->pathname = l_strdup(pathname);
+       desc->events = l_queue_new();
+       desc->callbacks = l_queue_new();
+
+       l_queue_push_tail(watch_list, desc);
+
+done:
+       l_queue_push_tail(desc->callbacks, watch);
+       watch->desc = desc;
+       return watch;
+}
+
+LIB_EXPORT void l_dir_watch_destroy(struct l_dir_watch *watch)
+{
+       struct watch_desc *desc;
+       int fd;
+
+       if (!watch)
+               return;
+
+       desc = watch->desc;
+       l_queue_remove(desc->callbacks, watch);
+
+       /*
+        * As long as the watch descriptor has callbacks registered, it is
+        * still needed to be active.
+        */
+       if (!l_queue_isempty(desc->callbacks))
+               goto done;
+
+       if (!l_queue_remove(watch_list, desc))
+               goto done;
+
+       fd = l_io_get_fd(inotify_io);
+       inotify_rm_watch(fd, desc->wd);
+
+       l_queue_destroy(desc->callbacks, NULL);
+       l_queue_destroy(desc->events, free_event);
+       l_free(desc->pathname);
+       l_free(desc);
+
+       /*
+        * When the number of watches goes to zero, then this will close
+        * the inotify file descriptor, otherwise it will do nothing.
+        */
+       shutdown_inotify();
+
+done:
+       if (watch->destroy)
+               watch->destroy(watch->user_data);
+
+       l_free(watch);
+}
diff --git a/ell/dir.h b/ell/dir.h
new file mode 100644 (file)
index 0000000..ae6ca5b
--- /dev/null
+++ b/ell/dir.h
@@ -0,0 +1,55 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_DIR_H
+#define __ELL_DIR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_dir_watch;
+
+enum l_dir_watch_event {
+        L_DIR_WATCH_EVENT_CREATED,
+       L_DIR_WATCH_EVENT_REMOVED,
+       L_DIR_WATCH_EVENT_MODIFIED,
+       L_DIR_WATCH_EVENT_ACCESSED,
+       L_DIR_WATCH_EVENT_ATTRIB,
+};
+
+typedef void (*l_dir_watch_event_func_t) (const char *filename,
+                                               enum l_dir_watch_event event,
+                                               void *user_data);
+typedef void (*l_dir_watch_destroy_func_t) (void *user_data);
+
+struct l_dir_watch *l_dir_watch_new(const char *pathname,
+                                       l_dir_watch_event_func_t function,
+                                       void *user_data,
+                                       l_dir_watch_destroy_func_t destroy);
+void l_dir_watch_destroy(struct l_dir_watch *watch);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_DIR_H */
diff --git a/ell/ecc-external.c b/ell/ecc-external.c
new file mode 100644 (file)
index 0000000..1c118c2
--- /dev/null
@@ -0,0 +1,951 @@
+/*
+ * Copyright (c) 2013, Kenneth MacKay
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *  * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "private.h"
+#include "ecc.h"
+#include "ecc-private.h"
+#include "random.h"
+
+typedef struct {
+       uint64_t m_low;
+       uint64_t m_high;
+} uint128_t;
+
+static void vli_clear(uint64_t *vli, unsigned int ndigits)
+{
+       unsigned int i;
+
+       for (i = 0; i < ndigits; i++)
+               vli[i] = 0;
+}
+
+/* Returns true if vli == 0, false otherwise. */
+static bool vli_is_zero(const uint64_t *vli, unsigned int ndigits)
+{
+       unsigned int i;
+
+       for (i = 0; i < ndigits; i++) {
+               if (vli[i])
+                       return false;
+       }
+
+       return true;
+}
+
+/* Returns nonzero if bit bit of vli is set. */
+static uint64_t vli_test_bit(const uint64_t *vli, unsigned int bit)
+{
+       return (vli[bit / 64] & ((uint64_t) 1 << (bit % 64)));
+}
+
+/* Sets dest = src. */
+static void vli_set(uint64_t *dest, const uint64_t *src, unsigned int ndigits)
+{
+       unsigned int i;
+
+       for (i = 0; i < ndigits; i++)
+               dest[i] = src[i];
+}
+
+/* Returns sign of left - right. */
+int _vli_cmp(const uint64_t *left, const uint64_t *right, unsigned int ndigits)
+{
+       int i;
+
+       for (i = ndigits - 1; i >= 0; i--) {
+               if (left[i] > right[i])
+                       return 1;
+               else if (left[i] < right[i])
+                       return -1;
+       }
+
+       return 0;
+}
+
+/* Computes result = in << c, returning carry. Can modify in place
+ * (if result == in). 0 < shift < 64.
+ */
+static uint64_t vli_lshift(uint64_t *result, const uint64_t *in,
+                                                       unsigned int shift,
+                                                       unsigned int ndigits)
+{
+       uint64_t carry = 0;
+       unsigned int i;
+
+       for (i = 0; i < ndigits; i++) {
+               uint64_t temp = in[i];
+
+               result[i] = (temp << shift) | carry;
+               carry = temp >> (64 - shift);
+       }
+
+       return carry;
+}
+
+/* Computes vli = vli >> 1. */
+void _vli_rshift1(uint64_t *vli, unsigned int ndigits)
+{
+       uint64_t *end = vli;
+       uint64_t carry = 0;
+
+       vli += ndigits;
+
+       while (vli-- > end) {
+               uint64_t temp = *vli;
+               *vli = (temp >> 1) | carry;
+               carry = temp << 63;
+       }
+}
+
+/* Computes result = left + right, returning carry. Can modify in place. */
+static uint64_t vli_add(uint64_t *result, const uint64_t *left,
+                                                       const uint64_t *right,
+                                                       unsigned int ndigits)
+{
+       uint64_t carry = 0;
+       unsigned int i;
+
+       for (i = 0; i < ndigits; i++) {
+               uint64_t sum;
+
+               sum = left[i] + right[i] + carry;
+               if (sum != left[i])
+                       carry = (sum < left[i]);
+
+               result[i] = sum;
+       }
+
+       return carry;
+}
+
+/* Computes result = left - right, returning borrow. Can modify in place. */
+uint64_t _vli_sub(uint64_t *result, const uint64_t *left,
+                                                       const uint64_t *right,
+                                                       unsigned int ndigits)
+{
+       uint64_t borrow = 0;
+       unsigned int i;
+
+       for (i = 0; i < ndigits; i++) {
+               uint64_t diff;
+
+               diff = left[i] - right[i] - borrow;
+               if (diff != left[i])
+                       borrow = (diff > left[i]);
+
+               result[i] = diff;
+       }
+
+       return borrow;
+}
+
+static uint128_t mul_64_64(uint64_t left, uint64_t right)
+{
+       uint64_t a0 = left & 0xffffffffull;
+       uint64_t a1 = left >> 32;
+       uint64_t b0 = right & 0xffffffffull;
+       uint64_t b1 = right >> 32;
+       uint64_t m0 = a0 * b0;
+       uint64_t m1 = a0 * b1;
+       uint64_t m2 = a1 * b0;
+       uint64_t m3 = a1 * b1;
+       uint128_t result;
+
+       m2 += (m0 >> 32);
+       m2 += m1;
+
+       /* Overflow */
+       if (m2 < m1)
+               m3 += 0x100000000ull;
+
+       result.m_low = (m0 & 0xffffffffull) | (m2 << 32);
+       result.m_high = m3 + (m2 >> 32);
+
+       return result;
+}
+
+static uint128_t add_128_128(uint128_t a, uint128_t b)
+{
+       uint128_t result;
+
+       result.m_low = a.m_low + b.m_low;
+       result.m_high = a.m_high + b.m_high + (result.m_low < a.m_low);
+
+       return result;
+}
+
+static void vli_mult(uint64_t *result, const uint64_t *left,
+                                                       const uint64_t *right,
+                                                       unsigned int ndigits)
+{
+       uint128_t r01 = { 0, 0 };
+       uint64_t r2 = 0;
+       unsigned int i, k;
+
+       /* Compute each digit of result in sequence, maintaining the
+        * carries.
+        */
+       for (k = 0; k < ndigits * 2 - 1; k++) {
+               unsigned int min;
+
+               if (k < ndigits)
+                       min = 0;
+               else
+                       min = (k + 1) - ndigits;
+
+               for (i = min; i <= k && i < ndigits; i++) {
+                       uint128_t product;
+
+                       product = mul_64_64(left[i], right[k - i]);
+
+                       r01 = add_128_128(r01, product);
+                       r2 += (r01.m_high < product.m_high);
+               }
+
+               result[k] = r01.m_low;
+               r01.m_low = r01.m_high;
+               r01.m_high = r2;
+               r2 = 0;
+       }
+
+       result[ndigits * 2 - 1] = r01.m_low;
+}
+
+static void vli_square(uint64_t *result, const uint64_t *left,
+                       unsigned int ndigits)
+{
+       uint128_t r01 = { 0, 0 };
+       uint64_t r2 = 0;
+       unsigned int i, k;
+
+       for (k = 0; k < ndigits * 2 - 1; k++) {
+               unsigned int min;
+
+               if (k < ndigits)
+                       min = 0;
+               else
+                       min = (k + 1) - ndigits;
+
+               for (i = min; i <= k && i <= k - i; i++) {
+                       uint128_t product;
+
+                       product = mul_64_64(left[i], left[k - i]);
+
+                       if (i < k - i) {
+                               r2 += product.m_high >> 63;
+                               product.m_high = (product.m_high << 1) |
+                                                       (product.m_low >> 63);
+                               product.m_low <<= 1;
+                       }
+
+                       r01 = add_128_128(r01, product);
+                       r2 += (r01.m_high < product.m_high);
+               }
+
+               result[k] = r01.m_low;
+               r01.m_low = r01.m_high;
+               r01.m_high = r2;
+               r2 = 0;
+       }
+
+       result[ndigits * 2 - 1] = r01.m_low;
+}
+
+/* Computes result = (left + right) % mod.
+ * Assumes that left < mod and right < mod, result != mod.
+ */
+void _vli_mod_add(uint64_t *result, const uint64_t *left,
+                               const uint64_t *right, const uint64_t *mod,
+                               unsigned int ndigits)
+{
+       uint64_t carry;
+
+       carry = vli_add(result, left, right, ndigits);
+
+       /* result > mod (result = mod + remainder), so subtract mod to
+        * get remainder.
+        */
+       if (carry || _vli_cmp(result, mod, ndigits) >= 0)
+               _vli_sub(result, result, mod, ndigits);
+}
+
+/* Computes result = (left - right) % mod.
+ * Assumes that left < mod and right < mod, result != mod.
+ */
+void _vli_mod_sub(uint64_t *result, const uint64_t *left,
+                               const uint64_t *right, const uint64_t *mod,
+                               unsigned int ndigits)
+{
+       uint64_t borrow = _vli_sub(result, left, right, ndigits);
+
+       /* In this case, p_result == -diff == (max int) - diff.
+        * Since -x % d == d - x, we can get the correct result from
+        * result + mod (with overflow).
+        */
+       if (borrow)
+               vli_add(result, result, mod, ndigits);
+}
+
+/* Computes p_result = p_product % curve_p.
+ * See algorithm 5 and 6 from
+ * http://www.isys.uni-klu.ac.at/PDF/2001-0126-MT.pdf
+ */
+static void vli_mmod_fast_192(uint64_t *result, const uint64_t *product,
+                               const uint64_t *curve_prime, uint64_t *tmp)
+{
+       const unsigned int ndigits = 3;
+       int carry;
+
+       vli_set(result, product, ndigits);
+
+       vli_set(tmp, &product[3], ndigits);
+       carry = vli_add(result, result, tmp, ndigits);
+
+       tmp[0] = 0;
+       tmp[1] = product[3];
+       tmp[2] = product[4];
+       carry += vli_add(result, result, tmp, ndigits);
+
+       tmp[0] = tmp[1] = product[5];
+       tmp[2] = 0;
+       carry += vli_add(result, result, tmp, ndigits);
+
+       while (carry || _vli_cmp(curve_prime, result, ndigits) != 1)
+               carry -= _vli_sub(result, result, curve_prime, ndigits);
+}
+
+/* Computes result = product % curve_prime
+ * from http://www.nsa.gov/ia/_files/nist-routines.pdf
+ */
+static void vli_mmod_fast_256(uint64_t *result, const uint64_t *product,
+                               const uint64_t *curve_prime, uint64_t *tmp)
+{
+       int carry;
+       const unsigned int ndigits = 4;
+
+       /* t */
+       vli_set(result, product, ndigits);
+
+       /* s1 */
+       tmp[0] = 0;
+       tmp[1] = product[5] & 0xffffffff00000000ull;
+       tmp[2] = product[6];
+       tmp[3] = product[7];
+       carry = vli_lshift(tmp, tmp, 1, ndigits);
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s2 */
+       tmp[1] = product[6] << 32;
+       tmp[2] = (product[6] >> 32) | (product[7] << 32);
+       tmp[3] = product[7] >> 32;
+       carry += vli_lshift(tmp, tmp, 1, ndigits);
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s3 */
+       tmp[0] = product[4];
+       tmp[1] = product[5] & 0xffffffff;
+       tmp[2] = 0;
+       tmp[3] = product[7];
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s4 */
+       tmp[0] = (product[4] >> 32) | (product[5] << 32);
+       tmp[1] = (product[5] >> 32) | (product[6] & 0xffffffff00000000ull);
+       tmp[2] = product[7];
+       tmp[3] = (product[6] >> 32) | (product[4] << 32);
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* d1 */
+       tmp[0] = (product[5] >> 32) | (product[6] << 32);
+       tmp[1] = (product[6] >> 32);
+       tmp[2] = 0;
+       tmp[3] = (product[4] & 0xffffffff) | (product[5] << 32);
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       /* d2 */
+       tmp[0] = product[6];
+       tmp[1] = product[7];
+       tmp[2] = 0;
+       tmp[3] = (product[4] >> 32) | (product[5] & 0xffffffff00000000ull);
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       /* d3 */
+       tmp[0] = (product[6] >> 32) | (product[7] << 32);
+       tmp[1] = (product[7] >> 32) | (product[4] << 32);
+       tmp[2] = (product[4] >> 32) | (product[5] << 32);
+       tmp[3] = (product[6] << 32);
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       /* d4 */
+       tmp[0] = product[7];
+       tmp[1] = product[4] & 0xffffffff00000000ull;
+       tmp[2] = product[5];
+       tmp[3] = product[6] & 0xffffffff00000000ull;
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       if (carry < 0) {
+               do {
+                       carry += vli_add(result, result, curve_prime, ndigits);
+               } while (carry < 0);
+       } else {
+               while (carry || _vli_cmp(curve_prime, result, ndigits) != 1)
+                       carry -= _vli_sub(result, result, curve_prime, ndigits);
+       }
+}
+
+/*
+ * The NIST algorithms define S values, which are comprised of 32 bit C values
+ * of the original product we are trying to reduce. Since we are working with
+ * 64 bit 'digits', we need to convert these C values into 64 bit chunks. This
+ * macro mainly makes code readability easier since we can directly pass the
+ * two C indexes (h and l). Some of these C values are zero, which is also a
+ * value C index. In this case -1 should be passed to indicate zero.
+ */
+#define ECC_SET_S(prod, h, l) ({                               \
+       uint64_t r = 0;                                         \
+       if (h == -1) {                                          \
+               /* zero, don't do anything */                   \
+       } else if (h & 1)                                       \
+               r |= (prod[h / 2] & 0xffffffff00000000ull);     \
+       else                                                    \
+               r |= (prod[h / 2] << 32);                       \
+       if (l == -1) {                                          \
+               /* zero, don't do anything */                   \
+       } else if (l & 1)                                       \
+               r |= (prod[l / 2] >> 32);                       \
+       else                                                    \
+               r |= (prod[l / 2] & 0xffffffff);                \
+       r;                                                      \
+})
+
+static void vli_mmod_fast_384(uint64_t *result, const uint64_t *product,
+                               const uint64_t *curve_prime, uint64_t *tmp)
+{
+       int carry;
+       const unsigned int ndigits = 6;
+
+       /* t */
+       vli_set(result, product, ndigits);
+
+       /* s1 */
+       tmp[0] = 0;
+       tmp[1] = 0;
+       tmp[2] = ECC_SET_S(product, 22, 21);
+       tmp[3] = ECC_SET_S(product, -1, 23);
+       tmp[4] = 0;
+       tmp[5] = 0;
+       carry = vli_lshift(tmp, tmp, 1, ndigits);
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s2 */
+       tmp[0] = product[6];
+       tmp[1] = product[7];
+       tmp[2] = product[8];
+       tmp[3] = product[9];
+       tmp[4] = product[10];
+       tmp[5] = product[11];
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s3 */
+       tmp[0] = ECC_SET_S(product, 22, 21);
+       tmp[1] = ECC_SET_S(product, 12, 23);
+       tmp[2] = ECC_SET_S(product, 14, 13);
+       tmp[3] = ECC_SET_S(product, 16, 15);
+       tmp[4] = ECC_SET_S(product, 18, 17);
+       tmp[5] = ECC_SET_S(product, 20, 19);
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s4 */
+       tmp[0] = ECC_SET_S(product, 23, -1);
+       tmp[1] = ECC_SET_S(product, 20, -1);
+       tmp[2] = ECC_SET_S(product, 13, 12);
+       tmp[3] = ECC_SET_S(product, 15, 14);
+       tmp[4] = ECC_SET_S(product, 17, 16);
+       tmp[5] = ECC_SET_S(product, 19, 18);
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s5 */
+       tmp[0] = 0;
+       tmp[1] = 0;
+       tmp[2] = ECC_SET_S(product, 21, 20);
+       tmp[3] = ECC_SET_S(product, 23, 22);
+       tmp[4] = 0;
+       tmp[5] = 0;
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s6 */
+       tmp[0] = ECC_SET_S(product, -1, 20);
+       tmp[1] = ECC_SET_S(product, 21, -1);
+       tmp[2] = ECC_SET_S(product, 23, 22);
+       tmp[3] = 0;
+       tmp[4] = 0;
+       tmp[5] = 0;
+       carry += vli_add(result, result, tmp, ndigits);
+
+       /* s7 */
+       tmp[0] = ECC_SET_S(product, 12, 23);
+       tmp[1] = ECC_SET_S(product, 14, 13);
+       tmp[2] = ECC_SET_S(product, 16, 15);
+       tmp[3] = ECC_SET_S(product, 18, 17);
+       tmp[4] = ECC_SET_S(product, 20, 19);
+       tmp[5] = ECC_SET_S(product, 22, 21);
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       /* s8 */
+       tmp[0] = ECC_SET_S(product, 20, -1);
+       tmp[1] = ECC_SET_S(product, 22, 21);
+       tmp[2] = ECC_SET_S(product, -1, 23);
+       tmp[3] = 0;
+       tmp[4] = 0;
+       tmp[5] = 0;
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       /* s9 */
+       tmp[0] = 0;
+       tmp[1] = ECC_SET_S(product, 23, -1);
+       tmp[2] = ECC_SET_S(product, -1, 23);
+       tmp[3] = 0;
+       tmp[4] = 0;
+       tmp[5] = 0;
+       carry -= _vli_sub(result, result, tmp, ndigits);
+
+       if (carry < 0) {
+               do {
+                       carry += vli_add(result, result, curve_prime, ndigits);
+               } while (carry < 0);
+       } else {
+               while (carry || _vli_cmp(curve_prime, result, ndigits) != 1)
+                       carry -= _vli_sub(result, result, curve_prime, ndigits);
+       }
+}
+
+/* Computes result = product % curve_prime
+ *  from http://www.nsa.gov/ia/_files/nist-routines.pdf
+*/
+static bool vli_mmod_fast(uint64_t *result, uint64_t *product,
+                               const uint64_t *curve_prime,
+                               unsigned int ndigits)
+{
+       uint64_t tmp[2 * L_ECC_MAX_DIGITS];
+
+       switch (ndigits) {
+       case 3:
+               vli_mmod_fast_192(result, product, curve_prime, tmp);
+               break;
+       case 4:
+               vli_mmod_fast_256(result, product, curve_prime, tmp);
+               break;
+       case 6:
+               vli_mmod_fast_384(result, product, curve_prime, tmp);
+               break;
+       default:
+               return false;
+       }
+
+       return true;
+}
+
+/* Computes result = (left * right) % curve_p. */
+void _vli_mod_mult_fast(uint64_t *result, const uint64_t *left,
+                       const uint64_t *right, const uint64_t *curve_prime,
+                       unsigned int ndigits)
+{
+       uint64_t product[2 * L_ECC_MAX_DIGITS];
+
+       vli_mult(product, left, right, ndigits);
+       vli_mmod_fast(result, product, curve_prime, ndigits);
+}
+
+/* Computes result = left^2 % curve_p. */
+void _vli_mod_square_fast(uint64_t *result, const uint64_t *left,
+                                       const uint64_t *curve_prime,
+                                       unsigned int ndigits)
+{
+       uint64_t product[2 * L_ECC_MAX_DIGITS];
+
+       vli_square(product, left, ndigits);
+       vli_mmod_fast(result, product, curve_prime, ndigits);
+}
+
+#define EVEN(vli) (!(vli[0] & 1))
+/* Computes result = (1 / p_input) % mod. All VLIs are the same size.
+ * See "From Euclid's GCD to Montgomery Multiplication to the Great Divide"
+ * https://labs.oracle.com/techrep/2001/smli_tr-2001-95.pdf
+ */
+void _vli_mod_inv(uint64_t *result, const uint64_t *input,
+                                               const uint64_t *mod,
+                                               unsigned int ndigits)
+{
+       uint64_t a[L_ECC_MAX_DIGITS], b[L_ECC_MAX_DIGITS];
+       uint64_t u[L_ECC_MAX_DIGITS], v[L_ECC_MAX_DIGITS];
+       uint64_t carry;
+       int cmp_result;
+
+       if (vli_is_zero(input, ndigits)) {
+               vli_clear(result, ndigits);
+               return;
+       }
+
+       vli_set(a, input, ndigits);
+       vli_set(b, mod, ndigits);
+       vli_clear(u, ndigits);
+       u[0] = 1;
+       vli_clear(v, ndigits);
+
+       while ((cmp_result = _vli_cmp(a, b, ndigits)) != 0) {
+               carry = 0;
+
+               if (EVEN(a)) {
+                       _vli_rshift1(a, ndigits);
+
+                       if (!EVEN(u))
+                               carry = vli_add(u, u, mod, ndigits);
+
+                       _vli_rshift1(u, ndigits);
+                       if (carry)
+                               u[ndigits - 1] |= 0x8000000000000000ull;
+               } else if (EVEN(b)) {
+                       _vli_rshift1(b, ndigits);
+
+                       if (!EVEN(v))
+                               carry = vli_add(v, v, mod, ndigits);
+
+                       _vli_rshift1(v, ndigits);
+                       if (carry)
+                               v[ndigits - 1] |= 0x8000000000000000ull;
+               } else if (cmp_result > 0) {
+                       _vli_sub(a, a, b, ndigits);
+                       _vli_rshift1(a, ndigits);
+
+                       if (_vli_cmp(u, v, ndigits) < 0)
+                               vli_add(u, u, mod, ndigits);
+
+                       _vli_sub(u, u, v, ndigits);
+                       if (!EVEN(u))
+                               carry = vli_add(u, u, mod, ndigits);
+
+                       _vli_rshift1(u, ndigits);
+                       if (carry)
+                               u[ndigits - 1] |= 0x8000000000000000ull;
+               } else {
+                       _vli_sub(b, b, a, ndigits);
+                       _vli_rshift1(b, ndigits);
+
+                       if (_vli_cmp(v, u, ndigits) < 0)
+                               vli_add(v, v, mod, ndigits);
+
+                       _vli_sub(v, v, u, ndigits);
+                       if (!EVEN(v))
+                               carry = vli_add(v, v, mod, ndigits);
+
+                       _vli_rshift1(v, ndigits);
+                       if (carry)
+                               v[ndigits - 1] |= 0x8000000000000000ull;
+               }
+       }
+
+       vli_set(result, u, ndigits);
+}
+
+/* ------ Point operations ------ */
+
+/* Point multiplication algorithm using Montgomery's ladder with co-Z
+ * coordinates. From http://eprint.iacr.org/2011/338.pdf
+ */
+
+/* Double in place */
+static void ecc_point_double_jacobian(uint64_t *x1, uint64_t *y1, uint64_t *z1,
+                                       const uint64_t *curve_prime,
+                                       unsigned int ndigits)
+{
+       /* t1 = x, t2 = y, t3 = z */
+       uint64_t t4[L_ECC_MAX_DIGITS];
+       uint64_t t5[L_ECC_MAX_DIGITS];
+
+       if (vli_is_zero(z1, ndigits))
+               return;
+
+       /* t4 = y1^2 */
+       _vli_mod_square_fast(t4, y1, curve_prime, ndigits);
+       /* t5 = x1*y1^2 = A */
+       _vli_mod_mult_fast(t5, x1, t4, curve_prime, ndigits);
+       /* t4 = y1^4 */
+       _vli_mod_square_fast(t4, t4, curve_prime, ndigits);
+       /* t2 = y1*z1 = z3 */
+       _vli_mod_mult_fast(y1, y1, z1, curve_prime, ndigits);
+       /* t3 = z1^2 */
+       _vli_mod_square_fast(z1, z1, curve_prime, ndigits);
+
+       /* t1 = x1 + z1^2 */
+       _vli_mod_add(x1, x1, z1, curve_prime, ndigits);
+       /* t3 = 2*z1^2 */
+       _vli_mod_add(z1, z1, z1, curve_prime, ndigits);
+       /* t3 = x1 - z1^2 */
+       _vli_mod_sub(z1, x1, z1, curve_prime, ndigits);
+       /* t1 = x1^2 - z1^4 */
+       _vli_mod_mult_fast(x1, x1, z1, curve_prime, ndigits);
+
+       /* t3 = 2*(x1^2 - z1^4) */
+       _vli_mod_add(z1, x1, x1, curve_prime, ndigits);
+       /* t1 = 3*(x1^2 - z1^4) */
+       _vli_mod_add(x1, x1, z1, curve_prime, ndigits);
+       if (vli_test_bit(x1, 0)) {
+               uint64_t carry = vli_add(x1, x1, curve_prime, ndigits);
+               _vli_rshift1(x1, ndigits);
+               x1[ndigits - 1] |= carry << 63;
+       } else {
+               _vli_rshift1(x1, ndigits);
+       }
+       /* t1 = 3/2*(x1^2 - z1^4) = B */
+
+       /* t3 = B^2 */
+       _vli_mod_square_fast(z1, x1, curve_prime, ndigits);
+       /* t3 = B^2 - A */
+       _vli_mod_sub(z1, z1, t5, curve_prime, ndigits);
+       /* t3 = B^2 - 2A = x3 */
+       _vli_mod_sub(z1, z1, t5, curve_prime, ndigits);
+       /* t5 = A - x3 */
+       _vli_mod_sub(t5, t5, z1, curve_prime, ndigits);
+       /* t1 = B * (A - x3) */
+       _vli_mod_mult_fast(x1, x1, t5, curve_prime, ndigits);
+       /* t4 = B * (A - x3) - y1^4 = y3 */
+       _vli_mod_sub(t4, x1, t4, curve_prime, ndigits);
+
+       vli_set(x1, z1, ndigits);
+       vli_set(z1, y1, ndigits);
+       vli_set(y1, t4, ndigits);
+}
+
+/* Modify (x1, y1) => (x1 * z^2, y1 * z^3) */
+static void apply_z(uint64_t *x1, uint64_t *y1, uint64_t *z,
+                       const uint64_t *curve_prime, unsigned int ndigits)
+{
+       uint64_t t1[L_ECC_MAX_DIGITS];
+
+       _vli_mod_square_fast(t1, z, curve_prime, ndigits);    /* z^2 */
+       _vli_mod_mult_fast(x1, x1, t1, curve_prime, ndigits); /* x1 * z^2 */
+       _vli_mod_mult_fast(t1, t1, z, curve_prime, ndigits);  /* z^3 */
+       _vli_mod_mult_fast(y1, y1, t1, curve_prime, ndigits); /* y1 * z^3 */
+}
+
+/* P = (x1, y1) => 2P, (x2, y2) => P' */
+static void xycz_initial_double(uint64_t *x1, uint64_t *y1, uint64_t *x2,
+                                       uint64_t *y2, uint64_t *p_initial_z,
+                                       const uint64_t *curve_prime,
+                                       unsigned int ndigits)
+{
+       uint64_t z[L_ECC_MAX_DIGITS];
+
+       vli_set(x2, x1, ndigits);
+       vli_set(y2, y1, ndigits);
+
+       vli_clear(z, ndigits);
+       z[0] = 1;
+
+       if (p_initial_z)
+               vli_set(z, p_initial_z, ndigits);
+
+       apply_z(x1, y1, z, curve_prime, ndigits);
+
+       ecc_point_double_jacobian(x1, y1, z, curve_prime, ndigits);
+
+       apply_z(x2, y2, z, curve_prime, ndigits);
+}
+
+/* Input P = (x1, y1, Z), Q = (x2, y2, Z)
+ * Output P' = (x1', y1', Z3), P + Q = (x3, y3, Z3)
+ * or P => P', Q => P + Q
+ */
+static void xycz_add(uint64_t *x1, uint64_t *y1, uint64_t *x2, uint64_t *y2,
+                       const uint64_t *curve_prime, unsigned int ndigits)
+{
+       /* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
+       uint64_t t5[L_ECC_MAX_DIGITS];
+
+       /* t5 = x2 - x1 */
+       _vli_mod_sub(t5, x2, x1, curve_prime, ndigits);
+       /* t5 = (x2 - x1)^2 = A */
+       _vli_mod_square_fast(t5, t5, curve_prime, ndigits);
+       /* t1 = x1*A = B */
+       _vli_mod_mult_fast(x1, x1, t5, curve_prime, ndigits);
+       /* t3 = x2*A = C */
+       _vli_mod_mult_fast(x2, x2, t5, curve_prime, ndigits);
+       /* t4 = y2 - y1 */
+       _vli_mod_sub(y2, y2, y1, curve_prime, ndigits);
+       /* t5 = (y2 - y1)^2 = D */
+       _vli_mod_square_fast(t5, y2, curve_prime, ndigits);
+
+       /* t5 = D - B */
+       _vli_mod_sub(t5, t5, x1, curve_prime, ndigits);
+       /* t5 = D - B - C = x3 */
+       _vli_mod_sub(t5, t5, x2, curve_prime, ndigits);
+       /* t3 = C - B */
+       _vli_mod_sub(x2, x2, x1, curve_prime, ndigits);
+       /* t2 = y1*(C - B) */
+       _vli_mod_mult_fast(y1, y1, x2, curve_prime, ndigits);
+       /* t3 = B - x3 */
+       _vli_mod_sub(x2, x1, t5, curve_prime, ndigits);
+       /* t4 = (y2 - y1)*(B - x3) */
+       _vli_mod_mult_fast(y2, y2, x2, curve_prime, ndigits);
+       /* t4 = y3 */
+       _vli_mod_sub(y2, y2, y1, curve_prime, ndigits);
+
+       vli_set(x2, t5, ndigits);
+}
+
+/* Input P = (x1, y1, Z), Q = (x2, y2, Z)
+ * Output P + Q = (x3, y3, Z3), P - Q = (x3', y3', Z3)
+ * or P => P - Q, Q => P + Q
+ */
+static void xycz_add_c(uint64_t *x1, uint64_t *y1, uint64_t *x2, uint64_t *y2,
+                       const uint64_t *curve_prime, unsigned int ndigits)
+{
+       /* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
+       uint64_t t5[L_ECC_MAX_DIGITS];
+       uint64_t t6[L_ECC_MAX_DIGITS];
+       uint64_t t7[L_ECC_MAX_DIGITS];
+
+       /* t5 = x2 - x1 */
+       _vli_mod_sub(t5, x2, x1, curve_prime, ndigits);
+       /* t5 = (x2 - x1)^2 = A */
+       _vli_mod_square_fast(t5, t5, curve_prime, ndigits);
+       /* t1 = x1*A = B */
+       _vli_mod_mult_fast(x1, x1, t5, curve_prime, ndigits);
+       /* t3 = x2*A = C */
+       _vli_mod_mult_fast(x2, x2, t5, curve_prime, ndigits);
+       /* t4 = y2 + y1 */
+       _vli_mod_add(t5, y2, y1, curve_prime, ndigits);
+       /* t4 = y2 - y1 */
+       _vli_mod_sub(y2, y2, y1, curve_prime, ndigits);
+
+       /* t6 = C - B */
+       _vli_mod_sub(t6, x2, x1, curve_prime, ndigits);
+       /* t2 = y1 * (C - B) */
+       _vli_mod_mult_fast(y1, y1, t6, curve_prime, ndigits);
+       /* t6 = B + C */
+       _vli_mod_add(t6, x1, x2, curve_prime, ndigits);
+       /* t3 = (y2 - y1)^2 */
+       _vli_mod_square_fast(x2, y2, curve_prime, ndigits);
+       /* t3 = x3 */
+       _vli_mod_sub(x2, x2, t6, curve_prime, ndigits);
+
+       /* t7 = B - x3 */
+       _vli_mod_sub(t7, x1, x2, curve_prime, ndigits);
+       /* t4 = (y2 - y1)*(B - x3) */
+       _vli_mod_mult_fast(y2, y2, t7, curve_prime, ndigits);
+       /* t4 = y3 */
+       _vli_mod_sub(y2, y2, y1, curve_prime, ndigits);
+
+       /* t7 = (y2 + y1)^2 = F */
+       _vli_mod_square_fast(t7, t5, curve_prime, ndigits);
+       /* t7 = x3' */
+       _vli_mod_sub(t7, t7, t6, curve_prime, ndigits);
+       /* t6 = x3' - B */
+       _vli_mod_sub(t6, t7, x1, curve_prime, ndigits);
+       /* t6 = (y2 + y1)*(x3' - B) */
+       _vli_mod_mult_fast(t6, t6, t5, curve_prime, ndigits);
+       /* t2 = y3' */
+       _vli_mod_sub(y1, t6, y1, curve_prime, ndigits);
+
+       vli_set(x1, t7, ndigits);
+}
+
+void _ecc_point_mult(struct l_ecc_point *result,
+                       const struct l_ecc_point *point, const uint64_t *scalar,
+                       uint64_t *initial_z, const uint64_t *curve_prime)
+{
+       /* R0 and R1 */
+       const struct l_ecc_curve *curve = point->curve;
+       uint64_t rx[2][L_ECC_MAX_DIGITS];
+       uint64_t ry[2][L_ECC_MAX_DIGITS];
+       uint64_t z[L_ECC_MAX_DIGITS];
+       uint64_t sk[2][L_ECC_MAX_DIGITS];
+       int i, nb;
+       unsigned int ndigits = curve->ndigits;
+       int num_bits;
+       int carry;
+
+       carry = vli_add(sk[0], scalar, curve->n, ndigits);
+       vli_add(sk[1], sk[0], curve->n, ndigits);
+       scalar = sk[!carry];
+       num_bits = sizeof(uint64_t) * ndigits * 8 + 1;
+
+       vli_set(rx[1], point->x, ndigits);
+       vli_set(ry[1], point->y, ndigits);
+
+       xycz_initial_double(rx[1], ry[1], rx[0], ry[0], initial_z, curve_prime,
+                           ndigits);
+
+       for (i = num_bits - 2; i > 0; i--) {
+               nb = !vli_test_bit(scalar, i);
+               xycz_add_c(rx[1 - nb], ry[1 - nb], rx[nb], ry[nb], curve_prime,
+                          ndigits);
+               xycz_add(rx[nb], ry[nb], rx[1 - nb], ry[1 - nb], curve_prime,
+                        ndigits);
+       }
+
+       nb = !vli_test_bit(scalar, 0);
+       xycz_add_c(rx[1 - nb], ry[1 - nb], rx[nb], ry[nb], curve_prime,
+                  ndigits);
+
+       /* Find final 1/Z value. */
+       /* X1 - X0 */
+       _vli_mod_sub(z, rx[1], rx[0], curve_prime, ndigits);
+       /* Yb * (X1 - X0) */
+       _vli_mod_mult_fast(z, z, ry[1 - nb], curve_prime, ndigits);
+       /* xP * Yb * (X1 - X0) */
+       _vli_mod_mult_fast(z, z, point->x, curve_prime, ndigits);
+
+       /* 1 / (xP * Yb * (X1 - X0)) */
+       _vli_mod_inv(z, z, curve_prime, ndigits);
+
+       /* yP / (xP * Yb * (X1 - X0)) */
+       _vli_mod_mult_fast(z, z, point->y, curve_prime, ndigits);
+       /* Xb * yP / (xP * Yb * (X1 - X0)) */
+       _vli_mod_mult_fast(z, z, rx[1 - nb], curve_prime, ndigits);
+       /* End 1/Z calculation */
+
+       xycz_add(rx[nb], ry[nb], rx[1 - nb], ry[1 - nb], curve_prime, ndigits);
+
+       apply_z(rx[0], ry[0], z, curve_prime, ndigits);
+
+       vli_set(result->x, rx[0], ndigits);
+       vli_set(result->y, ry[0], ndigits);
+}
+
+/* Returns true if p_point is the point at infinity, false otherwise. */
+bool _ecc_point_is_zero(const struct l_ecc_point *point)
+{
+       return (vli_is_zero(point->x, point->curve->ndigits) &&
+               vli_is_zero(point->y, point->curve->ndigits));
+}
diff --git a/ell/ecc-private.h b/ell/ecc-private.h
new file mode 100644 (file)
index 0000000..0e85d98
--- /dev/null
@@ -0,0 +1,99 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "ecc.h"
+
+struct l_ecc_curve;
+
+struct l_ecc_point {
+       uint64_t x[L_ECC_MAX_DIGITS];
+       uint64_t y[L_ECC_MAX_DIGITS];
+       const struct l_ecc_curve *curve;
+};
+
+struct l_ecc_curve {
+       unsigned int ndigits;
+       unsigned int ike_group;
+       unsigned int tls_group;
+       const char *name;
+       struct l_ecc_point g;
+       uint64_t p[L_ECC_MAX_DIGITS];
+       uint64_t n[L_ECC_MAX_DIGITS];
+       uint64_t b[L_ECC_MAX_DIGITS];
+};
+
+struct l_ecc_scalar {
+       uint64_t c[L_ECC_MAX_DIGITS];
+       const struct l_ecc_curve *curve;
+};
+
+void _ecc_be2native(uint64_t *dest, const uint64_t *bytes,
+                                                       unsigned int ndigits);
+
+void _ecc_native2be(uint64_t *dest, const uint64_t *native,
+                                                       unsigned int ndigits);
+
+void _vli_mod_inv(uint64_t *result, const uint64_t *input, const uint64_t *mod,
+                       unsigned int ndigits);
+
+void _vli_mod_sub(uint64_t *result, const uint64_t *left, const uint64_t *right,
+               const uint64_t *curve_prime, unsigned int ndigits);
+
+void _vli_mod_add(uint64_t *result, const uint64_t *left, const uint64_t *right,
+                       const uint64_t *curve_prime, unsigned int ndigits);
+
+void _vli_rshift1(uint64_t *vli, unsigned int ndigits);
+
+void _vli_mod_mult_fast(uint64_t *result, const uint64_t *left,
+               const uint64_t *right, const uint64_t *curve_prime,
+               unsigned int ndigits);
+void _vli_mod_square_fast(uint64_t *result, const uint64_t *left,
+                                       const uint64_t *curve_prime,
+                                       unsigned int ndigits);
+void _vli_mod_exp(uint64_t *result, uint64_t *base, uint64_t *exp,
+               const uint64_t *mod, unsigned int ndigits);
+
+int _vli_cmp(const uint64_t *left, const uint64_t *right, unsigned int ndigits);
+
+uint64_t _vli_sub(uint64_t *result, const uint64_t *left,
+                                                       const uint64_t *right,
+                                                       unsigned int ndigits);
+
+int _vli_legendre(uint64_t *val, const uint64_t *p, unsigned int ndigits);
+
+bool _ecc_point_is_zero(const struct l_ecc_point *point);
+
+void _ecc_calculate_p2(const struct l_ecc_curve *curve, uint64_t *p2);
+
+bool _ecc_compute_y(const struct l_ecc_curve *curve, uint64_t *y, uint64_t *x);
+
+void _ecc_point_mult(struct l_ecc_point *result,
+                       const struct l_ecc_point *point, const uint64_t *scalar,
+                       uint64_t *initial_z, const uint64_t *curve_prime);
+void _ecc_point_add(struct l_ecc_point *ret, const struct l_ecc_point *p,
+                       const struct l_ecc_point *q,
+                       const uint64_t *curve_prime);
+struct l_ecc_scalar *_ecc_constant_new(const struct l_ecc_curve *curve,
+                                               const void *buf, size_t len);
diff --git a/ell/ecc.c b/ell/ecc.c
new file mode 100644 (file)
index 0000000..d0c7393
--- /dev/null
+++ b/ell/ecc.c
@@ -0,0 +1,760 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "ecc.h"
+#include "ecc-private.h"
+#include "random.h"
+#include "private.h"
+#include "missing.h"
+
+/*
+ * RFC 5114 - Section 2.6 256-bit Random ECP Group
+ */
+#define P256_CURVE_P { 0xFFFFFFFFFFFFFFFFull, 0x00000000FFFFFFFFull, \
+                       0x0000000000000000ull, 0xFFFFFFFF00000001ull }
+#define P256_CURVE_GX { 0xF4A13945D898C296ull, 0x77037D812DEB33A0ull,   \
+                       0xF8BCE6E563A440F2ull, 0x6B17D1F2E12C4247ull }
+#define P256_CURVE_GY { 0xCBB6406837BF51F5ull, 0x2BCE33576B315ECEull,   \
+                       0x8EE7EB4A7C0F9E16ull, 0x4FE342E2FE1A7F9Bull }
+#define P256_CURVE_N { 0xF3B9CAC2FC632551ull, 0xBCE6FAADA7179E84ull,   \
+                       0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFF00000000ull }
+#define P256_CURVE_B { 0x3BCE3C3E27D2604Bull, 0x651D06B0CC53B0F6ull,   \
+                       0xB3EBBD55769886BCull, 0x5AC635D8AA3A93E7ull }
+
+static const struct l_ecc_curve p256 = {
+       .name = "secp256r1",
+       .ike_group = 19,
+       .tls_group = 23,
+       .ndigits = 4,
+       .g = {
+               .x = P256_CURVE_GX,
+               .y = P256_CURVE_GY,
+               .curve = &p256
+       },
+       .p = P256_CURVE_P,
+       .n = P256_CURVE_N,
+       .b = P256_CURVE_B,
+};
+
+/*
+ * RFC 5114 - Section 2.7 384-bit Random ECP Group
+ */
+#define P384_CURVE_P { 0x00000000FFFFFFFFull, 0xFFFFFFFF00000000ull, \
+                       0xFFFFFFFFFFFFFFFEull, 0xFFFFFFFFFFFFFFFFull, \
+                       0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull }
+#define P384_CURVE_GX {        0x3A545E3872760AB7ull, 0x5502F25DBF55296Cull, \
+                       0x59F741E082542A38ull, 0x6E1D3B628BA79B98ull, \
+                       0x8EB1C71EF320AD74ull, 0xAA87CA22BE8B0537ull }
+#define P384_CURVE_GY {        0x7A431D7C90EA0E5Full, 0x0A60B1CE1D7E819Dull, \
+                       0xE9DA3113B5F0B8C0ull, 0xF8F41DBD289A147Cull, \
+                       0x5D9E98BF9292DC29ull, 0x3617DE4A96262C6Full }
+#define P384_CURVE_N { 0xECEC196ACCC52973ull, 0x581A0DB248B0A77Aull, \
+                       0xC7634D81F4372DDFull, 0xFFFFFFFFFFFFFFFFull, \
+                       0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFFull }
+#define P384_CURVE_B { 0x2A85C8EDD3EC2AEFull, 0xC656398D8A2ED19Dull, \
+                       0x0314088F5013875Aull, 0x181D9C6EFE814112ull, \
+                       0x988E056BE3F82D19ull, 0xB3312FA7E23EE7E4ull }
+
+static const struct l_ecc_curve p384 = {
+       .name = "secp384r1",
+       .ike_group = 20,
+       .tls_group = 24,
+       .ndigits = 6,
+       .g = {
+               .x = P384_CURVE_GX,
+               .y = P384_CURVE_GY,
+               .curve = &p384
+       },
+       .p = P384_CURVE_P,
+       .n = P384_CURVE_N,
+       .b = P384_CURVE_B
+};
+
+static const struct l_ecc_curve *curves[] = {
+       &p256,
+       &p384,
+};
+
+LIB_EXPORT const struct l_ecc_curve *l_ecc_curve_get(const char *name)
+{
+       int i;
+
+       if (unlikely(!name))
+               return NULL;
+
+       for (i = 0; curves[i]; i++) {
+               if (!strcmp(curves[i]->name, name))
+                       return curves[i];
+       }
+
+       return NULL;
+}
+
+LIB_EXPORT const char *l_ecc_curve_get_name(const struct l_ecc_curve *curve)
+{
+       if (unlikely(!curve))
+               return NULL;
+
+       return curve->name;
+}
+
+LIB_EXPORT size_t l_ecc_curve_get_scalar_bytes(const struct l_ecc_curve *curve)
+{
+       if (unlikely(!curve))
+               return 0;
+
+       return curve->ndigits * 8;
+}
+
+LIB_EXPORT const struct l_ecc_curve *l_ecc_curve_get_ike_group(
+                                                       unsigned int group)
+{
+       unsigned int i;
+
+       for (i = 0; i < L_ARRAY_SIZE(curves); i++) {
+               if (curves[i]->ike_group == group)
+                       return curves[i];
+       }
+
+       return NULL;
+}
+
+LIB_EXPORT const struct l_ecc_curve *l_ecc_curve_get_tls_group(
+                                                       unsigned int group)
+{
+       unsigned int i;
+
+       for (i = 0; i < L_ARRAY_SIZE(curves); i++) {
+               if (curves[i]->tls_group == group)
+                       return curves[i];
+       }
+
+       return NULL;
+}
+
+LIB_EXPORT const unsigned int *l_ecc_curve_get_supported_ike_groups(void)
+{
+       static unsigned int supported_ike_groups[L_ARRAY_SIZE(curves) + 1];
+       static bool ike_first = true;
+
+       if (ike_first) {
+               unsigned int i;
+
+               for (i = 0; i < L_ARRAY_SIZE(curves); i++)
+                       supported_ike_groups[i] = curves[i]->ike_group;
+
+               supported_ike_groups[i] = 0;
+               ike_first = false;
+       }
+
+       return supported_ike_groups;
+}
+
+LIB_EXPORT const unsigned int *l_ecc_curve_get_supported_tls_groups(void)
+{
+       static unsigned int supported_tls_groups[L_ARRAY_SIZE(curves) + 1];
+       static bool tls_first = true;
+
+       if (tls_first) {
+               unsigned int i;
+
+               for (i = 0; i < L_ARRAY_SIZE(curves); i++)
+                       supported_tls_groups[i] = curves[i]->tls_group;
+
+               supported_tls_groups[i] = 0;
+               tls_first = false;
+       }
+
+       return supported_tls_groups;
+}
+
+static bool ecc_valid_point(struct l_ecc_point *point)
+{
+       const struct l_ecc_curve *curve = point->curve;
+       uint64_t tmp1[L_ECC_MAX_DIGITS];
+       uint64_t tmp2[L_ECC_MAX_DIGITS];
+       uint64_t _3[L_ECC_MAX_DIGITS] = { 3 };  /* -a = 3 */
+       unsigned int ndigits = curve->ndigits;
+
+       /* The point at infinity is invalid. */
+       if (_ecc_point_is_zero(point))
+               return false;
+
+       /* x and y must be smaller than p. */
+       if (_vli_cmp(curve->p, point->x, ndigits) != 1 ||
+                       _vli_cmp(curve->p, point->y, ndigits) != 1)
+               return false;
+
+       /* Computes result = y^2. */
+       _vli_mod_square_fast(tmp1, point->y, curve->p, ndigits);
+
+       /* Computes result = x^3 + ax + b. result must not overlap x. */
+       /* r = x^2 */
+       _vli_mod_square_fast(tmp2, point->x, curve->p, ndigits);
+       /* r = x^2 - 3 */
+       _vli_mod_sub(tmp2, tmp2, _3, curve->p, ndigits);
+       /* r = x^3 - 3x */
+       _vli_mod_mult_fast(tmp2, tmp2, point->x, curve->p, ndigits);
+       /* r = x^3 - 3x + b */
+       _vli_mod_add(tmp2, tmp2, curve->b, curve->p, ndigits);
+       /* Make sure that y^2 == x^3 + ax + b */
+       return (_vli_cmp(tmp1, tmp2, ndigits) == 0);
+}
+
+void _ecc_be2native(uint64_t *dest, const uint64_t *bytes,
+                                                       unsigned int ndigits)
+{
+       unsigned int i;
+       uint64_t tmp[L_ECC_MAX_DIGITS];
+
+       for (i = 0; i < ndigits; i++)
+               tmp[ndigits - 1 - i] = l_get_be64(&bytes[i]);
+
+       memcpy(dest, tmp, ndigits * 8);
+}
+
+void _ecc_native2be(uint64_t *dest, const uint64_t *native,
+                                                       unsigned int ndigits)
+{
+       unsigned int i;
+       uint64_t tmp[L_ECC_MAX_DIGITS];
+
+       for (i = 0; i < ndigits; i++)
+               l_put_be64(native[ndigits - 1 - i], &tmp[i]);
+
+       memcpy(dest, tmp, ndigits * 8);
+}
+
+static void ecc_compute_y_sqr(const struct l_ecc_curve *curve,
+                                       uint64_t *y_sqr, const uint64_t *x)
+{
+       uint64_t sum[L_ECC_MAX_DIGITS] = { 0 };
+       uint64_t tmp[L_ECC_MAX_DIGITS] = { 0 };
+       uint64_t _3[L_ECC_MAX_DIGITS] = { 3ull }; /* -a = 3 */
+
+       /* x^3 */
+       _vli_mod_square_fast(sum, x, curve->p, curve->ndigits);
+       _vli_mod_mult_fast(sum, sum, x, curve->p, curve->ndigits);
+       /* x^3 - ax */
+       _vli_mod_mult_fast(tmp, _3, x, curve->p, curve->ndigits);
+       _vli_mod_sub(sum, sum, tmp, curve->p, curve->ndigits);
+       /* x^3 - ax + b */
+       _vli_mod_add(sum, sum, curve->b, curve->p, curve->ndigits);
+
+       memcpy(y_sqr, sum, curve->ndigits * 8);
+}
+
+bool _ecc_compute_y(const struct l_ecc_curve *curve, uint64_t *y, uint64_t *x)
+{
+       /*
+        * y = sqrt(x^3 + ax + b) (mod p)
+        *
+        * Since our prime p satisfies p = 3 (mod 4), we can say:
+        *
+        * y = (x^3 - 3x + b)^((p + 1) / 4)
+        *
+        * This avoids the need for a square root function.
+        */
+
+       uint64_t sum[L_ECC_MAX_DIGITS] = { 0 };
+       uint64_t expo[L_ECC_MAX_DIGITS] = { 0 };
+       uint64_t one[L_ECC_MAX_DIGITS] = { 1ull };
+       uint64_t check[L_ECC_MAX_DIGITS] = { 0 };
+
+       memcpy(expo, curve->p, curve->ndigits * 8);
+
+       /* x^3 - 3x + b */
+       ecc_compute_y_sqr(curve, sum, x);
+
+       /* (p + 1) / 4  == (p >> 2) + 1 */
+       _vli_rshift1(expo, curve->ndigits);
+       _vli_rshift1(expo, curve->ndigits);
+       _vli_mod_add(expo, expo, one, curve->p, curve->ndigits);
+       /* sum ^ ((p + 1) / 4) */
+       _vli_mod_exp(y, sum, expo, curve->p, curve->ndigits);
+
+       /* square y to ensure we have a correct value */
+       _vli_mod_mult_fast(check, y, y, curve->p, curve->ndigits);
+
+       if (_vli_cmp(check, sum, curve->ndigits) != 0)
+               return false;
+
+       return true;
+}
+
+/*
+ * IETF - Compact representation of an elliptic curve point:
+ * https://tools.ietf.org/id/draft-jivsov-ecc-compact-00.xml
+ *
+ * "min(y,p-y) can be calculated with the help of the pre-calculated value
+ *  p2=(p-1)/2. min(y,p-y) is y if y<p2 and p-y otherwise."
+ */
+void _ecc_calculate_p2(const struct l_ecc_curve *curve, uint64_t *p2)
+{
+       uint64_t one[L_ECC_MAX_DIGITS] = { 1 };
+
+       _vli_mod_sub(p2, curve->p, one, curve->p, curve->ndigits);
+       _vli_rshift1(p2, curve->ndigits);
+}
+
+/*
+ * IETF draft-jivsov-ecc-compact-00 Section 4.1
+ * Encoding and decoding of an elliptic curve point
+ * ...
+ * Decoding:
+ * Given the compact representation of Q, return canonical representation
+ * of Q=(x,y) as follows:
+ *     1. y' = sqrt( x^3 + a*x + b ), where y'>0
+ *     2. y = min(y',p-y')
+ *     3. Q=(x,y) is the canonical representation of the point
+ */
+static bool decode_point(const struct l_ecc_curve *curve, uint64_t *x,
+                               struct l_ecc_point *point)
+{
+       uint64_t y_min[L_ECC_MAX_DIGITS];
+       uint64_t p2[L_ECC_MAX_DIGITS];
+
+       if (!_ecc_compute_y(curve, y_min, (uint64_t *)x))
+               return false;
+
+       _ecc_calculate_p2(curve, p2);
+
+       if (_vli_cmp(y_min, p2, curve->ndigits) >= 0)
+               _vli_mod_sub(point->y, curve->p, y_min,
+                                       curve->p, curve->ndigits);
+       else
+               memcpy(point->y, y_min, curve->ndigits * 8);
+
+       memcpy(point->x, x, curve->ndigits * 8);
+
+       return true;
+}
+
+/* (rx, ry) = (px, py) + (qx, qy) */
+void _ecc_point_add(struct l_ecc_point *ret, const struct l_ecc_point *p,
+                       const struct l_ecc_point *q,
+                       const uint64_t *curve_prime)
+{
+       /*
+       * s = (py - qy)/(px - qx)
+       *
+       * rx = s^2 - px - qx
+       * ry = s(px - rx) - py
+       */
+       uint64_t s[L_ECC_MAX_DIGITS];
+       uint64_t kp1[L_ECC_MAX_DIGITS];
+       uint64_t kp2[L_ECC_MAX_DIGITS];
+       uint64_t resx[L_ECC_MAX_DIGITS];
+       uint64_t resy[L_ECC_MAX_DIGITS];
+       unsigned int ndigits = p->curve->ndigits;
+
+       memset(s, 0, ndigits * 8);
+
+       /* kp1 = py - qy */
+       _vli_mod_sub(kp1, q->y, p->y, curve_prime, ndigits);
+       /* kp2 = px - qx */
+       _vli_mod_sub(kp2, q->x, p->x, curve_prime, ndigits);
+       /* s = kp1/kp2 */
+       _vli_mod_inv(kp2, kp2, curve_prime, ndigits);
+       _vli_mod_mult_fast(s, kp1, kp2, curve_prime, ndigits);
+       /* rx = s^2 - px - qx */
+       _vli_mod_mult_fast(kp1, s, s, curve_prime, ndigits);
+       _vli_mod_sub(kp1, kp1, p->x, curve_prime, ndigits);
+       _vli_mod_sub(resx, kp1, q->x, curve_prime, ndigits);
+       /* ry = s(px - rx) - py */
+       _vli_mod_sub(kp1, p->x, resx, curve_prime, ndigits);
+       _vli_mod_mult_fast(kp1, s, kp1, curve_prime, ndigits);
+       _vli_mod_sub(resy, kp1, p->y, curve_prime, ndigits);
+
+       memcpy(ret->x, resx, ndigits * 8);
+       memcpy(ret->y, resy, ndigits * 8);
+}
+
+/* result = (base ^ exp) % p */
+void _vli_mod_exp(uint64_t *result, uint64_t *base, uint64_t *exp,
+                       const uint64_t *mod, unsigned int ndigits)
+{
+       unsigned int i;
+       int bit;
+       uint64_t n[L_ECC_MAX_DIGITS];
+       uint64_t r[L_ECC_MAX_DIGITS] = { 1 };
+
+       memcpy(n, base, ndigits * 8);
+
+       for (i = 0; i < ndigits; i++) {
+               for (bit = 0; bit < 64; bit++) {
+                       uint64_t tmp[L_ECC_MAX_DIGITS];
+
+                       if (exp[i] & (1ull << bit)) {
+                               _vli_mod_mult_fast(tmp, r, n, mod, ndigits);
+                               memcpy(r, tmp, ndigits * 8);
+                       }
+
+                       _vli_mod_mult_fast(tmp, n, n, mod, ndigits);
+                       memcpy(n, tmp, ndigits * 8);
+               }
+       }
+
+       memcpy(result, r, ndigits * 8);
+}
+
+int _vli_legendre(uint64_t *val, const uint64_t *p, unsigned int ndigits)
+{
+       uint64_t tmp[L_ECC_MAX_DIGITS];
+       uint64_t exp[L_ECC_MAX_DIGITS];
+       uint64_t _1[L_ECC_MAX_DIGITS] = { 1ull };
+       uint64_t _0[L_ECC_MAX_DIGITS] = { 0 };
+
+       /* check that val ^ ((p - 1) / 2) == [1, 0 or -1] */
+
+       _vli_sub(exp, p, _1, ndigits);
+       _vli_rshift1(exp, ndigits);
+       _vli_mod_exp(tmp, val, exp, p, ndigits);
+
+       if (_vli_cmp(tmp, _1, ndigits) == 0)
+               return 1;
+       else if (_vli_cmp(tmp, _0, ndigits) == 0)
+               return 0;
+       else
+               return -1;
+}
+
+static bool vli_is_zero_or_one(const uint64_t *vli, unsigned int ndigits)
+{
+       unsigned int i;
+
+       if (ndigits == 0 || vli[0] > 1)
+               return false;
+
+       for (i = 1; i < ndigits; i++) {
+               if (vli[i])
+                       return false;
+       }
+
+       return true;
+}
+
+LIB_EXPORT struct l_ecc_point *l_ecc_point_new(const struct l_ecc_curve *curve)
+{
+       struct l_ecc_point *p = l_new(struct l_ecc_point, 1);
+
+       p->curve = curve;
+
+       return p;
+}
+
+LIB_EXPORT struct l_ecc_point *l_ecc_point_from_data(
+                                       const struct l_ecc_curve *curve,
+                                       enum l_ecc_point_type type,
+                                       const void *data, size_t len)
+{
+       struct l_ecc_point *p;
+       size_t bytes = curve->ndigits * 8;
+
+       if (!data)
+               return NULL;
+
+       /* In all cases there should be an X coordinate in data */
+       if (len < bytes)
+               return NULL;
+
+       p = l_ecc_point_new(curve);
+
+       _ecc_be2native(p->x, (void *) data, curve->ndigits);
+
+       switch (type) {
+       case L_ECC_POINT_TYPE_COMPLIANT:
+               if (!decode_point(curve, p->x, p))
+                       goto failed;
+
+               break;
+       case L_ECC_POINT_TYPE_COMPRESSED_BIT0:
+               if (!_ecc_compute_y(curve, p->y, p->x))
+                       goto failed;
+
+               if (!(p->y[0] & 1))
+                       _vli_mod_sub(p->y, curve->p, p->y, curve->p,
+                                               curve->ndigits);
+               break;
+       case L_ECC_POINT_TYPE_COMPRESSED_BIT1:
+               if (!_ecc_compute_y(curve, p->y, p->x))
+                       goto failed;
+
+               if (p->y[0] & 1)
+                       _vli_mod_sub(p->y, curve->p, p->y, curve->p,
+                                               curve->ndigits);
+
+               break;
+       case L_ECC_POINT_TYPE_FULL:
+               if (len < bytes * 2)
+                       goto failed;
+
+               _ecc_be2native(p->y, (void *) data + bytes, curve->ndigits);
+
+               if (!ecc_valid_point(p))
+                       goto failed;
+
+               break;
+       }
+
+       return p;
+
+failed:
+       l_free(p);
+       return NULL;
+}
+
+LIB_EXPORT ssize_t l_ecc_point_get_x(const struct l_ecc_point *p, void *x,
+                                       size_t xlen)
+{
+       if (xlen < p->curve->ndigits * 8)
+               return -EMSGSIZE;
+
+       _ecc_native2be(x, (uint64_t *) p->x, p->curve->ndigits);
+
+       return p->curve->ndigits * 8;
+}
+
+LIB_EXPORT ssize_t l_ecc_point_get_data(const struct l_ecc_point *p, void *buf,
+                                       size_t len)
+{
+       if (len < (p->curve->ndigits * 8) * 2)
+               return -EMSGSIZE;
+
+       _ecc_native2be(buf, (uint64_t *) p->x, p->curve->ndigits);
+       _ecc_native2be(buf + (p->curve->ndigits * 8), (uint64_t *) p->y,
+                               p->curve->ndigits);
+
+       return (p->curve->ndigits * 8) * 2;
+}
+
+LIB_EXPORT void l_ecc_point_free(struct l_ecc_point *p)
+{
+       if (unlikely(!p))
+               return;
+
+       explicit_bzero(p->x, p->curve->ndigits * 8);
+       explicit_bzero(p->y, p->curve->ndigits * 8);
+       l_free(p);
+}
+
+struct l_ecc_scalar *_ecc_constant_new(const struct l_ecc_curve *curve,
+                                               const void *buf, size_t len)
+{
+       struct l_ecc_scalar *c;
+
+       if (unlikely(!curve))
+               return NULL;
+
+       if (buf && len != curve->ndigits * 8)
+               return NULL;
+
+       c = l_new(struct l_ecc_scalar, 1);
+
+       c->curve = curve;
+
+       if (buf)
+               memcpy(c->c, buf, len);
+
+       return c;
+}
+
+LIB_EXPORT struct l_ecc_scalar *l_ecc_scalar_new(
+                                       const struct l_ecc_curve *curve,
+                                       const void *buf, size_t len)
+{
+       struct l_ecc_scalar *c;
+
+       c = _ecc_constant_new(curve, NULL, 0);
+       if (!c)
+               return NULL;
+
+       if (!buf)
+               return c;
+
+       _ecc_be2native(c->c, buf, curve->ndigits);
+
+       if (!vli_is_zero_or_one(c->c, curve->ndigits) &&
+                               _vli_cmp(c->c, curve->n, curve->ndigits) < 0)
+               return c;
+
+       l_ecc_scalar_free(c);
+
+       return NULL;
+}
+
+LIB_EXPORT struct l_ecc_scalar *l_ecc_scalar_new_random(
+                                       const struct l_ecc_curve *curve)
+{
+       uint64_t r[L_ECC_MAX_DIGITS];
+
+       l_getrandom(r, curve->ndigits * 8);
+
+       while (_vli_cmp(r, curve->p, curve->ndigits) > 0 ||
+                       _vli_cmp(r, curve->n, curve->ndigits) > 0 ||
+                       vli_is_zero_or_one(r, curve->ndigits))
+               l_getrandom(r, curve->ndigits * 8);
+
+       return _ecc_constant_new(curve, r, curve->ndigits * 8);
+}
+
+LIB_EXPORT ssize_t l_ecc_scalar_get_data(const struct l_ecc_scalar *c,
+                                               void *buf, size_t len)
+{
+       if (len < c->curve->ndigits * 8)
+               return -EMSGSIZE;
+
+       _ecc_native2be(buf, (uint64_t *) c->c, c->curve->ndigits);
+
+       return c->curve->ndigits * 8;
+}
+
+LIB_EXPORT void l_ecc_scalar_free(struct l_ecc_scalar *c)
+{
+       if (unlikely(!c))
+               return;
+
+       explicit_bzero(c->c, c->curve->ndigits * 8);
+       l_free(c);
+}
+
+LIB_EXPORT struct l_ecc_scalar *l_ecc_curve_get_order(
+                                               const struct l_ecc_curve *curve)
+{
+       return _ecc_constant_new(curve, curve->n, curve->ndigits * 8);
+}
+
+LIB_EXPORT bool l_ecc_scalar_add(struct l_ecc_scalar *ret,
+                                       const struct l_ecc_scalar *a,
+                                       const struct l_ecc_scalar *b,
+                                       const struct l_ecc_scalar *mod)
+{
+       if (unlikely(!ret || !a || !b || !mod))
+               return false;
+
+       _vli_mod_add(ret->c, a->c, b->c, mod->c, a->curve->ndigits);
+
+       return true;
+}
+
+LIB_EXPORT bool l_ecc_point_multiply(struct l_ecc_point *ret,
+                                       const struct l_ecc_scalar *scalar,
+                                       const struct l_ecc_point *point)
+{
+       if (unlikely(!ret || !scalar || !point))
+               return false;
+
+       _ecc_point_mult(ret, point, scalar->c, NULL, scalar->curve->p);
+
+       return true;
+}
+
+LIB_EXPORT bool l_ecc_point_add(struct l_ecc_point *ret,
+                                       const struct l_ecc_point *a,
+                                       const struct l_ecc_point *b)
+{
+       if (unlikely(!ret || !a || !b))
+               return false;
+
+       _ecc_point_add(ret, a, b, a->curve->p);
+
+       return true;
+}
+
+LIB_EXPORT bool l_ecc_point_inverse(struct l_ecc_point *p)
+{
+       if (unlikely(!p))
+               return false;
+
+       _vli_mod_sub(p->y, p->curve->p, p->y, p->curve->p, p->curve->ndigits);
+
+       return true;
+}
+
+LIB_EXPORT bool l_ecc_scalar_multiply(struct l_ecc_scalar *ret,
+                                       const struct l_ecc_scalar *a,
+                                       const struct l_ecc_scalar *b)
+{
+       if (unlikely(!ret || !a || !b))
+               return false;
+
+       _vli_mod_mult_fast(ret->c, a->c, b->c, a->curve->p, a->curve->ndigits);
+
+       return true;
+}
+
+LIB_EXPORT int l_ecc_scalar_legendre(struct l_ecc_scalar *value)
+{
+       if (unlikely(!value))
+               return -1;
+
+       return _vli_legendre(value->c, value->curve->p, value->curve->ndigits);
+}
+
+LIB_EXPORT bool l_ecc_scalar_sum_x(struct l_ecc_scalar *ret,
+                                       const struct l_ecc_scalar *x)
+{
+       if (unlikely(!ret || !x))
+               return false;
+
+       ecc_compute_y_sqr(x->curve, ret->c, x->c);
+
+       return true;
+}
+
+LIB_EXPORT struct l_ecc_scalar *l_ecc_curve_get_prime(
+                                               const struct l_ecc_curve *curve)
+{
+       if (unlikely(!curve))
+               return NULL;
+
+       return _ecc_constant_new(curve, curve->p, curve->ndigits * 8);
+}
+
+LIB_EXPORT bool l_ecc_scalars_are_equal(const struct l_ecc_scalar *a,
+                                               const struct l_ecc_scalar *b)
+{
+       if (unlikely(!a || !b))
+               return false;
+
+       return (memcmp(a->c, b->c, a->curve->ndigits * 8) == 0);
+}
+
+LIB_EXPORT bool l_ecc_points_are_equal(const struct l_ecc_point *a,
+                                               const struct l_ecc_point *b)
+{
+       if (unlikely(!a || !b))
+               return false;
+
+       return ((memcmp(a->x, b->x, a->curve->ndigits * 8) == 0) &&
+                       (memcmp(a->y, b->y, a->curve->ndigits * 8) == 0));
+}
diff --git a/ell/ecc.h b/ell/ecc.h
new file mode 100644 (file)
index 0000000..26a5889
--- /dev/null
+++ b/ell/ecc.h
@@ -0,0 +1,103 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_ECC_H
+#define __ELL_ECC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define L_ECC_MAX_DIGITS 6
+#define L_ECC_SCALAR_MAX_BYTES         L_ECC_MAX_DIGITS * 8
+#define L_ECC_POINT_MAX_BYTES          L_ECC_SCALAR_MAX_BYTES * 2
+
+struct l_ecc_curve;
+struct l_ecc_point;
+struct l_ecc_scalar;
+
+enum l_ecc_point_type {
+       L_ECC_POINT_TYPE_COMPLIANT = 0x01,
+       L_ECC_POINT_TYPE_COMPRESSED_BIT0 = 0x02,
+       L_ECC_POINT_TYPE_COMPRESSED_BIT1 = 0x03,
+       L_ECC_POINT_TYPE_FULL = 0x04,
+};
+
+const struct l_ecc_curve *l_ecc_curve_get(const char *name);
+const char *l_ecc_curve_get_name(const struct l_ecc_curve *curve);
+size_t l_ecc_curve_get_scalar_bytes(const struct l_ecc_curve *curve);
+const unsigned int *l_ecc_curve_get_supported_ike_groups(void);
+const unsigned int *l_ecc_curve_get_supported_tls_groups(void);
+const struct l_ecc_curve *l_ecc_curve_get_ike_group(unsigned int group);
+const struct l_ecc_curve *l_ecc_curve_get_tls_group(unsigned int group);
+
+struct l_ecc_point *l_ecc_point_new(const struct l_ecc_curve *curve);
+struct l_ecc_point *l_ecc_point_from_data(const struct l_ecc_curve *curve,
+                                       enum l_ecc_point_type type,
+                                       const void *data, size_t len);
+
+ssize_t l_ecc_point_get_x(const struct l_ecc_point *p, void *x, size_t xlen);
+ssize_t l_ecc_point_get_data(const struct l_ecc_point *p, void *buf, size_t len);
+void l_ecc_point_free(struct l_ecc_point *p);
+
+struct l_ecc_scalar *l_ecc_scalar_new(const struct l_ecc_curve *curve,
+                                               const void *buf, size_t len);
+struct l_ecc_scalar *l_ecc_scalar_new_random(
+                                       const struct l_ecc_curve *curve);
+ssize_t l_ecc_scalar_get_data(const struct l_ecc_scalar *c, void *buf,
+                                       size_t len);
+void l_ecc_scalar_free(struct l_ecc_scalar *c);
+
+/* Constant operations */
+struct l_ecc_scalar *l_ecc_curve_get_order(const struct l_ecc_curve *curve);
+bool l_ecc_scalar_add(struct l_ecc_scalar *ret, const struct l_ecc_scalar *a,
+                               const struct l_ecc_scalar *b,
+                               const struct l_ecc_scalar *mod);
+
+/* Point operations */
+bool l_ecc_point_multiply(struct l_ecc_point *ret,
+                               const struct l_ecc_scalar *scalar,
+                               const struct l_ecc_point *point);
+bool l_ecc_point_add(struct l_ecc_point *ret, const struct l_ecc_point *a,
+                               const struct l_ecc_point *b);
+bool l_ecc_point_inverse(struct l_ecc_point *p);
+
+/* extra operations needed for SAE */
+bool l_ecc_scalar_multiply(struct l_ecc_scalar *ret,
+                               const struct l_ecc_scalar *a,
+                               const struct l_ecc_scalar *b);
+int l_ecc_scalar_legendre(struct l_ecc_scalar *value);
+bool l_ecc_scalar_sum_x(struct l_ecc_scalar *ret, const struct l_ecc_scalar *x);
+
+struct l_ecc_scalar *l_ecc_curve_get_prime(const struct l_ecc_curve *curve);
+
+bool l_ecc_scalars_are_equal(const struct l_ecc_scalar *a,
+                               const struct l_ecc_scalar *b);
+
+bool l_ecc_points_are_equal(const struct l_ecc_point *a,
+                               const struct l_ecc_point *b);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_ECC_H */
diff --git a/ell/ecdh.c b/ell/ecdh.c
new file mode 100644 (file)
index 0000000..a10189f
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+
+#include "private.h"
+#include "ecc-private.h"
+#include "ecc.h"
+#include "ecdh.h"
+#include "random.h"
+
+/*
+ * Some sane maximum for calculating the public key.
+ */
+#define ECDH_MAX_ITERATIONS 20
+
+/*
+ * IETF draft-jivsov-ecc-compact-00 Section 4.2.1
+ *
+ * The following algorithm calculates a key pair {k, Q=k*G=(x,y)}, where k is
+ * the private key and Q=(x,y) is the public key.
+ *
+ * Black box generation:
+ *     1. Generate a key pair {k, Q=k*G=(x,y)} with KG
+ *     2. if( y != min(y,p-y) ) goto step 1
+ *     3. output {k, Q=(x,y)} as a key pair
+ */
+LIB_EXPORT bool l_ecdh_generate_key_pair(const struct l_ecc_curve *curve,
+                                       struct l_ecc_scalar **out_private,
+                                       struct l_ecc_point **out_public)
+{
+       bool compliant = false;
+       int iter = 0;
+       uint64_t p2[L_ECC_MAX_DIGITS];
+
+       _ecc_calculate_p2(curve, p2);
+
+       *out_public = l_ecc_point_new(curve);
+
+       while (!compliant && iter++ < ECDH_MAX_ITERATIONS) {
+               *out_private = l_ecc_scalar_new_random(curve);
+
+               _ecc_point_mult(*out_public, &curve->g, (*out_private)->c,
+                                       NULL, curve->p);
+
+               /* ensure public key is compliant */
+               if (_vli_cmp((*out_public)->y, p2, curve->ndigits) >= 0) {
+                       compliant = true;
+                       break;
+               }
+
+               l_ecc_scalar_free(*out_private);
+       }
+
+       if (!compliant) {
+               l_ecc_point_free(*out_public);
+               return false;
+       }
+
+       return true;
+}
+
+LIB_EXPORT bool l_ecdh_generate_shared_secret(
+                               const struct l_ecc_scalar *private_key,
+                               const struct l_ecc_point *other_public,
+                               struct l_ecc_scalar **secret)
+{
+       const struct l_ecc_curve *curve = private_key->curve;
+       struct l_ecc_scalar *z;
+       struct l_ecc_point *product;
+
+       z = l_ecc_scalar_new_random(curve);
+
+       product = l_ecc_point_new(curve);
+
+       _ecc_point_mult(product, other_public, private_key->c, z->c, curve->p);
+
+       *secret = _ecc_constant_new(curve, product->x, curve->ndigits * 8);
+
+       l_ecc_point_free(product);
+       l_ecc_scalar_free(z);
+
+       return true;
+}
diff --git a/ell/ecdh.h b/ell/ecdh.h
new file mode 100644 (file)
index 0000000..34cbc6b
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_ECDH_H
+#define __ELL_ECDH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_ecc_curve;
+struct l_ecc_point;
+struct l_ecc_scalar;
+
+/*
+ * Generate a private/public key pair. private/public are out parameters and
+ * must be freed.
+ */
+bool l_ecdh_generate_key_pair(const struct l_ecc_curve *curve,
+                                       struct l_ecc_scalar **out_private,
+                                       struct l_ecc_point **out_public);
+/*
+ * Generate a shared secret from a private/public key. secret is an out
+ * parameters and must be freed.
+ */
+bool l_ecdh_generate_shared_secret(const struct l_ecc_scalar *private_key,
+                               const struct l_ecc_point *other_public,
+                               struct l_ecc_scalar **secret);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_ECDH_H */
diff --git a/ell/ell.h b/ell/ell.h
new file mode 100644 (file)
index 0000000..3bb9185
--- /dev/null
+++ b/ell/ell.h
@@ -0,0 +1,64 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <ell/util.h>
+#include <ell/test.h>
+#include <ell/strv.h>
+#include <ell/utf8.h>
+#include <ell/queue.h>
+#include <ell/hashmap.h>
+#include <ell/string.h>
+#include <ell/main.h>
+#include <ell/idle.h>
+#include <ell/signal.h>
+#include <ell/timeout.h>
+#include <ell/io.h>
+#include <ell/ringbuf.h>
+#include <ell/log.h>
+#include <ell/plugin.h>
+#include <ell/checksum.h>
+#include <ell/settings.h>
+#include <ell/hwdb.h>
+#include <ell/cipher.h>
+#include <ell/random.h>
+#include <ell/uintset.h>
+#include <ell/base64.h>
+#include <ell/pem.h>
+#include <ell/tls.h>
+#include <ell/uuid.h>
+#include <ell/key.h>
+#include <ell/pkcs5.h>
+#include <ell/file.h>
+#include <ell/dir.h>
+#include <ell/net.h>
+#include <ell/netlink.h>
+#include <ell/genl.h>
+#include <ell/dbus.h>
+#include <ell/dbus-service.h>
+#include <ell/dbus-client.h>
+#include <ell/dhcp.h>
+#include <ell/cert.h>
+#include <ell/ecc.h>
+#include <ell/ecdh.h>
+#include <ell/time.h>
+#include <ell/gpio.h>
+#include <ell/path.h>
diff --git a/ell/ell.pc.in b/ell/ell.pc.in
new file mode 100644 (file)
index 0000000..4fc933b
--- /dev/null
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ELL
+Description: Embedded Linux library
+Version: @VERSION@
+Libs: -L${libdir} -lell -ldl
+Cflags: -I${includedir}
diff --git a/ell/ell.sym b/ell/ell.sym
new file mode 100644 (file)
index 0000000..46df1bd
--- /dev/null
@@ -0,0 +1,546 @@
+ELL_0.10 {
+global:
+       /* util */
+       l_malloc;
+       l_realloc;
+       l_memdup;
+       l_free;
+       l_strdup;
+       l_strndup;
+       l_strdup_printf;
+       l_strdup_vprintf;
+       l_strlcpy;
+       l_str_has_prefix;
+       l_str_has_suffix;
+       l_util_hexstring;
+       l_util_hexstring_upper;
+       l_util_from_hexstring;
+       l_util_hexdump;
+       l_util_hexdump_two;
+       l_util_hexdumpv;
+       l_util_debug;
+       l_util_get_debugfs_path;
+       /* test */
+       l_test_init;
+       l_test_run;
+       l_test_add;
+       /* strv */
+       l_strfreev;
+       l_strsplit;
+       l_strsplit_set;
+       l_strjoinv;
+       l_strv_new;
+       l_strv_free;
+       l_strv_length;
+       l_strv_contains;
+       l_strv_append;
+       l_strv_append_printf;
+       l_strv_append_vprintf;
+       l_strv_copy;
+       /* utf8 */
+       l_ascii_table;
+       l_utf8_get_codepoint;
+       l_utf8_validate;
+       l_utf8_strlen;
+       l_utf8_from_utf16;
+       l_utf8_to_utf16;
+       l_utf8_from_wchar;
+       l_utf8_from_ucs2be;
+       l_utf8_to_ucs2be;
+       /* queue */
+       l_queue_new;
+       l_queue_destroy;
+       l_queue_clear;
+       l_queue_push_tail;
+       l_queue_push_head;
+       l_queue_pop_head;
+       l_queue_peek_head;
+       l_queue_peek_tail;
+       l_queue_insert;
+       l_queue_find;
+       l_queue_remove;
+       l_queue_reverse;
+       l_queue_foreach;
+       l_queue_foreach_remove;
+       l_queue_remove_if;
+       l_queue_length;
+       l_queue_isempty;
+       l_queue_get_entries;
+       /* hashmap */
+       l_hashmap_new;
+       l_str_hash;
+       l_hashmap_string_new;
+       l_hashmap_set_hash_function;
+       l_hashmap_set_compare_function;
+       l_hashmap_set_key_copy_function;
+       l_hashmap_set_key_free_function;
+       l_hashmap_destroy;
+       l_hashmap_insert;
+       l_hashmap_remove;
+       l_hashmap_lookup;
+       l_hashmap_foreach;
+       l_hashmap_foreach_remove;
+       l_hashmap_size;
+       l_hashmap_isempty;
+       /* string */
+       l_string_new;
+       l_string_free;
+       l_string_unwrap;
+       l_string_append;
+       l_string_append_c;
+       l_string_append_fixed;
+       l_string_append_vprintf;
+       l_string_append_printf;
+       l_string_length;
+       l_string_truncate;
+       l_parse_args;
+       /* main */
+       l_main_init;
+       l_main_prepare;
+       l_main_iterate;
+       l_main_run;
+       l_main_exit;
+       l_main_quit;
+       l_main_run_with_signal;
+       l_main_get_epoll_fd;
+       /* base64 */
+       l_base64_decode;
+       l_base64_encode;
+       /* checksum */
+       l_checksum_new;
+       l_checksum_new_cmac_aes;
+       l_checksum_new_hmac;
+       l_checksum_clone;
+       l_checksum_free;
+       l_checksum_reset;
+       l_checksum_update;
+       l_checksum_updatev;
+       l_checksum_get_digest;
+       l_checksum_get_string;
+       l_checksum_is_supported;
+       l_checksum_cmac_aes_supported;
+       l_checksum_digest_length;
+       /* cipher */
+       l_cipher_new;
+       l_aead_cipher_new;
+       l_cipher_free;
+       l_aead_cipher_free;
+       l_cipher_encrypt;
+       l_cipher_encryptv;
+       l_cipher_decrypt;
+       l_cipher_decryptv;
+       l_cipher_set_iv;
+       l_aead_cipher_encrypt;
+       l_aead_cipher_decrypt;
+       l_cipher_is_supported;
+       l_aead_cipher_is_supported;
+       /* dbus */
+       l_dbus_proxy_get_path;
+       l_dbus_proxy_get_interface;
+       l_dbus_proxy_get_property;
+       l_dbus_proxy_set_property;
+       l_dbus_proxy_method_call;
+       l_dbus_client_new;
+       l_dbus_client_destroy;
+       l_dbus_client_set_connect_handler;
+       l_dbus_client_set_disconnect_handler;
+       l_dbus_client_set_ready_handler;
+       l_dbus_client_set_proxy_handlers;
+       l_dbus_message_set_no_reply;
+       l_dbus_message_get_no_reply;
+       l_dbus_message_set_no_autostart;
+       l_dbus_message_get_no_autostart;
+       l_dbus_message_new_method_call;
+       l_dbus_message_new_signal;
+       l_dbus_message_new_method_return;
+       l_dbus_message_new_error_valist;
+       l_dbus_message_new_error;
+       l_dbus_message_ref;
+       l_dbus_message_unref;
+       l_dbus_message_get_error;
+       l_dbus_message_is_error;
+       l_dbus_message_get_arguments_valist;
+       l_dbus_message_get_arguments;
+       l_dbus_message_set_arguments;
+       l_dbus_message_set_arguments_valist;
+       l_dbus_message_get_path;
+       l_dbus_message_get_interface;
+       l_dbus_message_get_member;
+       l_dbus_message_get_destination;
+       l_dbus_message_get_sender;
+       l_dbus_message_get_signature;
+       l_dbus_message_iter_next_entry;
+       l_dbus_message_iter_get_variant;
+       l_dbus_message_iter_get_fixed_array;
+       l_dbus_message_builder_new;
+       l_dbus_message_builder_destroy;
+       l_dbus_message_builder_append_basic;
+       l_dbus_message_builder_enter_container;
+       l_dbus_message_builder_leave_container;
+       l_dbus_message_builder_enter_struct;
+       l_dbus_message_builder_leave_struct;
+       l_dbus_message_builder_enter_array;
+       l_dbus_message_builder_leave_array;
+       l_dbus_message_builder_enter_dict;
+       l_dbus_message_builder_leave_dict;
+       l_dbus_message_builder_enter_variant;
+       l_dbus_message_builder_leave_variant;
+       l_dbus_message_builder_append_from_iter;
+       l_dbus_message_builder_append_from_valist;
+       l_dbus_message_builder_finalize;
+       l_dbus_interface_method;
+       l_dbus_interface_signal;
+       l_dbus_interface_property;
+       l_dbus_property_changed;
+       l_dbus_new;
+       l_dbus_new_default;
+       l_dbus_destroy;
+       l_dbus_set_ready_handler;
+       l_dbus_set_disconnect_handler;
+       l_dbus_set_debug;
+       l_dbus_send_with_reply;
+       l_dbus_send;
+       l_dbus_cancel;
+       l_dbus_register;
+       l_dbus_unregister;
+       l_dbus_method_call;
+       l_dbus_register_interface;
+       l_dbus_unregister_interface;
+       l_dbus_register_object;
+       l_dbus_unregister_object;
+       l_dbus_object_add_interface;
+       l_dbus_object_remove_interface;
+       l_dbus_object_get_data;
+       l_dbus_object_manager_enable;
+       l_dbus_add_disconnect_watch;
+       l_dbus_add_service_watch;
+       l_dbus_remove_watch;
+       l_dbus_add_signal_watch;
+       l_dbus_remove_signal_watch;
+       l_dbus_name_acquire;
+       /* dhcp */
+       l_dhcp_lease_get_address;
+       l_dhcp_lease_get_gateway;
+       l_dhcp_lease_get_netmask;
+       l_dhcp_lease_get_broadcast;
+       l_dhcp_lease_get_server_id;
+       l_dhcp_lease_get_dns;
+       l_dhcp_lease_get_domain_name;
+       l_dhcp_lease_get_t1;
+       l_dhcp_lease_get_t2;
+       l_dhcp_lease_get_lifetime;
+       l_dhcp_client_new;
+       l_dhcp_client_destroy;
+       l_dhcp_client_add_request_option;
+       l_dhcp_client_set_address;
+       l_dhcp_client_set_interface_name;
+       l_dhcp_client_set_hostname;
+       l_dhcp_client_get_lease;
+       l_dhcp_client_start;
+       l_dhcp_client_stop;
+       l_dhcp_client_set_event_handler;
+       l_dhcp_client_set_debug;
+       /* dir */
+       l_dir_watch_new;
+       l_dir_watch_destroy;
+       /* file */
+       l_file_get_contents;
+       /* genl */
+       l_genl_new;
+       l_genl_ref;
+       l_genl_unref;
+       l_genl_set_debug;
+       l_genl_discover_families;
+       l_genl_add_unicast_watch;
+       l_genl_remove_unicast_watch;
+       l_genl_add_family_watch;
+       l_genl_remove_family_watch;
+       l_genl_request_family;
+       l_genl_msg_new;
+       l_genl_msg_new_sized;
+       l_genl_msg_ref;
+       l_genl_msg_unref;
+       l_genl_msg_get_command;
+       l_genl_msg_get_version;
+       l_genl_msg_get_error;
+       l_genl_msg_append_attr;
+       l_genl_msg_append_attrv;
+       l_genl_msg_enter_nested;
+       l_genl_msg_leave_nested;
+       l_genl_attr_init;
+       l_genl_attr_next;
+       l_genl_attr_recurse;
+       l_genl_family_info_can_send;
+       l_genl_family_info_can_dump;
+       l_genl_family_info_has_group;
+       l_genl_family_info_get_groups;
+       l_genl_family_info_get_id;
+       l_genl_family_info_get_name;
+       l_genl_family_info_get_version;
+       l_genl_family_new;
+       l_genl_family_free;
+       l_genl_family_get_info;
+       l_genl_family_get_genl;
+       l_genl_family_send;
+       l_genl_family_dump;
+       l_genl_family_cancel;
+       l_genl_family_register;
+       l_genl_family_unregister;
+       /* hwdb */
+       l_hwdb_new;
+       l_hwdb_new_default;
+       l_hwdb_ref;
+       l_hwdb_unref;
+       l_hwdb_lookup;
+       l_hwdb_lookup_valist;
+       l_hwdb_lookup_free;
+       l_hwdb_foreach;
+       /* idle */
+       l_idle_create;
+       l_idle_oneshot;
+       l_idle_remove;
+       /* io */
+       l_io_new;
+       l_io_destroy;
+       l_io_get_fd;
+       l_io_set_close_on_destroy;
+       l_io_set_read_handler;
+       l_io_set_write_handler;
+       l_io_set_disconnect_handler;
+       l_io_set_debug;
+       /* key */
+       l_key_new;
+       l_key_free;
+       l_key_free_norevoke;
+       l_key_update;
+       l_key_extract;
+       l_key_get_payload_size;
+       l_key_get_info;
+       l_key_generate_dh_private;
+       l_key_compute_dh_public;
+       l_key_compute_dh_secret;
+       l_key_validate_dh_payload;
+       l_key_encrypt;
+       l_key_decrypt;
+       l_key_sign;
+       l_key_verify;
+       l_keyring_new;
+       l_keyring_restrict;
+       l_keyring_free;
+       l_keyring_free_norevoke;
+       l_keyring_link;
+       l_keyring_unlink;
+       l_keyring_link_nested;
+       l_keyring_unlink_nested;
+       l_key_is_supported;
+       /* log */
+       l_log_set_ident;
+       l_log_set_handler;
+       l_log_set_null;
+       l_log_set_stderr;
+       l_log_set_syslog;
+       l_log_set_journal;
+       l_log_with_location;
+       l_debug_add_section;
+       l_debug_enable_full;
+       l_debug_disable;
+       /* net */
+       l_net_get_mac_address;
+       l_net_get_name;
+       l_net_hostname_is_root;
+       l_net_hostname_is_localhost;
+       /* netlink */
+       l_netlink_new;
+       l_netlink_destroy;
+       l_netlink_send;
+       l_netlink_cancel;
+       l_netlink_register;
+       l_netlink_unregister;
+       l_netlink_set_debug;
+       /* path */
+       l_path_find;
+       l_path_get_mtime;
+       l_path_next;
+       l_path_touch;
+       /* pem */
+       l_pem_load_buffer;
+       l_pem_load_certificate_chain;
+       l_pem_load_certificate_chain_from_data;
+       l_pem_load_certificate_list;
+       l_pem_load_certificate_list_from_data;
+       l_pem_load_file;
+       l_pem_load_private_key;
+       l_pem_load_private_key_from_data;
+       /* pkcs5 */
+       l_pkcs5_pbkdf1;
+       l_pkcs5_pbkdf2;
+       /* plugin */
+       l_plugin_add;
+       l_plugin_load;
+       l_plugin_unload;
+       /* getrandom */
+       l_getrandom;
+       l_getrandom_is_supported;
+       l_getrandom_uint32;
+       /* ringbuf */
+       l_ringbuf_new;
+       l_ringbuf_free;
+       l_ringbuf_set_input_tracing;
+       l_ringbuf_capacity;
+       l_ringbuf_len;
+       l_ringbuf_drain;
+       l_ringbuf_peek;
+       l_ringbuf_write;
+       l_ringbuf_avail;
+       l_ringbuf_printf;
+       l_ringbuf_vprintf;
+       l_ringbuf_read;
+       l_ringbuf_append;
+       /* settings */
+       l_settings_new;
+       l_settings_free;
+       l_settings_load_from_data;
+       l_settings_to_data;
+       l_settings_load_from_file;
+       l_settings_set_debug;
+       l_settings_get_groups;
+       l_settings_has_group;
+       l_settings_get_keys;
+       l_settings_has_key;
+       l_settings_get_value;
+       l_settings_set_value;
+       l_settings_get_bool;
+       l_settings_set_bool;
+       l_settings_get_int;
+       l_settings_set_int;
+       l_settings_get_uint;
+       l_settings_set_uint;
+       l_settings_get_int64;
+       l_settings_set_int64;
+       l_settings_get_uint64;
+       l_settings_set_uint64;
+       l_settings_get_string;
+       l_settings_set_string;
+       l_settings_get_string_list;
+       l_settings_set_string_list;
+       l_settings_get_double;
+       l_settings_set_double;
+       l_settings_get_float;
+       l_settings_set_float;
+       l_settings_remove_group;
+       l_settings_remove_key;
+       l_settings_has_embedded_group;
+       l_settings_get_embedded_groups;
+       l_settings_get_embedded_value;
+       /* signal */
+       l_signal_create;
+       l_signal_remove;
+       /* timeout */
+       l_timeout_create;
+       l_timeout_create_ms;
+       l_timeout_modify;
+       l_timeout_modify_ms;
+       l_timeout_remove;
+       l_timeout_set_callback;
+       /* tls */
+       l_tls_handle_rx;
+       l_tls_prf_get_bytes;
+       l_tls_new;
+       l_tls_free;
+       l_tls_write;
+       l_tls_start;
+       l_tls_close;
+       l_tls_set_cacert;
+       l_tls_set_auth_data;
+       l_tls_set_version_range;
+       l_tls_set_domain_mask;
+       l_tls_alert_to_str;
+       l_tls_set_debug;
+       /* uintset */
+       l_uintset_new_from_range;
+       l_uintset_new;
+       l_uintset_free;
+       l_uintset_take;
+       l_uintset_put;
+       l_uintset_contains;
+       l_uintset_get_min;
+       l_uintset_get_max;
+       l_uintset_find_unused_min;
+       l_uintset_find_unused;
+       l_uintset_find_max;
+       l_uintset_find_min;
+       l_uintset_foreach;
+       l_uintset_intersect;
+       l_uintset_isempty;
+       /* uuid */
+       l_uuid_v3;
+       l_uuid_v4;
+       l_uuid_v5;
+       l_uuid_is_valid;
+       l_uuid_get_version;
+       l_uuid_to_string;
+       l_uuid_from_string;
+       /* cert */
+       l_cert_new_from_der;
+       l_cert_free;
+       l_cert_get_der_data;
+       l_cert_get_dn;
+       l_cert_get_pubkey_type;
+       l_cert_get_pubkey;
+       l_certchain_free;
+       l_certchain_get_leaf;
+       l_certchain_walk_from_leaf;
+       l_certchain_walk_from_ca;
+       l_certchain_verify;
+       /* ecc */
+       l_ecc_curve_get;
+       l_ecc_curve_get_name;
+       l_ecc_curve_get_scalar_bytes;
+       l_ecc_curve_get_supported_ike_groups;
+       l_ecc_curve_get_supported_tls_groups;
+       l_ecc_curve_get_ike_group;
+       l_ecc_curve_get_tls_group;
+       l_ecc_curve_get_order;
+       l_ecc_curve_get_prime;
+       l_ecc_point_add;
+       l_ecc_point_free;
+       l_ecc_point_from_data;
+       l_ecc_point_get_x;
+       l_ecc_point_get_data;
+       l_ecc_point_inverse;
+       l_ecc_point_multiply;
+       l_ecc_point_new;
+       l_ecc_points_are_equal;
+       l_ecc_scalar_add;
+       l_ecc_scalar_free;
+       l_ecc_scalar_get_data;
+       l_ecc_scalar_legendre;
+       l_ecc_scalar_multiply;
+       l_ecc_scalar_new;
+       l_ecc_scalar_new_random;
+       l_ecc_scalar_sum_x;
+       l_ecc_scalars_are_equal;
+       /* ecdh */
+       l_ecdh_generate_key_pair;
+       l_ecdh_generate_shared_secret;
+       /* time */
+       l_time_now;
+       /* gpio */
+       l_gpio_chips_with_line_label;
+       l_gpio_chip_new;
+       l_gpio_chip_free;
+       l_gpio_chip_find_line_offset;
+       l_gpio_chip_get_label;
+       l_gpio_chip_get_name;
+       l_gpio_chip_get_num_lines;
+       l_gpio_chip_get_line_label;
+       l_gpio_chip_get_line_consumer;
+       l_gpio_writer_new;
+       l_gpio_writer_free;
+       l_gpio_writer_set;
+       l_gpio_reader_new;
+       l_gpio_reader_free;
+       l_gpio_reader_get;
+local:
+       *;
+};
diff --git a/ell/file.c b/ell/file.c
new file mode 100644 (file)
index 0000000..2d04452
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "file.h"
+#include "private.h"
+
+/**
+ * l_file_get_contents:
+ * @filename: File to load
+ * @out_len: Set to the length of the loaded file
+ *
+ * Attempts to load the contents of a file via sequential read system calls.
+ * This can be useful for files that are not mmapable, e.g. sysfs entries.
+ *
+ * Returns: A newly allocated memory region with the file contents
+ **/
+LIB_EXPORT void *l_file_get_contents(const char *filename, size_t *out_len)
+{
+       int fd;
+       struct stat st;
+       uint8_t *contents;
+       size_t bytes_read = 0;
+       ssize_t nread;
+
+       fd = open(filename, O_RDONLY);
+       if (fd < 0)
+               return NULL;
+
+       if (fstat(fd, &st) < 0) {
+               close(fd);
+               return NULL;
+       }
+
+       contents = l_malloc(st.st_size);
+
+       do {
+               nread = read(fd, contents + bytes_read, 4096);
+
+               if (nread < 0) {
+                       if (errno == EINTR)
+                               continue;
+
+                       goto error;
+               }
+
+               bytes_read += nread;
+       } while (nread != 0);
+
+       if (out_len)
+               *out_len = bytes_read;
+
+       close(fd);
+       return contents;
+
+error:
+       l_free(contents);
+       close(fd);
+       return NULL;
+}
diff --git a/ell/file.h b/ell/file.h
new file mode 100644 (file)
index 0000000..4ae37dd
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_FILE_H
+#define __ELL_FILE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *l_file_get_contents(const char *filename, size_t *out_len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_FILE_H */
diff --git a/ell/genl-private.h b/ell/genl-private.h
new file mode 100644 (file)
index 0000000..3c3e525
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+struct l_genl_msg *_genl_msg_create(const struct nlmsghdr *nlmsg);
+const void *_genl_msg_as_bytes(struct l_genl_msg *msg, uint16_t type,
+                                       uint16_t flags, uint32_t seq,
+                                       uint32_t pid,
+                                       size_t *out_size);
diff --git a/ell/genl.c b/ell/genl.c
new file mode 100644 (file)
index 0000000..431ed05
--- /dev/null
@@ -0,0 +1,2062 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <linux/genetlink.h>
+
+#include "util.h"
+#include "queue.h"
+#include "io.h"
+#include "netlink-private.h"
+#include "genl.h"
+#include "genl-private.h"
+#include "private.h"
+
+#define MAX_NESTING_LEVEL 4
+#define GENL_DEBUG(fmt, args...)       \
+       l_util_debug(genl->debug_callback, genl->debug_data, "%s:%i " fmt, \
+                       __func__, __LINE__, ## args)
+
+struct nest_info {
+       uint16_t type;
+       uint16_t offset;
+};
+
+struct unicast_watch {
+       uint32_t id;
+       char name[GENL_NAMSIZ];
+       l_genl_msg_func_t handler;
+       void *user_data;
+       l_genl_destroy_func_t destroy;
+};
+
+struct family_watch {
+       uint32_t id;
+       char *name;
+       l_genl_discover_func_t appeared_func;
+       l_genl_vanished_func_t vanished_func;
+       l_genl_destroy_func_t destroy;
+       void *user_data;
+};
+
+struct genl_discovery {
+       l_genl_discover_func_t cb;
+       l_genl_destroy_func_t destroy;
+       void *user_data;
+       uint32_t cmd_id;
+};
+
+struct l_genl {
+       int ref_count;
+       int fd;
+       uint32_t pid;
+       uint32_t next_seq;
+       struct l_io *io;
+       struct l_queue *request_queue;
+       struct l_queue *pending_list;
+       struct l_queue *notify_list;
+       unsigned int next_request_id;
+       unsigned int next_notify_id;
+       struct genl_discovery *discovery;
+       uint32_t next_watch_id;
+       struct l_queue *unicast_watches;
+       struct l_queue *family_watches;
+       struct l_queue *family_infos;
+       struct l_genl_family *nlctrl;
+       uint32_t next_handle_id;
+       l_genl_debug_func_t debug_callback;
+       l_genl_destroy_func_t debug_destroy;
+       void *debug_data;
+
+       bool in_family_watch_notify : 1;
+       bool in_unicast_watch_notify : 1;
+       bool in_mcast_notify : 1;
+       bool writer_active : 1;
+};
+
+struct l_genl_msg {
+       int ref_count;
+       int error;
+       uint8_t cmd;
+       uint8_t version;
+       void *data;
+       uint32_t size;
+       uint32_t len;
+       struct nest_info nests[MAX_NESTING_LEVEL];
+       uint8_t nesting_level;
+};
+
+struct genl_request {
+       unsigned int id;
+       uint32_t handle_id;
+       uint16_t type;
+       uint16_t flags;
+       uint32_t seq;
+       struct l_genl_msg *msg;
+       l_genl_msg_func_t callback;
+       l_genl_destroy_func_t destroy;
+       void *user_data;
+};
+
+struct mcast_notify {
+       unsigned int id;
+       uint32_t handle_id;
+       uint16_t type;
+       uint32_t group;
+       l_genl_msg_func_t callback;
+       l_genl_destroy_func_t destroy;
+       void *user_data;
+};
+
+struct genl_op {
+       uint32_t id;
+       uint32_t flags;
+};
+
+struct genl_mcast {
+       char name[GENL_NAMSIZ];
+       uint32_t id;
+       unsigned int users;
+};
+
+struct l_genl_family_info {
+       char name[GENL_NAMSIZ];
+       uint16_t id;
+       uint32_t version;
+       uint32_t hdrsize;
+       uint32_t maxattr;
+       struct l_queue *op_list;
+       struct l_queue *mcast_list;
+};
+
+struct l_genl_family {
+       uint16_t id;
+       uint32_t handle_id;
+       struct l_genl *genl;
+};
+
+static inline uint32_t get_next_id(uint32_t *id)
+{
+       *id += 1;
+       if (!*id)
+               *id = 1;
+
+       return *id;
+}
+
+static bool family_info_match(const void *a, const void *b)
+{
+       const struct l_genl_family_info *ia = a;
+       uint16_t id = L_PTR_TO_UINT(b);
+
+       return ia->id == id;
+}
+
+static struct l_genl_family_info *family_info_new(const char *name)
+{
+       struct l_genl_family_info *info = l_new(struct l_genl_family_info, 1);
+
+       l_strlcpy(info->name, name, GENL_NAMSIZ);
+       info->op_list = l_queue_new();
+       info->mcast_list = l_queue_new();
+       return info;
+}
+
+static void family_info_free(void *user_data)
+{
+       struct l_genl_family_info *info = user_data;
+
+       l_queue_destroy(info->op_list, l_free);
+       info->op_list = NULL;
+       l_queue_destroy(info->mcast_list, l_free);
+       info->mcast_list = NULL;
+       l_free(info);
+}
+
+static void family_info_add_op(struct l_genl_family_info *info,
+                               uint32_t id, uint32_t flags)
+{
+       struct genl_op *op;
+
+       op = l_new(struct genl_op, 1);
+
+       op->id = id;
+       op->flags = flags;
+
+       l_queue_push_tail(info->op_list, op);
+}
+
+static bool match_mcast_name(const void *a, const void *b)
+{
+       const struct genl_mcast *mcast = a;
+       const char *name = b;
+
+       return !strncmp(mcast->name, name, GENL_NAMSIZ);
+}
+
+static bool match_mcast_id(const void *a, const void *b)
+{
+       const struct genl_mcast *mcast = a;
+       uint32_t id = L_PTR_TO_UINT(b);
+
+       return mcast->id == id;
+}
+
+static void family_info_add_mcast(struct l_genl_family_info *info,
+                                       const char *name, uint32_t id)
+{
+       struct genl_mcast *mcast;
+
+       mcast = l_queue_find(info->mcast_list, match_mcast_name, name);
+       if (mcast)
+               return;
+
+       mcast = l_new(struct genl_mcast, 1);
+       l_strlcpy(mcast->name, name, GENL_NAMSIZ);
+       mcast->id = id;
+       mcast->users = 0;
+
+       l_queue_push_tail(info->mcast_list, mcast);
+}
+
+static void family_ops(struct l_genl_family_info *info,
+                                               struct l_genl_attr *attr)
+{
+       uint16_t type, len;
+       const void *data;
+
+       while (l_genl_attr_next(attr, &type, &len, &data)) {
+               struct l_genl_attr attr_op;
+               uint32_t id = 0, flags = 0;
+
+               l_genl_attr_recurse(attr, &attr_op);
+
+               while (l_genl_attr_next(&attr_op, &type, &len, &data)) {
+                       switch (type) {
+                       case CTRL_ATTR_OP_ID:
+                               id = *((uint32_t *) data);
+                               break;
+                       case CTRL_ATTR_OP_FLAGS:
+                               flags = *((uint32_t *) data);
+                               break;
+                       }
+               }
+
+               if (id > 0)
+                       family_info_add_op(info, id, flags);
+       }
+}
+
+static void family_mcast_groups(struct l_genl_family_info *info,
+                                               struct l_genl_attr *attr)
+{
+       uint16_t type, len;
+       const void *data;
+
+       while (l_genl_attr_next(attr, &type, &len, &data)) {
+               struct l_genl_attr attr_grp;
+               const char *name = NULL;
+               uint32_t id = 0;
+
+               l_genl_attr_recurse(attr, &attr_grp);
+
+               while (l_genl_attr_next(&attr_grp, &type, &len, &data)) {
+                       switch (type) {
+                       case CTRL_ATTR_MCAST_GRP_NAME:
+                               name = data;
+                               break;
+                       case CTRL_ATTR_MCAST_GRP_ID:
+                               id = *((uint32_t *) data);
+                               break;
+                       }
+               }
+
+               if (name && id > 0)
+                       family_info_add_mcast(info, name, id);
+       }
+}
+
+static int parse_cmd_newfamily(struct l_genl_family_info *info,
+                                       struct l_genl_msg *msg)
+{
+       struct l_genl_attr attr, nested;
+       uint16_t type, len;
+       const void *data;
+       int error;
+
+       error = l_genl_msg_get_error(msg);
+       if (error < 0)
+               return error;
+
+       if (!l_genl_attr_init(&attr, msg))
+               return -EINVAL;
+
+       while (l_genl_attr_next(&attr, &type, &len, &data)) {
+               switch (type) {
+               case CTRL_ATTR_FAMILY_ID:
+                       info->id = *((uint16_t *) data);
+                       break;
+               case CTRL_ATTR_FAMILY_NAME:
+                       l_strlcpy(info->name, data, GENL_NAMSIZ);
+                       break;
+               case CTRL_ATTR_VERSION:
+                       info->version = l_get_u32(data);
+                       break;
+               case CTRL_ATTR_HDRSIZE:
+                       info->hdrsize = l_get_u32(data);
+                       break;
+               case CTRL_ATTR_MAXATTR:
+                       info->maxattr = l_get_u32(data);
+                       break;
+               case CTRL_ATTR_OPS:
+                       if (l_genl_attr_recurse(&attr, &nested))
+                               family_ops(info, &nested);
+                       break;
+               case CTRL_ATTR_MCAST_GROUPS:
+                       if (l_genl_attr_recurse(&attr, &nested))
+                               family_mcast_groups(info, &nested);
+                       break;
+               }
+       }
+
+       return 0;
+}
+
+LIB_EXPORT bool l_genl_family_info_has_group(
+                               const struct l_genl_family_info *info,
+                               const char *group)
+{
+       struct genl_mcast *mcast;
+
+       if (unlikely(!info))
+               return false;
+
+       mcast = l_queue_find(info->mcast_list, match_mcast_name,
+                                                       (char *) group);
+       if (!mcast)
+               return false;
+
+       return true;
+}
+
+static bool match_op_id(const void *a, const void *b)
+{
+       const struct genl_op *op = a;
+       uint32_t id = L_PTR_TO_UINT(b);
+
+       return op->id == id;
+}
+
+LIB_EXPORT bool l_genl_family_info_can_send(
+                                       const struct l_genl_family_info *info,
+                                       uint8_t cmd)
+{
+       struct genl_op *op;
+
+       if (unlikely(!info))
+               return false;
+
+       op = l_queue_find(info->op_list, match_op_id, L_UINT_TO_PTR(cmd));
+       if (!op)
+               return false;
+
+       if (op->flags & GENL_CMD_CAP_DO)
+               return true;
+
+       return false;
+}
+
+LIB_EXPORT bool l_genl_family_info_can_dump(
+                                       const struct l_genl_family_info *info,
+                                       uint8_t cmd)
+{
+       struct genl_op *op;
+
+       if (!info)
+               return false;
+
+       op = l_queue_find(info->op_list, match_op_id, L_UINT_TO_PTR(cmd));
+       if (!op)
+               return false;
+
+       if (op->flags & GENL_CMD_CAP_DUMP)
+               return true;
+
+       return false;
+}
+
+LIB_EXPORT char **l_genl_family_info_get_groups(
+                                       const struct l_genl_family_info *info)
+{
+       char **groups;
+       size_t n_groups;
+       const struct l_queue_entry *entry;
+       int i;
+
+       if (unlikely(!info))
+               return NULL;
+
+       n_groups = l_queue_length(info->mcast_list);
+       groups = l_new(char *, n_groups + 1);
+
+       for (entry = l_queue_get_entries(info->mcast_list), i = 0;
+                                               entry; entry = entry->next) {
+               struct genl_mcast *mcast = entry->data;
+
+               groups[i++] = l_strdup(mcast->name);
+       }
+
+       return groups;
+}
+
+LIB_EXPORT uint32_t l_genl_family_info_get_id(
+                                       const struct l_genl_family_info *info)
+{
+       if (unlikely(!info))
+               return 0;
+
+       return info->id;
+}
+
+LIB_EXPORT const char *l_genl_family_info_get_name(
+                                       const struct l_genl_family_info *info)
+{
+       if (unlikely(!info))
+               return NULL;
+
+       return info->name;
+}
+
+LIB_EXPORT uint32_t l_genl_family_info_get_version(
+                                       const struct l_genl_family_info *info)
+{
+       if (unlikely(!info))
+               return 0;
+
+       return info->version;
+}
+
+static void unicast_watch_free(void *data)
+{
+       struct unicast_watch *watch = data;
+
+       if (watch->destroy)
+               watch->destroy(watch->user_data);
+
+       l_free(watch);
+}
+
+static bool unicast_watch_match(const void *a, const void *b)
+{
+       const struct unicast_watch *watch = a;
+       uint32_t id = L_PTR_TO_UINT(b);
+
+       return watch->id == id;
+}
+
+static void unicast_watch_prune(struct l_genl *genl)
+{
+       struct unicast_watch *watch;
+
+       while ((watch = l_queue_remove_if(genl->unicast_watches,
+                                               unicast_watch_match,
+                                               L_UINT_TO_PTR(0))))
+               unicast_watch_free(watch);
+}
+
+static void family_watch_free(void *data)
+{
+       struct family_watch *watch = data;
+
+       if (watch->destroy)
+               watch->destroy(watch->user_data);
+
+       l_free(watch->name);
+       l_free(watch);
+}
+
+static bool family_watch_match(const void *a, const void *b)
+{
+       const struct family_watch *watch = a;
+       uint32_t id = L_PTR_TO_UINT(b);
+
+       return watch->id == id;
+}
+
+static struct l_genl_family_info *family_info_update(struct l_genl *genl,
+                                       struct l_genl_family_info *info)
+{
+       struct l_genl_family_info *old =
+               l_queue_find(genl->family_infos, family_info_match,
+                                               L_UINT_TO_PTR(info->id));
+       if (old) {
+               GENL_DEBUG("Keeping old family info: %s", old->name);
+               family_info_free(info);
+               return old;
+       }
+
+       GENL_DEBUG("Added new family info: %s", info->name);
+       l_queue_push_head(genl->family_infos, info);
+       return info;
+}
+
+static void family_watch_prune(struct l_genl *genl)
+{
+       struct family_watch *watch;
+
+       while ((watch = l_queue_remove_if(genl->family_watches,
+                                               family_watch_match,
+                                               L_UINT_TO_PTR(0))))
+               family_watch_free(watch);
+}
+
+static void nlctrl_newfamily(struct l_genl_msg *msg, struct l_genl *genl)
+{
+       struct l_genl_family_info *info = family_info_new(NULL);
+       const struct l_queue_entry *entry;
+
+       if (parse_cmd_newfamily(info, msg) < 0) {
+               family_info_free(info);
+               return;
+       }
+
+       info = family_info_update(genl, info);
+
+       genl->in_family_watch_notify = true;
+
+       for (entry = l_queue_get_entries(genl->family_watches);
+                                               entry; entry = entry->next) {
+               struct family_watch *watch = entry->data;
+
+               if (!watch->id)
+                       continue;
+
+               if (!watch->appeared_func)
+                       continue;
+
+               if (watch->name && strcmp(watch->name, info->name))
+                       continue;
+
+               watch->appeared_func(info, watch->user_data);
+       }
+
+       genl->in_family_watch_notify = false;
+       family_watch_prune(genl);
+}
+
+static void nlctrl_delfamily(struct l_genl_msg *msg, struct l_genl *genl)
+{
+       const struct l_queue_entry *entry;
+       struct l_genl_attr attr;
+       uint16_t type, len;
+       const void *data;
+       uint16_t id = 0;
+       const char *name = NULL;
+       struct l_genl_family_info *old;
+
+       if (!l_genl_attr_init(&attr, msg))
+               return;
+
+       while (l_genl_attr_next(&attr, &type, &len, &data)) {
+               switch (type) {
+               case CTRL_ATTR_FAMILY_ID:
+                       id = l_get_u16(data);
+                       break;
+               case CTRL_ATTR_FAMILY_NAME:
+                       name = data;
+                       break;
+               }
+       }
+
+       if (!id || !name)
+               return;
+
+       genl->in_family_watch_notify = true;
+
+       for (entry = l_queue_get_entries(genl->family_watches);
+                                               entry; entry = entry->next) {
+               struct family_watch *watch = entry->data;
+
+               if (!watch->id)
+                       continue;
+
+               if (!watch->vanished_func)
+                       continue;
+
+               if (watch->name && strcmp(watch->name, name))
+                       continue;
+
+               watch->vanished_func(name, watch->user_data);
+       }
+
+       genl->in_family_watch_notify = false;
+       family_watch_prune(genl);
+
+       old = l_queue_remove_if(genl->family_infos, family_info_match,
+                                       L_UINT_TO_PTR(id));
+       if (old) {
+               GENL_DEBUG("Removing old family info: %s", old->name);
+               family_info_free(old);
+       }
+}
+
+static void nlctrl_notify(struct l_genl_msg *msg, void *user_data)
+{
+       struct l_genl *genl = user_data;
+       uint8_t cmd;
+
+       cmd = l_genl_msg_get_command(msg);
+
+       switch (cmd) {
+       case CTRL_CMD_NEWFAMILY:
+               nlctrl_newfamily(msg, genl);
+               break;
+       case CTRL_CMD_DELFAMILY:
+               nlctrl_delfamily(msg, genl);
+               break;
+       case CTRL_CMD_NEWOPS:
+               GENL_DEBUG("CMD_NEWOPS");
+               break;
+       case CTRL_CMD_DELOPS:
+               GENL_DEBUG("CMD_DELOPS");
+               break;
+       case CTRL_CMD_NEWMCAST_GRP:
+               GENL_DEBUG("CMD_NEWMCAST_GRP");
+               break;
+       case CTRL_CMD_DELMCAST_GRP:
+               GENL_DEBUG("CMD_DELMCAST_GRP");
+               break;
+       }
+}
+
+static struct l_genl_family *family_alloc(struct l_genl *genl, uint16_t id)
+{
+       struct l_genl_family *family;
+
+       family = l_new(struct l_genl_family, 1);
+       family->genl = genl;
+       family->id = id;
+       family->handle_id = get_next_id(&genl->next_handle_id);
+       return family;
+}
+
+static void destroy_request(void *data)
+{
+       struct genl_request *request = data;
+
+       if (request->destroy)
+               request->destroy(request->user_data);
+
+       l_genl_msg_unref(request->msg);
+
+       l_free(request);
+}
+
+static void mcast_notify_free(void *data)
+{
+       struct mcast_notify *notify = data;
+
+       if (notify->destroy)
+               notify->destroy(notify->user_data);
+
+       l_free(notify);
+}
+
+static bool mcast_notify_match(const void *a, const void *b)
+{
+       const struct mcast_notify *notify = a;
+       uint32_t id = L_PTR_TO_UINT(b);
+
+       return notify->id == id;
+}
+
+static bool mcast_notify_match_by_hid(const void *a, const void *b)
+{
+       const struct mcast_notify *notify = a;
+       uint32_t id = L_PTR_TO_UINT(b);
+
+       return notify->handle_id == id;
+}
+
+static void mcast_notify_prune(struct l_genl *genl)
+{
+       struct mcast_notify *notify;
+
+       while ((notify = l_queue_remove_if(genl->notify_list,
+                                               mcast_notify_match,
+                                               L_UINT_TO_PTR(0))))
+               mcast_notify_free(notify);
+}
+
+static bool match_request_id(const void *a, const void *b)
+{
+       const struct genl_request *request = a;
+       unsigned int id = L_PTR_TO_UINT(b);
+
+       return request->id == id;
+}
+
+static bool match_request_hid(const void *a, const void *b)
+{
+       const struct genl_request *request = a;
+       unsigned int id = L_PTR_TO_UINT(b);
+
+       return request->handle_id == id;
+}
+
+static struct l_genl_msg *msg_alloc(uint8_t cmd, uint8_t version, uint32_t size)
+{
+       struct l_genl_msg *msg;
+
+       msg = l_new(struct l_genl_msg, 1);
+
+       msg->cmd = cmd;
+       msg->version = version;
+
+       msg->len = NLMSG_HDRLEN + GENL_HDRLEN;
+       msg->size = msg->len + NLMSG_ALIGN(size);
+
+       msg->data = l_realloc(NULL, msg->size);
+       memset(msg->data, 0, msg->size);
+       msg->nesting_level = 0;
+
+       return l_genl_msg_ref(msg);
+}
+
+static bool msg_grow(struct l_genl_msg *msg, uint32_t needed)
+{
+       uint32_t grow_by;
+
+       if (msg->size >= msg->len + needed)
+               return true;
+
+       grow_by = msg->len + needed - msg->size;
+
+       if (grow_by < 32)
+               grow_by = 128;
+
+       msg->data = l_realloc(msg->data, msg->size + grow_by);
+       memset(msg->data + msg->size, 0, grow_by);
+       msg->size += grow_by;
+
+       return true;
+}
+
+struct l_genl_msg *_genl_msg_create(const struct nlmsghdr *nlmsg)
+{
+       struct l_genl_msg *msg;
+
+       msg = l_new(struct l_genl_msg, 1);
+
+       if (nlmsg->nlmsg_type == NLMSG_ERROR) {
+               struct nlmsgerr *err = NLMSG_DATA(nlmsg);
+
+               msg->error = err->error;
+               goto done;
+       }
+
+       msg->data = l_memdup(nlmsg, nlmsg->nlmsg_len);
+
+       msg->len = nlmsg->nlmsg_len;
+       msg->size = nlmsg->nlmsg_len;
+
+       if (msg->len >= GENL_HDRLEN) {
+               struct genlmsghdr *genlmsg = msg->data + NLMSG_HDRLEN;
+
+               msg->cmd = genlmsg->cmd;
+               msg->version = genlmsg->version;
+       }
+
+done:
+       return l_genl_msg_ref(msg);
+}
+
+static void write_watch_destroy(void *user_data)
+{
+       struct l_genl *genl = user_data;
+
+       genl->writer_active = false;
+}
+
+static bool can_write_data(struct l_io *io, void *user_data)
+{
+       struct l_genl *genl = user_data;
+       struct genl_request *request;
+       struct nlmsghdr *nlmsg;
+       struct genlmsghdr *genlmsg;
+       ssize_t bytes_written;
+
+       request = l_queue_pop_head(genl->request_queue);
+       if (!request)
+               return false;
+
+       request->seq = get_next_id(&genl->next_seq);
+
+       nlmsg = request->msg->data;
+
+       nlmsg->nlmsg_len = request->msg->len;
+       nlmsg->nlmsg_type = request->type;
+       nlmsg->nlmsg_flags = request->flags;
+       nlmsg->nlmsg_seq = request->seq;
+       nlmsg->nlmsg_pid = genl->pid;
+
+       genlmsg = request->msg->data + NLMSG_HDRLEN;
+
+       genlmsg->cmd = request->msg->cmd;
+       genlmsg->version = request->msg->version;
+
+       bytes_written = send(genl->fd, request->msg->data,
+                                               request->msg->len, 0);
+       if (bytes_written < 0) {
+               l_queue_push_head(genl->request_queue, request);
+               return false;
+       }
+
+       l_util_hexdump(false, request->msg->data, bytes_written,
+                               genl->debug_callback, genl->debug_data);
+
+       l_queue_push_tail(genl->pending_list, request);
+
+       return false;
+}
+
+static void wakeup_writer(struct l_genl *genl)
+{
+       if (genl->writer_active)
+               return;
+
+       if (l_queue_isempty(genl->request_queue))
+               return;
+
+       if (!l_queue_isempty(genl->pending_list))
+               return;
+
+       l_io_set_write_handler(genl->io, can_write_data, genl,
+                                               write_watch_destroy);
+
+       genl->writer_active = true;
+}
+
+static bool match_request_seq(const void *a, const void *b)
+{
+       const struct genl_request *request = a;
+       uint32_t seq = L_PTR_TO_UINT(b);
+
+       return request->seq == seq;
+}
+
+static void dispatch_unicast_watches(struct l_genl *genl, uint16_t id,
+                                                       struct l_genl_msg *msg)
+{
+       const struct l_queue_entry *entry;
+       struct l_genl_family_info *info = l_queue_find(genl->family_infos,
+                                                       family_info_match,
+                                                       L_UINT_TO_PTR(id));
+
+       if (!info)
+               return;
+
+       genl->in_unicast_watch_notify = true;
+
+       for (entry = l_queue_get_entries(genl->unicast_watches);
+                                               entry; entry = entry->next) {
+               struct unicast_watch *watch = entry->data;
+
+               if (!watch->id)
+                       continue;
+
+               if (!watch->handler)
+                       continue;
+
+               if (strncmp(watch->name, info->name, GENL_NAMSIZ))
+                       continue;
+
+               watch->handler(msg, watch->user_data);
+       }
+
+       genl->in_unicast_watch_notify = false;
+       unicast_watch_prune(genl);
+}
+
+static void process_unicast(struct l_genl *genl, const struct nlmsghdr *nlmsg)
+{
+       struct l_genl_msg *msg;
+       struct genl_request *request;
+
+       if (nlmsg->nlmsg_type == NLMSG_NOOP ||
+                                       nlmsg->nlmsg_type == NLMSG_OVERRUN)
+               return;
+
+       msg = _genl_msg_create(nlmsg);
+       if (!nlmsg->nlmsg_seq) {
+               if (msg)
+                       dispatch_unicast_watches(genl, nlmsg->nlmsg_type, msg);
+               goto done;
+       }
+
+       request = l_queue_remove_if(genl->pending_list, match_request_seq,
+                                       L_UINT_TO_PTR(nlmsg->nlmsg_seq));
+       if (!request)
+               goto done;
+
+       if (!msg)
+               goto free_request;
+
+       if (request->callback && nlmsg->nlmsg_type != NLMSG_DONE)
+               request->callback(msg, request->user_data);
+
+       if ((nlmsg->nlmsg_flags & NLM_F_MULTI) &&
+                                       nlmsg->nlmsg_type != NLMSG_DONE) {
+               l_queue_push_head(genl->pending_list, request);
+               goto done;
+       }
+
+free_request:
+       destroy_request(request);
+       wakeup_writer(genl);
+done:
+       l_genl_msg_unref(msg);
+}
+
+static void process_multicast(struct l_genl *genl, uint32_t group,
+                                               const struct nlmsghdr *nlmsg)
+{
+       const struct l_queue_entry *entry;
+       struct l_genl_msg *msg = _genl_msg_create(nlmsg);
+
+       if (!msg)
+               return;
+
+       genl->in_mcast_notify = true;
+
+       for (entry = l_queue_get_entries(genl->notify_list);
+                                               entry; entry = entry->next) {
+               struct mcast_notify *notify = entry->data;
+
+               if (notify->type != nlmsg->nlmsg_type)
+                       continue;
+
+               if (notify->group != group)
+                       continue;
+
+               if (!notify->callback)
+                       continue;
+
+               notify->callback(msg, notify->user_data);
+       }
+
+       genl->in_mcast_notify = false;
+       mcast_notify_prune(genl);
+
+       l_genl_msg_unref(msg);
+}
+
+static void read_watch_destroy(void *user_data)
+{
+}
+
+static bool received_data(struct l_io *io, void *user_data)
+{
+       struct l_genl *genl = user_data;
+       struct cmsghdr *cmsg;
+       struct msghdr msg;
+       struct iovec iov;
+       unsigned char buf[8192];
+       unsigned char control[32];
+       ssize_t bytes_read;
+       struct nlmsghdr *nlmsg;
+       size_t nlmsg_len;
+       uint32_t group = 0;
+
+       memset(&iov, 0, sizeof(iov));
+       iov.iov_base = buf;
+       iov.iov_len = sizeof(buf);
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+       msg.msg_control = control;
+       msg.msg_controllen = sizeof(control);
+
+       bytes_read = recvmsg(genl->fd, &msg, 0);
+       if (bytes_read < 0) {
+               if (errno != EAGAIN && errno != EINTR)
+                       return false;
+
+               return true;
+       }
+
+       nlmsg_len = bytes_read;
+
+       l_util_hexdump(true, buf, nlmsg_len,
+                               genl->debug_callback, genl->debug_data);
+
+       for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+                                       cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+               struct nl_pktinfo pktinfo;
+
+               if (cmsg->cmsg_level != SOL_NETLINK)
+                       continue;
+
+               if (cmsg->cmsg_type != NETLINK_PKTINFO)
+                       continue;
+
+               memcpy(&pktinfo, CMSG_DATA(cmsg), sizeof(pktinfo));
+
+               group = pktinfo.group;
+       }
+
+       for (nlmsg = iov.iov_base; NLMSG_OK(nlmsg, nlmsg_len);
+                               nlmsg = NLMSG_NEXT(nlmsg, nlmsg_len)) {
+               if (group > 0)
+                       process_multicast(genl, group, nlmsg);
+               else
+                       process_unicast(genl, nlmsg);
+       }
+
+       return true;
+}
+
+static struct l_genl_family_info *build_nlctrl_info()
+{
+       struct l_genl_family_info *r = family_info_new("nlctrl");
+
+       r->id = GENL_ID_CTRL;
+       family_info_add_mcast(r, "notify", GENL_ID_CTRL);
+       family_info_add_op(r, CTRL_CMD_GETFAMILY, GENL_CMD_CAP_DUMP);
+
+       return r;
+}
+
+LIB_EXPORT struct l_genl *l_genl_new(void)
+{
+       struct l_genl *genl;
+       struct sockaddr_nl addr;
+       socklen_t addrlen = sizeof(addr);
+       int fd, pktinfo = 1;
+
+       fd = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
+                                                       NETLINK_GENERIC);
+       if (fd < 0)
+               return NULL;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.nl_family = AF_NETLINK;
+       addr.nl_pid = 0;
+
+       if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0)
+               goto err;
+
+       if (getsockname(fd, (struct sockaddr *) &addr, &addrlen) < 0)
+               goto err;
+
+       if (setsockopt(fd, SOL_NETLINK, NETLINK_PKTINFO,
+                                       &pktinfo, sizeof(pktinfo)) < 0)
+               goto err;
+
+       genl = l_new(struct l_genl, 1);
+       genl->pid = addr.nl_pid;
+       genl->ref_count = 1;
+       genl->fd = fd;
+       genl->io = l_io_new(genl->fd);
+       l_io_set_read_handler(genl->io, received_data, genl,
+                                               read_watch_destroy);
+
+       genl->request_queue = l_queue_new();
+       genl->pending_list = l_queue_new();
+       genl->notify_list = l_queue_new();
+       genl->family_watches = l_queue_new();
+       genl->family_infos = l_queue_new();
+       genl->unicast_watches = l_queue_new();
+
+       l_queue_push_head(genl->family_infos, build_nlctrl_info());
+
+       genl->nlctrl = family_alloc(genl, GENL_ID_CTRL);
+       l_genl_family_register(genl->nlctrl, "notify",
+                                               nlctrl_notify, genl, NULL);
+
+       return genl;
+
+err:
+       close(fd);
+       return NULL;
+}
+
+LIB_EXPORT struct l_genl *l_genl_ref(struct l_genl *genl)
+{
+       if (unlikely(!genl))
+               return NULL;
+
+       __sync_fetch_and_add(&genl->ref_count, 1);
+
+       return genl;
+}
+
+LIB_EXPORT void l_genl_unref(struct l_genl *genl)
+{
+       if (unlikely(!genl))
+               return;
+
+       if (__sync_sub_and_fetch(&genl->ref_count, 1))
+               return;
+
+       if (genl->discovery) {
+               if (genl->discovery->destroy)
+                       genl->discovery->destroy(genl->discovery->user_data);
+
+               l_free(genl->discovery);
+               genl->discovery = NULL;
+       }
+
+       l_genl_family_free(genl->nlctrl);
+
+       l_queue_destroy(genl->unicast_watches, unicast_watch_free);
+       l_queue_destroy(genl->family_watches, family_watch_free);
+       l_queue_destroy(genl->family_infos, family_info_free);
+       l_queue_destroy(genl->notify_list, mcast_notify_free);
+       l_queue_destroy(genl->pending_list, destroy_request);
+       l_queue_destroy(genl->request_queue, destroy_request);
+
+       l_io_set_write_handler(genl->io, NULL, NULL, NULL);
+       l_io_set_read_handler(genl->io, NULL, NULL, NULL);
+
+       l_io_destroy(genl->io);
+       genl->io = NULL;
+       close(genl->fd);
+
+       if (genl->debug_destroy)
+               genl->debug_destroy(genl->debug_data);
+
+       l_free(genl);
+}
+
+LIB_EXPORT bool l_genl_set_debug(struct l_genl *genl,
+                                       l_genl_debug_func_t callback,
+                                       void *user_data,
+                                       l_genl_destroy_func_t destroy)
+{
+       if (unlikely(!genl))
+               return false;
+
+       if (genl->debug_destroy)
+               genl->debug_destroy(genl->debug_data);
+
+       genl->debug_callback = callback;
+       genl->debug_destroy = destroy;
+       genl->debug_data = user_data;
+
+       return true;
+}
+
+static void dump_family_callback(struct l_genl_msg *msg, void *user_data)
+{
+       struct l_genl *genl = user_data;
+       struct genl_discovery *discovery = genl->discovery;
+       struct l_genl_family_info *info = family_info_new(NULL);
+
+       discovery->cmd_id = 0;
+
+       if (parse_cmd_newfamily(info, msg) < 0) {
+               family_info_free(info);
+               return;
+       }
+
+       info = family_info_update(genl, info);
+
+       if (discovery->cb)
+               discovery->cb(info, discovery->user_data);
+}
+
+static void dump_family_done(void *user_data)
+{
+       struct l_genl *genl = user_data;
+       struct genl_discovery *discovery = genl->discovery;
+
+       if (discovery->destroy)
+               discovery->destroy(discovery->user_data);
+
+       l_free(discovery);
+       genl->discovery = NULL;
+}
+
+LIB_EXPORT bool l_genl_discover_families(struct l_genl *genl,
+                                               l_genl_discover_func_t cb,
+                                               void *user_data,
+                                               l_genl_destroy_func_t destroy)
+{
+       struct l_genl_msg *msg;
+       struct genl_discovery *discovery;
+
+       if (unlikely(!genl))
+               return false;
+
+       if (genl->discovery)
+               return false;
+
+       discovery = l_new(struct genl_discovery, 1);
+       discovery->cb = cb;
+       discovery->user_data = user_data;
+       discovery->destroy = destroy;
+
+       msg = l_genl_msg_new_sized(CTRL_CMD_GETFAMILY, NLA_HDRLEN);
+       discovery->cmd_id = l_genl_family_dump(genl->nlctrl, msg,
+                                               dump_family_callback,
+                                               genl, dump_family_done);
+
+       if (!discovery->cmd_id) {
+               l_free(discovery);
+               return false;
+       }
+
+       genl->discovery = discovery;
+       return true;
+}
+
+/**
+ * l_genl_add_unicast_watch:
+ * @genl: GENL connection
+ * @name: Name of the family for which a unicast watch will be registered
+ * @handler: Callback to call when a matching unicast is received
+ * @user_data: user data for the callback
+ * @destroy: Destroy callback for user data
+ *
+ * Adds a watch for unicast messages for a given family specified by @family.
+ * The watch can be registered even if the family has not been discovered yet
+ * or doesn't exist.
+ *
+ * Returns: a non-zero watch identifier that can be passed to
+ *          l_genl_remove_unicast_watch to remove this watch, or zero if the
+ *          watch could not be created successfully.
+ **/
+LIB_EXPORT unsigned int l_genl_add_unicast_watch(struct l_genl *genl,
+                                               const char *family,
+                                               l_genl_msg_func_t handler,
+                                               void *user_data,
+                                               l_genl_destroy_func_t destroy)
+{
+       struct unicast_watch *watch;
+
+       if (unlikely(!genl || !family))
+               return 0;
+
+       if (strlen(family) >= GENL_NAMSIZ)
+               return 0;
+
+       watch = l_new(struct unicast_watch, 1);
+       l_strlcpy(watch->name, family, GENL_NAMSIZ);
+       watch->handler = handler;
+       watch->destroy = destroy;
+       watch->user_data = user_data;
+       watch->id = get_next_id(&genl->next_watch_id);
+       l_queue_push_tail(genl->unicast_watches, watch);
+
+       return watch->id;
+}
+
+/**
+ * l_genl_remove_unicast_watch:
+ * @genl: GENL connection
+ * @id: unique identifier of the unicast watch to remove
+ *
+ * Removes the unicast watch.  If a destroy callback was provided, then it is
+ * called in order to free any associated user data.
+ *
+ * Returns: #true if the watch was removed successfully and #false otherwise.
+ **/
+LIB_EXPORT bool l_genl_remove_unicast_watch(struct l_genl *genl,
+                                                       unsigned int id)
+{
+       struct unicast_watch *watch;
+
+       if (unlikely(!genl))
+               return false;
+
+       if (genl->in_unicast_watch_notify) {
+               watch = l_queue_find(genl->unicast_watches, unicast_watch_match,
+                                                       L_UINT_TO_PTR(id));
+               if (!watch)
+                       return false;
+
+               watch->id = 0;
+               return true;
+       }
+
+       watch = l_queue_remove_if(genl->unicast_watches, unicast_watch_match,
+                                                       L_UINT_TO_PTR(id));
+       if (!watch)
+               return false;
+
+       unicast_watch_free(watch);
+
+       return true;
+}
+
+/**
+ * l_genl_add_family_watch:
+ * @genl: GENL connection
+ * @name: Name of the family to watch for.  Use NULL to match any family.
+ * @appeared_func: Callback to call when the matching family appears
+ * @vanished_func: Callback to call when the matching family disappears
+ * @user_data: user data for the callback
+ * @destroy: Destroy callback for user data
+ *
+ * Returns: a non-zero watch identifier that can be passed to
+ *          l_genl_remove_family_watch to remove this watch, or zero if the
+ *          watch could not be created successfully.
+ **/
+LIB_EXPORT unsigned int l_genl_add_family_watch(struct l_genl *genl,
+                                       const char *name,
+                                       l_genl_discover_func_t appeared_func,
+                                       l_genl_vanished_func_t vanished_func,
+                                       void *user_data,
+                                       l_genl_destroy_func_t destroy)
+{
+       struct family_watch *watch;
+       size_t len = 0;
+
+       if (unlikely(!genl))
+               return 0;
+
+       if (name) {
+               len = strlen(name);
+               if (len >= GENL_NAMSIZ)
+                       return 0;
+       }
+
+       watch = l_new(struct family_watch, 1);
+       watch->name = l_strdup(name);
+       watch->appeared_func = appeared_func;
+       watch->vanished_func = vanished_func;
+       watch->user_data = user_data;
+       watch->destroy = destroy;
+       watch->id = get_next_id(&genl->next_watch_id);
+       l_queue_push_tail(genl->family_watches, watch);
+
+       return watch->id;
+}
+
+/**
+ * l_genl_remove_family_watch:
+ * @genl: GENL connection
+ * @id: unique identifier of the family watch to remove
+ *
+ * Removes the family watch.  If a destroy callback was provided, then it is
+ * called in order to free any associated user data.
+ *
+ * Returns: #true if the watch was removed successfully and #false otherwise.
+ **/
+LIB_EXPORT bool l_genl_remove_family_watch(struct l_genl *genl,
+                                                       unsigned int id)
+{
+       struct family_watch *watch;
+
+       if (unlikely(!genl))
+               return false;
+
+       if (genl->in_family_watch_notify) {
+               watch = l_queue_find(genl->family_watches, family_watch_match,
+                                                       L_UINT_TO_PTR(id));
+               if (!watch)
+                       return false;
+
+               watch->id = 0;
+               return true;
+       }
+
+       watch = l_queue_remove_if(genl->family_watches, family_watch_match,
+                                                       L_UINT_TO_PTR(id));
+       if (!watch)
+               return false;
+
+       family_watch_free(watch);
+
+       return true;
+}
+
+struct family_request {
+       void *user_data;
+       l_genl_discover_func_t appeared_func;
+       l_genl_destroy_func_t destroy;
+       struct l_genl *genl;
+};
+
+static void request_family_callback(struct l_genl_msg *msg, void *user_data)
+{
+       struct family_request *req = user_data;
+       struct l_genl_family_info *info = family_info_new(NULL);
+
+       if (parse_cmd_newfamily(info, msg) < 0) {
+               family_info_free(info);
+
+               if (req->appeared_func)
+                       req->appeared_func(NULL, req->user_data);
+
+               return;
+       }
+
+       info = family_info_update(req->genl, info);
+
+       /*
+        * watch events should trigger as a result of new_family event.
+        * Do not trigger these here as the family might have already been
+        * discovered
+        */
+
+       if (req->appeared_func)
+               req->appeared_func(info, req->user_data);
+}
+
+static void family_request_free(void *user_data)
+{
+       struct family_request *req = user_data;
+
+       if (req->destroy)
+               req->destroy(req->user_data);
+
+       l_free(req);
+}
+
+/**
+ * l_genl_request_family:
+ * @genl: GENL connection
+ * @name: Name of the family to request
+ * @appeared_func: Callback to call
+ * @user_data: User data
+ * @destroy: Destroy callback for user_data
+ *
+ * Attempts to request a family given by @name. If the family is not currently
+ * available, then the kernel will attempt to auto-load the module for that
+ * family and if successful, the family will appear.  If the family is already
+ * loaded, the kernel will not perform auto-loading.  In both cases the callback
+ * is called with the family information.  If auto-loading failed, a NULL
+ * will be given as a parameter to @appeared_func.
+ *
+ * Returns: #true if the request could be started successfully,
+ * false otherwise.
+ **/
+LIB_EXPORT bool l_genl_request_family(struct l_genl *genl, const char *name,
+                                       l_genl_discover_func_t appeared_func,
+                                       void *user_data,
+                                       l_genl_destroy_func_t destroy)
+{
+       size_t len;
+       struct l_genl_msg *msg;
+       struct family_request *req;
+
+       if (unlikely(!genl) || unlikely(!name))
+               return NULL;
+
+       len = strlen(name);
+       if (unlikely(strlen(name) >= GENL_NAMSIZ))
+               return NULL;
+
+       req = l_new(struct family_request, 1);
+       req->appeared_func = appeared_func;
+       req->user_data = user_data;
+       req->destroy = destroy;
+       req->genl = genl;
+
+       msg = l_genl_msg_new_sized(CTRL_CMD_GETFAMILY,
+                                               NLA_HDRLEN + GENL_NAMSIZ);
+       l_genl_msg_append_attr(msg, CTRL_ATTR_FAMILY_NAME, len + 1, name);
+
+       if (l_genl_family_send(genl->nlctrl, msg, request_family_callback,
+                               req, family_request_free) > 0)
+               return true;
+
+       return false;
+}
+
+const void *_genl_msg_as_bytes(struct l_genl_msg *msg, uint16_t type,
+                                       uint16_t flags, uint32_t seq,
+                                       uint32_t pid,
+                                       size_t *out_size)
+{
+       struct nlmsghdr *nlmsg;
+       struct genlmsghdr *genlmsg;
+
+       nlmsg = msg->data;
+
+       nlmsg->nlmsg_len = msg->len;
+       nlmsg->nlmsg_type = type;
+       nlmsg->nlmsg_flags = flags;
+       nlmsg->nlmsg_seq = seq;
+       nlmsg->nlmsg_pid = pid;
+
+       genlmsg = msg->data + NLMSG_HDRLEN;
+
+       genlmsg->cmd = msg->cmd;
+       genlmsg->version = msg->version;
+
+       if (out_size)
+               *out_size = msg->len;
+
+       return msg->data;
+}
+
+LIB_EXPORT struct l_genl_msg *l_genl_msg_new(uint8_t cmd)
+{
+       return l_genl_msg_new_sized(cmd, 0);
+}
+
+LIB_EXPORT struct l_genl_msg *l_genl_msg_new_sized(uint8_t cmd, uint32_t size)
+{
+       return msg_alloc(cmd, 0x00, size);
+}
+
+LIB_EXPORT struct l_genl_msg *l_genl_msg_ref(struct l_genl_msg *msg)
+{
+       if (unlikely(!msg))
+               return NULL;
+
+       __sync_fetch_and_add(&msg->ref_count, 1);
+
+       return msg;
+}
+
+LIB_EXPORT void l_genl_msg_unref(struct l_genl_msg *msg)
+{
+       if (unlikely(!msg))
+               return;
+
+       if (__sync_sub_and_fetch(&msg->ref_count, 1))
+               return;
+
+       l_free(msg->data);
+       l_free(msg);
+}
+
+LIB_EXPORT uint8_t l_genl_msg_get_command(struct l_genl_msg *msg)
+{
+       if (unlikely(!msg))
+               return 0;
+
+       return msg->cmd;
+}
+
+LIB_EXPORT uint8_t l_genl_msg_get_version(struct l_genl_msg *msg)
+{
+       if (unlikely(!msg))
+               return 0;
+
+       return msg->version;
+}
+
+LIB_EXPORT int l_genl_msg_get_error(struct l_genl_msg *msg)
+{
+       if (unlikely(!msg))
+               return -ENOMSG;
+
+       return msg->error;
+}
+
+LIB_EXPORT bool l_genl_msg_append_attr(struct l_genl_msg *msg, uint16_t type,
+                                               uint16_t len, const void *data)
+{
+       struct nlattr *nla;
+
+       if (unlikely(!msg))
+               return false;
+
+       if (!msg_grow(msg, NLA_HDRLEN + NLA_ALIGN(len)))
+               return false;
+
+       nla = msg->data + msg->len;
+       nla->nla_len = NLA_HDRLEN + len;
+       nla->nla_type = type;
+
+       if (len)
+               memcpy(msg->data + msg->len + NLA_HDRLEN, data, len);
+
+       msg->len += NLA_HDRLEN + NLA_ALIGN(len);
+
+       return true;
+}
+
+LIB_EXPORT bool l_genl_msg_append_attrv(struct l_genl_msg *msg, uint16_t type,
+                                       const struct iovec *iov,
+                                       size_t iov_len)
+{
+       struct nlattr *nla;
+       size_t len = 0;
+       unsigned int i;
+
+       if (unlikely(!msg))
+               return false;
+
+       for (i = 0; i < iov_len; i++)
+               len += iov[i].iov_len;
+
+       if (!msg_grow(msg, NLA_HDRLEN + NLA_ALIGN(len)))
+               return false;
+
+       nla = msg->data + msg->len;
+       nla->nla_len = NLA_HDRLEN + len;
+       nla->nla_type = type;
+
+       msg->len += NLA_HDRLEN;
+
+       for (i = 0; i < iov_len; i++, iov++) {
+               memcpy(msg->data + msg->len, iov->iov_base, iov->iov_len);
+               msg->len += iov->iov_len;
+       }
+
+       msg->len += NLA_ALIGN(len) - len;
+
+       return true;
+}
+
+LIB_EXPORT bool l_genl_msg_enter_nested(struct l_genl_msg *msg, uint16_t type)
+{
+       if (unlikely(!msg))
+               return false;
+
+       if (unlikely(msg->nesting_level == MAX_NESTING_LEVEL))
+               return false;
+
+       if (!msg_grow(msg, NLA_HDRLEN))
+               return false;
+
+       msg->nests[msg->nesting_level].type = type;
+       msg->nests[msg->nesting_level].offset = msg->len;
+       msg->nesting_level += 1;
+
+       msg->len += NLA_HDRLEN;
+
+       return true;
+}
+
+LIB_EXPORT bool l_genl_msg_leave_nested(struct l_genl_msg *msg)
+{
+       struct nlattr *nla;
+
+       if (unlikely(!msg))
+               return false;
+
+       if (unlikely(msg->nesting_level == 0))
+               return false;
+
+       nla = msg->data + msg->nests[msg->nesting_level - 1].offset;
+       nla->nla_type = msg->nests[msg->nesting_level - 1].type;
+       nla->nla_len = msg->len - msg->nests[msg->nesting_level - 1].offset;
+
+       msg->nesting_level -= 1;
+
+       return true;
+}
+
+#define NLA_OK(nla,len)         ((len) >= (int) sizeof(struct nlattr) && \
+                               (nla)->nla_len >= sizeof(struct nlattr) && \
+                               (nla)->nla_len <= (len))
+#define NLA_NEXT(nla,attrlen)  ((attrlen) -= NLMSG_ALIGN((nla)->nla_len), \
+                               (struct nlattr*)(((char*)(nla)) + \
+                               NLMSG_ALIGN((nla)->nla_len)))
+
+#define NLA_LENGTH(len)                (NLMSG_ALIGN(sizeof(struct nlattr)) + (len))
+#define NLA_DATA(nla)          ((void*)(((char*)(nla)) + NLA_LENGTH(0)))
+#define NLA_PAYLOAD(nla)       ((int)((nla)->nla_len) - NLA_LENGTH(0))
+
+LIB_EXPORT bool l_genl_attr_init(struct l_genl_attr *attr,
+                                               struct l_genl_msg *msg)
+{
+       const struct nlattr *nla;
+       uint32_t len;
+
+       if (unlikely(!attr) || unlikely(!msg))
+               return false;
+
+       if (!msg->data || msg->len < NLMSG_HDRLEN + GENL_HDRLEN)
+               return false;
+
+       nla = msg->data + NLMSG_HDRLEN + GENL_HDRLEN;
+       len = msg->len - NLMSG_HDRLEN - GENL_HDRLEN;
+
+       if (!NLA_OK(nla, len))
+               return false;
+
+       attr->msg = msg;
+       attr->data = NULL;
+       attr->len = 0;
+       attr->next_data = nla;
+       attr->next_len = len;
+
+       return true;
+}
+
+LIB_EXPORT bool l_genl_attr_next(struct l_genl_attr *attr,
+                                               uint16_t *type,
+                                               uint16_t *len,
+                                               const void **data)
+{
+       const struct nlattr *nla;
+
+       if (unlikely(!attr))
+               return false;
+
+       nla = attr->next_data;
+
+       if (!NLA_OK(nla, attr->next_len))
+               return false;
+
+       if (type)
+               *type = nla->nla_type & NLA_TYPE_MASK;
+
+       if (len)
+               *len = NLA_PAYLOAD(nla);
+
+       if (data)
+               *data = NLA_DATA(nla);
+
+       attr->data = attr->next_data;
+       attr->len = attr->next_len;
+
+       attr->next_data = NLA_NEXT(nla, attr->next_len);
+
+       return true;
+}
+
+LIB_EXPORT bool l_genl_attr_recurse(struct l_genl_attr *attr,
+                                               struct l_genl_attr *nested)
+{
+       const struct nlattr *nla;
+
+       if (unlikely(!attr) || unlikely(!nested))
+               return false;
+
+       nla = attr->data;
+       if (!nla)
+               return false;
+
+       nested->msg = attr->msg;
+       nested->data = NULL;
+       nested->len = 0;
+       nested->next_data = NLA_DATA(nla);
+       nested->next_len = NLA_PAYLOAD(nla);
+
+       return true;
+}
+
+/**
+ * l_genl_family_new:
+ * @genl: GENL connection
+ * @name: Name of the family for which a handle will be created
+ *
+ * Attempts to create a handle over which applications can send requests and
+ * listen to events from a given family.  The family must have been discovered
+ * previously via @l_genl_discover_families or @l_genl_add_family_watch; or
+ * autoloaded using @l_genl_family_request.
+ *
+ * The destruction of the handle using @l_genl_family_free will clean up all
+ * requests started via this handle as well as unregister from any
+ * notifications.  Notifications & Requests started by other handles will be
+ * unaffected.
+ *
+ * Returns: #NULL if the family handle could not be created and a valid
+ * handle on success.
+ **/
+LIB_EXPORT struct l_genl_family *l_genl_family_new(struct l_genl *genl,
+                                                       const char *name)
+{
+       struct l_genl_family *family;
+       struct l_genl_family_info *info;
+       const struct l_queue_entry *entry;
+
+       if (unlikely(!genl) || unlikely(!name))
+               return NULL;
+
+       for (entry = l_queue_get_entries(genl->family_infos);
+                                               entry; entry = entry->next) {
+               info = entry->data;
+
+               if (!strncmp(name, info->name, GENL_NAMSIZ))
+                       break;
+       }
+
+       if (!entry)
+               return NULL;
+
+       family = family_alloc(genl, info->id);
+
+       return family;
+}
+
+LIB_EXPORT const struct l_genl_family_info *l_genl_family_get_info(
+                                               struct l_genl_family *family)
+{
+       if (unlikely(!family))
+               return NULL;
+
+       return l_queue_find(family->genl->family_infos, family_info_match,
+                                       L_UINT_TO_PTR(family->id));
+}
+
+LIB_EXPORT struct l_genl *l_genl_family_get_genl(struct l_genl_family *family)
+{
+       if (unlikely(!family))
+               return 0;
+
+       return family->genl;
+}
+
+static unsigned int send_common(struct l_genl_family *family, uint16_t flags,
+                               struct l_genl_msg *msg, l_genl_msg_func_t callback,
+                               void *user_data, l_genl_destroy_func_t destroy)
+{
+       struct l_genl *genl;
+       struct genl_request *request;
+
+       if (!family || !msg)
+               return 0;
+
+       genl = family->genl;
+       if (!genl)
+               return 0;
+
+       request = l_new(struct genl_request, 1);
+       request->type = family->id;
+       request->flags = NLM_F_REQUEST | flags;
+       request->msg = msg;
+       request->callback = callback;
+       request->destroy = destroy;
+       request->user_data = user_data;
+       request->id = get_next_id(&genl->next_request_id);
+       request->handle_id = family->handle_id;
+       l_queue_push_tail(genl->request_queue, request);
+
+       wakeup_writer(genl);
+
+       return request->id;
+}
+
+LIB_EXPORT unsigned int l_genl_family_send(struct l_genl_family *family,
+                                               struct l_genl_msg *msg,
+                                               l_genl_msg_func_t callback,
+                                               void *user_data,
+                                               l_genl_destroy_func_t destroy)
+{
+       return send_common(family, NLM_F_ACK, msg, callback,
+                                               user_data, destroy);
+}
+
+LIB_EXPORT unsigned int l_genl_family_dump(struct l_genl_family *family,
+                                               struct l_genl_msg *msg,
+                                               l_genl_msg_func_t callback,
+                                               void *user_data,
+                                               l_genl_destroy_func_t destroy)
+{
+       return send_common(family, NLM_F_ACK | NLM_F_DUMP, msg, callback,
+                                                       user_data, destroy);
+}
+
+LIB_EXPORT bool l_genl_family_cancel(struct l_genl_family *family,
+                                                       unsigned int id)
+{
+       struct l_genl *genl;
+       struct genl_request *request;
+
+       if (unlikely(!family) || unlikely(!id))
+               return false;
+
+       genl = family->genl;
+       if (!genl)
+               return false;
+
+       request = l_queue_remove_if(genl->request_queue, match_request_id,
+                                                       L_UINT_TO_PTR(id));
+       if (request)
+               goto done;
+
+       request = l_queue_remove_if(genl->pending_list, match_request_id,
+                                                       L_UINT_TO_PTR(id));
+       if (!request)
+               return false;
+
+done:
+       destroy_request(request);
+
+       return true;
+}
+
+static void add_membership(struct l_genl *genl, struct genl_mcast *mcast)
+{
+       int group = mcast->id;
+
+       if (mcast->users > 0)
+               goto done;
+
+       if (setsockopt(genl->fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP,
+                                               &group, sizeof(group)) < 0)
+               return;
+
+done:
+       mcast->users++;
+}
+
+static void drop_membership(struct l_genl *genl, struct genl_mcast *mcast)
+{
+       int group;
+
+       if (--mcast->users)
+               return;
+
+       group = mcast->id;
+
+       setsockopt(genl->fd, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP,
+                                                       &group, sizeof(group));
+}
+
+LIB_EXPORT unsigned int l_genl_family_register(struct l_genl_family *family,
+                                               const char *group,
+                                               l_genl_msg_func_t callback,
+                                               void *user_data,
+                                               l_genl_destroy_func_t destroy)
+{
+       struct l_genl *genl;
+       struct l_genl_family_info *info;
+       struct mcast_notify *notify;
+       struct genl_mcast *mcast;
+
+       if (unlikely(!family) || unlikely(!group))
+               return 0;
+
+       genl = family->genl;
+       if (!genl)
+               return 0;
+
+       info = l_queue_find(genl->family_infos, family_info_match,
+                                       L_UINT_TO_PTR(family->id));
+       if (!info)
+               return 0;
+
+       mcast = l_queue_find(info->mcast_list, match_mcast_name, group);
+       if (!mcast)
+               return 0;
+
+       notify = l_new(struct mcast_notify, 1);
+       notify->type = info->id;
+       notify->group = mcast->id;
+       notify->callback = callback;
+       notify->destroy = destroy;
+       notify->user_data = user_data;
+       notify->id = get_next_id(&genl->next_notify_id);
+       notify->handle_id = family->handle_id;
+       l_queue_push_tail(genl->notify_list, notify);
+
+       add_membership(genl, mcast);
+
+       return notify->id;
+}
+
+LIB_EXPORT bool l_genl_family_unregister(struct l_genl_family *family,
+                                                       unsigned int id)
+{
+       struct l_genl *genl;
+       struct mcast_notify *notify;
+       struct l_genl_family_info *info;
+       struct genl_mcast *mcast;
+
+       if (unlikely(!family) || unlikely(!id))
+               return false;
+
+       genl = family->genl;
+       if (!genl)
+               return false;
+
+       if (genl->in_mcast_notify) {
+               notify = l_queue_find(genl->notify_list, mcast_notify_match,
+                                                       L_UINT_TO_PTR(id));
+               if (!notify)
+                       return false;
+
+               notify->id = 0;
+       } else {
+               notify = l_queue_remove_if(genl->notify_list,
+                                                       mcast_notify_match,
+                                                       L_UINT_TO_PTR(id));
+               if (!notify)
+                       return false;
+       }
+
+       info = l_queue_find(genl->family_infos, family_info_match,
+                                       L_UINT_TO_PTR(family->id));
+       if (!info)
+               goto done;
+
+       mcast = l_queue_find(info->mcast_list, match_mcast_id,
+                                               L_UINT_TO_PTR(notify->group));
+       if (!mcast)
+               goto done;
+
+       drop_membership(genl, mcast);
+
+done:
+       if (notify->id)
+               mcast_notify_free(notify);
+
+       return true;
+}
+
+LIB_EXPORT void l_genl_family_free(struct l_genl_family *family)
+{
+       struct l_genl *genl;
+       struct genl_request *req;
+       struct mcast_notify *notify;
+       struct l_genl_family_info *info;
+
+       if (!family)
+               return;
+
+       genl = family->genl;
+       info = l_queue_find(genl->family_infos, family_info_match,
+                                       L_UINT_TO_PTR(family->id));
+
+       while ((req = l_queue_remove_if(genl->pending_list,
+                                       match_request_hid,
+                                       L_UINT_TO_PTR(family->handle_id))))
+               destroy_request(req);
+
+       while ((req = l_queue_remove_if(genl->request_queue,
+                                       match_request_hid,
+                                       L_UINT_TO_PTR(family->handle_id))))
+               destroy_request(req);
+
+       while ((notify = l_queue_remove_if(genl->notify_list,
+                                       mcast_notify_match_by_hid,
+                                       L_UINT_TO_PTR(family->handle_id)))) {
+               struct genl_mcast *mcast = l_queue_find(info->mcast_list,
+                                               match_mcast_id,
+                                               L_UINT_TO_PTR(notify->group));
+
+               if (mcast)
+                       drop_membership(genl, mcast);
+
+               mcast_notify_free(notify);
+       }
+
+       l_free(family);
+}
diff --git a/ell/genl.h b/ell/genl.h
new file mode 100644 (file)
index 0000000..c3f641f
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_GENL_H
+#define __ELL_GENL_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct iovec;
+
+struct l_genl;
+struct l_genl_family_info;
+struct l_genl_family;
+struct l_genl_msg;
+
+typedef void (*l_genl_destroy_func_t)(void *user_data);
+typedef void (*l_genl_debug_func_t)(const char *str, void *user_data);
+typedef void (*l_genl_msg_func_t)(struct l_genl_msg *msg, void *user_data);
+typedef void (*l_genl_discover_func_t)(const struct l_genl_family_info *info,
+                                               void *user_data);
+typedef void (*l_genl_vanished_func_t)(const char *name, void *user_data);
+
+struct l_genl *l_genl_new(void);
+struct l_genl *l_genl_ref(struct l_genl *genl);
+void l_genl_unref(struct l_genl *genl);
+
+bool l_genl_set_debug(struct l_genl *genl, l_genl_debug_func_t callback,
+                               void *user_data, l_genl_destroy_func_t destroy);
+
+bool l_genl_discover_families(struct l_genl *genl,
+                               l_genl_discover_func_t cb, void *user_data,
+                               l_genl_destroy_func_t destroy);
+
+unsigned int l_genl_add_unicast_watch(struct l_genl *genl,
+                                               const char *family,
+                                               l_genl_msg_func_t handler,
+                                               void *user_data,
+                                               l_genl_destroy_func_t destroy);
+bool l_genl_remove_unicast_watch(struct l_genl *genl, unsigned int id);
+
+unsigned int l_genl_add_family_watch(struct l_genl *genl,
+                                       const char *name,
+                                       l_genl_discover_func_t appeared_func,
+                                       l_genl_vanished_func_t vanished_func,
+                                       void *user_data,
+                                       l_genl_destroy_func_t destroy);
+bool l_genl_remove_family_watch(struct l_genl *genl, unsigned int id);
+bool l_genl_request_family(struct l_genl *genl, const char *name,
+                                       l_genl_discover_func_t appeared_func,
+                                       void *user_data,
+                                       l_genl_destroy_func_t destroy);
+
+struct l_genl_attr {
+       struct l_genl_msg *msg;
+       const void *data;
+       uint32_t len;
+       const void *next_data;
+       uint32_t next_len;
+};
+
+struct l_genl_msg* l_genl_msg_new(uint8_t cmd);
+struct l_genl_msg *l_genl_msg_new_sized(uint8_t cmd, uint32_t size);
+
+struct l_genl_msg *l_genl_msg_ref(struct l_genl_msg *msg);
+void l_genl_msg_unref(struct l_genl_msg *msg);
+
+uint8_t l_genl_msg_get_command(struct l_genl_msg *msg);
+uint8_t l_genl_msg_get_version(struct l_genl_msg *msg);
+int l_genl_msg_get_error(struct l_genl_msg *msg);
+
+bool l_genl_msg_append_attr(struct l_genl_msg *msg, uint16_t type,
+                                       uint16_t len, const void *data);
+bool l_genl_msg_append_attrv(struct l_genl_msg *msg, uint16_t type,
+                               const struct iovec *iov, size_t iov_len);
+bool l_genl_msg_enter_nested(struct l_genl_msg *msg, uint16_t type);
+bool l_genl_msg_leave_nested(struct l_genl_msg *msg);
+
+bool l_genl_attr_init(struct l_genl_attr *attr, struct l_genl_msg *msg);
+bool l_genl_attr_next(struct l_genl_attr *attr, uint16_t *type,
+                                       uint16_t *len, const void **data);
+bool l_genl_attr_recurse(struct l_genl_attr *attr, struct l_genl_attr *nested);
+
+bool l_genl_family_info_has_group(const struct l_genl_family_info *info,
+                                       const char *group);
+bool l_genl_family_info_can_send(const struct l_genl_family_info *info,
+                                       uint8_t cmd);
+bool l_genl_family_info_can_dump(const struct l_genl_family_info *info,
+                                       uint8_t cmd);
+char **l_genl_family_info_get_groups(const struct l_genl_family_info *info);
+uint32_t l_genl_family_info_get_id(const struct l_genl_family_info *info);
+const char *l_genl_family_info_get_name(const struct l_genl_family_info *info);
+uint32_t l_genl_family_info_get_version(const struct l_genl_family_info *info);
+
+struct l_genl_family *l_genl_family_new(struct l_genl *genl, const char *name);
+void l_genl_family_free(struct l_genl_family *family);
+
+const struct l_genl_family_info *l_genl_family_get_info(
+                                               struct l_genl_family *family);
+
+struct l_genl *l_genl_family_get_genl(struct l_genl_family *family);
+
+unsigned int l_genl_family_send(struct l_genl_family *family,
+                               struct l_genl_msg *msg,
+                               l_genl_msg_func_t callback,
+                               void *user_data,
+                               l_genl_destroy_func_t destroy);
+unsigned int l_genl_family_dump(struct l_genl_family *family,
+                               struct l_genl_msg *msg,
+                               l_genl_msg_func_t callback,
+                               void *user_data,
+                               l_genl_destroy_func_t destroy);
+bool l_genl_family_cancel(struct l_genl_family *family, unsigned int id);
+
+unsigned int l_genl_family_register(struct l_genl_family *family,
+                               const char *group, l_genl_msg_func_t callback,
+                               void *user_data, l_genl_destroy_func_t destroy);
+bool l_genl_family_unregister(struct l_genl_family *family, unsigned int id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_GENL_H */
diff --git a/ell/gpio.c b/ell/gpio.c
new file mode 100644 (file)
index 0000000..c470ba9
--- /dev/null
@@ -0,0 +1,400 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019 Geanix. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <linux/gpio.h>
+
+#include "private.h"
+#include "strv.h"
+#include "util.h"
+#include "gpio.h"
+
+struct l_gpio_chip {
+       int fd;
+       char *name;
+       char *label;
+       uint32_t n_lines;
+};
+
+struct l_gpio_writer {
+       int fd;
+       uint32_t n_offsets;
+};
+
+struct l_gpio_reader {
+       int fd;
+       uint32_t n_offsets;
+};
+
+static bool chip_has_line_label(const char *chip_name, const char *line_label)
+{
+       struct l_gpio_chip *chip;
+       bool has_label;
+
+       chip = l_gpio_chip_new(chip_name);
+       if (!chip)
+               return false;
+
+       has_label = l_gpio_chip_find_line_offset(chip, line_label, NULL);
+
+       l_gpio_chip_free(chip);
+
+       return has_label;
+}
+
+LIB_EXPORT char **l_gpio_chips_with_line_label(const char *line_label)
+{
+       struct dirent *entry;
+       DIR *dp;
+       char **chips = NULL;
+
+       dp = opendir("/sys/bus/gpio/devices");
+       if (dp == NULL)
+               return NULL;
+
+       while ((entry = readdir(dp))) {
+               if (entry->d_type != DT_LNK)
+                       continue;
+
+               if (!l_str_has_prefix(entry->d_name, "gpiochip"))
+                       continue;
+
+               if (chip_has_line_label(entry->d_name, line_label))
+                       chips = l_strv_append(chips, entry->d_name);
+       }
+
+       closedir(dp);
+
+       return chips;
+}
+
+LIB_EXPORT struct l_gpio_chip *l_gpio_chip_new(const char *chip_name)
+{
+       struct l_gpio_chip *chip;
+       struct gpiochip_info info;
+       char *path;
+       int fd;
+       int ret;
+
+       if (unlikely(!chip_name))
+               return NULL;
+
+       path = l_strdup_printf("/dev/%s", chip_name);
+       fd = open(path, O_RDONLY | O_CLOEXEC);
+       l_free(path);
+
+       if (fd < 0)
+               return NULL;
+
+       memset(&info, 0, sizeof(info));
+
+       ret = ioctl(fd, GPIO_GET_CHIPINFO_IOCTL, &info);
+       if (ret < 0) {
+               close(fd);
+               return NULL;
+       }
+
+       chip = l_new(struct l_gpio_chip, 1);
+       chip->fd = fd;
+       chip->n_lines = info.lines;
+       chip->label = l_strndup(info.label, sizeof(info.label));
+       chip->name = l_strdup(chip_name);
+
+       return chip;
+}
+
+LIB_EXPORT const char *l_gpio_chip_get_label(struct l_gpio_chip *chip)
+{
+       if (unlikely(!chip))
+               return NULL;
+
+       return chip->label;
+}
+
+LIB_EXPORT const char *l_gpio_chip_get_name(struct l_gpio_chip *chip)
+{
+       if (unlikely(!chip))
+               return NULL;
+
+       return chip->name;
+}
+
+LIB_EXPORT uint32_t l_gpio_chip_get_num_lines(struct l_gpio_chip *chip)
+{
+       if (unlikely(!chip))
+               return 0;
+
+       return chip->n_lines;
+}
+
+LIB_EXPORT void l_gpio_chip_free(struct l_gpio_chip *chip)
+{
+       if (unlikely(!chip))
+               return;
+
+       if (chip->fd >= 0)
+               close(chip->fd);
+
+       l_free(chip->name);
+       l_free(chip->label);
+       l_free(chip);
+}
+
+LIB_EXPORT bool l_gpio_chip_find_line_offset(struct l_gpio_chip *chip,
+                                               const char *line_label,
+                                               uint32_t *line_offset)
+{
+       struct gpioline_info info;
+       uint32_t i;
+
+       if (unlikely(!chip))
+               return false;
+
+       if (unlikely(!line_label))
+               return false;
+
+       for (i = 0; i < chip->n_lines; i++) {
+               memset(&info, 0, sizeof(info));
+               info.line_offset = i;
+
+               if (ioctl(chip->fd, GPIO_GET_LINEINFO_IOCTL, &info) < 0)
+                       return false;
+
+               if (strcmp(info.name, line_label) != 0)
+                       continue;
+
+               if (line_offset)
+                       *line_offset = i;
+
+               return true;
+       }
+
+       return false;
+}
+
+LIB_EXPORT char *l_gpio_chip_get_line_label(struct l_gpio_chip *chip,
+                                               uint32_t offset)
+{
+       struct gpioline_info info;
+
+       if (unlikely(!chip))
+               return NULL;
+
+       if (unlikely(offset >= chip->n_lines))
+               return NULL;
+
+       memset(&info, 0, sizeof(info));
+       info.line_offset = offset;
+
+       if (ioctl(chip->fd, GPIO_GET_LINEINFO_IOCTL, &info) < 0)
+               return NULL;
+
+       return l_strdup(info.name);
+}
+
+LIB_EXPORT char *l_gpio_chip_get_line_consumer(struct l_gpio_chip *chip,
+                                               uint32_t offset)
+{
+       struct gpioline_info info;
+
+       if (unlikely(!chip))
+               return NULL;
+
+       if (unlikely(offset >= chip->n_lines))
+               return NULL;
+
+       memset(&info, 0, sizeof(info));
+       info.line_offset = offset;
+
+       if (ioctl(chip->fd, GPIO_GET_LINEINFO_IOCTL, &info) < 0)
+               return NULL;
+
+       return l_strdup(info.consumer);
+}
+
+LIB_EXPORT struct l_gpio_writer *l_gpio_writer_new(struct l_gpio_chip *chip,
+                                               const char *consumer,
+                                               uint32_t n_offsets,
+                                               const uint32_t offsets[],
+                                               const uint32_t values[])
+{
+       struct l_gpio_writer *writer;
+       struct gpiohandle_request request;
+       uint32_t i;
+
+       if (unlikely(!chip))
+               return NULL;
+
+       if (unlikely(n_offsets == 0 || n_offsets > GPIOHANDLES_MAX))
+               return NULL;
+
+       if (unlikely(!offsets))
+               return NULL;
+
+       memset(&request, 0, sizeof(request));
+       l_strlcpy(request.consumer_label, consumer, 32);
+       request.lines = n_offsets;
+       request.flags = GPIOHANDLE_REQUEST_OUTPUT;
+
+       for (i = 0; i < n_offsets; i++) {
+               if (offsets[i] >= chip->n_lines)
+                       return NULL;
+
+               request.lineoffsets[i] = offsets[i];
+               request.default_values[i] = values[i];
+       }
+
+       if (ioctl(chip->fd, GPIO_GET_LINEHANDLE_IOCTL, &request) < 0)
+               return NULL;
+
+       if (request.fd <= 0)
+               return NULL;
+
+       writer = l_new(struct l_gpio_writer, 1);
+       writer->fd = request.fd;
+       writer->n_offsets = n_offsets;
+
+       return writer;
+}
+
+LIB_EXPORT void l_gpio_writer_free(struct l_gpio_writer *writer)
+{
+       if (unlikely(!writer))
+               return;
+
+       if (writer->fd >= 0)
+               close(writer->fd);
+
+       l_free(writer);
+}
+
+LIB_EXPORT bool l_gpio_writer_set(struct l_gpio_writer *writer, uint32_t n_values,
+                                       const uint32_t values[])
+{
+       struct gpiohandle_data data;
+       uint32_t i;
+
+       if (unlikely(!writer))
+               return false;
+
+       if (unlikely(!values))
+               return false;
+
+       if (unlikely(n_values != writer->n_offsets))
+               return false;
+
+       for (i = 0; i < n_values; i++)
+               data.values[i] = values[i];
+
+       if (ioctl(writer->fd, GPIOHANDLE_SET_LINE_VALUES_IOCTL, &data) < 0)
+               return false;
+
+       return true;
+}
+
+LIB_EXPORT struct l_gpio_reader *l_gpio_reader_new(struct l_gpio_chip *chip,
+                                                       const char *consumer,
+                                                       uint32_t n_offsets,
+                                                       const uint32_t offsets[])
+{
+       struct l_gpio_reader *reader;
+       struct gpiohandle_request request;
+       uint32_t i;
+
+       if (unlikely(!chip))
+               return NULL;
+
+       if (unlikely(n_offsets == 0 || n_offsets > GPIOHANDLES_MAX))
+               return NULL;
+
+       if (unlikely(!offsets))
+               return NULL;
+
+       memset(&request, 0, sizeof(request));
+       l_strlcpy(request.consumer_label, consumer, 32);
+       request.lines = n_offsets;
+       request.flags = GPIOHANDLE_REQUEST_INPUT;
+
+       for (i = 0; i < n_offsets; i++) {
+               if (offsets[i] >= chip->n_lines)
+                       return NULL;
+
+               request.lineoffsets[i] = offsets[i];
+       }
+
+       if (ioctl(chip->fd, GPIO_GET_LINEHANDLE_IOCTL, &request) < 0)
+               return NULL;
+
+       if (request.fd <= 0)
+               return NULL;
+
+       reader = l_new(struct l_gpio_reader, 1);
+       reader->fd = request.fd;
+       reader->n_offsets = n_offsets;
+
+       return reader;
+}
+
+LIB_EXPORT void l_gpio_reader_free(struct l_gpio_reader *reader)
+{
+       if (unlikely(!reader))
+               return;
+
+       if (reader->fd >= 0)
+               close(reader->fd);
+
+       l_free(reader);
+}
+
+LIB_EXPORT bool l_gpio_reader_get(struct l_gpio_reader *reader,
+                                       uint32_t n_values, uint32_t values[])
+{
+       struct gpiohandle_data data;
+       uint32_t i;
+
+       if (unlikely(!reader))
+               return false;
+
+       if (unlikely(n_values != reader->n_offsets))
+               return false;
+
+       if (unlikely(!values))
+               return false;
+
+       if (ioctl(reader->fd, GPIOHANDLE_GET_LINE_VALUES_IOCTL, &data) < 0)
+               return false;
+
+       for (i = 0; i < n_values; i++)
+               values[i] = data.values[i];
+
+       return true;
+}
diff --git a/ell/gpio.h b/ell/gpio.h
new file mode 100644 (file)
index 0000000..4912519
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019 Geanix. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_GPIO_H
+#define __ELL_GPIO_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_gpio_chip;
+struct l_gpio_writer;
+struct l_gpio_reader;
+
+char **l_gpio_chips_with_line_label(const char *line_label);
+struct l_gpio_chip *l_gpio_chip_new(const char *chip_name);
+void l_gpio_chip_free(struct l_gpio_chip *chip);
+const char *l_gpio_chip_get_label(struct l_gpio_chip *chip);
+const char *l_gpio_chip_get_name(struct l_gpio_chip *chip);
+uint32_t l_gpio_chip_get_num_lines(struct l_gpio_chip *chip);
+bool l_gpio_chip_find_line_offset(struct l_gpio_chip *chip,
+                                       const char *line_label,
+                                       uint32_t *line_offset);
+char *l_gpio_chip_get_line_label(struct l_gpio_chip *chip, uint32_t offset);
+char *l_gpio_chip_get_line_consumer(struct l_gpio_chip *chip, uint32_t offset);
+
+struct l_gpio_writer *l_gpio_writer_new(struct l_gpio_chip *chip,
+                                       const char *consumer,
+                                       uint32_t n_offsets,
+                                       const uint32_t offsets[],
+                                       const uint32_t values[]);
+void l_gpio_writer_free(struct l_gpio_writer *writer);
+bool l_gpio_writer_set(struct l_gpio_writer *writer, uint32_t n_values,
+                       const uint32_t values[]);
+
+struct l_gpio_reader *l_gpio_reader_new(struct l_gpio_chip *chip,
+                                       const char *consumer,
+                                       uint32_t n_offsets,
+                                       const uint32_t offsets[]);
+void l_gpio_reader_free(struct l_gpio_reader *reader);
+bool l_gpio_reader_get(struct l_gpio_reader *reader, uint32_t n_values,
+                       uint32_t values[]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_GPIO_H */
diff --git a/ell/gvariant-private.h b/ell/gvariant-private.h
new file mode 100644 (file)
index 0000000..6c0005a
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+struct l_dbus_message_iter;
+struct dbus_builder;
+
+bool _gvariant_iter_init(struct l_dbus_message_iter *iter,
+                               struct l_dbus_message *message,
+                               const char *sig_start, const char *sig_end,
+                               const void *data, size_t len);
+bool _gvariant_iter_next_entry_basic(struct l_dbus_message_iter *iter,
+                                       char type, void *out_p);
+bool _gvariant_iter_enter_struct(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *structure);
+bool _gvariant_iter_enter_variant(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *variant);
+bool _gvariant_iter_enter_array(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *array);
+bool _gvariant_iter_skip_entry(struct l_dbus_message_iter *iter);
+
+bool _gvariant_valid_signature(const char *sig);
+int _gvariant_get_alignment(const char *signature);
+bool _gvariant_is_fixed_size(const char *signature);
+int _gvariant_get_fixed_size(const char *signature);
+int _gvariant_num_children(const char *sig);
+
+struct dbus_builder *_gvariant_builder_new(void *body, size_t body_size);
+void _gvariant_builder_free(struct dbus_builder *builder);
+bool _gvariant_builder_append_basic(struct dbus_builder *builder,
+                                       char type, const void *value);
+bool _gvariant_builder_mark(struct dbus_builder *builder);
+bool _gvariant_builder_rewind(struct dbus_builder *builder);
+char *_gvariant_builder_finish(struct dbus_builder *builder,
+                               void **body, size_t *body_size);
+bool _gvariant_builder_enter_struct(struct dbus_builder *builder,
+                                       const char *signature);
+bool _gvariant_builder_leave_struct(struct dbus_builder *builder);
+bool _gvariant_builder_enter_dict(struct dbus_builder *builder,
+                                       const char *signature);
+bool _gvariant_builder_leave_dict(struct dbus_builder *builder);
+bool _gvariant_builder_enter_variant(struct dbus_builder *builder,
+                                       const char *signature);
+bool _gvariant_builder_leave_variant(struct dbus_builder *builder);
+bool _gvariant_builder_enter_array(struct dbus_builder *builder,
+                                       const char *signature);
+bool _gvariant_builder_leave_array(struct dbus_builder *builder);
+
+size_t _gvariant_message_finalize(size_t header_end,
+                                       void *body, size_t body_size,
+                                       const char *signature);
diff --git a/ell/gvariant-util.c b/ell/gvariant-util.c
new file mode 100644 (file)
index 0000000..cf0161a
--- /dev/null
@@ -0,0 +1,1382 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdbool.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdarg.h>
+#include <endian.h>
+#include <limits.h>
+
+#include "private.h"
+#include "util.h"
+#include "queue.h"
+#include "string.h"
+#include "log.h"
+#include "dbus.h"
+#include "dbus-private.h"
+#include "gvariant-private.h"
+
+static const char *simple_types = "sogybnqiuxtdh";
+static const char *variable_types = "sogav";
+static const char *fixed_types = "bynqhiuxtd";
+
+/*
+ * The alignment of a container type is equal to the largest alignment of
+ * any potential child of that container. This means that, even if an array
+ * of 32-bit integers is empty, it still must be aligned to the nearest
+ * multiple of 4 bytes. It also means that the variant type (described below)
+ * has an alignment of 8 (since it could potentially contain a value of any
+ * other type and the maximum alignment is 8).
+ */
+static int get_basic_alignment(const char type)
+{
+       switch (type) {
+       case 'b':
+               return 1;
+       case 'y':
+               return 1;
+       case 'n':
+       case 'q':
+               return 2;
+       case 'i':
+       case 'u':
+               return 4;
+       case 'x':
+       case 't':
+       case 'd':
+               return 8;
+       case 's':
+       case 'g':
+       case 'o':
+               return 1;
+       case 'h':
+               return 4;
+       case 'v':
+               return 8;
+       default:
+               return 0;
+       }
+}
+
+static int get_basic_fixed_size(const char type)
+{
+       switch (type) {
+       case 'b':
+               return 1;
+       case 'y':
+               return 1;
+       case 'n':
+       case 'q':
+               return 2;
+       case 'i':
+       case 'u':
+               return 4;
+       case 'x':
+       case 't':
+       case 'd':
+               return 8;
+       case 'h':
+               return 4;
+       default:
+               return 0;
+       }
+}
+
+static const char *validate_next_type(const char *sig, int *out_alignment)
+{
+       char s = *sig;
+       int alignment;
+
+       if (s == '\0')
+               return NULL;
+
+       if (strchr(simple_types, s) || s == 'v') {
+               *out_alignment = get_basic_alignment(s);
+               return sig + 1;
+       }
+
+       switch (s) {
+       case 'a':
+               return validate_next_type(++sig, out_alignment);
+
+       case '{':
+               s = *++sig;
+
+               /* Dictionary keys can only be simple types */
+               if (!strchr(simple_types, s))
+                       return NULL;
+
+               alignment = get_basic_alignment(s);
+
+               sig = validate_next_type(sig + 1, out_alignment);
+
+               if (!sig)
+                       return NULL;
+
+               if (*sig != '}')
+                       return NULL;
+
+               if (alignment > *out_alignment)
+                       *out_alignment = alignment;
+
+               return sig + 1;
+
+       case '(':
+       {
+               int max_alignment = 1, alignment;
+
+               sig++;
+
+               while (sig && *sig != ')') {
+                       sig = validate_next_type(sig, &alignment);
+
+                       if (alignment > max_alignment)
+                               max_alignment = alignment;
+               }
+
+               if (!sig)
+                       return NULL;
+
+               if (*sig != ')')
+                       return NULL;
+
+               *out_alignment = max_alignment;
+
+               return sig + 1;
+       }
+       }
+
+       return NULL;
+}
+
+bool _gvariant_valid_signature(const char *sig)
+{
+       const char *s = sig;
+       int a;
+
+       if (strlen(sig) > 255)
+               return false;
+
+       do {
+               s = validate_next_type(s, &a);
+
+               if (!s)
+                       return false;
+       } while (*s);
+
+       return true;
+}
+
+int _gvariant_num_children(const char *sig)
+{
+       const char *s = sig;
+       int a;
+       int num_children = 0;
+
+       if (strlen(sig) > 255)
+               return false;
+
+       do {
+               s = validate_next_type(s, &a);
+
+               if (!s)
+                       return -1;
+
+               num_children += 1;
+       } while (*s);
+
+       return num_children;
+}
+
+int _gvariant_get_alignment(const char *sig)
+{
+       int max_alignment = 1, alignment;
+       const char *s = sig;
+
+       /* 8 is the largest alignment possible, so quit if we reach it */
+       while (*s && max_alignment != 8) {
+               s = validate_next_type(s, &alignment);
+               if (!s)
+                       return 0;
+
+               if (alignment > max_alignment)
+                       max_alignment = alignment;
+       }
+
+       return max_alignment;
+}
+
+bool _gvariant_is_fixed_size(const char *sig)
+{
+       while (*sig != 0) {
+               if (strchr(variable_types, sig[0]))
+                       return false;
+
+               sig += 1;
+       }
+
+       return true;
+}
+
+int _gvariant_get_fixed_size(const char *sig)
+{
+       const char *s = sig;
+       const char *p;
+       int size = 0;
+       int alignment;
+       int max_alignment = 1;
+       int r;
+
+       while (*s) {
+               if (strchr(variable_types, *s))
+                       return 0;
+
+               if (strchr(fixed_types, *s)) {
+                       alignment = get_basic_alignment(*s);
+
+                       if (alignment > max_alignment)
+                               max_alignment = alignment;
+
+                       size = align_len(size, alignment);
+                       size += get_basic_fixed_size(*s);
+                       s++;
+                       continue;
+               }
+
+               if (*s == '}' || *s == ')')
+                       break;
+
+               p = validate_next_type(s, &alignment);
+
+               if (!p)
+                       return 0;
+
+               if (alignment > max_alignment)
+                       max_alignment = alignment;
+
+               size = align_len(size, alignment);
+
+               /* Handle special case of unit type */
+               if (s[0] == '(' && s[1] == ')')
+                       r = 1;
+               else
+                       r = _gvariant_get_fixed_size(s + 1);
+
+               if (r == 0)
+                       return 0;
+
+               size += r;
+               s = p;
+       }
+
+       size = align_len(size, max_alignment);
+
+       return size;
+}
+
+static inline size_t offset_length(size_t size, size_t n_offsets)
+{
+       if (size + n_offsets <= 0xff)
+               return 1;
+       if (size + n_offsets * 2 <= 0xffff)
+               return 2;
+       if (size + n_offsets * 4 <= 0xffffffff)
+               return 4;
+       else
+               return 8;
+}
+
+static inline size_t read_word_le(const void *p, size_t sz) {
+       union {
+               uint16_t u16;
+               uint32_t u32;
+               uint64_t u64;
+       } x;
+
+       if (sz == 1)
+               return *(uint8_t *) p;
+
+       memcpy(&x, p, sz);
+
+       if (sz == 2)
+               return le16toh(x.u16);
+       else if (sz == 4)
+               return le32toh(x.u32);
+       else
+               return le64toh(x.u64);
+}
+
+static inline void write_word_le(void *p, size_t value, size_t sz) {
+       union {
+               uint16_t u16;
+               uint32_t u32;
+               uint64_t u64;
+       } x;
+
+       if (sz == 1) {
+               *(uint8_t *) p = value;
+               return;
+       }
+
+       if (sz == 2)
+               x.u16 = htole16((uint16_t) value);
+       else if (sz == 4)
+               x.u32 = htole32((uint32_t) value);
+       else
+               x.u64 = htole64((uint64_t) value);
+
+       memcpy(p, &x, sz);
+}
+
+static bool gvariant_iter_init_internal(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message *message,
+                                       enum dbus_container_type type,
+                                       const char *sig_start,
+                                       const char *sig_end, const void *data,
+                                       size_t len)
+{
+       const char *p;
+       int i;
+       int v;
+       char subsig[256];
+       unsigned int num_variable = 0;
+       unsigned int offset_len = offset_length(len, 0);
+       size_t last_offset;
+       struct gvariant_type_info {
+               uint8_t sig_start;
+               uint8_t sig_end;
+               bool fixed_size : 1;
+               unsigned int alignment : 4;
+               size_t end;             /* Index past the end of the type */
+       } *children;
+       int n_children;
+
+       if (sig_end) {
+               size_t len = sig_end - sig_start;
+               memcpy(subsig, sig_start, len);
+               subsig[len] = '\0';
+       } else
+               strcpy(subsig, sig_start);
+
+       iter->message = message;
+       iter->sig_start = sig_start;
+       iter->sig_len = strlen(subsig);
+       iter->sig_pos = 0;
+       iter->data = data;
+       iter->len = len;
+       iter->pos = 0;
+
+       if (subsig[0] != '\0') {
+               n_children = _gvariant_num_children(subsig);
+               if (n_children < 0)
+                       return false;
+
+               children = l_new(struct gvariant_type_info, n_children);
+       } else {
+               n_children = 0;
+
+               children = NULL;
+       }
+
+       for (p = sig_start, i = 0; i < n_children; i++) {
+               int alignment;
+               size_t size;
+               size_t len;
+
+               children[i].sig_start = p - sig_start;
+               p = validate_next_type(p, &alignment);
+               children[i].sig_end = p - sig_start;
+
+               len = children[i].sig_end - children[i].sig_start;
+               memcpy(subsig, sig_start + children[i].sig_start, len);
+               subsig[len] = '\0';
+
+               children[i].alignment = alignment;
+               children[i].fixed_size = _gvariant_is_fixed_size(subsig);
+
+               if (children[i].fixed_size) {
+                       size = _gvariant_get_fixed_size(subsig);
+                       children[i].end = size;
+               } else if (i + 1 < n_children)
+                       num_variable += 1;
+       }
+
+       if (len < num_variable * offset_len)
+               goto fail;
+
+       last_offset = len - num_variable * offset_len;
+
+       if (num_variable > 0)
+               iter->offsets = iter->data + len - offset_len;
+       else
+               iter->offsets = NULL;
+
+       for (i = 0, v = 0; i < n_children; i++) {
+               size_t o;
+
+               if (children[i].fixed_size) {
+                       if (i == 0)
+                               continue;
+
+                       o = align_len(children[i-1].end,
+                                       children[i].alignment);
+                       children[i].end += o;
+
+                       if (children[i].end > len)
+                               goto fail;
+
+                       continue;
+               }
+
+               if (num_variable == 0) {
+                       children[i].end = last_offset;
+                       continue;
+               }
+
+               v += 1;
+               children[i].end = read_word_le(data + len - offset_len * v,
+                                               offset_len);
+               num_variable -= 1;
+
+               if (children[i].end > len)
+                       goto fail;
+       }
+
+       iter->container_type = type;
+
+       if (type == DBUS_CONTAINER_TYPE_ARRAY &&
+                       !children[0].fixed_size) {
+               size_t offset = read_word_le(iter->data + iter->len -
+                                               offset_len, offset_len);
+               iter->offsets = iter->data + offset;
+       }
+
+       l_free(children);
+
+       return true;
+
+fail:
+       l_free(children);
+       return false;
+}
+
+bool _gvariant_iter_init(struct l_dbus_message_iter *iter,
+                               struct l_dbus_message *message,
+                               const char *sig_start, const char *sig_end,
+                               const void *data, size_t len)
+{
+       return gvariant_iter_init_internal(iter, message,
+                                               DBUS_CONTAINER_TYPE_STRUCT,
+                                               sig_start, sig_end, data, len);
+}
+
+static const void *next_item(struct l_dbus_message_iter *iter,
+                                                       size_t *out_item_size)
+{
+       const void *start;
+       const char *p;
+       char sig[256];
+       int alignment;
+       bool fixed_size;
+       bool last_member;
+       unsigned int sig_len;
+       unsigned int offset_len;
+
+       memcpy(sig, iter->sig_start + iter->sig_pos,
+                       iter->sig_len - iter->sig_pos);
+       sig[iter->sig_len - iter->sig_pos] = '\0';
+
+       /*
+        * Find the next type and make a note whether it is the last in the
+        * structure.  Arrays will always have a single complete type, so
+        * last_member will always be true.
+        */
+       p = validate_next_type(sig, &alignment);
+       if (!p)
+               return NULL;
+
+       sig_len = p - sig;
+
+       last_member = *p == '\0';
+       sig[sig_len] = '\0';
+
+       fixed_size = _gvariant_is_fixed_size(sig);
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY)
+               iter->sig_pos += sig_len;
+
+       iter->pos = align_len(iter->pos, alignment);
+
+       if (fixed_size) {
+               *out_item_size = _gvariant_get_fixed_size(sig);
+               goto done;
+       }
+
+       if (iter->container_type != DBUS_CONTAINER_TYPE_ARRAY && last_member) {
+               unsigned int len = iter->len;
+
+               offset_len = offset_length(iter->len, 0);
+
+               if (iter->offsets && iter->offsets + offset_len <
+                               iter->data + len)
+                       len = iter->offsets + offset_len - iter->data;
+
+               *out_item_size = len - iter->pos;
+               goto done;
+       }
+
+       if (iter->offsets >= iter->data + iter->len)
+                       return NULL;
+
+       offset_len = offset_length(iter->len, 0);
+       *out_item_size = read_word_le(iter->offsets, offset_len) - iter->pos;
+
+       /* In structures the offsets are in reverse order */
+       if (iter->container_type == DBUS_CONTAINER_TYPE_ARRAY)
+               iter->offsets += offset_len;
+       else
+               iter->offsets -= offset_len;
+
+done:
+       start = iter->data + iter->pos;
+
+       if (start >= iter->data + iter->len)
+               return NULL;
+
+       iter->pos += *out_item_size;
+
+       return start;
+}
+
+bool _gvariant_iter_next_entry_basic(struct l_dbus_message_iter *iter,
+                                       char type, void *out)
+{
+       size_t item_size = 0;
+       const void *start;
+       uint8_t uint8_val;
+       uint16_t uint16_val;
+       uint32_t uint32_val;
+       uint64_t uint64_val;
+       int16_t int16_val;
+       int32_t int32_val;
+       int64_t int64_val;
+
+       if (iter->pos >= iter->len)
+               return false;
+
+       if (iter->sig_start[iter->sig_pos] != type)
+               return false;
+
+       start = next_item(iter, &item_size);
+       if (!start)
+               return false;
+
+       switch (type) {
+       case 'o':
+       case 's':
+       case 'g':
+       {
+               const void *end = memchr(start, 0, item_size);
+
+               if (!end)
+                       return false;
+
+               *(const char**) out = start;
+               break;
+       }
+       case 'b':
+               uint8_val = l_get_u8(start);
+               *(bool *) out = !!uint8_val;
+               break;
+       case 'y':
+               uint8_val = l_get_u8(start);
+               *(uint8_t *) out = uint8_val;
+               break;
+       case 'n':
+               int16_val = l_get_s16(start);
+               *(int16_t *) out = int16_val;
+               break;
+       case 'q':
+               uint16_val = l_get_u16(start);
+               *(uint16_t *) out = uint16_val;
+               break;
+       case 'i':
+               int32_val = l_get_s32(start);
+               *(int32_t *) out = int32_val;
+               break;
+       case 'h':
+       case 'u':
+               uint32_val = l_get_u32(start);
+               *(uint32_t *) out = uint32_val;
+               break;
+       case 'x':
+               int64_val = l_get_s64(start);
+               *(int64_t *) out = int64_val;
+               break;
+       case 't':
+               uint64_val = l_get_u64(start);
+               *(uint64_t *) out = uint64_val;
+               break;
+       case 'd':
+               uint64_val = l_get_u64(start);
+               *(uint64_t *) out = uint64_val;
+               break;
+       }
+
+       return true;
+}
+
+bool _gvariant_iter_enter_struct(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *structure)
+{
+       bool is_dict = iter->sig_start[iter->sig_pos] == '{';
+       bool is_struct = iter->sig_start[iter->sig_pos] == '(';
+       const char *sig_start = iter->sig_start + iter->sig_pos + 1;
+       const char *sig_end;
+       const void *start;
+       size_t item_size;
+       enum dbus_container_type type;
+
+       if (!is_dict && !is_struct)
+               return false;
+
+       start = next_item(iter, &item_size);
+       if (!start)
+               return false;
+
+       /* For ARRAY containers the sig_pos is never incremented */
+       if (iter->container_type == DBUS_CONTAINER_TYPE_ARRAY)
+               sig_end = iter->sig_start + iter->sig_len - 1;
+       else
+               sig_end = iter->sig_start + iter->sig_pos - 1;
+
+       type = is_dict ? DBUS_CONTAINER_TYPE_DICT_ENTRY :
+                       DBUS_CONTAINER_TYPE_STRUCT;
+
+       return gvariant_iter_init_internal(structure, iter->message,
+                                               type, sig_start, sig_end,
+                                               start, item_size);
+}
+
+bool _gvariant_iter_enter_variant(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *variant)
+{
+       size_t item_size;
+       const void *start, *end, *nul;
+       char signature[256];
+
+       if (iter->sig_start[iter->sig_pos] != 'v')
+               return false;
+
+       start = next_item(iter, &item_size);
+       if (!start)
+               return false;
+
+       /* Find the signature */
+       end = start + item_size;
+       nul = memrchr(start, 0, end - start);
+
+       if (!nul)
+               return false;
+
+       if (end - nul - 1 > 255)
+               return false;
+
+       memcpy(signature, nul + 1, end - nul - 1);
+       signature[end - nul - 1] = '\0';
+
+       if (_gvariant_num_children(signature) != 1)
+               return false;
+
+       return gvariant_iter_init_internal(variant, iter->message,
+                                               DBUS_CONTAINER_TYPE_VARIANT,
+                                               nul + 1, end,
+                                               start, nul - start);
+}
+
+bool _gvariant_iter_enter_array(struct l_dbus_message_iter *iter,
+                                       struct l_dbus_message_iter *array)
+{
+       const char *sig_start;
+       const char *sig_end;
+       size_t item_size;
+       const void *start;
+
+       if (iter->sig_start[iter->sig_pos] != 'a')
+               return false;
+
+       sig_start = iter->sig_start + iter->sig_pos + 1;
+
+       start = next_item(iter, &item_size);
+       if (!start)
+               return false;
+
+       /* For ARRAY containers the sig_pos is never incremented */
+       if (iter->container_type == DBUS_CONTAINER_TYPE_ARRAY)
+               sig_end = iter->sig_start + iter->sig_len;
+       else
+               sig_end = iter->sig_start + iter->sig_pos;
+
+       return gvariant_iter_init_internal(array, iter->message,
+                                               DBUS_CONTAINER_TYPE_ARRAY,
+                                               sig_start, sig_end,
+                                               start, item_size);
+}
+
+bool _gvariant_iter_skip_entry(struct l_dbus_message_iter *iter)
+{
+       size_t size;
+
+       if (!next_item(iter, &size))
+               return false;
+
+       return true;
+}
+
+struct dbus_builder {
+       struct l_string *signature;
+       void *body;
+       size_t body_size;
+       size_t body_pos;
+       struct l_queue *containers;
+       struct {
+               struct container *container;
+               int sig_end;
+               size_t body_pos;
+               size_t offset_index;
+               bool variable_is_last : 1;
+       } mark;
+};
+
+struct container {
+       size_t *offsets;
+       size_t offsets_size;
+       size_t offset_index;
+       size_t start;
+       bool variable_is_last : 1;
+       enum dbus_container_type type;
+       char signature[256];
+       uint8_t sigindex;
+};
+
+static inline size_t grow_body(struct dbus_builder *builder,
+                                       size_t len, unsigned int alignment)
+{
+       size_t size = align_len(builder->body_pos, alignment);
+
+       if (size + len > builder->body_size) {
+               builder->body = l_realloc(builder->body, size + len);
+               builder->body_size = size + len;
+       }
+
+       if (size - builder->body_pos > 0)
+               memset(builder->body + builder->body_pos, 0,
+                       size - builder->body_pos);
+
+       builder->body_pos = size + len;
+
+       return size;
+}
+
+static inline bool grow_offsets(struct container *container)
+{
+       size_t needed;
+
+       if (container->offset_index < container->offsets_size)
+               return true;
+
+       needed = container->offsets_size * 2;
+
+       if (needed > USHRT_MAX)
+               return false;
+
+       if (needed == 0)
+               needed = 8;
+
+       container->offsets = l_realloc(container->offsets,
+                                               needed * sizeof(size_t));
+       container->offsets_size = needed;
+
+       return true;
+}
+
+static struct container *container_new(enum dbus_container_type type,
+                                       const char *signature, size_t start)
+{
+       struct container *ret;
+
+       ret = l_new(struct container, 1);
+
+       ret->type = type;
+       strcpy(ret->signature, signature);
+       ret->start = start;
+
+       return ret;
+}
+
+static void container_free(struct container *container)
+{
+       l_free(container->offsets);
+       l_free(container);
+}
+
+static void container_append_struct_offsets(struct container *container,
+                                       struct dbus_builder *builder)
+{
+       size_t offset_size;
+       int i;
+       size_t start;
+
+       if (container->variable_is_last)
+               container->offset_index -= 1;
+
+       if (container->offset_index == 0)
+               return;
+
+       offset_size = offset_length(builder->body_pos,
+                                               container->offset_index);
+       i = container->offset_index - 1;
+
+       start = grow_body(builder, offset_size * container->offset_index, 1);
+
+       for (i = container->offset_index - 1; i >= 0; i--) {
+               write_word_le(builder->body + start,
+                               container->offsets[i], offset_size);
+               start += offset_size;
+       }
+}
+
+static void container_append_array_offsets(struct container *container,
+                                       struct dbus_builder *builder)
+{
+       size_t offset_size;
+       unsigned int i;
+       size_t start;
+
+       if (container->offset_index == 0)
+               return;
+
+       offset_size = offset_length(builder->body_pos,
+                                               container->offset_index);
+       start = grow_body(builder, offset_size * container->offset_index, 1);
+
+       for (i = 0; i < container->offset_index; i++) {
+               write_word_le(builder->body + start,
+                               container->offsets[i], offset_size);
+               start += offset_size;
+       }
+}
+
+struct dbus_builder *_gvariant_builder_new(void *body, size_t body_size)
+{
+       struct dbus_builder *builder;
+       struct container *root;
+
+       builder = l_new(struct dbus_builder, 1);
+       builder->signature = l_string_new(63);
+
+       builder->containers = l_queue_new();
+       root = container_new(DBUS_CONTAINER_TYPE_STRUCT, "", 0);
+       l_queue_push_head(builder->containers, root);
+
+       builder->body = body;
+       builder->body_size = body_size;
+       builder->body_pos = body_size;
+
+       builder->mark.container = root;
+
+       return builder;
+}
+
+void _gvariant_builder_free(struct dbus_builder *builder)
+{
+       if (unlikely(!builder))
+               return;
+
+       l_string_free(builder->signature);
+       l_queue_destroy(builder->containers,
+                               (l_queue_destroy_func_t) container_free);
+       l_free(builder->body);
+
+       l_free(builder);
+}
+
+static bool enter_struct_dict_common(struct dbus_builder *builder,
+                                       const char *signature,
+                                       enum dbus_container_type type,
+                                       const char open,
+                                       const char close)
+{
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *container = l_queue_peek_head(builder->containers);
+       int alignment;
+       size_t start;
+
+       if (qlen == 1) {
+               if (l_string_length(builder->signature) +
+                               strlen(signature) + 2 > 255)
+                       return false;
+       } else {
+               /* Verify Signatures Match */
+               char expect[256];
+               const char *start;
+               const char *end;
+
+               start = container->signature + container->sigindex;
+               end = validate_next_type(start, &alignment) - 1;
+
+               if (*start != open || *end != close)
+                       return false;
+
+               memcpy(expect, start + 1, end - start - 1);
+               expect[end - start - 1] = '\0';
+
+               if (strcmp(expect, signature))
+                       return false;
+       }
+
+       alignment = _gvariant_get_alignment(signature);
+       start = grow_body(builder, 0, alignment);
+
+       container = container_new(type, signature, start);
+       l_queue_push_head(builder->containers, container);
+
+       return true;
+}
+
+bool _gvariant_builder_enter_struct(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       if (signature[0] && !_gvariant_valid_signature(signature))
+               return false;
+
+       return enter_struct_dict_common(builder, signature,
+                                       DBUS_CONTAINER_TYPE_STRUCT, '(', ')');
+}
+
+bool _gvariant_builder_enter_dict(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       if (_gvariant_num_children(signature) != 2)
+               return false;
+
+       if (!strchr(simple_types, signature[0]))
+               return false;
+
+       return enter_struct_dict_common(builder, signature,
+                                       DBUS_CONTAINER_TYPE_DICT_ENTRY,
+                                       '{', '}');
+}
+
+static bool leave_struct_dict_common(struct dbus_builder *builder,
+                                       enum dbus_container_type type,
+                                       const char open,
+                                       const char close)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *parent;
+
+       if (unlikely(qlen <= 1))
+               return false;
+
+       if (unlikely(container->type != type))
+               return false;
+
+       l_queue_pop_head(builder->containers);
+       qlen -= 1;
+       parent = l_queue_peek_head(builder->containers);
+
+       if (_gvariant_is_fixed_size(container->signature)) {
+               int alignment = _gvariant_get_alignment(container->signature);
+               grow_body(builder, 0, alignment);
+
+               /* Empty struct or "unit type" is encoded as a zero byte */
+               if (container->signature[0] == '\0') {
+                       size_t start = grow_body(builder, 1, 1);
+
+                       memset(builder->body + start, 0, 1);
+               }
+
+               parent->variable_is_last = false;
+       } else {
+               size_t offset;
+
+               if (!grow_offsets(parent))
+                       return false;
+
+               container_append_struct_offsets(container, builder);
+               offset = builder->body_pos - parent->start;
+               parent->offsets[parent->offset_index++] = offset;
+               parent->variable_is_last = true;
+       }
+
+       if (qlen == 1)
+               l_string_append_printf(builder->signature, "%c%s%c",
+                                               open,
+                                               container->signature,
+                                               close);
+       else if (parent->type != DBUS_CONTAINER_TYPE_ARRAY)
+               parent->sigindex += strlen(container->signature) + 2;
+
+       container_free(container);
+
+       return true;
+}
+
+bool _gvariant_builder_leave_struct(struct dbus_builder *builder)
+{
+       return leave_struct_dict_common(builder, DBUS_CONTAINER_TYPE_STRUCT,
+                                       '(', ')');
+}
+
+bool _gvariant_builder_leave_dict(struct dbus_builder *builder)
+{
+       return leave_struct_dict_common(builder,
+                                       DBUS_CONTAINER_TYPE_DICT_ENTRY,
+                                       '{', '}');
+}
+
+bool _gvariant_builder_enter_variant(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+
+       if (_gvariant_num_children(signature) != 1)
+               return false;
+
+       if (qlen == 1) {
+               if (l_string_length(builder->signature) + 1 > 255)
+                       return false;
+       } else if (container->signature[container->sigindex] != 'v')
+               return false;
+
+       start = grow_body(builder, 0, 8);
+
+       container = container_new(DBUS_CONTAINER_TYPE_VARIANT,
+                                       signature, start);
+       l_queue_push_head(builder->containers, container);
+
+       return true;
+}
+
+bool _gvariant_builder_leave_variant(struct dbus_builder *builder)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *parent;
+       size_t start;
+       size_t siglen;
+       size_t offset;
+
+       if (unlikely(qlen <= 1))
+               return false;
+
+       if (unlikely(container->type != DBUS_CONTAINER_TYPE_VARIANT))
+               return false;
+
+       l_queue_pop_head(builder->containers);
+       qlen -= 1;
+       parent = l_queue_peek_head(builder->containers);
+
+       siglen = strlen(container->signature);
+       start = grow_body(builder, siglen + 1, 1);
+       memset(builder->body + start, 0, 1);
+       memcpy(builder->body + start + 1, container->signature, siglen);
+
+       if (!grow_offsets(parent))
+               return false;
+
+       offset = builder->body_pos - parent->start;
+       parent->offsets[parent->offset_index++] = offset;
+       parent->variable_is_last = true;
+
+       if (qlen == 1)
+               l_string_append_c(builder->signature, 'v');
+       else if (parent->type != DBUS_CONTAINER_TYPE_ARRAY)
+               parent->sigindex += 1;
+
+       container_free(container);
+
+       return true;
+}
+
+bool _gvariant_builder_enter_array(struct dbus_builder *builder,
+                                       const char *signature)
+{
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+       int alignment;
+
+       if (_gvariant_num_children(signature) != 1)
+               return false;
+
+       if (qlen == 1) {
+               if (l_string_length(builder->signature) +
+                               strlen(signature) + 1 > 255)
+                       return false;
+       } else {
+               /* Verify Signatures Match */
+               char expect[256];
+               const char *start;
+               const char *end;
+
+               start = container->signature + container->sigindex;
+               end = validate_next_type(start, &alignment);
+
+               if (*start != 'a')
+                       return false;
+
+               memcpy(expect, start + 1, end - start - 1);
+               expect[end - start - 1] = '\0';
+
+               if (strcmp(expect, signature))
+                       return false;
+       }
+
+       alignment = _gvariant_get_alignment(signature);
+       start = grow_body(builder, 0, alignment);
+
+       container = container_new(DBUS_CONTAINER_TYPE_ARRAY, signature, start);
+       l_queue_push_head(builder->containers, container);
+
+       return true;
+}
+
+bool _gvariant_builder_leave_array(struct dbus_builder *builder)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t qlen = l_queue_length(builder->containers);
+       struct container *parent;
+       size_t offset;
+
+       if (unlikely(qlen <= 1))
+               return false;
+
+       if (unlikely(container->type != DBUS_CONTAINER_TYPE_ARRAY))
+               return false;
+
+       l_queue_pop_head(builder->containers);
+       qlen -= 1;
+       parent = l_queue_peek_head(builder->containers);
+
+       if (!_gvariant_is_fixed_size(container->signature))
+               container_append_array_offsets(container, builder);
+
+       if (!grow_offsets(parent))
+               return false;
+
+       offset = builder->body_pos - parent->start;
+       parent->offsets[parent->offset_index++] = offset;
+       parent->variable_is_last = true;
+
+       if (qlen == 1)
+               l_string_append_printf(builder->signature, "a%s",
+                                                       container->signature);
+       else if (parent->type != DBUS_CONTAINER_TYPE_ARRAY)
+               parent->sigindex += strlen(container->signature) + 1;
+
+       container_free(container);
+
+       return true;
+}
+
+bool _gvariant_builder_append_basic(struct dbus_builder *builder,
+                                       char type, const void *value)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+       size_t start;
+       unsigned int alignment;
+       size_t len;
+       size_t offset;
+
+       if (unlikely(!builder))
+               return false;
+
+       if (unlikely(!strchr(simple_types, type)))
+               return false;
+
+       alignment = get_basic_alignment(type);
+       if (!alignment)
+               return false;
+
+       if (l_queue_length(builder->containers) == 1)
+               l_string_append_c(builder->signature, type);
+       else if (container->signature[container->sigindex] != type)
+               return false;
+
+       len = get_basic_fixed_size(type);
+
+       if (len) {
+               start = grow_body(builder, len, alignment);
+               memcpy(builder->body + start, value, len);
+               container->variable_is_last = false;
+
+               if (container->type != DBUS_CONTAINER_TYPE_ARRAY)
+                       container->sigindex += 1;
+
+               return true;
+       }
+
+       if (!grow_offsets(container))
+               return false;
+
+       len = strlen(value) + 1;
+       start = grow_body(builder, len, alignment);
+       memcpy(builder->body + start, value, len);
+
+       offset = builder->body_pos - container->start;
+       container->offsets[container->offset_index++] = offset;
+       container->variable_is_last = true;
+
+       if (container->type != DBUS_CONTAINER_TYPE_ARRAY)
+               container->sigindex += 1;
+
+       return true;
+}
+
+bool _gvariant_builder_mark(struct dbus_builder *builder)
+{
+       struct container *container = l_queue_peek_head(builder->containers);
+
+       builder->mark.container = container;
+
+       if (l_queue_length(builder->containers) == 1)
+               builder->mark.sig_end = l_string_length(builder->signature);
+       else
+               builder->mark.sig_end = container->sigindex;
+
+       builder->mark.body_pos = builder->body_pos;
+       builder->mark.offset_index = container->offset_index;
+       builder->mark.variable_is_last = container->variable_is_last;
+
+       return true;
+}
+
+bool _gvariant_builder_rewind(struct dbus_builder *builder)
+{
+       struct container *container;
+
+       while ((container = l_queue_peek_head(builder->containers)) !=
+                               builder->mark.container) {
+               container_free(container);
+               l_queue_pop_head(builder->containers);
+       }
+
+       builder->body_pos = builder->mark.body_pos;
+       container->offset_index = builder->mark.offset_index;
+       container->variable_is_last = builder->mark.variable_is_last;
+
+       if (l_queue_length(builder->containers) == 1)
+               l_string_truncate(builder->signature, builder->mark.sig_end);
+       else
+               container->sigindex = builder->mark.sig_end;
+
+       return true;
+}
+
+char *_gvariant_builder_finish(struct dbus_builder *builder,
+                               void **body, size_t *body_size)
+{
+       char *signature;
+       struct container *root;
+       uint8_t *variant_buf;
+       size_t size;
+
+       if (unlikely(!builder))
+               return NULL;
+
+       if (unlikely(l_queue_length(builder->containers) != 1))
+               return NULL;
+
+       root = l_queue_peek_head(builder->containers);
+
+       signature = l_string_unwrap(builder->signature);
+       builder->signature = NULL;
+
+       if (_gvariant_is_fixed_size(signature)) {
+               int alignment = _gvariant_get_alignment(signature);
+               grow_body(builder, 0, alignment);
+
+               /* Empty struct or "unit type" is encoded as a zero byte */
+               if (signature[0] == '\0') {
+                       size_t start = grow_body(builder, 1, 1);
+
+                       memset(builder->body + start, 0, 1);
+               }
+       } else
+               container_append_struct_offsets(root, builder);
+
+       /*
+        * Make sure there's enough space after the body for the variant
+        * signature written here but not included in the body size and
+        * one framing offset value to be written in
+        * _gvariant_message_finalize.
+        */
+       size = 3 + strlen(signature) + 8;
+       if (builder->body_pos + size > builder->body_size)
+               builder->body = l_realloc(builder->body,
+                                               builder->body_pos + size);
+
+       variant_buf = builder->body + builder->body_pos;
+       *variant_buf++ = 0;
+       *variant_buf++ = '(';
+       variant_buf = mempcpy(variant_buf, signature, strlen(signature));
+       *variant_buf++ = ')';
+
+       *body = builder->body;
+       *body_size = builder->body_pos;
+       builder->body = NULL;
+       builder->body_size = 0;
+
+       return signature;
+}
+
+/*
+ * Write the header's framing offset after the body variant which is the
+ * last piece of data in the message after the header, the padding and
+ * the builder has written the message body.
+ */
+size_t _gvariant_message_finalize(size_t header_end,
+                                       void *body, size_t body_size,
+                                       const char *signature)
+{
+       size_t offset_start;
+       size_t offset_size;
+
+       offset_start = body_size + 3 + strlen(signature);
+
+       offset_size = offset_length(align_len(header_end, 8) + offset_start, 1);
+
+       write_word_le(body + offset_start, header_end, offset_size);
+
+       return align_len(header_end, 8) + offset_start + offset_size;
+}
diff --git a/ell/hashmap.c b/ell/hashmap.c
new file mode 100644 (file)
index 0000000..0d552e5
--- /dev/null
@@ -0,0 +1,653 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "util.h"
+#include "hashmap.h"
+#include "private.h"
+
+/**
+ * SECTION:hashmap
+ * @short_description: Hash table support
+ *
+ * Hash table support
+ */
+
+#define NBUCKETS 127
+
+struct entry {
+       void *key;
+       void *value;
+       struct entry *next;
+       unsigned int hash;
+};
+
+/**
+ * l_hashmap:
+ *
+ * Opague object representing the hash table.
+ */
+struct l_hashmap {
+       l_hashmap_hash_func_t hash_func;
+       l_hashmap_compare_func_t compare_func;
+       l_hashmap_key_new_func_t key_new_func;
+       l_hashmap_key_free_func_t key_free_func;
+       unsigned int entries;
+       struct entry buckets[NBUCKETS];
+};
+
+static inline void *get_key_new(const struct l_hashmap *hashmap,
+                               const void *key)
+{
+       if (hashmap->key_new_func)
+               return hashmap->key_new_func(key);
+
+       return (void *)key;
+}
+
+static inline void free_key(const struct l_hashmap *hashmap, void *key)
+{
+       if (hashmap->key_free_func)
+               hashmap->key_free_func(key);
+}
+
+static inline unsigned int hash_superfast(const uint8_t *key, unsigned int len)
+{
+       /*
+        * Paul Hsieh (http://www.azillionmonkeys.com/qed/hash.html)
+        * used by WebCore (http://webkit.org/blog/8/hashtables-part-2/),
+        * EFL's eina, kmod and possible others.
+        */
+       unsigned int tmp, hash = len, rem = len & 3;
+
+       len /= 4;
+
+       /* Main loop */
+       for (; len > 0; len--) {
+               hash += l_get_u16(key);
+               tmp = (l_get_u16(key + 2) << 11) ^ hash;
+               hash = (hash << 16) ^ tmp;
+               key += 4;
+               hash += hash >> 11;
+       }
+
+       /* Handle end cases */
+       switch (rem) {
+       case 3:
+               hash += l_get_u16(key);
+               hash ^= hash << 16;
+               hash ^= key[2] << 18;
+               hash += hash >> 11;
+               break;
+
+       case 2:
+               hash += l_get_u16(key);
+               hash ^= hash << 11;
+               hash += hash >> 17;
+               break;
+
+       case 1:
+               hash += *key;
+               hash ^= hash << 10;
+               hash += hash >> 1;
+               break;
+       }
+
+       /* Force "avalanching" of final 127 bits */
+       hash ^= hash << 3;
+       hash += hash >> 5;
+       hash ^= hash << 4;
+       hash += hash >> 17;
+       hash ^= hash << 25;
+       hash += hash >> 6;
+
+       return hash;
+}
+
+static unsigned int direct_hash_func(const void *p)
+{
+       return L_PTR_TO_UINT(p);
+}
+
+static int direct_compare_func(const void *a, const void *b)
+{
+        return a < b ? -1 : (a > b ? 1 : 0);
+}
+
+/**
+ * l_hashmap_new:
+ *
+ * Create a new hash table. The keys are managed as pointers, that is,
+ * the pointer value is hashed and looked up.
+ *
+ * No error handling is needed since. In case of real memory allocation
+ * problems abort() will be called.
+ *
+ * See also l_hashmap_string_new().
+ *
+ * Returns: a newly allocated #l_hashmap object
+ **/
+LIB_EXPORT struct l_hashmap *l_hashmap_new(void)
+{
+       struct l_hashmap *hashmap;
+
+       hashmap = l_new(struct l_hashmap, 1);
+
+       hashmap->hash_func = direct_hash_func;
+       hashmap->compare_func = direct_compare_func;
+       hashmap->entries = 0;
+
+       return hashmap;
+}
+
+LIB_EXPORT unsigned int l_str_hash(const void *p)
+{
+       const char *s = p;
+       size_t len = strlen(s);
+
+       return hash_superfast((const uint8_t *)s, len);
+}
+
+/**
+ * l_hashmap_string_new:
+ *
+ * Create a new hash table. The keys are considered strings and are
+ * copied.
+ *
+ * No error handling is needed since. In case of real memory allocation
+ * problems abort() will be called.
+ *
+ * See also l_hashmap_new().
+ *
+ * Returns: a newly allocated #l_hashmap object
+ **/
+LIB_EXPORT struct l_hashmap *l_hashmap_string_new(void)
+{
+       struct l_hashmap *hashmap;
+
+       hashmap = l_new(struct l_hashmap, 1);
+
+       hashmap->hash_func = l_str_hash;
+       hashmap->compare_func = (l_hashmap_compare_func_t) strcmp;
+       hashmap->key_new_func = (l_hashmap_key_new_func_t) l_strdup;
+       hashmap->key_free_func = l_free;
+       hashmap->entries = 0;
+
+       return hashmap;
+}
+
+/**
+ * l_hashmap_set_hash_function:
+ * @hashmap: hash table object
+ * @func: Key hashing function
+ *
+ * Sets the hashing function to be used by this object.
+ *
+ * This function can only be called when the @hashmap is empty.
+ *
+ * Returns: #true when the hashing function could be updated successfully,
+ * and #false otherwise.
+ **/
+LIB_EXPORT bool l_hashmap_set_hash_function(struct l_hashmap *hashmap,
+                                               l_hashmap_hash_func_t func)
+{
+       if (unlikely(!hashmap))
+               return false;
+
+       if (hashmap->entries != 0)
+               return false;
+
+       hashmap->hash_func = func;
+
+       return true;
+}
+
+/**
+ * l_hashmap_set_compare_function:
+ * @hashmap: hash table object
+ * @func: Key compare function
+ *
+ * Sets the key comparison function to be used by this object.
+ *
+ * This function can only be called when the @hashmap is empty.
+ *
+ * Returns: #true when the comparison function could be updated successfully,
+ * and #false otherwise.
+ **/
+LIB_EXPORT bool l_hashmap_set_compare_function(struct l_hashmap *hashmap,
+                                               l_hashmap_compare_func_t func)
+{
+       if (unlikely(!hashmap))
+               return false;
+
+       if (hashmap->entries != 0)
+               return false;
+
+       hashmap->compare_func = func;
+
+       return true;
+}
+
+/**
+ * l_hashmap_set_key_copy_function:
+ * @hashmap: hash table object
+ * @func: Key duplication function
+ *
+ * Sets the key duplication function to be used by this object.  If the
+ * function is NULL, then the keys are assigned directly.
+ *
+ * This function can only be called when the @hashmap is empty.
+ *
+ * Returns: #true when the key copy function could be updated successfully,
+ * and #false otherwise.
+ **/
+LIB_EXPORT bool l_hashmap_set_key_copy_function(struct l_hashmap *hashmap,
+                                               l_hashmap_key_new_func_t func)
+{
+       if (unlikely(!hashmap))
+               return false;
+
+       if (hashmap->entries != 0)
+               return false;
+
+       hashmap->key_new_func = func;
+
+       return true;
+}
+
+/**
+ * l_hashmap_set_key_free_function:
+ * @hashmap: hash table object
+ * @func: Key destructor function
+ *
+ * Sets the key destructor function to be used by this object.  This function
+ * should undo the result of the function specified in
+ * l_hashmap_set_key_copy_function(). This function can be NULL, in which
+ * case no destructor is called.
+ *
+ * This function can only be called when the @hashmap is empty.
+ *
+ * Returns: #true when the key free function could be updated successfully,
+ * and #false otherwise.
+ **/
+LIB_EXPORT bool l_hashmap_set_key_free_function(struct l_hashmap *hashmap,
+                                               l_hashmap_key_free_func_t func)
+{
+       if (unlikely(!hashmap))
+               return false;
+
+       if (hashmap->entries != 0)
+               return false;
+
+       hashmap->key_free_func = func;
+
+       return true;
+}
+
+/**
+ * l_hashmap_destroy:
+ * @hashmap: hash table object
+ * @destroy: destroy function
+ *
+ * Free hash table and call @destory on all remaining entries.
+ *
+ * NOTE: While the destroy is in progress, the hashmap is assumed to be
+ * invariant.  The behavior of adding or removing entries while a destroy
+ * operation is in progress is undefined.
+ **/
+LIB_EXPORT void l_hashmap_destroy(struct l_hashmap *hashmap,
+                               l_hashmap_destroy_func_t destroy)
+{
+       unsigned int i;
+
+       if (unlikely(!hashmap))
+               return;
+
+       for (i = 0; i < NBUCKETS; i++) {
+               struct entry *entry, *next, *head = &hashmap->buckets[i];
+
+               if (!head->next)
+                       continue;
+
+               for (entry = head;; entry = next) {
+                       if (destroy)
+                               destroy(entry->value);
+
+                       free_key(hashmap, entry->key);
+
+                       next = entry->next;
+
+                       if (entry != head)
+                               l_free(entry);
+
+                       if (next == head)
+                               break;
+               }
+       }
+
+       l_free(hashmap);
+}
+
+/**
+ * l_hashmap_insert:
+ * @hashmap: hash table object
+ * @key: key pointer
+ * @value: value pointer
+ *
+ * Insert new @value entry with @key.
+ *
+ * Returns: #true when value has been added and #false in case of failure
+ **/
+LIB_EXPORT bool l_hashmap_insert(struct l_hashmap *hashmap,
+                               const void *key, void *value)
+{
+       struct entry *entry, *head;
+       unsigned int hash;
+       void *key_new;
+
+       if (unlikely(!hashmap))
+               return false;
+
+       key_new = get_key_new(hashmap, key);
+       hash = hashmap->hash_func(key_new);
+       head = &hashmap->buckets[hash % NBUCKETS];
+
+       if (!head->next) {
+               head->key = key_new;
+               head->value = value;
+               head->hash = hash;
+               head->next = head;
+               goto done;
+       }
+
+       entry = l_new(struct entry, 1);
+       entry->key = key_new;
+       entry->value = value;
+       entry->hash = hash;
+       entry->next = head;
+
+       while (head->next != entry->next)
+               head = head->next;
+
+       head->next = entry;
+
+done:
+       hashmap->entries++;
+
+       return true;
+}
+
+/**
+ * l_hashmap_remove:
+ * @hashmap: hash table object
+ * @key: key pointer
+ *
+ * Remove entry for @key.
+ *
+ * Returns: value pointer of the removed entry or #NULL in case of failure
+ **/
+LIB_EXPORT void *l_hashmap_remove(struct l_hashmap *hashmap, const void *key)
+{
+       struct entry *entry, *head, *prev;
+       unsigned int hash;
+
+       if (unlikely(!hashmap))
+               return NULL;
+
+       hash = hashmap->hash_func(key);
+       head = &hashmap->buckets[hash % NBUCKETS];
+
+       if (!head->next)
+               return NULL;
+
+       for (entry = head, prev = NULL;; prev = entry, entry = entry->next) {
+               void *value;
+
+               if (entry->hash != hash)
+                       goto next;
+
+               if (hashmap->compare_func(key, entry->key))
+                       goto next;
+
+               value = entry->value;
+
+               if (entry == head) {
+                       if (entry->next == head) {
+                               free_key(hashmap, entry->key);
+                               head->key = NULL;
+                               head->value = NULL;
+                               head->hash = 0;
+                               head->next = NULL;
+                       } else {
+                               entry = entry->next;
+                               free_key(hashmap, head->key);
+                               head->key = entry->key;
+                               head->value = entry->value;
+                               head->hash = entry->hash;
+                               head->next = entry->next;
+                               l_free(entry);
+                       }
+               } else {
+                       prev->next = entry->next;
+                       free_key(hashmap, entry->key);
+                       l_free(entry);
+               }
+
+               hashmap->entries--;
+
+               return value;
+
+next:
+               if (entry->next == head)
+                       break;
+       }
+
+       return NULL;
+}
+
+/**
+ * l_hashmap_lookup:
+ * @hashmap: hash table object
+ * @key: key pointer
+ *
+ * Lookup entry for @key.
+ *
+ * Returns: value pointer for @key or #NULL in case of failure
+ **/
+LIB_EXPORT void *l_hashmap_lookup(struct l_hashmap *hashmap, const void *key)
+{
+       struct entry *entry, *head;
+       unsigned int hash;
+
+       if (unlikely(!hashmap))
+               return NULL;
+
+       hash = hashmap->hash_func(key);
+       head = &hashmap->buckets[hash % NBUCKETS];
+
+       if (!head->next)
+               return NULL;
+
+       for (entry = head;; entry = entry->next) {
+               if (entry->hash == hash &&
+                               !hashmap->compare_func(key, entry->key))
+                       return entry->value;
+
+               if (entry->next == head)
+                       break;
+       }
+
+       return NULL;
+}
+
+/**
+ * l_hashmap_foreach:
+ * @hashmap: hash table object
+ * @function: callback function
+ * @user_data: user data given to callback function
+ *
+ * Call @function for every entry in @hashmap.
+ *
+ * NOTE: While the foreach is in progress, the hashmap is assumed to be
+ * invariant.  The behavior of adding or removing entries while a foreach
+ * operation is in progress is undefined.
+ **/
+LIB_EXPORT void l_hashmap_foreach(struct l_hashmap *hashmap,
+                       l_hashmap_foreach_func_t function, void *user_data)
+{
+       unsigned int i;
+
+       if (unlikely(!hashmap || !function))
+               return;
+
+       for (i = 0; i < NBUCKETS; i++) {
+               struct entry *entry, *head = &hashmap->buckets[i];
+
+               if (!head->next)
+                       continue;
+
+               for (entry = head;; entry = entry->next) {
+                       function(entry->key, entry->value, user_data);
+
+                       if (entry->next == head)
+                               break;
+               }
+       }
+}
+
+/**
+ * l_hashmap_foreach_remove:
+ * @hashmap: hash table object
+ * @function: callback function
+ * @user_data: user data given to callback function
+ *
+ * Call @function for every entry in @hashmap.  If the @function returns
+ * true, then the object will be removed from the hashmap.
+ *
+ * NOTE: While the foreach is in progress, the hashmap is assumed to be
+ * invariant.  The behavior of adding or removing entries while a foreach
+ * operation is in progress is undefined.
+ *
+ * Returns: Number of entries removed.
+ **/
+LIB_EXPORT unsigned int l_hashmap_foreach_remove(struct l_hashmap *hashmap,
+                                       l_hashmap_remove_func_t function,
+                                       void *user_data)
+{
+       unsigned int i;
+       unsigned int nremoved = 0;
+
+       if (unlikely(!hashmap || !function))
+               return 0;
+
+       for (i = 0; i < NBUCKETS; i++) {
+               struct entry *head = &hashmap->buckets[i];
+               struct entry *entry;
+               struct entry *prev;
+               bool remove;
+
+               if (head->next == NULL)
+                       continue;
+
+               entry = head;
+               prev = NULL;
+
+               while (true) {
+                       remove = function(entry->key, entry->value, user_data);
+
+                       if (!remove)
+                               goto next;
+
+                       nremoved += 1;
+                       hashmap->entries -= 1;
+
+                       if (entry == head) {
+                               if (entry->next == head) {
+                                       free_key(hashmap, entry->key);
+                                       head->key = NULL;
+                                       head->value = NULL;
+                                       head->hash = 0;
+                                       head->next = NULL;
+                                       break;
+                               } else {
+                                       entry = entry->next;
+                                       free_key(hashmap, head->key);
+                                       head->key = entry->key;
+                                       head->value = entry->value;
+                                       head->hash = entry->hash;
+                                       head->next = entry->next;
+                                       l_free(entry);
+                                       entry = head;
+                                       continue;
+                               }
+                       } else {
+                               prev->next = entry->next;
+                               free_key(hashmap, entry->key);
+                               l_free(entry);
+                               entry = prev->next;
+                               if (entry == head)
+                                       break;
+                               continue;
+                       }
+
+next:
+                       if (entry->next == head)
+                               break;
+
+                       prev = entry;
+                       entry = entry->next;
+               }
+       }
+
+       return nremoved;
+}
+
+/**
+ * l_hashmap_size:
+ * @hashmap: hash table object
+ *
+ * Returns: entries in the hash table
+ **/
+LIB_EXPORT unsigned int l_hashmap_size(struct l_hashmap *hashmap)
+{
+       if (unlikely(!hashmap))
+               return 0;
+
+       return hashmap->entries;
+}
+
+/**
+ * l_hashmap_isempty:
+ * @hashmap: hash table object
+ *
+ * Returns: #true if hash table is empty and #false if not
+ **/
+LIB_EXPORT bool l_hashmap_isempty(struct l_hashmap *hashmap)
+{
+       if (unlikely(!hashmap))
+               return true;
+
+       return hashmap->entries == 0;
+}
diff --git a/ell/hashmap.h b/ell/hashmap.h
new file mode 100644 (file)
index 0000000..3d23c7e
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_HASHMAP_H
+#define __ELL_HASHMAP_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*l_hashmap_foreach_func_t) (const void *key, void *value,
+                                                       void *user_data);
+typedef void (*l_hashmap_destroy_func_t) (void *value);
+typedef unsigned int (*l_hashmap_hash_func_t) (const void *p);
+typedef int (*l_hashmap_compare_func_t) (const void *a, const void *b);
+typedef void *(*l_hashmap_key_new_func_t) (const void *p);
+typedef void (*l_hashmap_key_free_func_t) (void *p);
+typedef bool (*l_hashmap_remove_func_t)(const void *key, void *value,
+                                               void *user_data);
+
+struct l_hashmap;
+
+unsigned int l_str_hash(const void *p);
+
+struct l_hashmap *l_hashmap_new(void);
+struct l_hashmap *l_hashmap_string_new(void);
+
+bool l_hashmap_set_hash_function(struct l_hashmap *hashmap,
+                                               l_hashmap_hash_func_t func);
+bool l_hashmap_set_compare_function(struct l_hashmap *hashmap,
+                                               l_hashmap_compare_func_t func);
+bool l_hashmap_set_key_copy_function(struct l_hashmap *hashmap,
+                                               l_hashmap_key_new_func_t func);
+bool l_hashmap_set_key_free_function(struct l_hashmap *hashmap,
+                                       l_hashmap_key_free_func_t func);
+
+void l_hashmap_destroy(struct l_hashmap *hashmap,
+                       l_hashmap_destroy_func_t destroy);
+
+bool l_hashmap_insert(struct l_hashmap *hashmap,
+                       const void *key, void *value);
+void *l_hashmap_remove(struct l_hashmap *hashmap, const void *key);
+void *l_hashmap_lookup(struct l_hashmap *hashmap, const void *key);
+
+void l_hashmap_foreach(struct l_hashmap *hashmap,
+                       l_hashmap_foreach_func_t function, void *user_data);
+unsigned int l_hashmap_foreach_remove(struct l_hashmap *hashmap,
+                       l_hashmap_remove_func_t function, void *user_data);
+
+unsigned int l_hashmap_size(struct l_hashmap *hashmap);
+bool l_hashmap_isempty(struct l_hashmap *hashmap);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_HASHMAP_H */
diff --git a/ell/hwdb.c b/ell/hwdb.c
new file mode 100644 (file)
index 0000000..0d5f95a
--- /dev/null
@@ -0,0 +1,380 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <alloca.h>
+#include <fnmatch.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "util.h"
+#include "hwdb.h"
+#include "private.h"
+
+static const char trie_sig[8] = { 'K', 'S', 'L', 'P', 'H', 'H', 'R', 'H' };
+
+struct trie_header {
+       uint8_t  signature[8];          /* Signature */
+       uint64_t version;               /* Version of creator tool */
+       uint64_t file_size;             /* Size of complete file */
+       uint64_t header_size;           /* Size of header structure */
+       uint64_t node_size;             /* Size of node structure */
+       uint64_t child_size;            /* Size of child structure */
+       uint64_t entry_size;            /* Size of entry structure */
+       uint64_t root_offset;           /* Location of root node structure */
+       uint64_t nodes_size;            /* Size of the nodes section */
+       uint64_t strings_size;          /* Size of the strings section */
+
+       /* followed by nodes_size nodes data */
+       /* followed by strings_size strings data */
+} __attribute__ ((packed));
+
+struct trie_node {
+       uint64_t prefix_offset;         /* Location of prefix string */
+       uint8_t  child_count;           /* Number of child structures */
+       uint8_t  padding[7];
+       uint64_t entry_count;           /* Number of entry structures */
+
+       /* followed by child_count child structures */
+       /* followed by entry_count entry structures */
+} __attribute__ ((packed));
+
+struct trie_child {
+       uint8_t  c;                     /* Prefix character of child node */
+       uint8_t  padding[7];
+       uint64_t child_offset;          /* Location of child node structure */
+} __attribute__ ((packed));
+
+struct trie_entry {
+       uint64_t key_offset;            /* Location of key string */
+       uint64_t value_offset;          /* Location of value string */
+} __attribute__ ((packed));
+
+struct l_hwdb {
+       int ref_count;
+       int fd;
+       time_t mtime;
+       size_t size;
+       void *addr;
+       uint64_t root;
+};
+
+LIB_EXPORT struct l_hwdb *l_hwdb_new(const char *pathname)
+{
+       struct trie_header *hdr;
+       struct l_hwdb *hwdb;
+       struct stat st;
+       void *addr;
+       size_t size;
+       int fd;
+
+       if (!pathname)
+               return NULL;
+
+       fd = open(pathname, O_RDONLY | O_CLOEXEC);
+       if (fd < 0)
+               return NULL;
+
+       if (fstat(fd, &st) < 0) {
+               close(fd);
+               return NULL;
+       }
+
+       size = st.st_size;
+       if (size < sizeof(struct trie_header)) {
+               close(fd);
+               return NULL;
+       }
+
+       addr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+       if (addr == MAP_FAILED) {
+               close(fd);
+               return NULL;
+       }
+
+       hdr = addr;
+       if (memcmp(hdr->signature, trie_sig, sizeof(trie_sig)))
+               goto failed;
+
+       if (L_LE64_TO_CPU(hdr->file_size) != size)
+               goto failed;
+
+       if (L_LE64_TO_CPU(hdr->header_size) != sizeof(struct trie_header))
+               goto failed;
+
+       if (L_LE64_TO_CPU(hdr->node_size) != sizeof(struct trie_node))
+               goto failed;
+
+       if (L_LE64_TO_CPU(hdr->child_size) != sizeof(struct trie_child))
+               goto failed;
+
+       if (L_LE64_TO_CPU(hdr->entry_size) < sizeof(struct trie_entry))
+               goto failed;
+
+       if (L_LE64_TO_CPU(hdr->header_size) + L_LE64_TO_CPU(hdr->nodes_size) +
+                               L_LE64_TO_CPU(hdr->strings_size) != size)
+               goto failed;
+
+       hwdb = l_new(struct l_hwdb, 1);
+
+       hwdb->fd = fd;
+       hwdb->mtime = st.st_mtime;
+       hwdb->size = size;
+       hwdb->addr = addr;
+       hwdb->root = L_LE64_TO_CPU(hdr->root_offset);
+
+       return l_hwdb_ref(hwdb);
+
+failed:
+       munmap(addr, st.st_size);
+       close(fd);
+       return NULL;
+}
+
+LIB_EXPORT struct l_hwdb *l_hwdb_new_default(void)
+{
+       struct l_hwdb *db = NULL;
+       size_t i;
+       const char * const paths[] = {"/etc/udev/hwdb.bin",
+                                       "/usr/lib/udev/hwdb.bin",
+                                       "/lib/udev/hwdb.bin"};
+
+       for (i = 0; !db && i < L_ARRAY_SIZE(paths); i++)
+               db = l_hwdb_new(paths[i]);
+
+       return db;
+}
+
+LIB_EXPORT struct l_hwdb *l_hwdb_ref(struct l_hwdb *hwdb)
+{
+       if (!hwdb)
+               return NULL;
+
+       __sync_fetch_and_add(&hwdb->ref_count, 1);
+
+       return hwdb;
+}
+
+LIB_EXPORT void l_hwdb_unref(struct l_hwdb *hwdb)
+{
+       if (!hwdb)
+               return;
+
+       if (__sync_sub_and_fetch(&hwdb->ref_count, 1))
+               return;
+
+       munmap(hwdb->addr, hwdb->size);
+
+       close(hwdb->fd);
+
+       l_free(hwdb);
+}
+
+static void trie_fnmatch(const void *addr, uint64_t offset, const char *prefix,
+                               const char *string,
+                               struct l_hwdb_entry **entries)
+{
+       const struct trie_node *node = addr + offset;
+       const void *addr_ptr = addr + offset + sizeof(*node);
+       const char *prefix_str = addr + L_LE64_TO_CPU(node->prefix_offset);
+       uint64_t child_count = L_LE64_TO_CPU(node->child_count);
+       uint64_t entry_count = L_LE64_TO_CPU(node->entry_count);
+       uint64_t i;
+       size_t scratch_len;
+       char *scratch_buf;
+
+       scratch_len = strlen(prefix) + strlen(prefix_str);
+       scratch_buf = alloca(scratch_len + 2);
+       sprintf(scratch_buf, "%s%s", prefix, prefix_str);
+       scratch_buf[scratch_len + 1] = '\0';
+
+       /*
+        * Only incur the cost of this fnmatch() if there are children
+        * to visit.  In practice, nodes have either entries or children
+        * so fnmatch() will only be called once per node.
+        */
+       if (child_count) {
+               scratch_buf[scratch_len] = '*';
+
+               if (fnmatch(scratch_buf, string, 0) == FNM_NOMATCH)
+                       child_count = 0;
+       }
+
+       for (i = 0; i < child_count; i++) {
+               const struct trie_child *child = addr_ptr;
+
+               scratch_buf[scratch_len] = child->c;
+
+               trie_fnmatch(addr, L_LE64_TO_CPU(child->child_offset),
+                               scratch_buf, string, entries);
+
+               addr_ptr += sizeof(*child);
+       }
+
+       if (!entry_count)
+               return;
+
+       scratch_buf[scratch_len] = '\0';
+
+       if (fnmatch(scratch_buf, string, 0))
+               return;
+
+       for (i = 0; i < entry_count; i++) {
+               const struct trie_entry *entry = addr_ptr;
+               const char *key_str = addr + L_LE64_TO_CPU(entry->key_offset);
+               const char *val_str = addr + L_LE64_TO_CPU(entry->value_offset);
+               struct l_hwdb_entry *result;
+
+               if (key_str[0] == ' ') {
+                       result = l_new(struct l_hwdb_entry, 1);
+
+                       result->key = key_str + 1;
+                       result->value = val_str;
+                       result->next = (*entries);
+                       *entries = result;
+               }
+
+               addr_ptr += sizeof(*entry);
+       }
+}
+
+LIB_EXPORT struct l_hwdb_entry *l_hwdb_lookup(struct l_hwdb *hwdb,
+                                               const char *format, ...)
+{
+       struct l_hwdb_entry *entries = NULL;
+       va_list args;
+
+       va_start(args, format);
+       entries = l_hwdb_lookup_valist(hwdb, format, args);
+       va_end(args);
+
+       return entries;
+}
+
+LIB_EXPORT struct l_hwdb_entry *l_hwdb_lookup_valist(struct l_hwdb *hwdb,
+                                       const char *format, va_list args)
+{
+       struct l_hwdb_entry *entries = NULL;
+       char *modalias;
+       int len;
+
+       if (!hwdb || !format)
+               return NULL;
+
+       len = vasprintf(&modalias, format, args);
+       if (len < 0)
+               return NULL;
+
+       trie_fnmatch(hwdb->addr, hwdb->root, "", modalias, &entries);
+
+       free(modalias);
+
+       return entries;
+}
+
+LIB_EXPORT void l_hwdb_lookup_free(struct l_hwdb_entry *entries)
+{
+       while (entries) {
+               struct l_hwdb_entry *entry = entries;
+
+               entries = entries->next;
+
+               l_free(entry);
+       }
+}
+
+static void foreach_node(const void *addr, uint64_t offset, const char *prefix,
+                               l_hwdb_foreach_func_t func, void *user_data)
+{
+       const struct trie_node *node = addr + offset;
+       const void *addr_ptr = addr + offset + sizeof(*node);
+       const char *prefix_str = addr + L_LE64_TO_CPU(node->prefix_offset);
+       uint64_t child_count = L_LE64_TO_CPU(node->child_count);
+       uint64_t entry_count = L_LE64_TO_CPU(node->entry_count);
+       uint64_t i;
+       size_t scratch_len;
+       char *scratch_buf;
+       struct l_hwdb_entry *entries = NULL;
+
+       scratch_len = strlen(prefix) + strlen(prefix_str);
+       scratch_buf = alloca(scratch_len + 2);
+       sprintf(scratch_buf, "%s%s", prefix, prefix_str);
+       scratch_buf[scratch_len + 1] = '\0';
+
+       for (i = 0; i < child_count; i++) {
+               const struct trie_child *child = addr_ptr;
+
+               scratch_buf[scratch_len] = child->c;
+
+               foreach_node(addr, L_LE64_TO_CPU(child->child_offset),
+                                               scratch_buf, func, user_data);
+
+               addr_ptr += sizeof(*child);
+       }
+
+       if (!entry_count)
+               return;
+
+       scratch_buf[scratch_len] = '\0';
+
+       for (i = 0; i < entry_count; i++) {
+               const struct trie_entry *entry = addr_ptr;
+               const char *key_str = addr + L_LE64_TO_CPU(entry->key_offset);
+               const char *val_str = addr + L_LE64_TO_CPU(entry->value_offset);
+               struct l_hwdb_entry *result;
+
+               if (key_str[0] == ' ') {
+                       result = l_new(struct l_hwdb_entry, 1);
+
+                       result->key = key_str + 1;
+                       result->value = val_str;
+                       result->next = entries;
+                       entries = result;
+               }
+
+               addr_ptr += sizeof(*entry);
+       }
+
+       func(scratch_buf, entries, user_data);
+
+       l_hwdb_lookup_free(entries);
+}
+
+LIB_EXPORT bool l_hwdb_foreach(struct l_hwdb *hwdb, l_hwdb_foreach_func_t func,
+                                                       void *user_data)
+{
+       if (!hwdb || !func)
+               return false;
+
+       foreach_node(hwdb->addr, hwdb->root, "", func, user_data);
+
+       return true;
+}
diff --git a/ell/hwdb.h b/ell/hwdb.h
new file mode 100644 (file)
index 0000000..f37dac7
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_HWDB_H
+#define __ELL_HWDB_H
+
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_hwdb;
+
+struct l_hwdb *l_hwdb_new(const char *pathname);
+struct l_hwdb *l_hwdb_new_default(void);
+
+struct l_hwdb *l_hwdb_ref(struct l_hwdb *hwdb);
+void l_hwdb_unref(struct l_hwdb *hwdb);
+
+struct l_hwdb_entry {
+       const char *key;
+       const char *value;
+       struct l_hwdb_entry *next;
+};
+
+struct l_hwdb_entry *l_hwdb_lookup(struct l_hwdb *hwdb, const char *format, ...)
+                                       __attribute__((format(printf, 2, 3)));
+struct l_hwdb_entry *l_hwdb_lookup_valist(struct l_hwdb *hwdb,
+                                       const char *format, va_list args);
+void l_hwdb_lookup_free(struct l_hwdb_entry *entries);
+
+typedef void (*l_hwdb_foreach_func_t)(const char *modalias,
+                                       struct l_hwdb_entry *entries,
+                                                       void *user_data);
+
+bool l_hwdb_foreach(struct l_hwdb *hwdb, l_hwdb_foreach_func_t func,
+                                                       void *user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_HWDB_H */
diff --git a/ell/idle.c b/ell/idle.c
new file mode 100644 (file)
index 0000000..5c66280
--- /dev/null
@@ -0,0 +1,165 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <unistd.h>
+
+#include "util.h"
+#include "idle.h"
+#include "private.h"
+
+/**
+ * SECTION:idle
+ * @short_description: Idle processing support
+ *
+ * Idle processing support
+ */
+
+/**
+ * l_idle:
+ *
+ * Opague object representing the idle time event.
+ */
+struct l_idle {
+       union {
+               l_idle_notify_cb_t callback;
+               l_idle_oneshot_cb_t oneshot;
+       };
+
+       l_idle_destroy_cb_t destroy;
+       void *user_data;
+       int id;
+};
+
+static void idle_destroy(void *user_data)
+{
+       struct l_idle *idle = user_data;
+
+       if (idle->destroy)
+               idle->destroy(idle->user_data);
+
+       l_free(idle);
+}
+
+static void idle_callback(void *user_data)
+{
+       struct l_idle *idle = user_data;
+
+       if (idle->callback)
+               idle->callback(idle, idle->user_data);
+}
+
+static void oneshot_callback(void *user_data)
+{
+       struct l_idle *idle = user_data;
+
+       if (idle->oneshot)
+               idle->oneshot(idle->user_data);
+
+       idle_remove(idle->id);
+}
+
+/**
+ * l_idle_create:
+ * @callback: idle callback function
+ * @user_data: user data provided to idle callback function
+ * @destroy: destroy function for user data
+ *
+ * Create a new idle event processing object.
+ *
+ * The idle callback will be called until canceled using l_idle_remove().
+ *
+ * Returns: a newly allocated #l_idle object
+ **/
+LIB_EXPORT struct l_idle *l_idle_create(l_idle_notify_cb_t callback,
+                       void *user_data, l_idle_destroy_cb_t destroy)
+{
+       struct l_idle *idle;
+
+       if (unlikely(!callback))
+               return NULL;
+
+       idle = l_new(struct l_idle, 1);
+
+       idle->callback = callback;
+       idle->destroy = destroy;
+       idle->user_data = user_data;
+
+       idle->id = idle_add(idle_callback, idle, 0, idle_destroy);
+       if (idle->id < 0) {
+               l_free(idle);
+               return NULL;
+       }
+
+       return idle;
+}
+
+/**
+ * l_idle_oneshot:
+ * @callback: idle callback function
+ * @user_data: user data provided to idle callback function
+ * @destroy: destroy function for user data
+ *
+ * Create a new idle event processing object.  The callback will be called
+ * only once at which point the object will be destroyed.
+ *
+ * Returns: true if the oneshot idle object could be created successfully.
+ **/
+LIB_EXPORT bool l_idle_oneshot(l_idle_oneshot_cb_t callback, void *user_data,
+                               l_idle_destroy_cb_t destroy)
+{
+       struct l_idle *idle;
+
+       if (unlikely(!callback))
+               return NULL;
+
+       idle = l_new(struct l_idle, 1);
+
+       idle->oneshot = callback;
+       idle->destroy = destroy;
+       idle->user_data = user_data;
+
+       idle->id = idle_add(oneshot_callback, idle,
+                               IDLE_FLAG_NO_WARN_DANGLING, idle_destroy);
+       if (idle->id < 0) {
+               l_free(idle);
+               return false;
+       }
+
+       return true;
+}
+/**
+ * l_idle_remove:
+ * @idle: idle object
+ *
+ * Remove idle event processing object.
+ **/
+LIB_EXPORT void l_idle_remove(struct l_idle *idle)
+{
+       if (unlikely(!idle))
+               return;
+
+       idle_remove(idle->id);
+}
diff --git a/ell/idle.h b/ell/idle.h
new file mode 100644 (file)
index 0000000..19ae4d3
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_IDLE_H
+#define __ELL_IDLE_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_idle;
+
+typedef void (*l_idle_notify_cb_t) (struct l_idle *idle, void *user_data);
+typedef void (*l_idle_oneshot_cb_t) (void *user_data);
+typedef void (*l_idle_destroy_cb_t) (void *user_data);
+
+struct l_idle *l_idle_create(l_idle_notify_cb_t callback,
+                       void *user_data, l_idle_destroy_cb_t destroy);
+void l_idle_remove(struct l_idle *idle);
+
+bool l_idle_oneshot(l_idle_oneshot_cb_t callback, void *user_data,
+                       l_idle_destroy_cb_t destroy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_IDLE_H */
diff --git a/ell/io.c b/ell/io.c
new file mode 100644 (file)
index 0000000..878060c
--- /dev/null
+++ b/ell/io.c
@@ -0,0 +1,409 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+#include <unistd.h>
+#include <sys/epoll.h>
+
+#include "util.h"
+#include "io.h"
+#include "private.h"
+
+/**
+ * SECTION:io
+ * @short_description: IO support
+ *
+ * IO support
+ */
+
+/**
+ * l_io:
+ *
+ * Opague object representing the IO.
+ */
+struct l_io {
+       int fd;
+       uint32_t events;
+       bool close_on_destroy;
+       l_io_read_cb_t read_handler;
+       l_io_destroy_cb_t read_destroy;
+       void *read_data;
+       l_io_write_cb_t write_handler;
+       l_io_destroy_cb_t write_destroy;
+       void *write_data;
+       l_io_disconnect_cb_t disconnect_handler;
+       l_io_destroy_cb_t disconnect_destroy;
+       void *disconnect_data;
+       l_io_debug_cb_t debug_handler;
+       l_io_destroy_cb_t debug_destroy;
+       void *debug_data;
+};
+
+static void io_cleanup(void *user_data)
+{
+       struct l_io *io = user_data;
+
+       l_util_debug(io->debug_handler, io->debug_data, "cleanup <%p>", io);
+
+       if (io->write_destroy)
+               io->write_destroy(io->write_data);
+
+       io->write_handler = NULL;
+       io->write_data = NULL;
+
+       if (io->read_destroy)
+               io->read_destroy(io->read_data);
+
+       io->read_handler = NULL;
+       io->read_data = NULL;
+
+       if (io->close_on_destroy)
+               close(io->fd);
+
+       io->fd = -1;
+}
+
+static void io_closed(struct l_io *io)
+{
+       /*
+        * Save off copies of disconnect_handler, disconnect_destroy
+        * and disconnect_data in case the handler calls io_destroy
+        */
+       l_io_disconnect_cb_t handler = io->disconnect_handler;
+       l_io_destroy_cb_t destroy = io->disconnect_destroy;
+       void *disconnect_data = io->disconnect_data;
+
+       io->disconnect_handler = NULL;
+       io->disconnect_destroy = NULL;
+       io->disconnect_data = NULL;
+
+       if (handler)
+               handler(io, disconnect_data);
+
+       if (destroy)
+               destroy(disconnect_data);
+}
+
+static void io_callback(int fd, uint32_t events, void *user_data)
+{
+       struct l_io *io = user_data;
+
+       if (unlikely(events & (EPOLLERR | EPOLLHUP))) {
+               l_util_debug(io->debug_handler, io->debug_data,
+                                               "disconnect event <%p>", io);
+               watch_remove(io->fd);
+               io_closed(io);
+               return;
+       }
+
+       if ((events & EPOLLIN) && io->read_handler) {
+               l_util_debug(io->debug_handler, io->debug_data,
+                                               "read event <%p>", io);
+
+               if (!io->read_handler(io, io->read_data)) {
+                       if (io->read_destroy)
+                               io->read_destroy(io->read_data);
+
+                       io->read_handler = NULL;
+                       io->read_destroy = NULL;
+                       io->read_data = NULL;
+
+                       io->events &= ~EPOLLIN;
+
+                       if (watch_modify(io->fd, io->events, false) == -EBADF) {
+                               io->close_on_destroy = false;
+                               watch_clear(io->fd);
+                               io_closed(io);
+                               return;
+                       }
+               }
+       }
+
+       if ((events & EPOLLOUT) && io->write_handler) {
+               l_util_debug(io->debug_handler, io->debug_data,
+                                               "write event <%p>", io);
+
+               if (!io->write_handler(io, io->write_data)) {
+                       if (io->write_destroy)
+                               io->write_destroy(io->write_data);
+
+                       io->write_handler = NULL;
+                       io->write_destroy = NULL;
+                       io->write_data = NULL;
+
+                       io->events &= ~EPOLLOUT;
+
+                       if (watch_modify(io->fd, io->events, false) == -EBADF) {
+                               io->close_on_destroy = false;
+                               watch_clear(io->fd);
+                               io_closed(io);
+                               return;
+                       }
+               }
+       }
+}
+
+/**
+ * l_io_new:
+ * @fd: file descriptor
+ *
+ * Create new IO handling for a given file descriptor.
+ *
+ * Returns: a newly allocated #l_io object
+ **/
+LIB_EXPORT struct l_io *l_io_new(int fd)
+{
+       struct l_io *io;
+       int err;
+
+       if (unlikely(fd < 0))
+               return NULL;
+
+       io = l_new(struct l_io, 1);
+
+       io->fd = fd;
+       io->events = EPOLLHUP | EPOLLERR;
+       io->close_on_destroy = false;
+
+       err = watch_add(io->fd, io->events, io_callback, io, io_cleanup);
+       if (err) {
+               l_free(io);
+               return NULL;
+       }
+
+       return io;
+}
+
+/**
+ * l_io_destroy:
+ * @io: IO object
+ *
+ * Free IO object and close file descriptor (if enabled).
+ **/
+LIB_EXPORT void l_io_destroy(struct l_io *io)
+{
+       if (unlikely(!io))
+               return;
+
+       if (io->fd != -1)
+               watch_remove(io->fd);
+
+       io_closed(io);
+
+       if (io->debug_destroy)
+               io->debug_destroy(io->debug_data);
+
+       l_free(io);
+}
+
+/**
+ * l_io_get_fd:
+ * @io: IO object
+ *
+ * Returns: file descriptor associated with @io
+ **/
+LIB_EXPORT int l_io_get_fd(struct l_io *io)
+{
+       if (unlikely(!io))
+               return -1;
+
+       return io->fd;
+}
+
+/**
+ * l_io_set_close_on_destroy:
+ * @io: IO object
+ * @do_close: setting for destroy handling
+ *
+ * Set the automatic closing of the file descriptor when destroying @io.
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_io_set_close_on_destroy(struct l_io *io, bool do_close)
+{
+       if (unlikely(!io))
+               return false;
+
+       io->close_on_destroy = do_close;
+
+       return true;
+}
+
+/**
+ * l_io_set_read_handler:
+ * @io: IO object
+ * @callback: read handler callback function
+ * @user_data: user data provided to read handler callback function
+ * @destroy: destroy function for user data
+ *
+ * Set read function.
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_io_set_read_handler(struct l_io *io, l_io_read_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy)
+{
+       uint32_t events;
+       int err;
+
+       if (unlikely(!io || io->fd < 0))
+               return false;
+
+       l_util_debug(io->debug_handler, io->debug_data,
+                                       "set read handler <%p>", io);
+
+       if (io->read_destroy)
+               io->read_destroy(io->read_data);
+
+       if (callback)
+               events = io->events | EPOLLIN;
+       else
+               events = io->events & ~EPOLLIN;
+
+       io->read_handler = callback;
+       io->read_destroy = destroy;
+       io->read_data = user_data;
+
+       if (events == io->events)
+               return true;
+
+       err = watch_modify(io->fd, events, false);
+       if (err)
+               return false;
+
+       io->events = events;
+
+       return true;
+}
+
+/**
+ * l_io_set_write_handler:
+ * @io: IO object
+ * @callback: write handler callback function
+ * @user_data: user data provided to write handler callback function
+ * @destroy: destroy function for user data
+ *
+ * Set write function.
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_io_set_write_handler(struct l_io *io, l_io_write_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy)
+{
+       uint32_t events;
+       int err;
+
+       if (unlikely(!io || io->fd < 0))
+               return false;
+
+       l_util_debug(io->debug_handler, io->debug_data,
+                                       "set write handler <%p>", io);
+
+       if (io->write_handler == callback && io->write_destroy == destroy &&
+                                               io->write_data == user_data)
+               return true;
+
+       if (io->write_destroy)
+               io->write_destroy(io->write_data);
+
+       if (callback)
+               events = io->events | EPOLLOUT;
+       else
+               events = io->events & ~EPOLLOUT;
+
+       io->write_handler = callback;
+       io->write_destroy = destroy;
+       io->write_data = user_data;
+
+       if (events == io->events)
+               return true;
+
+       err = watch_modify(io->fd, events, false);
+       if (err)
+               return false;
+
+       io->events = events;
+
+       return true;
+}
+
+/**
+ * l_io_set_disconnect_handler:
+ * @io: IO object
+ * @callback: disconnect handler callback function
+ * @user_data: user data provided to disconnect handler callback function
+ * @destroy: destroy function for user data
+ *
+ * Set disconnect function.
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_io_set_disconnect_handler(struct l_io *io,
+                               l_io_disconnect_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy)
+{
+       if (unlikely(!io || io->fd < 0))
+               return false;
+
+       l_util_debug(io->debug_handler, io->debug_data,
+                                       "set disconnect handler <%p>", io);
+
+       if (io->disconnect_destroy)
+               io->disconnect_destroy(io->disconnect_data);
+
+       io->disconnect_handler = callback;
+       io->disconnect_destroy = destroy;
+       io->disconnect_data = user_data;
+
+       return true;
+}
+
+/**
+ * l_io_set_debug:
+ * @io: IO object
+ * @callback: debug callback function
+ * @user_data: user data provided to debug callback function
+ * @destroy: destroy function for user data
+ *
+ * Set debug function.
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_io_set_debug(struct l_io *io, l_io_debug_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy)
+{
+       if (unlikely(!io))
+               return false;
+
+       if (io->debug_destroy)
+               io->debug_destroy(io->debug_data);
+
+       io->debug_handler = callback;
+       io->debug_destroy = destroy;
+       io->debug_data = user_data;
+
+       return true;
+}
diff --git a/ell/io.h b/ell/io.h
new file mode 100644 (file)
index 0000000..0689d08
--- /dev/null
+++ b/ell/io.h
@@ -0,0 +1,62 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_IO_H
+#define __ELL_IO_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_io;
+
+typedef void (*l_io_debug_cb_t) (const char *str, void *user_data);
+
+typedef bool (*l_io_read_cb_t) (struct l_io *io, void *user_data);
+typedef bool (*l_io_write_cb_t) (struct l_io *io, void *user_data);
+typedef void (*l_io_disconnect_cb_t) (struct l_io *io, void *user_data);
+typedef void (*l_io_destroy_cb_t) (void *user_data);
+
+struct l_io *l_io_new(int fd);
+void l_io_destroy(struct l_io *io);
+
+int l_io_get_fd(struct l_io *io);
+bool l_io_set_close_on_destroy(struct l_io *io, bool do_close);
+
+bool l_io_set_read_handler(struct l_io *io, l_io_read_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy);
+bool l_io_set_write_handler(struct l_io *io, l_io_write_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy);
+bool l_io_set_disconnect_handler(struct l_io *io,
+                               l_io_disconnect_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy);
+
+bool l_io_set_debug(struct l_io *io, l_io_debug_cb_t callback,
+                               void *user_data, l_io_destroy_cb_t destroy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_IO_H */
diff --git a/ell/key.c b/ell/key.c
new file mode 100644 (file)
index 0000000..2e4f3e6
--- /dev/null
+++ b/ell/key.c
@@ -0,0 +1,816 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <stdint.h>
+#include <sys/syscall.h>
+#include <linux/keyctl.h>
+#include <errno.h>
+
+#include "private.h"
+#include "util.h"
+#include "key.h"
+#include "string.h"
+#include "random.h"
+#include "missing.h"
+
+#ifndef KEYCTL_DH_COMPUTE
+#define KEYCTL_DH_COMPUTE 23
+#endif
+
+#ifndef KEYCTL_PKEY_QUERY
+#define KEYCTL_PKEY_QUERY      24
+#define KEYCTL_PKEY_ENCRYPT    25
+#define KEYCTL_PKEY_DECRYPT    26
+#define KEYCTL_PKEY_SIGN       27
+#define KEYCTL_PKEY_VERIFY     28
+
+#define KEYCTL_SUPPORTS_ENCRYPT        0x01
+#define KEYCTL_SUPPORTS_DECRYPT        0x02
+#define KEYCTL_SUPPORTS_SIGN   0x04
+#define KEYCTL_SUPPORTS_VERIFY 0x08
+
+struct keyctl_pkey_query {
+       uint32_t supported_ops;
+       uint32_t key_size;
+       uint16_t max_data_size;
+       uint16_t max_sig_size;
+       uint16_t max_enc_size;
+       uint16_t max_dec_size;
+
+       uint32_t __spare[10];
+};
+
+struct keyctl_pkey_params {
+       int32_t key_id;
+       uint32_t in_len;
+       union {
+               uint32_t out_len;
+               uint32_t in2_len;
+       };
+       uint32_t __spare[7];
+};
+
+/* Work around the missing (pre-4.7) or broken (4.14.{70,71,72} and
+ * 4.18.{8,9,10}) kernel declaration of struct keyctl_dh_params
+ */
+struct dh_params {
+       int32_t private;
+       int32_t prime;
+       int32_t base;
+};
+#else
+/* When KEYCTL_PKEY_QUERY is defined by the kernel, the
+ * struct keyctl_dh_params declaration is valid.
+ */
+#define dh_params keyctl_dh_params
+#endif
+
+#ifndef KEYCTL_RESTRICT_KEYRING
+#define KEYCTL_RESTRICT_KEYRING 29
+#endif
+
+static int32_t internal_keyring;
+
+struct l_key {
+       int type;
+       int32_t serial;
+};
+
+struct l_keyring {
+       int32_t serial;
+};
+
+static const char * const key_type_names[] = {
+       [L_KEY_RAW] = "user",
+       [L_KEY_RSA] = "asymmetric",
+};
+
+static long kernel_add_key(const char *type, const char *description,
+                               const void *payload, size_t len, int32_t keyring)
+{
+       long result;
+
+       result = syscall(__NR_add_key, type, description, payload, len,
+                               keyring);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_read_key(int32_t serial, const void *payload, size_t len)
+{
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_READ, serial, payload, len);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_update_key(int32_t serial, const void *payload, size_t len)
+{
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_UPDATE, serial, payload, len);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_invalidate_key(int32_t serial)
+{
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_INVALIDATE, serial);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_link_key(int32_t key_serial, int32_t ring_serial)
+{
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_LINK, key_serial, ring_serial);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_unlink_key(int32_t key_serial, int32_t ring_serial)
+{
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_UNLINK, key_serial, ring_serial);
+
+       return result >= 0 ? result : -errno;
+}
+
+static char *format_key_info(const char *encoding, const char *hash)
+{
+       struct l_string *info;
+
+       if (!encoding && !hash)
+               return NULL;
+
+       info = l_string_new(0);
+
+       if (encoding)
+               l_string_append_printf(info, "enc=%s ", encoding);
+
+       if (hash)
+               l_string_append_printf(info, "hash=%s", hash);
+
+       return l_string_unwrap(info);
+}
+
+static long kernel_query_key(int32_t key_serial, const char *encoding,
+                               const char *hash, size_t *size, bool *public)
+{
+       long result;
+       struct keyctl_pkey_query query;
+       char *info = format_key_info(encoding, hash);
+
+       memset(&query, 0, sizeof(query));
+
+       result = syscall(__NR_keyctl, KEYCTL_PKEY_QUERY, key_serial, 0,
+                               info ?: "", &query);
+       if (result == 0) {
+               *size = query.key_size;
+               *public = ((query.supported_ops & KEYCTL_SUPPORTS_ENCRYPT) &&
+                       !(query.supported_ops & KEYCTL_SUPPORTS_DECRYPT));
+       }
+       l_free(info);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_dh_compute(int32_t private, int32_t prime, int32_t base,
+                             void *payload, size_t len)
+{
+       long result;
+
+       struct dh_params params = { .private = private,
+                                   .prime = prime,
+                                   .base = base };
+
+       result = syscall(__NR_keyctl, KEYCTL_DH_COMPUTE, &params, payload, len,
+                       NULL);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_restrict_keyring(int32_t serial, const char *keytype,
+                                       const char *restriction)
+{
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_RESTRICT_KEYRING, serial, keytype,
+                               restriction);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_key_eds(int op, int32_t serial, const char *encoding,
+                               const char *hash, const void *in, void *out,
+                               size_t len_in, size_t len_out)
+{
+       long result;
+       struct keyctl_pkey_params params = { .key_id = serial,
+                                            .in_len = len_in,
+                                            .out_len = len_out };
+       char *info = format_key_info(encoding, hash);
+
+       memset(out, 0, len_out);
+
+       result = syscall(__NR_keyctl, op, &params, info ?: "", in, out);
+       l_free(info);
+
+       return result >= 0 ? result : -errno;
+}
+
+static long kernel_key_verify(int32_t serial,
+                               const char *encoding, const char *hash,
+                               const void *data, size_t data_len,
+                               const void *sig, size_t sig_len)
+{
+       struct keyctl_pkey_params params = {
+               .key_id         = serial,
+               .in_len         = data_len,
+               .in2_len        = sig_len,
+       };
+       char *info = format_key_info(encoding, hash);
+       long result;
+
+       result = syscall(__NR_keyctl, KEYCTL_PKEY_VERIFY, &params,
+                               info ?: "", data, sig);
+       l_free(info);
+
+       return result >= 0 ? result : -errno;
+}
+
+static bool setup_internal_keyring(void)
+{
+       internal_keyring = kernel_add_key("keyring", "ell-internal", NULL, 0,
+                                               KEY_SPEC_THREAD_KEYRING);
+
+       if (internal_keyring <= 0) {
+               internal_keyring = 0;
+               return false;
+       }
+
+       return true;
+}
+
+LIB_EXPORT struct l_key *l_key_new(enum l_key_type type, const void *payload,
+                                       size_t payload_length)
+{
+       struct l_key *key;
+       char *description;
+       static unsigned long key_idx;
+
+       if (unlikely(!payload))
+               return NULL;
+
+       if (unlikely((size_t)type >= L_ARRAY_SIZE(key_type_names)))
+               return NULL;
+
+       if (!internal_keyring && !setup_internal_keyring())
+               return NULL;
+
+       key = l_new(struct l_key, 1);
+       key->type = type;
+       description = l_strdup_printf("ell-key-%lu", key_idx++);
+       key->serial = kernel_add_key(key_type_names[type], description, payload,
+                                       payload_length, internal_keyring);
+       l_free(description);
+
+       if (key->serial < 0) {
+               l_free(key);
+               key = NULL;
+       }
+
+       /*
+        * TODO: Query asymmetric key algorithm from the kernel and
+        * ensure that it matches the expected l_key_type. This can
+        * currently be found by digging through /proc/keys, but a
+        * keyctl() op makes more sense.
+        */
+
+       return key;
+}
+
+LIB_EXPORT void l_key_free(struct l_key *key)
+{
+       if (unlikely(!key))
+               return;
+
+       /*
+        * Use invalidate as, unlike revoke, this doesn't delay the
+        * key garbage collection and causes the quota used by the
+        * key to be released sooner and more predictably.
+        */
+       kernel_invalidate_key(key->serial);
+
+       l_free(key);
+}
+
+LIB_EXPORT void l_key_free_norevoke(struct l_key *key)
+{
+       if (unlikely(!key))
+               return;
+
+       kernel_unlink_key(key->serial, internal_keyring);
+
+       l_free(key);
+}
+
+LIB_EXPORT bool l_key_update(struct l_key *key, const void *payload, size_t len)
+{
+       long error;
+
+       if (unlikely(!key))
+               return false;
+
+       error = kernel_update_key(key->serial, payload, len);
+
+       return error == 0;
+}
+
+LIB_EXPORT bool l_key_extract(struct l_key *key, void *payload, size_t *len)
+{
+       long keylen;
+
+       if (unlikely(!key))
+               return false;
+
+       keylen = kernel_read_key(key->serial, payload, *len);
+
+       if (keylen < 0 || (size_t)keylen > *len) {
+               explicit_bzero(payload, *len);
+               return false;
+       }
+
+       *len = keylen;
+       return true;
+}
+
+LIB_EXPORT ssize_t l_key_get_payload_size(struct l_key *key)
+{
+       return kernel_read_key(key->serial, NULL, 0);
+}
+
+static const char *lookup_cipher(enum l_key_cipher_type cipher)
+{
+       const char* ret = NULL;
+
+       switch (cipher) {
+       case L_KEY_RSA_PKCS1_V1_5:
+               ret = "pkcs1";
+               break;
+       case L_KEY_RSA_RAW:
+               ret = "raw";
+               break;
+       }
+
+       return ret;
+}
+
+static const char *lookup_checksum(enum l_checksum_type checksum)
+{
+       const char* ret = NULL;
+
+       switch (checksum) {
+       case L_CHECKSUM_NONE:
+               break;
+       case L_CHECKSUM_MD4:
+               ret = "md4";
+               break;
+       case L_CHECKSUM_MD5:
+               ret = "md5";
+               break;
+       case L_CHECKSUM_SHA1:
+               ret = "sha1";
+               break;
+       case L_CHECKSUM_SHA224:
+               ret = "sha224";
+               break;
+       case L_CHECKSUM_SHA256:
+               ret = "sha256";
+               break;
+       case L_CHECKSUM_SHA384:
+               ret = "sha384";
+               break;
+       case L_CHECKSUM_SHA512:
+               ret = "sha512";
+               break;
+       }
+
+       return ret;
+}
+
+LIB_EXPORT bool l_key_get_info(struct l_key *key, enum l_key_cipher_type cipher,
+                       enum l_checksum_type checksum, size_t *bits,
+                       bool *public)
+{
+       if (unlikely(!key))
+               return false;
+
+       return !kernel_query_key(key->serial, lookup_cipher(cipher),
+                                       lookup_checksum(checksum), bits,
+                                       public);
+}
+
+LIB_EXPORT struct l_key *l_key_generate_dh_private(const void *prime_buf,
+                                                       size_t prime_len)
+{
+       uint8_t *buf;
+       const uint8_t *prime = prime_buf;
+       size_t prime_bits;
+       unsigned int i;
+       size_t private_bytes;
+       size_t random_bytes;
+       struct l_key *private;
+
+       /* Find the prime's bit length excluding leading 0s */
+
+       for (i = 0; i < prime_len && !prime[i]; i++);
+
+       if (i == prime_len || (i == prime_len - 1 && prime[i] < 5))
+               return NULL;
+
+       prime_bits = (prime_len - i) * 8 - __builtin_clz(prime[i]);
+
+       /*
+        * Generate a random DH private value conforming to 1 < x < p - 1.
+        * To do this covering all possible values in this range with the
+        * same probability of generating each value generally requires
+        * looping.  Instead we generate a value in the range
+        * [2 ^ (prime_bits - 2), 2 ^ (prime_bits - 1) - 1] by forcing bit
+        * prime_bits - 2 to 1, i.e. the range in PKCS #3 Section 7.1 for
+        * l equal to prime_bits - 1.  This means we're using between
+        * one half and one quarter of the full [2, p - 2] range, i.e.
+        * between 1 and 2 bits fewer.  Note that since p is odd
+        * p - 1 has the same bit length as p and so our maximum value
+        * 2 ^ (prime_bits - 1) - 1 is still less than p - 1.
+        */
+       private_bytes = ((prime_bits - 1) + 7) / 8;
+       random_bytes = ((prime_bits - 2) + 7) / 8;
+       buf = l_malloc(private_bytes);
+       l_getrandom(buf + private_bytes - random_bytes, random_bytes);
+
+       buf[0] &= (1 << ((prime_bits - 2) % 8)) - 1;
+       buf[0] |= 1 << ((prime_bits - 2) % 8);
+
+       private = l_key_new(L_KEY_RAW, buf, private_bytes);
+       explicit_bzero(buf, private_bytes);
+       l_free(buf);
+       return private;
+}
+
+static bool compute_common(struct l_key *base, struct l_key *private,
+                               struct l_key *prime, void *payload, size_t *len)
+{
+       long result_len;
+       bool usable_payload = *len != 0;
+
+       result_len = kernel_dh_compute(private->serial, prime->serial,
+                                       base->serial, payload, *len);
+
+       if (result_len > 0) {
+               *len = result_len;
+               return usable_payload;
+       } else {
+               return false;
+       }
+}
+
+LIB_EXPORT bool l_key_compute_dh_public(struct l_key *generator,
+                                       struct l_key *private,
+                                       struct l_key *prime,
+                                       void *payload, size_t *len)
+{
+       return compute_common(generator, private, prime, payload, len);
+}
+
+LIB_EXPORT bool l_key_compute_dh_secret(struct l_key *other_public,
+                                       struct l_key *private,
+                                       struct l_key *prime,
+                                       void *payload, size_t *len)
+{
+       return compute_common(other_public, private, prime, payload, len);
+}
+
+static int be_bignum_compare(const uint8_t *a, size_t a_len,
+                               const uint8_t *b, size_t b_len)
+{
+       unsigned int i;
+
+       if (a_len >= b_len) {
+               for (i = 0; i < a_len - b_len; i++)
+                       if (a[i])
+                               return 1;
+
+               return memcmp(a + i, b, b_len);
+       } else {
+               for (i = 0; i < b_len - a_len; i++)
+                       if (b[i])
+                               return -1;
+
+               return memcmp(a, b + i, a_len);
+       }
+}
+
+/*
+ * Validate that @payload is within range for a private and public key for
+ * a DH computation in the finite field group defined by modulus @prime_buf,
+ * both numbers stored as big-endian integers.  We require a key in the
+ * [2, prime - 2] (inclusive) interval.  PKCS #3 does not exclude 1 as a
+ * private key but other specs do.
+ */
+LIB_EXPORT bool l_key_validate_dh_payload(const void *payload, size_t len,
+                               const void *prime_buf, size_t prime_len)
+{
+       static const uint8_t one[] = { 1 };
+       uint8_t prime_1[prime_len];
+
+       /*
+        * Produce prime - 1 for the payload < prime - 1 check.
+        * prime is odd so just zero the LSB.
+        */
+       memcpy(prime_1, prime_buf, prime_len);
+
+       if (prime_len < 1 || !(prime_1[prime_len - 1] & 1))
+               return false;
+
+       prime_1[prime_len - 1] &= ~1;
+
+       if (be_bignum_compare(payload, len, one, 1) <= 0)
+               return false;
+
+       if (be_bignum_compare(payload, len, prime_1, prime_len) >= 0)
+               return false;
+
+       return true;
+}
+
+/* Common code for encrypt/decrypt/sign */
+static ssize_t eds_common(struct l_key *key,
+                               enum l_key_cipher_type cipher,
+                               enum l_checksum_type checksum, const void *in,
+                               void *out, size_t len_in, size_t len_out,
+                               int op)
+{
+       if (unlikely(!key))
+               return -EINVAL;
+
+       return kernel_key_eds(op, key->serial, lookup_cipher(cipher),
+                               lookup_checksum(checksum), in, out, len_in,
+                               len_out);
+}
+
+LIB_EXPORT ssize_t l_key_encrypt(struct l_key *key,
+                                       enum l_key_cipher_type cipher,
+                                       enum l_checksum_type checksum,
+                                       const void *in, void *out,
+                                       size_t len_in, size_t len_out)
+{
+       ssize_t ret_len;
+
+       ret_len = eds_common(key, cipher, checksum, in, out,
+                               len_in, len_out,
+                               KEYCTL_PKEY_ENCRYPT);
+
+       return ret_len;
+}
+
+LIB_EXPORT ssize_t l_key_decrypt(struct l_key *key,
+                                       enum l_key_cipher_type cipher,
+                                       enum l_checksum_type checksum,
+                                       const void *in, void *out,
+                                       size_t len_in, size_t len_out)
+{
+       ssize_t ret_len;
+
+       ret_len = eds_common(key, cipher, checksum, in, out, len_in,
+                               len_out, KEYCTL_PKEY_DECRYPT);
+
+       if (ret_len < 0)
+               goto done;
+
+done:
+       return ret_len;
+}
+
+LIB_EXPORT ssize_t l_key_sign(struct l_key *key,
+                               enum l_key_cipher_type cipher,
+                               enum l_checksum_type checksum, const void *in,
+                               void *out, size_t len_in, size_t len_out)
+{
+       ssize_t ret_len;
+
+       ret_len = eds_common(key, cipher, checksum, in, out,
+                               len_in, len_out,
+                               KEYCTL_PKEY_SIGN);
+
+       return ret_len;
+}
+
+LIB_EXPORT bool l_key_verify(struct l_key *key,
+                               enum l_key_cipher_type cipher,
+                               enum l_checksum_type checksum, const void *data,
+                               const void *sig, size_t len_data,
+                               size_t len_sig)
+{
+       long result;
+
+       if (unlikely(!key))
+               return false;
+
+       result = kernel_key_verify(key->serial, lookup_cipher(cipher),
+                                       lookup_checksum(checksum),
+                                       data, len_data,
+                                       sig, len_sig);
+
+       return result >= 0;
+}
+
+LIB_EXPORT struct l_keyring *l_keyring_new(void)
+{
+       struct l_keyring *keyring;
+       char *description;
+       static unsigned long keyring_idx;
+
+       if (!internal_keyring && !setup_internal_keyring())
+               return NULL;
+
+       keyring = l_new(struct l_keyring, 1);
+       description = l_strdup_printf("ell-keyring-%lu", keyring_idx++);
+       keyring->serial = kernel_add_key("keyring", description, NULL, 0,
+                                               internal_keyring);
+       l_free(description);
+
+       if (keyring->serial < 0) {
+               l_free(keyring);
+               return NULL;
+       }
+
+       return keyring;
+}
+
+LIB_EXPORT bool l_keyring_restrict(struct l_keyring *keyring,
+                                       enum l_keyring_restriction res,
+                                       const struct l_keyring *trusted)
+{
+       char *restriction = NULL;
+       long result;
+
+       switch (res) {
+       case L_KEYRING_RESTRICT_ASYM:
+       case L_KEYRING_RESTRICT_ASYM_CHAIN:
+       {
+               char *option = "";
+
+               if (res == L_KEYRING_RESTRICT_ASYM_CHAIN)
+                       option = ":chain";
+
+               restriction = l_strdup_printf("key_or_keyring:%d%s",
+                                               trusted ? trusted->serial : 0,
+                                               option);
+
+               break;
+       }
+       default:
+               /* Unsupported type */
+               return NULL;
+       }
+
+       result = kernel_restrict_keyring(keyring->serial, "asymmetric",
+                                               restriction);
+
+       l_free(restriction);
+
+       return result == 0;
+}
+
+LIB_EXPORT void l_keyring_free(struct l_keyring *keyring)
+{
+       if (unlikely(!keyring))
+               return;
+
+       kernel_invalidate_key(keyring->serial);
+
+       l_free(keyring);
+}
+
+LIB_EXPORT void l_keyring_free_norevoke(struct l_keyring *keyring)
+{
+       if (unlikely(!keyring))
+               return;
+
+       kernel_unlink_key(keyring->serial, internal_keyring);
+
+       l_free(keyring);
+}
+
+LIB_EXPORT bool l_keyring_link(struct l_keyring *keyring,
+                                                       const struct l_key *key)
+{
+       long error;
+
+       if (unlikely(!keyring) || unlikely(!key))
+               return false;
+
+       error = kernel_link_key(key->serial, keyring->serial);
+
+       return error == 0;
+}
+
+LIB_EXPORT bool l_keyring_unlink(struct l_keyring *keyring,
+                                                       const struct l_key *key)
+{
+       long error;
+
+       if (unlikely(!keyring) || unlikely(!key))
+               return false;
+
+       error = kernel_unlink_key(key->serial, keyring->serial);
+
+       return error == 0;
+}
+
+LIB_EXPORT bool l_keyring_link_nested(struct l_keyring *keyring,
+                                               const struct l_keyring *nested)
+{
+       long error;
+
+       if (unlikely(!keyring) || unlikely(!nested))
+               return false;
+
+       error = kernel_link_key(nested->serial, keyring->serial);
+
+       return error == 0;
+}
+
+LIB_EXPORT bool l_keyring_unlink_nested(struct l_keyring *keyring,
+                                               const struct l_keyring *nested)
+{
+       long error;
+
+       if (unlikely(!keyring) || unlikely(!nested))
+               return false;
+
+       error = kernel_unlink_key(nested->serial, keyring->serial);
+
+       return error == 0;
+}
+
+LIB_EXPORT bool l_key_is_supported(uint32_t features)
+{
+       long result;
+
+       if (features & L_KEY_FEATURE_DH) {
+               result = syscall(__NR_keyctl, KEYCTL_DH_COMPUTE, NULL, "x", 1,
+                                       NULL);
+
+               if (result == -1 && errno == EOPNOTSUPP)
+                       return false;
+       }
+
+       if (features & L_KEY_FEATURE_RESTRICT) {
+               result = syscall(__NR_keyctl, KEYCTL_RESTRICT_KEYRING, 0,
+                                       "asymmetric", "");
+
+               if (result == -1 && errno == EOPNOTSUPP)
+                       return false;
+       }
+
+       if (features & L_KEY_FEATURE_CRYPTO) {
+               result = syscall(__NR_keyctl, KEYCTL_PKEY_QUERY, 0, 0, "", 0);
+
+               if (result == -1 && errno == EOPNOTSUPP)
+                       return false;
+       }
+
+       return true;
+}
diff --git a/ell/key.h b/ell/key.h
new file mode 100644 (file)
index 0000000..f1f95e1
--- /dev/null
+++ b/ell/key.h
@@ -0,0 +1,128 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_KEY_H
+#define __ELL_KEY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+#include <stdbool.h>
+
+#include <ell/checksum.h>
+
+struct l_key;
+struct l_keyring;
+
+enum l_key_feature {
+       L_KEY_FEATURE_DH        = 1 << 0,
+       L_KEY_FEATURE_RESTRICT  = 1 << 1,
+       L_KEY_FEATURE_CRYPTO    = 1 << 2,
+};
+
+enum l_key_type {
+       L_KEY_RAW = 0,
+       L_KEY_RSA,
+};
+
+enum l_keyring_restriction {
+       L_KEYRING_RESTRICT_ASYM = 0,
+       L_KEYRING_RESTRICT_ASYM_CHAIN,
+};
+
+enum l_key_cipher_type {
+       L_KEY_RSA_PKCS1_V1_5,
+       L_KEY_RSA_RAW,
+};
+
+struct l_key *l_key_new(enum l_key_type type, const void *payload,
+                       size_t payload_length);
+
+void l_key_free(struct l_key *key);
+void l_key_free_norevoke(struct l_key *key);
+
+bool l_key_update(struct l_key *key, const void *payload, size_t len);
+
+bool l_key_extract(struct l_key *key, void *payload, size_t *len);
+
+ssize_t l_key_get_payload_size(struct l_key *key);
+
+bool l_key_get_info(struct l_key *key, enum l_key_cipher_type cipher,
+                       enum l_checksum_type checksum, size_t *bits,
+                       bool *out_public);
+
+struct l_key *l_key_generate_dh_private(const void *prime_buf,
+                                       size_t prime_len);
+
+bool l_key_compute_dh_public(struct l_key *generator, struct l_key *private_key,
+                               struct l_key *prime,
+                               void *payload, size_t *len);
+
+bool l_key_compute_dh_secret(struct l_key *other_public, struct l_key *private_key,
+                               struct l_key *prime,
+                               void *payload, size_t *len);
+
+bool l_key_validate_dh_payload(const void *payload, size_t len,
+                               const void *prime_buf, size_t prime_len);
+
+ssize_t l_key_encrypt(struct l_key *key, enum l_key_cipher_type cipher,
+                       enum l_checksum_type checksum, const void *in,
+                       void *out, size_t len_in, size_t len_out);
+
+ssize_t l_key_decrypt(struct l_key *key, enum l_key_cipher_type cipher,
+                       enum l_checksum_type checksum, const void *in,
+                       void *out, size_t len_in, size_t len_out);
+
+ssize_t l_key_sign(struct l_key *key, enum l_key_cipher_type cipher,
+                       enum l_checksum_type checksum, const void *in,
+                       void *out, size_t len_in, size_t len_out);
+
+bool l_key_verify(struct l_key *key, enum l_key_cipher_type cipher,
+                       enum l_checksum_type checksum, const void *data,
+                       const void *sig, size_t len_data, size_t len_sig);
+
+struct l_keyring *l_keyring_new(void);
+
+bool l_keyring_restrict(struct l_keyring *keyring, enum l_keyring_restriction res,
+                       const struct l_keyring *trust);
+
+void l_keyring_free(struct l_keyring *keyring);
+void l_keyring_free_norevoke(struct l_keyring *keyring);
+
+bool l_keyring_link(struct l_keyring *keyring, const struct l_key *key);
+
+bool l_keyring_unlink(struct l_keyring *keyring, const struct l_key *key);
+
+bool l_keyring_link_nested(struct l_keyring *keyring,
+                               const struct l_keyring *nested);
+bool l_keyring_unlink_nested(struct l_keyring *keyring,
+                               const struct l_keyring *nested);
+
+bool l_key_is_supported(uint32_t features);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_KEY_H */
diff --git a/ell/log.c b/ell/log.c
new file mode 100644 (file)
index 0000000..f3f4b0c
--- /dev/null
+++ b/ell/log.c
@@ -0,0 +1,455 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <fnmatch.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include "queue.h"
+#include "log.h"
+#include "private.h"
+
+struct debug_section {
+       struct l_debug_desc *start;
+       struct l_debug_desc *end;
+};
+
+struct l_queue *debug_sections;
+
+/**
+ * SECTION:log
+ * @short_description: Logging framework
+ *
+ * Logging framework
+ */
+
+/**
+ * l_debug_desc:
+ *
+ * Debug descriptor.
+ */
+
+static void log_null(int priority, const char *file, const char *line,
+                       const char *func, const char *format, va_list ap)
+{
+}
+
+static l_log_func_t log_func = log_null;
+static const char *log_ident = "";
+static int log_fd = -1;
+static unsigned long log_pid;
+
+static inline void close_log(void)
+{
+       if (log_fd > 0) {
+               close(log_fd);
+               log_fd = -1;
+       }
+}
+
+static int open_log(const char *path)
+{
+       struct sockaddr_un addr;
+
+       log_fd = socket(PF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (log_fd < 0)
+               return -1;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
+
+       if (connect(log_fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+               close_log();
+               return -1;
+       }
+
+       return 0;
+}
+
+/**
+ * l_log_set_ident:
+ * @ident: string identifier
+ *
+ * Sets the log identifier string.
+ **/
+LIB_EXPORT void l_log_set_ident(const char *ident)
+{
+       log_ident = ident;
+}
+
+/**
+ * l_log_set_handler:
+ * @function: log handler function
+ *
+ * Sets the log handler function.
+ **/
+LIB_EXPORT void l_log_set_handler(l_log_func_t function)
+{
+       L_DEBUG_SYMBOL(__debug_intern, "");
+
+       close_log();
+
+       if (!function) {
+               log_func = log_null;
+               return;
+       }
+
+       log_func = function;
+}
+
+/**
+ * l_log_set_null:
+ *
+ * Disable logging.
+ **/
+LIB_EXPORT void l_log_set_null(void)
+{
+       close_log();
+
+       log_func = log_null;
+}
+
+static void log_stderr(int priority, const char *file, const char *line,
+                       const char *func, const char *format, va_list ap)
+{
+       vfprintf(stderr, format, ap);
+}
+
+/**
+ * l_log_set_stderr:
+ *
+ * Enable logging to stderr.
+ **/
+LIB_EXPORT void l_log_set_stderr(void)
+{
+       close_log();
+
+       log_func = log_stderr;
+}
+
+static void log_syslog(int priority, const char *file, const char *line,
+                       const char *func, const char *format, va_list ap)
+{
+       struct msghdr msg;
+       struct iovec iov[2];
+       char hdr[64], *str;
+       int hdr_len, str_len;
+
+       str_len = vasprintf(&str, format, ap);
+       if (str_len < 0)
+               return;
+
+       hdr_len = snprintf(hdr, sizeof(hdr), "<%i>%s[%lu]: ", priority,
+                                       log_ident, (unsigned long) log_pid);
+
+       iov[0].iov_base = hdr;
+       iov[0].iov_len  = hdr_len;
+       iov[1].iov_base = str;
+       iov[1].iov_len  = str_len;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = iov;
+       msg.msg_iovlen = 2;
+
+       sendmsg(log_fd, &msg, 0);
+
+       free(str);
+}
+
+/**
+ * l_log_set_syslog:
+ *
+ * Enable logging to syslog.
+ **/
+LIB_EXPORT void l_log_set_syslog(void)
+{
+       close_log();
+
+       if (open_log("/dev/log") < 0) {
+               log_func = log_null;
+               return;
+       }
+
+       log_pid = getpid();
+
+       log_func = log_syslog;
+}
+
+static void log_journal(int priority, const char *file, const char *line,
+                       const char *func, const char *format, va_list ap)
+{
+       struct msghdr msg;
+       struct iovec iov[12];
+       char prio[16], *str;
+       int prio_len, str_len;
+
+       str_len = vasprintf(&str, format, ap);
+       if (str_len < 0)
+               return;
+
+       prio_len = snprintf(prio, sizeof(prio), "PRIORITY=%u\n", priority);
+
+       iov[0].iov_base = "MESSAGE=";
+       iov[0].iov_len  = 8;
+       iov[1].iov_base = str;
+       iov[1].iov_len  = str_len;
+       iov[2].iov_base = prio;
+       iov[2].iov_len  = prio_len;
+       iov[3].iov_base = "CODE_FILE=";
+       iov[3].iov_len  = 10;
+       iov[4].iov_base = (char *) file;
+       iov[4].iov_len  = strlen(file);
+       iov[5].iov_base = "\n";
+       iov[5].iov_len  = 1;
+       iov[6].iov_base = "CODE_LINE=";
+       iov[6].iov_len  = 10;
+       iov[7].iov_base = (char *) line;
+       iov[7].iov_len  = strlen(line);
+       iov[8].iov_base = "\n";
+       iov[8].iov_len  = 1;
+       iov[9].iov_base = "CODE_FUNC=";
+       iov[9].iov_len  = 10;
+       iov[10].iov_base = (char *) func;
+       iov[10].iov_len  = strlen(func);
+       iov[11].iov_base = "\n";
+       iov[11].iov_len  = 1;
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = iov;
+       msg.msg_iovlen = 12;
+
+       sendmsg(log_fd, &msg, 0);
+
+       free(str);
+}
+
+/**
+ * l_log_set_journal:
+ *
+ * Enable logging to journal.
+ **/
+LIB_EXPORT void l_log_set_journal(void)
+{
+       close_log();
+
+       if (open_log("/run/systemd/journal/socket") < 0) {
+               log_func = log_null;
+               return;
+       }
+
+       log_pid = getpid();
+
+       log_func = log_journal;
+}
+
+/**
+ * l_log_with_location:
+ * @priority: priority level
+ * @file: source file
+ * @line: source line
+ * @func: source function
+ * @format: format string
+ * @...: format arguments
+ *
+ * Log information.
+ **/
+LIB_EXPORT void l_log_with_location(int priority,
+                               const char *file, const char *line,
+                               const char *func, const char *format, ...)
+{
+       va_list ap;
+
+       va_start(ap, format);
+       log_func(priority, file, line, func, format, ap);
+       va_end(ap);
+}
+
+/**
+ * l_error:
+ * @format: format string
+ * @...: format arguments
+ *
+ **/
+
+/**
+ * l_warn:
+ * @format: format string
+ * @...: format arguments
+ *
+ **/
+
+/**
+ * l_info:
+ * @format: format string
+ * @...: format arguments
+ *
+ **/
+
+/**
+ * l_debug:
+ * @format: format string
+ * @...: format arguments
+ **/
+
+static const char *debug_pattern;
+
+void debug_enable(struct l_debug_desc *start, struct l_debug_desc *stop)
+{
+       struct l_debug_desc *desc;
+       char *pattern_copy;
+
+       if (!debug_pattern)
+               return;
+
+       pattern_copy = strdupa(debug_pattern);
+
+       while (pattern_copy) {
+               char *str = strsep(&pattern_copy, ":,");
+               if (!str)
+                       break;
+
+               for (desc = start; desc < stop; desc++) {
+                       if (!fnmatch(str, desc->file, 0))
+                               desc->flags |= L_DEBUG_FLAG_PRINT;
+                       if (!fnmatch(str, desc->func, 0))
+                               desc->flags |= L_DEBUG_FLAG_PRINT;
+               }
+       }
+}
+
+void debug_disable(struct l_debug_desc *start, struct l_debug_desc *stop)
+{
+       struct l_debug_desc *desc;
+
+       for (desc = start; desc < stop; desc++)
+               desc->flags &= ~L_DEBUG_FLAG_PRINT;
+}
+
+/**
+ * l_debug_add_section:
+ * @start: start of the debug section
+ * @stop: stop of the debug section
+ *
+ * Add information about a debug section.  This is used by shared libraries
+ * to tell ell about their debug section start & stopping points.  This is used
+ * to make l_debug statements work across all shared libraries that might be
+ * linked into the executable
+ */
+LIB_EXPORT void l_debug_add_section(struct l_debug_desc *start,
+                                       struct l_debug_desc *end)
+{
+       const struct l_queue_entry *entry;
+       const struct debug_section *section;
+       struct debug_section *new_section;
+
+       if (!debug_sections) {
+               debug_sections = l_queue_new();
+               goto add;
+       }
+
+       for (entry = l_queue_get_entries(debug_sections); entry;
+                                       entry = entry->next) {
+               section = entry->data;
+
+               if (section->start == start && section->end == end)
+                       return;
+       }
+
+add:
+       new_section = l_new(struct debug_section, 1);
+       new_section->start = start;
+       new_section->end = end;
+
+       l_queue_push_head(debug_sections, new_section);
+}
+
+/**
+ * l_debug_enable_full:
+ * @pattern: debug pattern
+ * @start: start of the debug section
+ * @stop: end of the debug section
+ *
+ * Enable debug sections based on @pattern.
+ **/
+LIB_EXPORT void l_debug_enable_full(const char *pattern,
+                                       struct l_debug_desc *start,
+                                       struct l_debug_desc *end)
+{
+       const struct l_queue_entry *entry;
+       const struct debug_section *section;
+
+       if (!pattern)
+               return;
+
+       debug_pattern = pattern;
+
+       l_debug_add_section(start, end);
+
+       for (entry = l_queue_get_entries(debug_sections); entry;
+                                       entry = entry->next) {
+               section = entry->data;
+               debug_enable(section->start, section->end);
+       }
+}
+
+/**
+ * l_debug_disable:
+ *
+ * Disable all debug sections.
+ **/
+LIB_EXPORT void l_debug_disable(void)
+{
+       const struct l_queue_entry *entry;
+       const struct debug_section *section;
+
+       for (entry = l_queue_get_entries(debug_sections); entry;
+                                       entry = entry->next) {
+               section = entry->data;
+               debug_disable(section->start, section->end);
+       }
+
+       debug_pattern = NULL;
+}
+
+__attribute__((constructor)) static void register_debug_section()
+{
+       extern struct l_debug_desc __start___ell_debug[];
+       extern struct l_debug_desc __stop___ell_debug[];
+
+       l_debug_add_section(__start___ell_debug, __stop___ell_debug);
+}
+
+__attribute__((destructor(65535))) static void free_debug_sections()
+{
+       l_queue_destroy(debug_sections, l_free);
+}
diff --git a/ell/log.h b/ell/log.h
new file mode 100644 (file)
index 0000000..19bf10b
--- /dev/null
+++ b/ell/log.h
@@ -0,0 +1,101 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_LOG_H
+#define __ELL_LOG_H
+
+#include <stdarg.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define L_LOG_ERR      3
+#define L_LOG_WARNING  4
+#define L_LOG_INFO     6
+#define L_LOG_DEBUG    7
+
+typedef void (*l_log_func_t) (int priority, const char *file, const char *line,
+                       const char *func, const char *format, va_list ap);
+
+void l_log_set_ident(const char *ident);
+void l_log_set_handler(l_log_func_t function);
+void l_log_set_null(void);
+void l_log_set_stderr(void);
+void l_log_set_syslog(void);
+void l_log_set_journal(void);
+
+void l_log_with_location(int priority, const char *file, const char *line,
+                               const char *func, const char *format, ...)
+                               __attribute__((format(printf, 5, 6)));
+
+#define l_log(priority, format, ...)  l_log_with_location(priority, \
+                                       __FILE__, L_STRINGIFY(__LINE__), \
+                                       __func__, format "\n", ##__VA_ARGS__)
+
+struct l_debug_desc {
+       const char *file;
+       const char *func;
+#define L_DEBUG_FLAG_DEFAULT (0)
+#define L_DEBUG_FLAG_PRINT   (1 << 0)
+       unsigned int flags;
+} __attribute__((aligned(8)));
+
+#define L_DEBUG_SYMBOL(symbol, format, ...) do { \
+       static struct l_debug_desc symbol \
+       __attribute__((used, section("__ell_debug"), aligned(8))) = { \
+               .file = __FILE__, .func = __func__, \
+               .flags = L_DEBUG_FLAG_DEFAULT, \
+       }; \
+       if (symbol.flags & L_DEBUG_FLAG_PRINT) \
+               l_log(L_LOG_DEBUG, "%s:%s() " format, __FILE__, \
+                                       __func__ , ##__VA_ARGS__); \
+} while (0)
+
+void l_debug_enable_full(const char *pattern,
+                               struct l_debug_desc *start,
+                               struct l_debug_desc *stop);
+void l_debug_add_section(struct l_debug_desc *start,
+                                       struct l_debug_desc *end);
+
+#define l_debug_enable(pattern) do { \
+_Pragma("GCC diagnostic push") \
+_Pragma("GCC diagnostic ignored \"-Wredundant-decls\"") \
+       extern struct l_debug_desc __start___ell_debug[]; \
+       extern struct l_debug_desc __stop___ell_debug[]; \
+       l_debug_enable_full(pattern, __start___ell_debug, __stop___ell_debug); \
+_Pragma("GCC diagnostic pop") \
+} while (0)
+
+void l_debug_disable(void);
+
+#define l_error(format, ...)  l_log(L_LOG_ERR, format, ##__VA_ARGS__)
+#define l_warn(format, ...)   l_log(L_LOG_WARNING, format, ##__VA_ARGS__)
+#define l_info(format, ...)   l_log(L_LOG_INFO, format, ##__VA_ARGS__)
+#define l_debug(format, ...)  L_DEBUG_SYMBOL(__debug_desc, format, ##__VA_ARGS__)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_LOG_H */
diff --git a/ell/main.c b/ell/main.c
new file mode 100644 (file)
index 0000000..3868f32
--- /dev/null
@@ -0,0 +1,663 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <limits.h>
+#include <signal.h>
+#include <sys/epoll.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include "signal.h"
+#include "queue.h"
+#include "log.h"
+#include "util.h"
+#include "main.h"
+#include "private.h"
+#include "timeout.h"
+
+/**
+ * SECTION:main
+ * @short_description: Main loop handling
+ *
+ * Main loop handling
+ */
+
+#define MAX_EPOLL_EVENTS 10
+
+#define IDLE_FLAG_DISPATCHING  1
+#define IDLE_FLAG_DESTROYED    2
+
+#define WATCH_FLAG_DISPATCHING 1
+#define WATCH_FLAG_DESTROYED   2
+
+#define WATCHDOG_TRIGGER_FREQ  2
+
+static int epoll_fd;
+static bool epoll_running;
+static bool epoll_terminate;
+static int idle_id;
+
+static int notify_fd;
+
+static struct l_timeout *watchdog;
+
+static struct l_queue *idle_list;
+
+struct watch_data {
+       int fd;
+       uint32_t events;
+       uint32_t flags;
+       watch_event_cb_t callback;
+       watch_destroy_cb_t destroy;
+       void *user_data;
+};
+
+#define DEFAULT_WATCH_ENTRIES 128
+
+static unsigned int watch_entries;
+static struct watch_data **watch_list;
+
+struct idle_data {
+       idle_event_cb_t callback;
+       idle_destroy_cb_t destroy;
+       void *user_data;
+       uint32_t flags;
+       int id;
+};
+
+static inline bool __attribute__ ((always_inline)) create_epoll(void)
+{
+       unsigned int i;
+
+       epoll_fd = epoll_create1(EPOLL_CLOEXEC);
+       if (epoll_fd < 0) {
+               epoll_fd = 0;
+               return false;
+       }
+
+       watch_list = malloc(DEFAULT_WATCH_ENTRIES * sizeof(void *));
+       if (!watch_list)
+               goto close_epoll;
+
+       idle_list = l_queue_new();
+
+       idle_id = 0;
+
+       watch_entries = DEFAULT_WATCH_ENTRIES;
+
+       for (i = 0; i < watch_entries; i++)
+               watch_list[i] = NULL;
+
+       return true;
+
+close_epoll:
+       close(epoll_fd);
+       epoll_fd = 0;
+
+       return false;
+}
+
+int watch_add(int fd, uint32_t events, watch_event_cb_t callback,
+                               void *user_data, watch_destroy_cb_t destroy)
+{
+       struct watch_data *data;
+       struct epoll_event ev;
+       int err;
+
+       if (unlikely(fd < 0 || !callback))
+               return -EINVAL;
+
+       if (!epoll_fd)
+               return -EIO;
+
+       if ((unsigned int) fd > watch_entries - 1)
+               return -ERANGE;
+
+       data = l_new(struct watch_data, 1);
+
+       data->fd = fd;
+       data->events = events;
+       data->flags = 0;
+       data->callback = callback;
+       data->destroy = destroy;
+       data->user_data = user_data;
+
+       memset(&ev, 0, sizeof(ev));
+       ev.events = events;
+       ev.data.ptr = data;
+
+       err = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, data->fd, &ev);
+       if (err < 0) {
+               l_free(data);
+               return -errno;
+       }
+
+       watch_list[fd] = data;
+
+       return 0;
+}
+
+int watch_modify(int fd, uint32_t events, bool force)
+{
+       struct watch_data *data;
+       struct epoll_event ev;
+       int err;
+
+       if (unlikely(fd < 0))
+               return -EINVAL;
+
+       if ((unsigned int) fd > watch_entries - 1)
+               return -ERANGE;
+
+       data = watch_list[fd];
+       if (!data)
+               return -ENXIO;
+
+       if (data->events == events && !force)
+               return 0;
+
+       memset(&ev, 0, sizeof(ev));
+       ev.events = events;
+       ev.data.ptr = data;
+
+       err = epoll_ctl(epoll_fd, EPOLL_CTL_MOD, data->fd, &ev);
+       if (err < 0)
+               return -errno;
+
+       data->events = events;
+
+       return 0;
+}
+
+int watch_clear(int fd)
+{
+       struct watch_data *data;
+
+       if (unlikely(fd < 0))
+               return -EINVAL;
+
+       if ((unsigned int) fd > watch_entries - 1)
+               return -ERANGE;
+
+       data = watch_list[fd];
+       if (!data)
+               return -ENXIO;
+
+       watch_list[fd] = NULL;
+
+       if (data->destroy)
+               data->destroy(data->user_data);
+
+       if (data->flags & WATCH_FLAG_DISPATCHING)
+               data->flags |= WATCH_FLAG_DESTROYED;
+       else
+               l_free(data);
+
+       return 0;
+}
+
+int watch_remove(int fd)
+{
+       int err = watch_clear(fd);
+
+       if (err < 0)
+               return err;
+
+       err = epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, NULL);
+       if (err < 0)
+               return -errno;
+
+       return err;
+}
+
+static bool idle_remove_by_id(void *data, void *user_data)
+{
+       struct idle_data *idle = data;
+       int id = L_PTR_TO_INT(user_data);
+
+       if (idle->id != id)
+               return false;
+
+       if (idle->destroy)
+               idle->destroy(idle->user_data);
+
+       if (idle->flags & IDLE_FLAG_DISPATCHING) {
+               idle->flags |= IDLE_FLAG_DESTROYED;
+               return false;
+       }
+
+       l_free(idle);
+
+       return true;
+}
+
+static bool idle_prune(void *data, void *user_data)
+{
+       struct idle_data *idle = data;
+
+       if ((idle->flags & IDLE_FLAG_DESTROYED) == 0)
+               return false;
+
+       l_free(idle);
+
+       return true;
+}
+
+int idle_add(idle_event_cb_t callback, void *user_data, uint32_t flags,
+               idle_destroy_cb_t destroy)
+{
+       struct idle_data *data;
+
+       if (unlikely(!callback))
+               return -EINVAL;
+
+       if (!epoll_fd)
+               return -EIO;
+
+       data = l_new(struct idle_data, 1);
+
+       data->callback = callback;
+       data->destroy = destroy;
+       data->user_data = user_data;
+       data->flags = flags;
+
+       if (!l_queue_push_tail(idle_list, data)) {
+               l_free(data);
+               return -ENOMEM;
+       }
+
+       data->id = idle_id++;
+
+       if (idle_id == INT_MAX)
+               idle_id = 0;
+
+       return data->id;
+}
+
+void idle_remove(int id)
+{
+       l_queue_foreach_remove(idle_list, idle_remove_by_id,
+                                       L_INT_TO_PTR(id));
+}
+
+static void idle_destroy(void *data)
+{
+       struct idle_data *idle = data;
+
+       if (!(idle->flags & IDLE_FLAG_NO_WARN_DANGLING))
+               l_error("Dangling idle descriptor %p, %d found",
+                                                       data, idle->id);
+
+       if (idle->destroy)
+               idle->destroy(idle->user_data);
+
+       l_free(idle);
+}
+
+static void idle_dispatch(void *data, void *user_data)
+{
+       struct idle_data *idle = data;
+
+       if (!idle->callback)
+               return;
+
+       idle->flags |= IDLE_FLAG_DISPATCHING;
+       idle->callback(idle->user_data);
+       idle->flags &= ~IDLE_FLAG_DISPATCHING;
+}
+
+static int sd_notify(const char *state)
+{
+       int err;
+
+       if (notify_fd <= 0)
+               return -ENOTCONN;
+
+       err = send(notify_fd, state, strlen(state), MSG_NOSIGNAL);
+       if (err < 0)
+               return -errno;
+
+       return 0;
+}
+
+static void watchdog_callback(struct l_timeout *timeout, void *user_data)
+{
+       int msec = L_PTR_TO_INT(user_data);
+
+       sd_notify("WATCHDOG=1");
+
+       l_timeout_modify_ms(timeout, msec);
+}
+
+static void create_sd_notify_socket(void)
+{
+       const char *sock;
+       struct sockaddr_un addr;
+       const char *watchdog_usec;
+       int msec;
+
+       /* check if NOTIFY_SOCKET has been set */
+       sock = getenv("NOTIFY_SOCKET");
+       if (!sock)
+               return;
+
+       /* check for abstract socket or absolute path */
+       if (sock[0] != '@' && sock[0] != '/')
+               return;
+
+       notify_fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (notify_fd < 0) {
+               notify_fd = 0;
+               return;
+       }
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, sock, sizeof(addr.sun_path) - 1);
+
+       if (addr.sun_path[0] == '@')
+               addr.sun_path[0] = '\0';
+
+       if (bind(notify_fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+               close(notify_fd);
+               notify_fd = 0;
+               return;
+       }
+
+       watchdog_usec = getenv("WATCHDOG_USEC");
+       if (!watchdog_usec)
+               return;
+
+       msec = atoi(watchdog_usec) / 1000;
+       if (msec < WATCHDOG_TRIGGER_FREQ)
+               return;
+
+       msec /= WATCHDOG_TRIGGER_FREQ;
+
+       watchdog = l_timeout_create_ms(msec, watchdog_callback,
+                                       L_INT_TO_PTR(msec), NULL);
+}
+
+/**
+ * l_main_init:
+ *
+ * Initialize the main loop. This must be called before l_main_run()
+ * and any other function that directly or indirectly sets up an idle
+ * or watch. A safe rule-of-thumb is to call it before any function
+ * prefixed with "l_".
+ *
+ * Returns: true if initialization was successful, false otherwise.
+ **/
+LIB_EXPORT bool l_main_init(void)
+{
+       if (unlikely(epoll_running))
+               return false;
+
+       if (!create_epoll())
+               return false;
+
+       create_sd_notify_socket();
+
+       epoll_terminate = false;
+
+       return true;
+}
+
+/**
+ * l_main_prepare:
+ *
+ * Prepare the iteration of the main loop
+ *
+ * Returns: The timeout to use.  This will be 0 if idle-event processing is
+ * currently pending, or -1 otherwise.  This value can be used to pass to
+ * l_main_iterate.
+ */
+LIB_EXPORT int l_main_prepare(void)
+{
+       return l_queue_isempty(idle_list) ? -1 : 0;
+}
+
+/**
+ * l_main_iterate:
+ *
+ * Run one iteration of the main event loop
+ */
+LIB_EXPORT void l_main_iterate(int timeout)
+{
+       struct epoll_event events[MAX_EPOLL_EVENTS];
+       struct watch_data *data;
+       int n, nfds;
+
+       nfds = epoll_wait(epoll_fd, events, MAX_EPOLL_EVENTS, timeout);
+
+       for (n = 0; n < nfds; n++) {
+               data = events[n].data.ptr;
+
+               data->flags |= WATCH_FLAG_DISPATCHING;
+       }
+
+       for (n = 0; n < nfds; n++) {
+               data = events[n].data.ptr;
+
+               if (data->flags & WATCH_FLAG_DESTROYED)
+                       continue;
+
+               data->callback(data->fd, events[n].events,
+                                                       data->user_data);
+       }
+
+       for (n = 0; n < nfds; n++) {
+               data = events[n].data.ptr;
+
+               if (data->flags & WATCH_FLAG_DESTROYED)
+                       l_free(data);
+               else
+                       data->flags = 0;
+       }
+
+       l_queue_foreach(idle_list, idle_dispatch, NULL);
+       l_queue_foreach_remove(idle_list, idle_prune, NULL);
+}
+
+/**
+ * l_main_run:
+ *
+ * Run the main loop
+ *
+ * The loop may be restarted by invoking this function after a
+ * previous invocation returns, provided that l_main_exit() has not
+ * been called first.
+ *
+ * Returns: #EXIT_SUCCESS after successful execution or #EXIT_FAILURE in
+ *          case of failure
+ **/
+LIB_EXPORT int l_main_run(void)
+{
+       int timeout;
+
+       /* Has l_main_init() been called? */
+       if (unlikely(!epoll_fd))
+               return EXIT_FAILURE;
+
+       if (unlikely(epoll_running))
+               return EXIT_FAILURE;
+
+       epoll_running = true;
+
+       for (;;) {
+               if (epoll_terminate)
+                       break;
+
+               timeout = l_main_prepare();
+               l_main_iterate(timeout);
+       }
+
+       epoll_running = false;
+
+       if (notify_fd) {
+               close(notify_fd);
+               notify_fd = 0;
+               l_timeout_remove(watchdog);
+               watchdog = NULL;
+       }
+
+       return EXIT_SUCCESS;
+}
+
+/**
+ * l_main_exit:
+ *
+ * Clean up after main loop completes.
+ *
+ **/
+LIB_EXPORT bool l_main_exit(void)
+{
+       unsigned int i;
+
+       if (epoll_running) {
+               l_error("Cleanup attempted on running main loop");
+               return false;
+       }
+
+       for (i = 0; i < watch_entries; i++) {
+               struct watch_data *data = watch_list[i];
+
+               if (!data)
+                       continue;
+
+               epoll_ctl(epoll_fd, EPOLL_CTL_DEL, data->fd, NULL);
+
+               if (data->destroy)
+                       data->destroy(data->user_data);
+               else
+                       l_error("Dangling file descriptor %d found", data->fd);
+
+               l_free(data);
+       }
+
+       watch_entries = 0;
+
+       free(watch_list);
+       watch_list = NULL;
+
+       l_queue_destroy(idle_list, idle_destroy);
+       idle_list = NULL;
+
+       close(epoll_fd);
+       epoll_fd = 0;
+
+       return true;
+}
+
+/**
+ * l_main_quit:
+ *
+ * Teminate the running main loop
+ *
+ * Returns: #true when terminating the main loop or #false in case of failure
+ **/
+LIB_EXPORT bool l_main_quit(void)
+{
+       if (unlikely(!epoll_running))
+               return false;
+
+       epoll_terminate = true;
+
+       return true;
+}
+
+struct signal_data {
+       l_main_signal_cb_t callback;
+       void *user_data;
+};
+
+static void sigint_handler(void *user_data)
+{
+       struct signal_data *data = user_data;
+
+       if (data->callback)
+               data->callback(SIGINT, data->user_data);
+}
+
+static void sigterm_handler(void *user_data)
+{
+       struct signal_data *data = user_data;
+
+       if (data->callback)
+               data->callback(SIGTERM, data->user_data);
+}
+
+/**
+ * l_main_run_with_signal:
+ *
+ * Run the main loop with signal handling for SIGINT and SIGTERM
+ *
+ * Returns: #EXIT_SUCCESS after successful execution or #EXIT_FAILURE in
+ *          case of failure
+ **/
+LIB_EXPORT int l_main_run_with_signal(l_main_signal_cb_t callback,
+                                                       void *user_data)
+{
+       struct signal_data *data;
+       struct l_signal *sigint;
+       struct l_signal *sigterm;
+       int result;
+
+       data = l_new(struct signal_data, 1);
+
+       data->callback = callback;
+       data->user_data = user_data;
+
+       sigint = l_signal_create(SIGINT, sigint_handler, data, NULL);
+       sigterm = l_signal_create(SIGTERM, sigterm_handler, data, NULL);
+
+       result = l_main_run();
+
+       l_signal_remove(sigint);
+       l_signal_remove(sigterm);
+
+       l_free(data);
+
+       return result;
+}
+
+/**
+ * l_main_get_epoll_fd:
+ *
+ * Can be used to obtain the epoll file descriptor in order to integrate
+ * the ell main event loop with other event loops.
+ *
+ * Returns: epoll file descriptor
+ **/
+LIB_EXPORT int l_main_get_epoll_fd(void)
+{
+       return epoll_fd;
+}
diff --git a/ell/main.h b/ell/main.h
new file mode 100644 (file)
index 0000000..99b34ad
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_MAIN_H
+#define __ELL_MAIN_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool l_main_init(void);
+int l_main_prepare(void);
+void l_main_iterate(int timeout);
+int l_main_run(void);
+bool l_main_exit(void);
+
+bool l_main_quit(void);
+
+typedef void (*l_main_signal_cb_t) (uint32_t signo, void *user_data);
+
+int l_main_run_with_signal(l_main_signal_cb_t callback, void *user_data);
+
+int l_main_get_epoll_fd();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_MAIN_H */
diff --git a/ell/missing.h b/ell/missing.h
new file mode 100644 (file)
index 0000000..37d5586
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <sys/syscall.h>
+
+#ifndef __NR_getrandom
+#  if defined __x86_64__
+#    define __NR_getrandom 318
+#  elif defined(__i386__)
+#    define __NR_getrandom 355
+#  elif defined(__arm__)
+#    define __NR_getrandom 384
+# elif defined(__aarch64__)
+#    define __NR_getrandom 278
+#  elif defined(__ia64__)
+#    define __NR_getrandom 1339
+#  elif defined(__m68k__)
+#    define __NR_getrandom 352
+#  elif defined(__s390x__)
+#    define __NR_getrandom 349
+#  elif defined(__powerpc__)
+#    define __NR_getrandom 359
+#  elif defined _MIPS_SIM
+#    if _MIPS_SIM == _MIPS_SIM_ABI32
+#      define __NR_getrandom 4353
+#    endif
+#    if _MIPS_SIM == _MIPS_SIM_NABI32
+#      define __NR_getrandom 6317
+#    endif
+#    if _MIPS_SIM == _MIPS_SIM_ABI64
+#      define __NR_getrandom 5313
+#    endif
+#  else
+#    warning "__NR_getrandom unknown for your architecture"
+#    define __NR_getrandom 0xffffffff
+#  endif
+#endif
+
+#ifndef HAVE_EXPLICIT_BZERO
+static inline void explicit_bzero(void *s, size_t n)
+{
+       memset(s, 0, n);
+       __asm__ __volatile__ ("" : : "r"(s) : "memory");
+}
+#endif
diff --git a/ell/net.c b/ell/net.c
new file mode 100644 (file)
index 0000000..350340a
--- /dev/null
+++ b/ell/net.c
@@ -0,0 +1,180 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/socket.h>
+#include <linux/if_arp.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+
+#include "net.h"
+#include "private.h"
+
+/**
+ * SECTION:net
+ * @short_description: Network Interface related utilities
+ *
+ * Network Interface utilities
+ */
+
+/**
+ * l_net_get_mac_address:
+ * @ifindex: Interface index to query
+ * @out_addr: Buffer to copy the mac address to.  Must be able to hold 6 bytes
+ *
+ * Obtains the mac address of the network interface given by @ifindex
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_net_get_mac_address(uint32_t ifindex, uint8_t *out_addr)
+{
+       struct ifreq ifr;
+       int sk, err;
+
+       sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return false;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = ifindex;
+
+       err = ioctl(sk, SIOCGIFNAME, &ifr);
+       if (err < 0)
+               goto error;
+
+       err = ioctl(sk, SIOCGIFHWADDR, &ifr);
+       if (err < 0)
+               goto error;
+
+       close(sk);
+
+       if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
+               return false;
+
+       memcpy(out_addr, ifr.ifr_hwaddr.sa_data, 6);
+       return true;
+
+error:
+       close(sk);
+       return false;
+}
+
+/**
+ * l_net_get_name:
+ * @ifindex: Interface index to query
+ *
+ * Obtains the name of the network inderface given by @ifindex
+ *
+ * Returns: A newly allocated string with the name or NULL on failure
+ **/
+LIB_EXPORT char *l_net_get_name(uint32_t ifindex)
+{
+       struct ifreq ifr;
+       int sk, err;
+
+       sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
+       if (sk < 0)
+               return NULL;
+
+       memset(&ifr, 0, sizeof(ifr));
+       ifr.ifr_ifindex = ifindex;
+
+       err = ioctl(sk, SIOCGIFNAME, &ifr);
+       close(sk);
+
+       if (err < 0)
+               return NULL;
+
+       return l_strdup(ifr.ifr_name);
+}
+
+/**
+ * l_net_hostname_is_root:
+ * @hostname: Hostname to validate
+ *
+ * Identifies if the hostname given by @hostname is root domain name or
+ * not.
+ *
+ * Returns: #true if the given hostname is root and #false otherwise.
+ **/
+LIB_EXPORT bool l_net_hostname_is_root(const char *hostname)
+{
+       if (unlikely(!hostname))
+               return false;
+
+       if (!strcmp(hostname, ""))
+               return true;
+
+       if (!strcmp(hostname, "."))
+               return true;
+
+       return false;
+}
+
+static bool str_has_suffix(const char *str, const char *suffix)
+{
+       size_t str_len;
+       size_t suffix_len;
+       size_t len_diff;
+
+       str_len = strlen(str);
+       suffix_len = strlen(suffix);
+
+       if (str_len < suffix_len)
+               return false;
+
+       len_diff = str_len - suffix_len;
+
+       return !strcasecmp(&str[len_diff], suffix);
+}
+
+/**
+ * l_net_hostname_is_localhost:
+ * @hostname: Hostname to validate
+ *
+ * Identifies if the hostname given by @hostname is localhost or not.
+ *
+ * Returns: #true if the given hostname is localhost and #false otherwise.
+ **/
+LIB_EXPORT bool l_net_hostname_is_localhost(const char *hostname)
+{
+       if (unlikely(!hostname))
+               return false;
+
+       if (!strcasecmp(hostname, "localhost") ||
+                       !strcasecmp(hostname, "localhost.") ||
+                       !strcasecmp(hostname, "localhost.localdomain") ||
+                       !strcasecmp(hostname, "localhost.localdomain."))
+               return true;
+
+       if (str_has_suffix(hostname, ".localhost") ||
+                       str_has_suffix(hostname, ".localhost.") ||
+                       str_has_suffix(hostname, ".localhost.localdomain") ||
+                       str_has_suffix(hostname, ".localhost.localdomain."))
+               return true;
+
+       return false;
+}
diff --git a/ell/net.h b/ell/net.h
new file mode 100644 (file)
index 0000000..6808e07
--- /dev/null
+++ b/ell/net.h
@@ -0,0 +1,42 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_NET_H
+#define __ELL_NET_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool l_net_get_mac_address(uint32_t ifindex, uint8_t *out_addr);
+char *l_net_get_name(uint32_t ifindex);
+bool l_net_hostname_is_root(const char *hostname);
+bool l_net_hostname_is_localhost(const char *hostname);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_NET_H */
diff --git a/ell/netlink-private.h b/ell/netlink-private.h
new file mode 100644 (file)
index 0000000..fff30af
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef SOL_NETLINK
+#define SOL_NETLINK 270
+#endif
diff --git a/ell/netlink.c b/ell/netlink.c
new file mode 100644 (file)
index 0000000..33d0e5b
--- /dev/null
@@ -0,0 +1,613 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
+#include "util.h"
+#include "hashmap.h"
+#include "queue.h"
+#include "io.h"
+#include "netlink-private.h"
+#include "netlink.h"
+#include "private.h"
+
+struct command {
+       unsigned int id;
+       uint32_t seq;
+       uint32_t len;
+       l_netlink_command_func_t handler;
+       l_netlink_destroy_func_t destroy;
+       void *user_data;
+};
+
+struct notify {
+       uint32_t group;
+       l_netlink_notify_func_t handler;
+       l_netlink_destroy_func_t destroy;
+       void *user_data;
+};
+
+struct l_netlink {
+       uint32_t pid;
+       struct l_io *io;
+       uint32_t next_seq;
+       struct l_queue *command_queue;
+       struct l_hashmap *command_pending;
+       struct l_hashmap *command_lookup;
+       unsigned int next_command_id;
+       struct l_hashmap *notify_groups;
+       struct l_hashmap *notify_lookup;
+       unsigned int next_notify_id;
+       l_netlink_debug_func_t debug_handler;
+       l_netlink_destroy_func_t debug_destroy;
+       void *debug_data;
+};
+
+static void destroy_command(void *data)
+{
+       struct command *command = data;
+
+       if (command->destroy)
+               command->destroy(command->user_data);
+
+       l_free(command);
+}
+
+static void destroy_notify(void *data)
+{
+       struct notify *notify = data;
+
+       if (notify->destroy)
+               notify->destroy(notify->user_data);
+
+       l_free(notify);
+}
+
+static void destroy_notify_group(void *data)
+{
+       struct l_hashmap *notify_list = data;
+
+       l_hashmap_destroy(notify_list, destroy_notify);
+}
+
+static bool can_write_data(struct l_io *io, void *user_data)
+{
+       struct l_netlink *netlink = user_data;
+       struct command *command;
+       struct sockaddr_nl addr;
+       const void *data;
+       ssize_t written;
+       int sk;
+
+       command = l_queue_pop_head(netlink->command_queue);
+       if (!command)
+               return false;
+
+       sk = l_io_get_fd(io);
+
+       memset(&addr, 0, sizeof(addr));
+       addr.nl_family = AF_NETLINK;
+       addr.nl_pid = 0;
+
+       data = ((void *) command) + NLMSG_ALIGN(sizeof(struct command));
+
+       written = sendto(sk, data, command->len, 0,
+                               (struct sockaddr *) &addr, sizeof(addr));
+       if (written < 0 || (uint32_t) written != command->len) {
+               l_hashmap_remove(netlink->command_lookup,
+                                       L_UINT_TO_PTR(command->id));
+               destroy_command(command);
+               return true;
+       }
+
+       l_util_hexdump(false, data, command->len,
+                               netlink->debug_handler, netlink->debug_data);
+
+       l_hashmap_insert(netlink->command_pending,
+                               L_UINT_TO_PTR(command->seq), command);
+
+       return l_queue_length(netlink->command_queue) > 0;
+}
+
+static void do_notify(const void *key, void *value, void *user_data)
+{
+       struct nlmsghdr *nlmsg = user_data;
+       struct notify *notify = value;
+
+       if (notify->handler) {
+               notify->handler(nlmsg->nlmsg_type, NLMSG_DATA(nlmsg),
+                       nlmsg->nlmsg_len - NLMSG_HDRLEN, notify->user_data);
+       }
+}
+
+static void process_broadcast(struct l_netlink *netlink, uint32_t group,
+                                               struct nlmsghdr *nlmsg)
+{
+       struct l_hashmap *notify_list;
+
+       notify_list = l_hashmap_lookup(netlink->notify_groups,
+                                               L_UINT_TO_PTR(group));
+       if (!notify_list)
+               return;
+
+       l_hashmap_foreach(notify_list, do_notify, nlmsg);
+}
+
+static void process_message(struct l_netlink *netlink, struct nlmsghdr *nlmsg)
+{
+       const void *data = nlmsg;
+       struct command *command;
+
+       command = l_hashmap_remove(netlink->command_pending,
+                                       L_UINT_TO_PTR(nlmsg->nlmsg_seq));
+       if (!command)
+               return;
+
+       if (!command->handler)
+               goto done;
+
+       if (nlmsg->nlmsg_type < NLMSG_MIN_TYPE) {
+               const struct nlmsgerr *err;
+
+               switch (nlmsg->nlmsg_type) {
+               case NLMSG_ERROR:
+                       err = data + NLMSG_HDRLEN;
+
+                       command->handler(err->error, 0, NULL, 0,
+                                                       command->user_data);
+                       break;
+               }
+       } else {
+               command->handler(0, nlmsg->nlmsg_type, data + NLMSG_HDRLEN,
+                                       nlmsg->nlmsg_len - NLMSG_HDRLEN,
+                                       command->user_data);
+       }
+
+done:
+       l_hashmap_remove(netlink->command_lookup, L_UINT_TO_PTR(command->id));
+
+       destroy_command(command);
+}
+
+static void process_multi(struct l_netlink *netlink, struct nlmsghdr *nlmsg)
+{
+       const void *data = nlmsg;
+       struct command *command;
+
+       if (nlmsg->nlmsg_type < NLMSG_MIN_TYPE) {
+               command = l_hashmap_remove(netlink->command_pending,
+                                       L_UINT_TO_PTR(nlmsg->nlmsg_seq));
+               if (!command)
+                       return;
+
+               l_hashmap_remove(netlink->command_lookup,
+                                       L_UINT_TO_PTR(command->id));
+
+               destroy_command(command);
+       } else {
+               command = l_hashmap_lookup(netlink->command_pending,
+                                       L_UINT_TO_PTR(nlmsg->nlmsg_seq));
+               if (!command)
+                       return;
+
+               if (!command->handler)
+                       return;
+
+               command->handler(0, nlmsg->nlmsg_type, data + NLMSG_HDRLEN,
+                                       nlmsg->nlmsg_len - NLMSG_HDRLEN,
+                                       command->user_data);
+       }
+}
+
+static bool can_read_data(struct l_io *io, void *user_data)
+{
+       struct l_netlink *netlink = user_data;
+       struct cmsghdr *cmsg;
+       struct msghdr msg;
+       struct iovec iov;
+       struct nlmsghdr *nlmsg;
+       unsigned char buffer[4096];
+       unsigned char control[32];
+       uint32_t group = 0;
+       ssize_t len;
+       int sk;
+
+       memset(buffer, 0, sizeof(buffer));
+       memset(control, 0, sizeof(control));
+
+       sk = l_io_get_fd(io);
+
+       iov.iov_base = buffer;
+       iov.iov_len = sizeof(buffer);
+
+       memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+       msg.msg_control = control;
+       msg.msg_controllen = sizeof(control);
+
+       len = recvmsg(sk, &msg, 0);
+       if (len < 0)
+               return false;
+
+       l_util_hexdump(true, buffer, len, netlink->debug_handler,
+                                               netlink->debug_data);
+
+       for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+                                       cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+               struct nl_pktinfo *pktinfo;
+
+               if (cmsg->cmsg_level != SOL_NETLINK)
+                       continue;
+
+               if (cmsg->cmsg_type != NETLINK_PKTINFO)
+                       continue;
+
+               pktinfo = (void *) CMSG_DATA(cmsg);
+
+               group = pktinfo->group;
+       }
+
+       for (nlmsg = iov.iov_base; NLMSG_OK(nlmsg, (uint32_t) len);
+                                       nlmsg = NLMSG_NEXT(nlmsg, len)) {
+               if (group > 0) {
+                       process_broadcast(netlink, group, nlmsg);
+                       continue;
+               }
+
+               if (nlmsg->nlmsg_pid != netlink->pid)
+                       continue;
+
+               if (nlmsg->nlmsg_flags & NLM_F_MULTI)
+                       process_multi(netlink, nlmsg);
+               else
+                       process_message(netlink, nlmsg);
+       }
+
+       return true;
+}
+
+static int create_netlink_socket(int protocol, uint32_t *pid)
+{
+       struct sockaddr_nl addr;
+       socklen_t addrlen = sizeof(addr);
+       int sk, pktinfo = 1;
+
+       sk = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
+                                                               protocol);
+       if (sk < 0)
+               return -1;
+
+       memset(&addr, 0, sizeof(addr));
+       addr.nl_family = AF_NETLINK;
+
+       if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       if (getsockname(sk, (struct sockaddr *) &addr, &addrlen) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       if (setsockopt(sk, SOL_NETLINK, NETLINK_PKTINFO,
+                                       &pktinfo, sizeof(pktinfo)) < 0) {
+               close(sk);
+               return -1;
+       }
+
+       if (pid)
+               *pid = addr.nl_pid;
+
+       return sk;
+}
+
+LIB_EXPORT struct l_netlink *l_netlink_new(int protocol)
+{
+       struct l_netlink *netlink;
+       int sk;
+
+       netlink = l_new(struct l_netlink, 1);
+
+       netlink->next_seq = 1;
+       netlink->next_command_id = 1;
+       netlink->next_notify_id = 1;
+
+       sk = create_netlink_socket(protocol, &netlink->pid);
+       if (sk < 0) {
+               l_free(netlink);
+               return NULL;
+       }
+
+       netlink->io = l_io_new(sk);
+       if (!netlink->io) {
+               close(sk);
+               l_free(netlink);
+               return NULL;
+       }
+
+       l_io_set_close_on_destroy(netlink->io, true);
+
+       l_io_set_read_handler(netlink->io, can_read_data, netlink, NULL);
+
+       netlink->command_queue = l_queue_new();
+       netlink->command_pending = l_hashmap_new();
+       netlink->command_lookup = l_hashmap_new();
+
+       netlink->notify_groups = l_hashmap_new();
+       netlink->notify_lookup = l_hashmap_new();
+
+       return netlink;
+}
+
+LIB_EXPORT void l_netlink_destroy(struct l_netlink *netlink)
+{
+       if (unlikely(!netlink))
+               return;
+
+       l_hashmap_destroy(netlink->notify_lookup, NULL);
+       l_hashmap_destroy(netlink->notify_groups, destroy_notify_group);
+
+       l_queue_destroy(netlink->command_queue, NULL);
+       l_hashmap_destroy(netlink->command_pending, NULL);
+       l_hashmap_destroy(netlink->command_lookup, destroy_command);
+
+       l_io_destroy(netlink->io);
+
+       l_free(netlink);
+}
+
+LIB_EXPORT unsigned int l_netlink_send(struct l_netlink *netlink,
+                       uint16_t type, uint16_t flags, const void *data,
+                       uint32_t len, l_netlink_command_func_t function,
+                       void *user_data, l_netlink_destroy_func_t destroy)
+{
+       struct command *command;
+       struct nlmsghdr *nlmsg;
+       size_t size;
+
+       if (unlikely(!netlink))
+               return 0;
+
+       if (!netlink->command_queue || !netlink->command_pending ||
+                                               !netlink->command_lookup)
+               return 0;
+
+       if (flags & 0xff)
+               return 0;
+
+       if (function)
+               flags |= NLM_F_ACK;
+
+       size = NLMSG_ALIGN(sizeof(struct command)) +
+                                       NLMSG_HDRLEN + NLMSG_ALIGN(len);
+
+       command = l_malloc(size);
+
+       memset(command, 0, size);
+       command->handler = function;
+       command->destroy = destroy;
+       command->user_data = user_data;
+
+       command->id = netlink->next_command_id;
+
+       if (!l_hashmap_insert(netlink->command_lookup,
+                                       L_UINT_TO_PTR(command->id), command))
+               goto free_command;
+
+       command->seq = netlink->next_seq++;
+       command->len = NLMSG_HDRLEN + NLMSG_ALIGN(len);
+
+       nlmsg = ((void *) command) + NLMSG_ALIGN(sizeof(struct command));
+
+       nlmsg->nlmsg_len = command->len;
+       nlmsg->nlmsg_type = type;
+       nlmsg->nlmsg_flags = NLM_F_REQUEST | flags;
+       nlmsg->nlmsg_seq = command->seq;
+       nlmsg->nlmsg_pid = netlink->pid;
+
+       if (data && len > 0)
+               memcpy(((void *) nlmsg) + NLMSG_HDRLEN, data, len);
+
+       l_queue_push_tail(netlink->command_queue, command);
+
+       l_io_set_write_handler(netlink->io, can_write_data, netlink, NULL);
+
+       netlink->next_command_id++;
+
+       return command->id;
+
+free_command:
+       l_free(command);
+
+       return 0;
+}
+
+LIB_EXPORT bool l_netlink_cancel(struct l_netlink *netlink, unsigned int id)
+{
+       struct command *command;
+
+       if (unlikely(!netlink || !id))
+               return false;
+
+       if (!netlink->command_queue || !netlink->command_pending ||
+                                               !netlink->command_lookup)
+               return false;
+
+       command = l_hashmap_remove(netlink->command_lookup, L_UINT_TO_PTR(id));
+       if (!command)
+               return false;
+
+       if (!l_queue_remove(netlink->command_queue, command)) {
+               l_hashmap_remove(netlink->command_pending,
+                                       L_UINT_TO_PTR(command->seq));
+       }
+
+       destroy_command(command);
+
+       return true;
+}
+
+static bool add_membership(struct l_netlink *netlink, uint32_t group)
+{
+       int sk, value = group;
+
+       sk = l_io_get_fd(netlink->io);
+
+       if (setsockopt(sk, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP,
+                                               &value, sizeof(value)) < 0)
+               return false;
+
+       return true;
+}
+
+static bool drop_membership(struct l_netlink *netlink, uint32_t group)
+{
+       int sk, value = group;
+
+       sk = l_io_get_fd(netlink->io);
+
+       if (setsockopt(sk, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP,
+                                               &value, sizeof(value)) < 0)
+               return false;
+
+       return true;
+}
+
+LIB_EXPORT unsigned int l_netlink_register(struct l_netlink *netlink,
+                       uint32_t group, l_netlink_notify_func_t function,
+                       void *user_data, l_netlink_destroy_func_t destroy)
+{
+       struct l_hashmap *notify_list;
+       struct notify *notify;
+       unsigned int id;
+
+       if (unlikely(!netlink))
+               return 0;
+
+       if (!netlink->notify_groups || !netlink->notify_lookup)
+               return 0;
+
+       notify_list = l_hashmap_lookup(netlink->notify_groups,
+                                               L_UINT_TO_PTR(group));
+       if (!notify_list) {
+               notify_list = l_hashmap_new();
+               if (!notify_list)
+                       return 0;
+
+               if (!l_hashmap_insert(netlink->notify_groups,
+                                       L_UINT_TO_PTR(group), notify_list)) {
+                       l_hashmap_destroy(notify_list, NULL);
+                       return 0;
+               }
+       }
+
+       notify = l_new(struct notify, 1);
+
+       notify->group = group;
+       notify->handler = function;
+       notify->destroy = destroy;
+       notify->user_data = user_data;
+
+       id = netlink->next_notify_id;
+
+       if (!l_hashmap_insert(netlink->notify_lookup,
+                                       L_UINT_TO_PTR(id), notify_list))
+               goto free_notify;
+
+       if (!l_hashmap_insert(notify_list, L_UINT_TO_PTR(id), notify))
+               goto remove_lookup;
+
+       if (l_hashmap_size(notify_list) == 1) {
+               if (!add_membership(netlink, notify->group))
+                       goto remove_notify;
+       }
+
+       netlink->next_notify_id++;
+
+       return id;
+
+remove_notify:
+       l_hashmap_remove(notify_list, L_UINT_TO_PTR(id));
+
+remove_lookup:
+       l_hashmap_remove(netlink->notify_lookup, L_UINT_TO_PTR(id));
+
+free_notify:
+       l_free(notify);
+
+       return 0;
+}
+
+LIB_EXPORT bool l_netlink_unregister(struct l_netlink *netlink, unsigned int id)
+{
+       struct l_hashmap *notify_list;
+       struct notify *notify;
+
+       if (unlikely(!netlink || !id))
+               return false;
+
+       if (!netlink->notify_groups || !netlink->notify_lookup)
+               return false;
+
+       notify_list = l_hashmap_remove(netlink->notify_lookup,
+                                               L_UINT_TO_PTR(id));
+       if (!notify_list)
+               return false;
+
+       notify = l_hashmap_remove(notify_list, L_UINT_TO_PTR(id));
+       if (!notify)
+               return false;
+
+       if (l_hashmap_size(notify_list) == 0)
+               drop_membership(netlink, notify->group);
+
+       destroy_notify(notify);
+
+       return true;
+}
+
+LIB_EXPORT bool l_netlink_set_debug(struct l_netlink *netlink,
+                       l_netlink_debug_func_t function,
+                       void *user_data, l_netlink_destroy_func_t destroy)
+{
+       if (unlikely(!netlink))
+               return false;
+
+       if (netlink->debug_destroy)
+               netlink->debug_destroy(netlink->debug_data);
+
+       netlink->debug_handler = function;
+       netlink->debug_destroy = destroy;
+       netlink->debug_data = user_data;
+
+       /* l_io_set_debug(netlink->io, function, user_data, NULL); */
+
+       return true;
+}
diff --git a/ell/netlink.h b/ell/netlink.h
new file mode 100644 (file)
index 0000000..b40933f
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_NETLINK_H
+#define __ELL_NETLINK_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*l_netlink_debug_func_t) (const char *str, void *user_data);
+
+typedef void (*l_netlink_command_func_t) (int error,
+                                               uint16_t type, const void *data,
+                                               uint32_t len, void *user_data);
+typedef void (*l_netlink_notify_func_t) (uint16_t type, const void *data,
+                                               uint32_t len, void *user_data);
+typedef void (*l_netlink_destroy_func_t) (void *user_data);
+
+struct l_netlink;
+
+struct l_netlink *l_netlink_new(int protocol);
+void l_netlink_destroy(struct l_netlink *netlink);
+
+unsigned int l_netlink_send(struct l_netlink *netlink,
+                       uint16_t type, uint16_t flags, const void *data,
+                       uint32_t len, l_netlink_command_func_t function,
+                       void *user_data, l_netlink_destroy_func_t destroy);
+bool l_netlink_cancel(struct l_netlink *netlink, unsigned int id);
+
+unsigned int l_netlink_register(struct l_netlink *netlink,
+                       uint32_t group, l_netlink_notify_func_t function,
+                       void *user_data, l_netlink_destroy_func_t destroy);
+bool l_netlink_unregister(struct l_netlink *netlink, unsigned int id);
+
+bool l_netlink_set_debug(struct l_netlink *netlink,
+                       l_netlink_debug_func_t function,
+                       void *user_data, l_netlink_destroy_func_t destroy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_NETLINK_H */
diff --git a/ell/path.c b/ell/path.c
new file mode 100644 (file)
index 0000000..dfede14
--- /dev/null
@@ -0,0 +1,187 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "time.h"
+#include "path.h"
+#include "private.h"
+
+static const char *next_in_path(const char *path, char **ret, size_t overhead)
+{
+       const char *p = path;
+       char *r;
+       size_t toalloc = 0;
+
+       while (p[0] != '\0' && p[0] != ':') {
+               switch (*p) {
+               case '\\':
+                       if (!*++p)
+                               break;
+                       /* Fall through */
+               default:
+                       p++;
+                       toalloc += 1;
+                       break;
+               }
+       }
+
+       r = l_new(char, toalloc + 1 + overhead);
+       p = path;
+       *ret = r;
+
+       while (p[0] != '\0' && p[0] != ':') {
+               switch (*p) {
+               case '\\':
+                       if (!*++p)
+                               break;
+                       /* Fall through */
+               default:
+                       *r++ = *p++;
+                       break;
+               }
+       }
+
+       if (p[0] == ':')
+               p++;
+
+       return p;
+}
+
+/**
+ * l_path_next:
+ * @path_str: contents of $PATH-like string
+ * @ret: The returned value
+ *
+ * Attempts to parse the next element of a $PATH-like string and returns the
+ * resulting directory in a newly-allocated variable assigned to @ret.  @ret
+ * must be a valid pointer to a char *.
+ *
+ * Returns: A pointer inside @path_str that begins just past the next ':'
+ * delimiter character or to the end of the string.
+ **/
+LIB_EXPORT const char *l_path_next(const char *path_str, char **ret)
+{
+       if (unlikely(!path_str))
+               return NULL;
+
+       return next_in_path(path_str, ret, 0);
+}
+
+/**
+ * l_path_find:
+ * @basename: The basename of the file, e.g. "vi"
+ * @path_str: A list of paths formatted like $PATH, e.g. from getenv
+ * @mode: mode to check.  This is the same mode as would be fed to access()
+ *
+ * Attempts to find @basename in one of the directories listed in @path_str.
+ * Only directories with absolute paths are used.
+ *
+ * Returns: A newly-allocated string with the full path of the resolved file
+ * given by @basename.  E.g. /usr/bin/vi.  Or NULL if no file could be found
+ * that matches the given @mode.
+ */
+LIB_EXPORT char *l_path_find(const char *basename,
+                                       const char *path_str, int mode)
+{
+       size_t overhead;
+       size_t len;
+       char *path;
+
+       if (unlikely(!path_str || !basename))
+               return NULL;
+
+       overhead = strlen(basename) + 1;
+
+       do {
+               path_str = next_in_path(path_str, &path, overhead);
+
+               if (path[0] == '/') {
+                       len = strlen(path);
+
+                       if (path[len - 1] != '/')
+                               path[len++] = '/';
+
+                       strcpy(path + len, basename);
+
+                       if (access(path, mode) == 0)
+                               return path;
+               }
+
+               l_free(path);
+       } while (path_str[0] != '\0');
+
+       return NULL;
+}
+
+/**
+ * l_path_get_mtime:
+ * @path: The path of the file
+ *
+ * Attempts find the modified time of file pointed to by @path.  If @path
+ * is a symbolic link, then the link is followed.
+ *
+ * Returns: The number of microseconds (usec) since the Epoch or L_TIME_INVALID
+ * if an error occurred.
+ */
+LIB_EXPORT uint64_t l_path_get_mtime(const char *path)
+{
+       struct stat sb;
+       int ret;
+
+       if (unlikely(path == NULL))
+               return L_TIME_INVALID;
+
+       ret = stat(path, &sb);
+       if (ret < 0)
+               return L_TIME_INVALID;
+
+       return sb.st_mtim.tv_sec * 1000000 + sb.st_mtim.tv_nsec / 1000;
+}
+
+/**
+ * l_path_touch:
+ * @path: The path of the file
+ *
+ * Updates the modification and last_accessed time of the file given by @path
+ * to the current time. If @path is a symbolic link, then the link is followed.
+ *
+ * Returns: 0 if the file times could be updated successfully and -errno
+ * otherwise.
+ */
+LIB_EXPORT int l_path_touch(const char *path)
+{
+       if (unlikely(!path))
+               return -EINVAL;
+
+       if (utimensat(0, path, NULL, 0) == 0)
+               return 0;
+
+       return -errno;
+}
diff --git a/ell/path.h b/ell/path.h
new file mode 100644 (file)
index 0000000..c89af32
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_PATH_H
+#define __ELL_PATH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char *l_path_next(const char *path_str, char **ret);
+char *l_path_find(const char *basename, const char *path_str, int mode);
+uint64_t l_path_get_mtime(const char *path);
+int l_path_touch(const char *path);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_PATH_H */
diff --git a/ell/pem-private.h b/ell/pem-private.h
new file mode 100644 (file)
index 0000000..1cf7ee5
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <sys/types.h>
+
+const char *pem_next(const void *buf, size_t buf_len, char **type_label,
+                               size_t *base64_len,
+                               const char **endp, bool strict);
diff --git a/ell/pem.c b/ell/pem.c
new file mode 100644 (file)
index 0000000..b54270e
--- /dev/null
+++ b/ell/pem.c
@@ -0,0 +1,557 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <strings.h>
+
+#include "util.h"
+#include "private.h"
+#include "key.h"
+#include "cert.h"
+#include "queue.h"
+#include "pem.h"
+#include "base64.h"
+#include "utf8.h"
+#include "asn1-private.h"
+#include "pkcs5-private.h"
+#include "cipher.h"
+#include "cert-private.h"
+#include "missing.h"
+#include "pem-private.h"
+
+#define PEM_START_BOUNDARY     "-----BEGIN "
+#define PEM_END_BOUNDARY       "-----END "
+
+static const char *is_start_boundary(const void *buf, size_t buf_len,
+                                       size_t *label_len)
+{
+       const char *start, *end, *ptr;
+       int prev_special, special;
+       const char *buf_ptr = buf;
+
+       if (buf_len < strlen(PEM_START_BOUNDARY))
+               return NULL;
+
+       /* Check we have a "-----BEGIN " (RFC7468 section 2) */
+       if (memcmp(buf, PEM_START_BOUNDARY, strlen(PEM_START_BOUNDARY)))
+               return NULL;
+
+       /*
+        * Check we have a string of printable characters in which no
+        * two consecutive characters are "special" nor is the first or the
+        * final character "special".  These special characters are space
+        * and hyphen.  (RFC7468 section 3)
+        * The loop will end on the second hyphen of the final "-----" if
+        * no error found earlier.
+        */
+       start = buf + strlen(PEM_START_BOUNDARY);
+       end = start;
+       prev_special = 1;
+
+       while (end < buf_ptr + buf_len && l_ascii_isprint(*end)) {
+               special = *end == ' ' || *end == '-';
+
+               if (prev_special && special)
+                       break;
+
+               end++;
+               prev_special = special;
+       }
+
+       /* Rewind to the first '-', but handle empty labels */
+       if (end != start)
+               end--;
+
+       /* Check we have a "-----" (RFC7468 section 2) */
+       if (end + 5 > buf_ptr + buf_len || memcmp(end, "-----", 5))
+               return NULL;
+
+       /* Check all remaining characters are horizontal whitespace (WSP) */
+       for (ptr = end + 5; ptr < buf_ptr + buf_len; ptr++)
+               if (*ptr != ' ' && *ptr != '\t')
+                       return NULL;
+
+       *label_len = end - start;
+
+       return start;
+}
+
+static bool is_end_boundary(const void *buf, size_t buf_len,
+                               const char *label, size_t label_len)
+{
+       const char *buf_ptr = buf;
+       size_t len = strlen(PEM_END_BOUNDARY) + label_len + 5;
+
+       if (buf_len < len)
+               return false;
+
+       if (memcmp(buf_ptr, PEM_END_BOUNDARY, strlen(PEM_END_BOUNDARY)) ||
+                       memcmp(buf_ptr + strlen(PEM_END_BOUNDARY),
+                               label, label_len) ||
+                       memcmp(buf_ptr + (len - 5), "-----", 5))
+               return false;
+
+       /* Check all remaining characters are horizontal whitespace (WSP) */
+       for (; len < buf_len; len++)
+               if (buf_ptr[len] != ' ' && buf_ptr[len] != '\t')
+                       return false;
+
+       return true;
+}
+
+const char *pem_next(const void *buf, size_t buf_len, char **type_label,
+                               size_t *base64_len,
+                               const char **endp, bool strict)
+{
+       const char *buf_ptr = buf;
+       const char *base64_data = NULL, *eol;
+       const char *label = NULL;
+       size_t label_len = 0;
+       const char *start = NULL;
+
+       /*
+        * The base64 parser uses the RFC7468 laxbase64text grammar but we
+        * do full checks on the encapsulation boundary lines, i.e. no
+        * leading spaces allowed, making sure quoted text and similar
+        * are not confused for actual PEM "textual encoding".
+        */
+       while (buf_len) {
+               for (eol = buf_ptr; eol < buf_ptr + buf_len; eol++)
+                       if (*eol == '\r' || *eol == '\n')
+                               break;
+
+               if (!base64_data) {
+                       label = is_start_boundary(buf_ptr, eol - buf_ptr,
+                                                       &label_len);
+                       if (label) {
+                               start = label - strlen("-----BEGIN ");
+                               base64_data = eol;
+                       } else if (strict)
+                               break;
+               } else if (start && is_end_boundary(buf_ptr, eol - buf_ptr,
+                                                       label, label_len)) {
+                       if (type_label)
+                               *type_label = l_strndup(label, label_len);
+
+                       if (base64_len)
+                               *base64_len = buf_ptr - base64_data;
+
+                       if (endp) {
+                               if (eol == buf + buf_len)
+                                       *endp = eol;
+                               else
+                                       *endp = eol + 1;
+                       }
+
+                       return base64_data;
+               }
+
+               if (eol == buf_ptr + buf_len)
+                       break;
+
+               buf_len -= eol + 1 - buf_ptr;
+               buf_ptr = eol + 1;
+
+               if (buf_len && *eol == '\r' && *buf_ptr == '\n') {
+                       buf_ptr++;
+                       buf_len--;
+               }
+       }
+
+       /* If we found no label signal EOF rather than parse error */
+       if (!base64_data && endp)
+               *endp = NULL;
+
+       return NULL;
+}
+
+static uint8_t *pem_load_buffer(const void *buf, size_t buf_len,
+                               char **type_label, size_t *len)
+{
+       size_t base64_len;
+       const char *base64;
+       char *label;
+       uint8_t *ret;
+
+       base64 = pem_next(buf, buf_len, &label, &base64_len,
+                               NULL, false);
+       if (!base64)
+               return NULL;
+
+       ret = l_base64_decode(base64, base64_len, len);
+       if (ret) {
+               *type_label = label;
+               return ret;
+       }
+
+       l_free(label);
+
+       return NULL;
+}
+
+LIB_EXPORT uint8_t *l_pem_load_buffer(const void *buf, size_t buf_len,
+                                       char **type_label, size_t *out_len)
+{
+       return pem_load_buffer(buf, buf_len, type_label, out_len);
+}
+
+struct pem_file_info {
+       int fd;
+       struct stat st;
+       uint8_t *data;
+};
+
+static int pem_file_open(struct pem_file_info *info, const char *filename)
+{
+       info->fd = open(filename, O_RDONLY);
+       if (info->fd < 0)
+               return -errno;
+
+       if (fstat(info->fd, &info->st) < 0) {
+               int r = -errno;
+
+               close(info->fd);
+               return r;
+       }
+
+       info->data = mmap(NULL, info->st.st_size,
+                               PROT_READ, MAP_SHARED, info->fd, 0);
+       if (info->data == MAP_FAILED) {
+               int r = -errno;
+
+               close(info->fd);
+               return r;
+       }
+
+       return 0;
+}
+
+static void pem_file_close(struct pem_file_info *info)
+{
+       munmap(info->data, info->st.st_size);
+       close(info->fd);
+}
+
+LIB_EXPORT uint8_t *l_pem_load_file(const char *filename,
+                                       char **type_label, size_t *len)
+{
+       struct pem_file_info file;
+       uint8_t *result;
+
+       if (unlikely(!filename))
+               return NULL;
+
+       if (pem_file_open(&file, filename) < 0)
+               return NULL;
+
+       result = pem_load_buffer(file.data, file.st.st_size,
+                                       type_label, len);
+       pem_file_close(&file);
+       return result;
+}
+
+static struct l_certchain *pem_list_to_chain(struct l_queue *list)
+{
+       struct l_certchain *chain;
+
+       if (!list)
+               return NULL;
+
+       chain = certchain_new_from_leaf(l_queue_pop_head(list));
+
+       while (!l_queue_isempty(list))
+               certchain_link_issuer(chain, l_queue_pop_head(list));
+
+       l_queue_destroy(list, NULL);
+       return chain;
+}
+
+LIB_EXPORT struct l_certchain *l_pem_load_certificate_chain_from_data(
+                                               const void *buf, size_t len)
+{
+       struct l_queue *list = l_pem_load_certificate_list_from_data(buf, len);
+
+       if (!list)
+               return NULL;
+
+       return pem_list_to_chain(list);
+}
+
+LIB_EXPORT struct l_certchain *l_pem_load_certificate_chain(
+                                                       const char *filename)
+{
+       struct l_queue *list = l_pem_load_certificate_list(filename);
+
+       if (!list)
+               return NULL;
+
+       return pem_list_to_chain(list);
+}
+
+LIB_EXPORT struct l_queue *l_pem_load_certificate_list_from_data(
+                                               const void *buf, size_t len)
+{
+       const char *ptr, *end;
+       struct l_queue *list = NULL;
+
+       ptr = buf;
+       end = buf + len;
+
+       while (ptr && ptr < end) {
+               uint8_t *der;
+               size_t der_len;
+               char *label = NULL;
+               struct l_cert *cert;
+               const char *base64;
+               size_t base64_len;
+
+               base64 = pem_next(ptr, end - ptr, &label,
+                                       &base64_len, &ptr, false);
+               if (!base64) {
+                       if (!ptr)
+                               break;
+
+                       /* if ptr was not reset to NULL; parse error */
+                       goto error;
+               }
+
+               der = l_base64_decode(base64, base64_len, &der_len);
+
+               if (!der || strcmp(label, "CERTIFICATE")) {
+                       if (der)
+                               l_free(label);
+                       l_free(der);
+
+                       goto error;
+               }
+
+               l_free(label);
+               cert = l_cert_new_from_der(der, der_len);
+               l_free(der);
+
+               if (!cert)
+                       goto error;
+
+               if (!list)
+                       list = l_queue_new();
+
+               l_queue_push_tail(list, cert);
+       }
+
+       return list;
+
+error:
+       l_queue_destroy(list, (l_queue_destroy_func_t) l_cert_free);
+       return NULL;
+}
+
+LIB_EXPORT struct l_queue *l_pem_load_certificate_list(const char *filename)
+{
+       struct pem_file_info file;
+       struct l_queue *list = NULL;
+
+       if (unlikely(!filename))
+               return NULL;
+
+       if (pem_file_open(&file, filename) < 0)
+               return NULL;
+
+       list = l_pem_load_certificate_list_from_data(file.data,
+                                                       file.st.st_size);
+       pem_file_close(&file);
+
+       return list;
+}
+
+static struct l_key *pem_load_private_key(uint8_t *content,
+                                               size_t len,
+                                               char *label,
+                                               const char *passphrase,
+                                               bool *encrypted)
+{
+       struct l_key *pkey = NULL;
+
+       /*
+        * RFC7469- and PKCS#8-compatible label (default in OpenSSL 1.0.1+)
+        * and the older (OpenSSL <= 0.9.8 default) label.
+        */
+       if (!strcmp(label, "PRIVATE KEY") ||
+                       !strcmp(label, "RSA PRIVATE KEY"))
+               goto done;
+
+       /* RFC5958 (PKCS#8) section 3 type encrypted key label */
+       if (!strcmp(label, "ENCRYPTED PRIVATE KEY")) {
+               const uint8_t *key_info, *alg_id, *data;
+               uint8_t tag;
+               size_t key_info_len, alg_id_len, data_len, tmp_len;
+               struct l_cipher *alg;
+               uint8_t *decrypted;
+               int i;
+
+               if (encrypted)
+                       *encrypted = true;
+
+               if (!passphrase)
+                       goto err;
+
+               /* Technically this is BER, not limited to DER */
+               key_info = asn1_der_find_elem(content, len, 0, &tag,
+                                               &key_info_len);
+               if (!key_info || tag != ASN1_ID_SEQUENCE)
+                       goto err;
+
+               alg_id = asn1_der_find_elem(key_info, key_info_len, 0, &tag,
+                                               &alg_id_len);
+               if (!alg_id || tag != ASN1_ID_SEQUENCE)
+                       goto err;
+
+               data = asn1_der_find_elem(key_info, key_info_len, 1, &tag,
+                                               &data_len);
+               if (!data || tag != ASN1_ID_OCTET_STRING || data_len < 8 ||
+                               (data_len & 7) != 0)
+                       goto err;
+
+               if (asn1_der_find_elem(content, len, 2, &tag, &tmp_len))
+                       goto err;
+
+               alg = pkcs5_cipher_from_alg_id(alg_id, alg_id_len, passphrase);
+               if (!alg)
+                       goto err;
+
+               decrypted = l_malloc(data_len);
+
+               if (!l_cipher_decrypt(alg, data, decrypted, data_len)) {
+                       l_cipher_free(alg);
+                       l_free(decrypted);
+                       goto err;
+               }
+
+               l_cipher_free(alg);
+               explicit_bzero(content, len);
+               l_free(content);
+               content = decrypted;
+               len = data_len;
+
+               /*
+                * Strip padding as defined in RFC8018 (for PKCS#5 v1) or
+                * RFC1423 / RFC5652 (for v2).
+                */
+
+               if (content[data_len - 1] >= data_len ||
+                               content[data_len - 1] > 16)
+                       goto err;
+
+               for (i = 1; i < content[data_len - 1]; i++)
+                       if (content[data_len - 1 - i] != content[data_len - 1])
+                               goto err;
+
+               len = data_len - content[data_len - 1];
+
+               goto done;
+       }
+
+       /*
+        * TODO: handle RSA PRIVATE KEY format encrypted keys
+        * (as produced by "openssl rsa" commands), incompatible with
+        * RFC7468 parsing because of the headers present before
+        * base64-encoded data.
+        */
+
+       /* Label not known */
+       goto err;
+
+done:
+       pkey = l_key_new(L_KEY_RSA, content, len);
+
+err:
+       if (content) {
+               explicit_bzero(content, len);
+               l_free(content);
+       }
+
+       l_free(label);
+       return pkey;
+}
+
+LIB_EXPORT struct l_key *l_pem_load_private_key_from_data(const void *buf,
+                                                       size_t buf_len,
+                                                       const char *passphrase,
+                                                       bool *encrypted)
+{
+       uint8_t *content;
+       char *label;
+       size_t len;
+
+       if (encrypted)
+               *encrypted = false;
+
+       content = pem_load_buffer(buf, buf_len, &label, &len);
+
+       if (!content)
+               return NULL;
+
+       return pem_load_private_key(content, len, label, passphrase, encrypted);
+}
+
+/**
+ * l_pem_load_private_key
+ * @filename: path string to the PEM file to load
+ * @passphrase: private key encryption passphrase or NULL for unencrypted
+ * @encrypted: receives indication whether the file was encrypted if non-NULL
+ *
+ * Load the PEM encoded RSA Private Key file at @filename.  If it is an
+ * encrypted private key and @passphrase was non-NULL, the file is
+ * decrypted.  If it's unencrypted @passphrase is ignored.  @encrypted
+ * stores information of whether the file was encrypted, both in a
+ * success case and on error when NULL is returned.  This can be used to
+ * check if a passphrase is required without prior information.
+ *
+ * Returns: An l_key object to be freed with an l_key_free* function,
+ * or NULL.
+ **/
+LIB_EXPORT struct l_key *l_pem_load_private_key(const char *filename,
+                                               const char *passphrase,
+                                               bool *encrypted)
+{
+       uint8_t *content;
+       char *label;
+       size_t len;
+
+       if (encrypted)
+               *encrypted = false;
+
+       content = l_pem_load_file(filename, &label, &len);
+
+       if (!content)
+               return NULL;
+
+       return pem_load_private_key(content, len, label, passphrase, encrypted);
+}
diff --git a/ell/pem.h b/ell/pem.h
new file mode 100644 (file)
index 0000000..1c93e7a
--- /dev/null
+++ b/ell/pem.h
@@ -0,0 +1,57 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_PEM_H
+#define __ELL_PEM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_queue;
+struct l_key;
+struct l_cert;
+struct l_certchain;
+
+uint8_t *l_pem_load_buffer(const void *buf, size_t buf_len, char **type_label,
+                               size_t *out_len);
+uint8_t *l_pem_load_file(const char *filename, char **type_label, size_t *len);
+
+struct l_certchain *l_pem_load_certificate_chain(const char *filename);
+struct l_certchain *l_pem_load_certificate_chain_from_data(const void *buf,
+                                                               size_t len);
+struct l_queue *l_pem_load_certificate_list(const char *filename);
+struct l_queue *l_pem_load_certificate_list_from_data(const void *buf,
+                                                       size_t len);
+
+struct l_key *l_pem_load_private_key(const char *filename,
+                                       const char *passphrase,
+                                       bool *encrypted);
+struct l_key *l_pem_load_private_key_from_data(const void *buf, size_t len,
+                                               const char *passphrase,
+                                               bool *encrypted);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_PEM_H */
diff --git a/ell/pkcs5-private.h b/ell/pkcs5-private.h
new file mode 100644 (file)
index 0000000..f4f41f5
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+struct l_cipher *pkcs5_cipher_from_alg_id(const uint8_t *id_asn1,
+                                               size_t id_asn1_len,
+                                               const char *password);
diff --git a/ell/pkcs5.c b/ell/pkcs5.c
new file mode 100644 (file)
index 0000000..f225c71
--- /dev/null
@@ -0,0 +1,488 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <stdarg.h>
+#include <string.h>
+#include <strings.h>
+
+#include "checksum.h"
+#include "cipher.h"
+#include "util.h"
+#include "asn1-private.h"
+#include "pkcs5.h"
+#include "pkcs5-private.h"
+#include "private.h"
+#include "missing.h"
+
+/* RFC8018 section 5.1 */
+LIB_EXPORT bool l_pkcs5_pbkdf1(enum l_checksum_type type, const char *password,
+                               const uint8_t *salt, size_t salt_len,
+                               unsigned int iter_count,
+                               uint8_t *out_dk, size_t dk_len)
+{
+       size_t hash_len, t_len;
+       uint8_t t[20 + salt_len + strlen(password)];
+       struct l_checksum *checksum;
+
+       switch (type) {
+       case L_CHECKSUM_MD5:
+               hash_len = 16;
+               break;
+       case L_CHECKSUM_SHA1:
+               hash_len = 20;
+               break;
+       case L_CHECKSUM_NONE:
+       case L_CHECKSUM_MD4:
+       case L_CHECKSUM_SHA224:
+       case L_CHECKSUM_SHA256:
+       case L_CHECKSUM_SHA384:
+       case L_CHECKSUM_SHA512:
+               return false;
+       default:
+               return false;
+       }
+
+       if (dk_len > hash_len)
+               return false;
+
+       checksum = l_checksum_new(type);
+       if (!checksum)
+               return false;
+
+       memcpy(t, password, strlen(password));
+       memcpy(t + strlen(password), salt, salt_len);
+       t_len = strlen(password) + salt_len;
+
+       while (iter_count) {
+               l_checksum_reset(checksum);
+
+               if (!l_checksum_update(checksum, t, t_len))
+                       break;
+
+               if (l_checksum_get_digest(checksum, t, hash_len) !=
+                               (ssize_t) hash_len)
+                       break;
+
+               t_len = hash_len;
+               iter_count--;
+       }
+
+       l_checksum_free(checksum);
+
+       if (!iter_count)
+               memcpy(out_dk, t, dk_len);
+
+       explicit_bzero(t, sizeof(t));
+       return !iter_count;
+}
+
+/* RFC8018 section 5.2 */
+LIB_EXPORT bool l_pkcs5_pbkdf2(enum l_checksum_type type, const char *password,
+                               const uint8_t *salt, size_t salt_len,
+                               unsigned int iter_count,
+                               uint8_t *out_dk, size_t dk_len)
+{
+       size_t h_len;
+       struct l_checksum *checksum;
+       unsigned int i;
+
+       switch (type) {
+       case L_CHECKSUM_SHA1:
+               h_len = 20;
+               break;
+       case L_CHECKSUM_SHA224:
+               h_len = 28;
+               break;
+       case L_CHECKSUM_SHA256:
+               h_len = 32;
+               break;
+       case L_CHECKSUM_SHA384:
+               h_len = 48;
+               break;
+       case L_CHECKSUM_SHA512:
+               h_len = 64;
+               break;
+       case L_CHECKSUM_NONE:
+       case L_CHECKSUM_MD4:
+       case L_CHECKSUM_MD5:
+               return false;
+       default:
+               return false;
+       }
+
+       checksum = l_checksum_new_hmac(type, password, strlen(password));
+       if (!checksum)
+               return false;
+
+       for (i = 1; dk_len; i++) {
+               unsigned int j, k;
+               uint8_t u[salt_len + 64];
+               size_t u_len;
+               size_t block_len = h_len;
+
+               if (block_len > dk_len)
+                       block_len = dk_len;
+
+               memset(out_dk, 0, block_len);
+
+               memcpy(u, salt, salt_len);
+               l_put_be32(i, u + salt_len);
+               u_len = salt_len + 4;
+
+               for (j = 0; j < iter_count; j++) {
+                       l_checksum_reset(checksum);
+
+                       if (!l_checksum_update(checksum, u, u_len))
+                               break;
+
+                       if (l_checksum_get_digest(checksum, u, h_len) !=
+                                       (ssize_t) h_len)
+                               break;
+
+                       u_len = h_len;
+
+                       for (k = 0; k < block_len; k++)
+                               out_dk[k] ^= u[k];
+               }
+
+               if (j < iter_count)
+                       break;
+
+               out_dk += block_len;
+               dk_len -= block_len;
+       }
+
+       l_checksum_free(checksum);
+
+       return !dk_len;
+}
+
+static struct asn1_oid pkcs5_pbkdf2_oid = {
+       9, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x05, 0x0c }
+};
+
+static struct asn1_oid pkcs5_pbes2_oid = {
+       9, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x05, 0x0d }
+};
+
+static const struct pkcs5_pbes1_encryption_oid {
+       enum l_checksum_type checksum_type;
+       enum l_cipher_type cipher_type;
+       struct asn1_oid oid;
+} pkcs5_pbes1_encryption_oids[] = {
+       { /* pbeWithMD5AndDES-CBC */
+               L_CHECKSUM_MD5, L_CIPHER_DES_CBC,
+               { 9, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x05, 0x03 } },
+       },
+       { /* pbeWithSHA1AndDES-CBC */
+               L_CHECKSUM_SHA1, L_CIPHER_DES_CBC,
+               { 9, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x05, 0x0a } },
+       },
+       /* MD2- and RC2-based schemes 1, 4, 6 and 11 not supported */
+};
+
+static const struct pkcs5_digest_alg_oid {
+       enum l_checksum_type type;
+       struct asn1_oid oid;
+} pkcs5_digest_alg_oids[] = {
+       { /* hmacWithSHA1 */
+               L_CHECKSUM_SHA1,
+               { 8, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x07 } },
+       },
+       { /* hmacWithSHA224 */
+               L_CHECKSUM_SHA224,
+               { 8, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x08 } },
+       },
+       { /* hmacWithSHA256 */
+               L_CHECKSUM_SHA256,
+               { 8, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x09 } },
+       },
+       { /* hmacWithSHA384 */
+               L_CHECKSUM_SHA384,
+               { 8, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x0a } },
+       },
+       { /* hmacWithSHA512 */
+               L_CHECKSUM_SHA512,
+               { 8, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x0b } },
+       },
+       /* hmacWithSHA512-224 and hmacWithSHA512-256 not supported */
+};
+
+static const struct pkcs5_enc_alg_oid {
+       enum l_cipher_type cipher_type;
+       uint8_t key_size, iv_size;
+       struct asn1_oid oid;
+} pkcs5_enc_alg_oids[] = {
+       { /* desCBC */
+               L_CIPHER_DES_CBC, 8, 8,
+               { 5, { 0x2b, 0x0e, 0x03, 0x02, 0x07 } },
+       },
+       { /* des-EDE3-CBC */
+               L_CIPHER_DES3_EDE_CBC, 24, 8,
+               { 8, { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x03, 0x07 } },
+       },
+       /* RC2/RC5-based schemes 2 and 9 not supported */
+       { /* aes128-CBC-PAD */
+               L_CIPHER_AES_CBC, 16, 16,
+               { 9, { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x01, 0x02 } },
+       },
+       { /* aes192-CBC-PAD */
+               L_CIPHER_AES_CBC, 24, 16,
+               { 9, { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x01, 0x16 } },
+       },
+       { /* aes256-CBC-PAD */
+               L_CIPHER_AES_CBC, 32, 16,
+               { 9, { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x01, 0x2a } },
+       },
+};
+
+static struct l_cipher *pkcs5_cipher_from_pbes2_params(
+                                               const uint8_t *pbes2_params,
+                                               size_t pbes2_params_len,
+                                               const char *password)
+{
+       uint8_t tag;
+       const uint8_t *kdf_sequence, *enc_sequence, *oid, *params,
+               *salt, *iter_count_buf, *key_len_buf, *prf_sequence;
+       size_t kdf_len, enc_len, params_len, salt_len, key_len, tmp_len;
+       unsigned int i, iter_count, pos;
+       enum l_checksum_type prf_alg = L_CHECKSUM_NONE;
+       const struct pkcs5_enc_alg_oid *enc_scheme = NULL;
+       uint8_t derived_key[64];
+       struct l_cipher *cipher;
+
+       /* RFC8018 section A.4 */
+
+       kdf_sequence = asn1_der_find_elem(pbes2_params, pbes2_params_len, 0,
+                                               &tag, &kdf_len);
+       if (!kdf_sequence || tag != ASN1_ID_SEQUENCE)
+               return NULL;
+
+       enc_sequence = asn1_der_find_elem(pbes2_params, pbes2_params_len, 1,
+                                               &tag, &enc_len);
+       if (!enc_sequence || tag != ASN1_ID_SEQUENCE)
+               return NULL;
+
+       if (asn1_der_find_elem(pbes2_params, pbes2_params_len, 2,
+                                               &tag, &tmp_len))
+               return NULL;
+
+       /* RFC8018 section A.2 */
+
+       oid = asn1_der_find_elem(kdf_sequence, kdf_len, 0, &tag, &tmp_len);
+       if (!oid || tag != ASN1_ID_OID)
+               return NULL;
+
+       if (!asn1_oid_eq(&pkcs5_pbkdf2_oid, tmp_len, oid))
+               return NULL;
+
+       params = asn1_der_find_elem(kdf_sequence, kdf_len, 1,
+                                               &tag, &params_len);
+       if (!params || tag != ASN1_ID_SEQUENCE)
+               return NULL;
+
+       if (asn1_der_find_elem(kdf_sequence, kdf_len, 2, &tag, &tmp_len))
+               return NULL;
+
+       salt = asn1_der_find_elem(params, params_len, 0, &tag, &salt_len);
+       if (!salt || tag != ASN1_ID_OCTET_STRING ||
+                       salt_len < 1 || salt_len > 512)
+               return NULL;
+
+       iter_count_buf = asn1_der_find_elem(params, params_len, 1,
+                                               &tag, &tmp_len);
+       if (!iter_count_buf || tag != ASN1_ID_INTEGER ||
+                       tmp_len < 1 || tmp_len > 4)
+               return NULL;
+
+       iter_count = 0;
+
+       while (tmp_len--)
+               iter_count = (iter_count << 8) | *iter_count_buf++;
+
+       pos = 2;
+       key_len_buf = asn1_der_find_elem(params, params_len, pos,
+                                               &tag, &tmp_len);
+       if (key_len_buf && tag == ASN1_ID_INTEGER) {
+               if (tmp_len != 1)
+                       return NULL;
+
+               pos++;
+               key_len = 0;
+
+               while (tmp_len--)
+                       key_len = (key_len << 8) | *key_len_buf++;
+       } else
+               key_len = 0;
+
+       prf_sequence = asn1_der_find_elem(params, params_len, pos,
+                                               &tag, &tmp_len);
+       if (prf_sequence && tag == ASN1_ID_SEQUENCE) {
+               pos++;
+
+               oid = asn1_der_find_elem(prf_sequence, tmp_len, 0,
+                                               &tag, &tmp_len);
+               if (!oid || tag != ASN1_ID_OID)
+                       return NULL;
+
+               for (i = 0; i < L_ARRAY_SIZE(pkcs5_digest_alg_oids); i++)
+                       if (asn1_oid_eq(&pkcs5_digest_alg_oids[i].oid,
+                                               tmp_len, oid))
+                               prf_alg = pkcs5_digest_alg_oids[i].type;
+
+               if (prf_alg == L_CHECKSUM_NONE)
+                       return NULL;
+       } else
+               prf_alg = L_CHECKSUM_SHA1;
+
+       oid = asn1_der_find_elem(enc_sequence, enc_len, 0, &tag, &tmp_len);
+       if (!oid || tag != ASN1_ID_OID)
+               return NULL;
+
+       for (i = 0; i < L_ARRAY_SIZE(pkcs5_enc_alg_oids); i++) {
+               if (asn1_oid_eq(&pkcs5_enc_alg_oids[i].oid, tmp_len, oid)) {
+                       enc_scheme = &pkcs5_enc_alg_oids[i];
+                       break;
+               }
+       }
+
+       if (!enc_scheme)
+               return NULL;
+
+       params = asn1_der_find_elem(enc_sequence, enc_len, 1,
+                                               &tag, &params_len);
+       if (!params)
+               return NULL;
+
+       /* RFC8018 section B.2 */
+
+       /*
+        * Since we don't support RC2/RC5, all our PKCS#5 ciphers only
+        * have an obligatory OCTET STRING IV parameter and a fixed key
+        * length.
+        */
+       if (tag != ASN1_ID_OCTET_STRING || params_len != enc_scheme->iv_size)
+               return NULL;
+
+       if (key_len && enc_scheme->key_size != key_len)
+               return NULL;
+
+       key_len = enc_scheme->key_size;
+
+       if (asn1_der_find_elem(enc_sequence, enc_len, 2, &tag, &tmp_len))
+               return NULL;
+
+       /* RFC8018 section 6.2 */
+
+       if (!l_pkcs5_pbkdf2(prf_alg, password, salt, salt_len, iter_count,
+                               derived_key, key_len))
+               return NULL;
+
+       cipher = l_cipher_new(enc_scheme->cipher_type, derived_key, key_len);
+       if (cipher && !l_cipher_set_iv(cipher, params, enc_scheme->iv_size)) {
+               l_cipher_free(cipher);
+               cipher = NULL;
+       }
+
+       explicit_bzero(derived_key, 16);
+       return cipher;
+}
+
+struct l_cipher *pkcs5_cipher_from_alg_id(const uint8_t *id_asn1,
+                                               size_t id_asn1_len,
+                                               const char *password)
+{
+       uint8_t tag;
+       const uint8_t *oid, *params, *salt, *iter_count_buf;
+       size_t oid_len, params_len, tmp_len;
+       unsigned int i, iter_count;
+       const struct pkcs5_pbes1_encryption_oid *pbes1_scheme = NULL;
+       uint8_t derived_key[16];
+       struct l_cipher *cipher;
+
+       oid = asn1_der_find_elem(id_asn1, id_asn1_len, 0, &tag, &oid_len);
+       if (!oid || tag != ASN1_ID_OID)
+               return NULL;
+
+       params = asn1_der_find_elem(id_asn1, id_asn1_len, 1, &tag, &params_len);
+       if (!params || tag != ASN1_ID_SEQUENCE)
+               return NULL;
+
+       if (asn1_der_find_elem(id_asn1, id_asn1_len, 2, &tag, &tmp_len))
+               return NULL;
+
+       if (asn1_oid_eq(&pkcs5_pbes2_oid, oid_len, oid))
+               return pkcs5_cipher_from_pbes2_params(params, params_len,
+                                                       password);
+
+       /* RFC8018 section A.3 */
+
+       for (i = 0; i < L_ARRAY_SIZE(pkcs5_pbes1_encryption_oids); i++) {
+               if (asn1_oid_eq(&pkcs5_pbes1_encryption_oids[i].oid,
+                                       oid_len, oid)) {
+                       pbes1_scheme = &pkcs5_pbes1_encryption_oids[i];
+                       break;
+               }
+       }
+
+       if (!pbes1_scheme)
+               return NULL;
+
+       salt = asn1_der_find_elem(params, params_len, 0, &tag, &tmp_len);
+       if (!salt || tag != ASN1_ID_OCTET_STRING || tmp_len != 8)
+               return NULL;
+
+       iter_count_buf = asn1_der_find_elem(params, params_len, 1,
+                                               &tag, &tmp_len);
+       if (!iter_count_buf || tag != ASN1_ID_INTEGER ||
+                       tmp_len < 1 || tmp_len > 4)
+               return NULL;
+
+       iter_count = 0;
+
+       while (tmp_len--)
+               iter_count = (iter_count << 8) | *iter_count_buf++;
+
+       if (asn1_der_find_elem(params, params_len, 2, &tag, &tmp_len))
+               return NULL;
+
+       /* RFC8018 section 6.1 */
+
+       if (!l_pkcs5_pbkdf1(pbes1_scheme->checksum_type,
+                               password, salt, 8, iter_count, derived_key, 16))
+               return NULL;
+
+       cipher = l_cipher_new(pbes1_scheme->cipher_type, derived_key + 0, 8);
+       if (cipher && !l_cipher_set_iv(cipher, derived_key + 8, 8)) {
+               l_cipher_free(cipher);
+               cipher = NULL;
+       }
+
+       explicit_bzero(derived_key, 16);
+       return cipher;
+}
diff --git a/ell/pkcs5.h b/ell/pkcs5.h
new file mode 100644 (file)
index 0000000..ff7bdfd
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_PKCS5_H
+#define __ELL_PKCS5_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdint.h>
+
+bool l_pkcs5_pbkdf1(enum l_checksum_type type, const char *password,
+                       const uint8_t *salt, size_t salt_len,
+                       unsigned int iter_count,
+                       uint8_t *out_dk, size_t dk_len);
+
+bool l_pkcs5_pbkdf2(enum l_checksum_type type, const char *password,
+                       const uint8_t *salt, size_t salt_len,
+                       unsigned int iter_count,
+                       uint8_t *out_dk, size_t dk_len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_PKCS5_H */
diff --git a/ell/plugin.c b/ell/plugin.c
new file mode 100644 (file)
index 0000000..21b81d0
--- /dev/null
@@ -0,0 +1,219 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <glob.h>
+
+#include "util.h"
+#include "queue.h"
+#include "plugin.h"
+#include "log.h"
+#include "private.h"
+
+/**
+ * SECTION:plugin
+ * @short_description: Plugin framework
+ *
+ * Plugin framework
+ */
+
+/**
+ * l_plugin_desc:
+ *
+ * Plugin descriptor.
+ */
+
+static struct l_queue *plugin_list;
+
+struct plugin {
+       void *handle;
+       bool active;
+       const struct l_plugin_desc *desc;
+};
+
+static void plugin_destroy(void *user_data)
+{
+       struct plugin *plugin = user_data;
+
+       if (plugin->active && plugin->desc->exit)
+               plugin->desc->exit();
+
+       if (plugin->handle)
+               dlclose(plugin->handle);
+
+       l_free(plugin);
+}
+
+static int compare_priority(const void *a, const void *b, void *user_data)
+{
+       const struct plugin *plugin_a = a;
+       const struct plugin *plugin_b = b;
+
+       return plugin_a->desc->priority - plugin_b->desc->priority;
+}
+
+static bool plugin_add(void *handle, const struct l_plugin_desc *desc,
+                                                       const char *version)
+{
+       struct plugin *plugin;
+
+       if (!desc->init)
+               return false;
+
+       if (version) {
+               if (!desc->version)
+                       return false;
+
+               if (strcmp(desc->version, version))
+                       return false;
+       }
+
+       plugin = l_new(struct plugin, 1);
+
+       plugin->handle = handle;
+       plugin->active = false;
+       plugin->desc = desc;
+
+       l_queue_insert(plugin_list, plugin, compare_priority, NULL);
+
+       if (desc->debug_start && desc->debug_stop)
+               debug_enable(desc->debug_start, desc->debug_stop);
+
+       return true;
+}
+
+static void plugin_start(void *data, void *user_data)
+{
+       struct plugin *plugin = data;
+
+       if (plugin->desc->init() < 0)
+               return;
+
+       plugin->active = true;
+}
+
+static void update_debug(void *data, void *user_data)
+{
+       struct plugin *plugin = data;
+
+       if (plugin->desc->debug_start && plugin->desc->debug_stop)
+               debug_enable(plugin->desc->debug_start,
+                                               plugin->desc->debug_stop);
+}
+
+void plugin_update_debug(void)
+{
+       l_queue_foreach(plugin_list, update_debug, NULL);
+}
+
+/**
+ * l_plugin_add:
+ * @desc: plugin description record
+ * @version: version string or #NULL
+ *
+ * Adds plugin description.
+ **/
+LIB_EXPORT void l_plugin_add(const struct l_plugin_desc *desc,
+                                               const char *version)
+{
+       if (!plugin_list)
+               plugin_list = l_queue_new();
+
+       if (!desc)
+               return;
+
+       plugin_add(NULL, desc, version);
+}
+
+/**
+ * l_plugin_load:
+ * @pattern: file pattern
+ * @symbol: plugin descriptor symbol
+ * @version: version string or #NULL
+ *
+ * Loads plugins from @pattern location and execute @symbol plugin descriptor.
+ **/
+LIB_EXPORT void l_plugin_load(const char *pattern, const char *symbol,
+                                                       const char *version)
+{
+       glob_t gl;
+       size_t i;
+
+       if (!plugin_list)
+               plugin_list = l_queue_new();
+
+       if (!pattern || !symbol)
+               goto done;
+
+       if (glob(pattern, GLOB_NOSORT, NULL, &gl))
+               goto done;
+
+       for (i = 0; i < gl.gl_pathc; i++) {
+               void *handle;
+               struct l_plugin_desc *desc;
+
+               handle = dlopen(gl.gl_pathv[i], RTLD_NOW);
+               if (!handle) {
+                       l_info("Unable to load %s: %s",
+                                       gl.gl_pathv[i], dlerror());
+                       continue;
+               }
+
+               desc = dlsym(handle, symbol);
+               if (!desc) {
+                       dlclose(handle);
+                       continue;
+               }
+
+               if (!plugin_add(handle, desc, version))
+                       dlclose(handle);
+       }
+
+       globfree(&gl);
+
+done:
+       l_queue_foreach(plugin_list, plugin_start, NULL);
+}
+
+/**
+ * l_plugin_unload:
+ *
+ * Unload all plugins.
+ **/
+LIB_EXPORT void l_plugin_unload(void)
+{
+       if (!plugin_list)
+               return;
+
+       l_queue_reverse(plugin_list);
+
+       l_queue_destroy(plugin_list, plugin_destroy);
+
+       plugin_list = NULL;
+}
diff --git a/ell/plugin.h b/ell/plugin.h
new file mode 100644 (file)
index 0000000..5ca95dc
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_PLUGIN_H
+#define __ELL_PLUGIN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define L_PLUGIN_PRIORITY_LOW      -100
+#define L_PLUGIN_PRIORITY_DEFAULT     0
+#define L_PLUGIN_PRIORITY_HIGH      100
+
+struct l_plugin_desc {
+       const char *name;
+       const char *description;
+       const char *version;
+       int priority;
+       int (*init) (void);
+       void (*exit) (void);
+       void *debug_start;
+       void *debug_stop;
+};
+
+
+#define L_PLUGIN_DEFINE(symbol, name, description, version, \
+                                               priority, init, exit) \
+               extern struct l_plugin_desc symbol \
+                               __attribute__ ((visibility("default"))); \
+               struct l_plugin_desc symbol = { \
+                       #name, description, version, priority, init, exit, \
+                       NULL, NULL \
+               };
+
+#define L_PLUGIN_DEFINE_DEBUG(symbol, name, description, version, \
+                                               priority, init, exit, debug) \
+               extern struct l_debug_desc __start_ ##debug[] \
+                               __attribute__ ((weak, visibility("hidden"))); \
+               extern struct l_debug_desc __stop_ ##debug[] \
+                               __attribute__ ((weak, visibility("hidden"))); \
+               extern struct l_plugin_desc symbol \
+                               __attribute__ ((visibility("default"))); \
+               struct l_plugin_desc symbol = { \
+                       #name, description, version, priority, init, exit, \
+                       __start_ ##debug, __stop_ ##debug \
+               };
+
+void l_plugin_add(const struct l_plugin_desc *desc, const char *version);
+
+void l_plugin_load(const char *pattern, const char *symbol,
+                                               const char *version);
+void l_plugin_unload(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_PLUGIN_H */
diff --git a/ell/private.h b/ell/private.h
new file mode 100644 (file)
index 0000000..4dc48d7
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <stdint.h>
+#include <errno.h>
+
+#include <ell/util.h>
+
+#define uninitialized_var(x) x = x
+
+#define align_len(len, boundary) (((len)+(boundary)-1) & ~((boundary)-1))
+
+#define LIB_EXPORT __attribute__ ((visibility("default")))
+
+struct l_debug_desc;
+
+void debug_enable(struct l_debug_desc *start, struct l_debug_desc *stop);
+void debug_disable(struct l_debug_desc *start, struct l_debug_desc *stop);
+
+void plugin_update_debug(void);
+
+typedef void (*watch_event_cb_t) (int fd, uint32_t events, void *user_data);
+typedef void (*watch_destroy_cb_t) (void *user_data);
+
+typedef void (*idle_event_cb_t) (void *user_data);
+typedef void (*idle_destroy_cb_t) (void *user_data);
+
+int watch_add(int fd, uint32_t events, watch_event_cb_t callback,
+                               void *user_data, watch_destroy_cb_t destroy);
+int watch_modify(int fd, uint32_t events, bool force);
+int watch_remove(int fd);
+int watch_clear(int fd);
+
+#define IDLE_FLAG_NO_WARN_DANGLING 0x10000000
+int idle_add(idle_event_cb_t callback, void *user_data, uint32_t flags,
+               idle_destroy_cb_t destroy);
+void idle_remove(int id);
diff --git a/ell/queue.c b/ell/queue.c
new file mode 100644 (file)
index 0000000..0f6ed3e
--- /dev/null
@@ -0,0 +1,589 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "util.h"
+#include "queue.h"
+#include "private.h"
+
+/**
+ * SECTION:queue
+ * @short_description: Queue support
+ *
+ * Queue support
+ */
+
+/**
+ * l_queue:
+ *
+ * Opague object representing the queue.
+ */
+struct l_queue {
+       struct l_queue_entry *head;
+       struct l_queue_entry *tail;
+       unsigned int entries;
+};
+
+/**
+ * l_queue_new:
+ *
+ * Create a new queue.
+ *
+ * No error handling is needed since. In case of real memory allocation
+ * problems abort() will be called.
+ *
+ * Returns: a newly allocated #l_queue object
+ **/
+LIB_EXPORT struct l_queue *l_queue_new(void)
+{
+       struct l_queue *queue;
+
+       queue = l_new(struct l_queue, 1);
+
+       queue->head = NULL;
+       queue->tail = NULL;
+       queue->entries = 0;
+
+       return queue;
+}
+
+/**
+ * l_queue_destroy:
+ * @queue: queue object
+ * @destroy: destroy function
+ *
+ * Free queue and call @destory on all remaining entries.
+ **/
+LIB_EXPORT void l_queue_destroy(struct l_queue *queue,
+                               l_queue_destroy_func_t destroy)
+{
+       l_queue_clear(queue, destroy);
+       l_free(queue);
+}
+
+/**
+ * l_queue_clear:
+ * @queue: queue object
+ * @destroy: destroy function
+ *
+ * Clear queue and call @destory on all remaining entries.
+ **/
+LIB_EXPORT void l_queue_clear(struct l_queue *queue,
+                               l_queue_destroy_func_t destroy)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue))
+               return;
+
+       entry = queue->head;
+
+       while (entry) {
+               struct l_queue_entry *tmp = entry;
+
+               if (destroy)
+                       destroy(entry->data);
+
+               entry = entry->next;
+
+               l_free(tmp);
+       }
+
+       queue->head = NULL;
+       queue->tail = NULL;
+       queue->entries = 0;
+}
+
+/**
+ * l_queue_push_tail:
+ * @queue: queue object
+ * @data: pointer to data
+ *
+ * Adds @data pointer at the end of the queue.
+ *
+ * Returns: #true when data has been added and #false in case an invalid
+ *          @queue object has been provided
+ **/
+LIB_EXPORT bool l_queue_push_tail(struct l_queue *queue, void *data)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue))
+               return false;
+
+       entry = l_new(struct l_queue_entry, 1);
+
+       entry->data = data;
+       entry->next = NULL;
+
+       if (queue->tail)
+               queue->tail->next = entry;
+
+       queue->tail = entry;
+
+       if (!queue->head)
+               queue->head = entry;
+
+       queue->entries++;
+
+       return true;
+}
+
+/**
+ * l_queue_push_head:
+ * @queue: queue object
+ * @data: pointer to data
+ *
+ * Adds @data pointer at the start of the queue.
+ *
+ * Returns: #true when data has been added and #false in case an invalid
+ *          @queue object has been provided
+ **/
+LIB_EXPORT bool l_queue_push_head(struct l_queue *queue, void *data)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue))
+               return false;
+
+       entry = l_new(struct l_queue_entry, 1);
+
+       entry->data = data;
+       entry->next = queue->head;
+
+       queue->head = entry;
+
+       if (!queue->tail)
+               queue->tail = entry;
+
+       queue->entries++;
+
+       return true;
+}
+
+/**
+ * l_queue_pop_head:
+ * @queue: queue object
+ *
+ * Removes the first element of the queue an returns it.
+ *
+ * Returns: data pointer to first element or #NULL in case an empty queue
+ **/
+LIB_EXPORT void *l_queue_pop_head(struct l_queue *queue)
+{
+       struct l_queue_entry *entry;
+       void *data;
+
+       if (unlikely(!queue))
+               return NULL;
+
+       if (!queue->head)
+               return NULL;
+
+       entry = queue->head;
+
+       if (!queue->head->next) {
+               queue->head = NULL;
+               queue->tail = NULL;
+       } else
+               queue->head = queue->head->next;
+
+       data = entry->data;
+
+       l_free(entry);
+
+       queue->entries--;
+
+       return data;
+}
+
+/**
+ * l_queue_peek_head:
+ * @queue: queue object
+ *
+ * Peeks at the first element of the queue an returns it.
+ *
+ * Returns: data pointer to first element or #NULL in case an empty queue
+ **/
+LIB_EXPORT void *l_queue_peek_head(struct l_queue *queue)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue))
+               return NULL;
+
+       if (!queue->head)
+               return NULL;
+
+       entry = queue->head;
+       return entry->data;
+}
+
+/**
+ * l_queue_peek_tail:
+ * @queue: queue object
+ *
+ * Peeks at the last element of the queue an returns it.
+ *
+ * Returns: data pointer to first element or #NULL in case an empty queue
+ **/
+LIB_EXPORT void *l_queue_peek_tail(struct l_queue *queue)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue))
+               return NULL;
+
+       if (!queue->tail)
+               return NULL;
+
+       entry = queue->tail;
+       return entry->data;
+}
+
+/**
+ * l_queue_insert:
+ * @queue: queue object
+ * @data: pointer to data
+ * @function: compare function
+ * @user_data: user data given to compare function
+ *
+ * Inserts @data pointer at a position in the queue determined by the
+ * compare @function.  @function should return > 0 if the @data (first
+ * parameter) should be inserted after the current entry (second parameter).
+ *
+ * Returns: #true when data has been added and #false in case of failure
+ **/
+LIB_EXPORT bool l_queue_insert(struct l_queue *queue, void *data,
+                        l_queue_compare_func_t function, void *user_data)
+{
+       struct l_queue_entry *entry, *prev, *cur;
+       int cmp;
+
+       if (unlikely(!queue || !function))
+               return false;
+
+       entry = l_new(struct l_queue_entry, 1);
+
+       entry->data = data;
+       entry->next = NULL;
+
+       if (!queue->head) {
+               queue->head = entry;
+               queue->tail = entry;
+               goto done;
+       }
+
+       for (prev = NULL, cur = queue->head; cur; prev = cur, cur = cur->next) {
+               cmp = function(entry->data, cur->data, user_data);
+
+               if (cmp >= 0)
+                       continue;
+
+               if (prev == NULL) {
+                       entry->next = queue->head;
+                       queue->head = entry;
+                       goto done;
+               }
+
+               entry->next = cur;
+               prev->next = entry;
+
+               goto done;
+       }
+
+       queue->tail->next = entry;
+       queue->tail = entry;
+
+done:
+       queue->entries++;
+
+       return true;
+}
+
+/**
+ * l_queue_find:
+ * @queue: queue object
+ * @function: match function
+ * @user_data: user data given to compare function
+ *
+ * Finds an entry in the queue by running the match @function
+ *
+ * Returns: Matching entry or NULL if no entry can be found
+ **/
+LIB_EXPORT void *l_queue_find(struct l_queue *queue,
+                               l_queue_match_func_t function,
+                               const void *user_data)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue || !function))
+               return NULL;
+
+       for (entry = queue->head; entry; entry = entry->next)
+               if (function(entry->data, user_data))
+                       return entry->data;
+
+       return NULL;
+}
+
+/**
+ * l_queue_remove:
+ * @queue: queue object
+ * @data: pointer to data
+ *
+ * Remove given @data from the queue.
+ *
+ * Returns: #true when data has been removed and #false when data could not
+ *          be found or an invalid @queue object has been provided
+ **/
+LIB_EXPORT bool l_queue_remove(struct l_queue *queue, void *data)
+{
+       struct l_queue_entry *entry, *prev;
+
+       if (unlikely(!queue))
+               return false;
+
+       for (entry = queue->head, prev = NULL; entry;
+                                       prev = entry, entry = entry->next) {
+               if (entry->data != data)
+                       continue;
+
+               if (prev)
+                       prev->next = entry->next;
+               else
+                       queue->head = entry->next;
+
+               if (!entry->next)
+                       queue->tail = prev;
+
+               l_free(entry);
+
+               queue->entries--;
+
+               return true;
+       }
+
+       return false;
+}
+
+/**
+ * l_queue_reverse:
+ * @queue: queue object
+ *
+ * Reverse entries in the queue.
+ *
+ * Returns: #true on success and #false on failure
+ **/
+LIB_EXPORT bool l_queue_reverse(struct l_queue *queue)
+{
+       struct l_queue_entry *entry, *prev = NULL;
+
+       if (unlikely(!queue))
+               return false;
+
+       entry = queue->head;
+
+       while (entry) {
+               struct l_queue_entry *next = entry->next;
+
+               entry->next = prev;
+
+               prev = entry;
+               entry = next;
+       }
+
+       queue->tail = queue->head;
+       queue->head = prev;
+
+       return true;
+}
+
+/**
+ * l_queue_foreach:
+ * @queue: queue object
+ * @function: callback function
+ * @user_data: user data given to callback function
+ *
+ * Call @function for every given data in @queue.
+ **/
+LIB_EXPORT void l_queue_foreach(struct l_queue *queue,
+                       l_queue_foreach_func_t function, void *user_data)
+{
+       struct l_queue_entry *entry;
+
+       if (unlikely(!queue || !function))
+               return;
+
+       for (entry = queue->head; entry; entry = entry->next)
+               function(entry->data, user_data);
+}
+
+/**
+ * l_queue_foreach_remove:
+ * @queue: queue object
+ * @function: callback function
+ * @user_data: user data given to callback function
+ *
+ * Remove all entries in the @queue where @function returns #true.
+ *
+ * Returns: number of removed entries
+ **/
+LIB_EXPORT unsigned int l_queue_foreach_remove(struct l_queue *queue,
+                        l_queue_remove_func_t function, void *user_data)
+{
+       struct l_queue_entry *entry, *prev = NULL;
+       unsigned int count = 0;
+
+       if (unlikely(!queue || !function))
+               return 0;
+
+       entry = queue->head;
+
+       while (entry) {
+               if (function(entry->data, user_data)) {
+                       struct l_queue_entry *tmp = entry;
+
+                       if (prev)
+                               prev->next = entry->next;
+                       else
+                               queue->head = entry->next;
+
+                       if (!entry->next)
+                               queue->tail = prev;
+
+                       entry = entry->next;
+
+                       l_free(tmp);
+
+                       count++;
+               } else {
+                       prev = entry;
+                       entry = entry->next;
+               }
+       }
+
+       queue->entries -= count;
+
+       return count;
+}
+
+/**
+ * l_queue_remove_if
+ * @queue: queue object
+ * @function: callback function
+ * @user_data: user data given to callback function
+ *
+ * Remove the first entry in the @queue where the function returns #true.
+ *
+ * Returns: NULL if no entry was found, or the entry data if removal was
+ * successful.
+ **/
+LIB_EXPORT void *l_queue_remove_if(struct l_queue *queue,
+                               l_queue_match_func_t function,
+                               const void *user_data)
+{
+       struct l_queue_entry *entry, *prev = NULL;
+
+       if (unlikely(!queue || !function))
+               return NULL;
+
+       entry = queue->head;
+
+       while (entry) {
+               if (function(entry->data, user_data)) {
+                       struct l_queue_entry *tmp = entry;
+                       void *data;
+
+                       if (prev)
+                               prev->next = entry->next;
+                       else
+                               queue->head = entry->next;
+
+                       if (!entry->next)
+                               queue->tail = prev;
+
+                       entry = entry->next;
+
+                       data = tmp->data;
+
+                       l_free(tmp);
+                       queue->entries--;
+
+                       return data;
+               } else {
+                       prev = entry;
+                       entry = entry->next;
+               }
+       }
+
+       return NULL;
+}
+
+/**
+ * l_queue_length:
+ * @queue: queue object
+ *
+ * Returns: entries of the queue
+ **/
+LIB_EXPORT unsigned int l_queue_length(struct l_queue *queue)
+{
+       if (unlikely(!queue))
+               return 0;
+
+       return queue->entries;
+}
+
+/**
+ * l_queue_isempty:
+ * @queue: queue object
+ *
+ * Returns: #true if @queue is empty and #false is not
+ **/
+LIB_EXPORT bool l_queue_isempty(struct l_queue *queue)
+{
+       if (unlikely(!queue))
+               return true;
+
+       return queue->entries == 0;
+}
+
+/**
+ * l_queue_get_entries:
+ * @queue: queue object
+ *
+ * This function gives direct, read-only access to the internal list structure
+ * of the queue.  This can be used to efficiently traverse the elements.
+ *
+ * Returns: A pointer to the head of the queue.
+ **/
+LIB_EXPORT const struct l_queue_entry *l_queue_get_entries(
+                                                       struct l_queue *queue)
+{
+       if (unlikely(!queue))
+               return NULL;
+
+       return queue->head;
+}
diff --git a/ell/queue.h b/ell/queue.h
new file mode 100644 (file)
index 0000000..ff46a08
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_QUEUE_H
+#define __ELL_QUEUE_H
+
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*l_queue_foreach_func_t) (void *data, void *user_data);
+typedef void (*l_queue_destroy_func_t) (void *data);
+typedef int (*l_queue_compare_func_t) (const void *a, const void *b,
+                                                       void *user_data);
+typedef bool (*l_queue_match_func_t) (const void *a, const void *b);
+typedef bool (*l_queue_remove_func_t) (void *data, void *user_data);
+
+struct l_queue;
+
+struct l_queue_entry {
+       void *data;
+       struct l_queue_entry *next;
+};
+
+struct l_queue *l_queue_new(void);
+void l_queue_destroy(struct l_queue *queue,
+                       l_queue_destroy_func_t destroy);
+void l_queue_clear(struct l_queue *queue,
+                       l_queue_destroy_func_t destroy);
+
+bool l_queue_push_tail(struct l_queue *queue, void *data);
+bool l_queue_push_head(struct l_queue *queue, void *data);
+void *l_queue_pop_head(struct l_queue *queue);
+void *l_queue_peek_head(struct l_queue *queue);
+void *l_queue_peek_tail(struct l_queue *queue);
+
+bool l_queue_insert(struct l_queue *queue, void *data,
+                       l_queue_compare_func_t function, void *user_data);
+void *l_queue_find(struct l_queue *queue,
+                       l_queue_match_func_t function, const void *user_data);
+bool l_queue_remove(struct l_queue *queue, void *data);
+void *l_queue_remove_if(struct l_queue *queue,
+                       l_queue_match_func_t function, const void *user_data);
+
+bool l_queue_reverse(struct l_queue *queue);
+
+void l_queue_foreach(struct l_queue *queue,
+                       l_queue_foreach_func_t function, void *user_data);
+unsigned int l_queue_foreach_remove(struct l_queue *queue,
+                       l_queue_remove_func_t function, void *user_data);
+
+unsigned int l_queue_length(struct l_queue *queue);
+bool l_queue_isempty(struct l_queue *queue);
+
+const struct l_queue_entry *l_queue_get_entries(struct l_queue *queue);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_QUEUE_H */
diff --git a/ell/random.c b/ell/random.c
new file mode 100644 (file)
index 0000000..0b5b09e
--- /dev/null
@@ -0,0 +1,105 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/syscall.h>
+
+#include "random.h"
+#include "private.h"
+#include "missing.h"
+
+#ifndef GRND_NONBLOCK
+#define GRND_NONBLOCK  0x0001
+#endif
+
+#ifndef GRND_RANDOM
+#define GRND_RANDOM    0x0002
+#endif
+
+static inline int getrandom(void *buffer, size_t count, unsigned flags) {
+        return syscall(__NR_getrandom, buffer, count, flags);
+}
+
+/**
+ * l_getrandom:
+ * @buf: buffer to fill with random data
+ * @len: length of random data requested
+ *
+ * Request a number of randomly generated bytes given by @len and put them
+ * into buffer @buf.
+ *
+ * Returns: true if the random data could be generated, false otherwise.
+ **/
+LIB_EXPORT bool l_getrandom(void *buf, size_t len)
+{
+       while (len) {
+               int ret;
+
+               ret = L_TFR(getrandom(buf, len, 0));
+               if (ret < 0)
+                       return false;
+
+               buf += ret;
+               len -= ret;
+       }
+
+       return true;
+}
+
+LIB_EXPORT bool l_getrandom_is_supported()
+{
+       static bool initialized = false;
+       static bool supported = true;
+       uint8_t buf[4];
+       int ret;
+
+       if (initialized)
+               return supported;
+
+       ret = getrandom(buf, sizeof(buf), GRND_NONBLOCK);
+
+       if (ret < 0 && errno == ENOSYS)
+               supported = false;
+
+       initialized = true;
+       return supported;
+}
+
+LIB_EXPORT uint32_t l_getrandom_uint32(void)
+{
+       int ret;
+       uint32_t u;
+
+       ret = getrandom(&u, sizeof(u), GRND_NONBLOCK);
+
+       if (ret == sizeof(u))
+               return u;
+
+        return random() * RAND_MAX + random();
+}
diff --git a/ell/random.h b/ell/random.h
new file mode 100644 (file)
index 0000000..49a4637
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_RANDOM_H
+#define __ELL_RANDOM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+bool l_getrandom(void *buf, size_t len);
+bool l_getrandom_is_supported();
+
+uint32_t l_getrandom_uint32(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_RANDOM_H */
diff --git a/ell/ringbuf.c b/ell/ringbuf.c
new file mode 100644 (file)
index 0000000..6e72408
--- /dev/null
@@ -0,0 +1,455 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2015  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <sys/uio.h>
+#include <sys/param.h>
+
+#include "private.h"
+#include "ringbuf.h"
+
+/**
+ * SECTION:ringbuf
+ * @short_description: Ring Buffer support
+ *
+ * Ring Buffer support
+ */
+
+/**
+ * l_ringbuf:
+ *
+ * Opague object representing the Ring Buffer.
+ */
+struct l_ringbuf {
+       void *buffer;
+       size_t size;
+       size_t in;
+       size_t out;
+       l_ringbuf_tracing_func_t in_tracing;
+       void *in_data;
+};
+
+#define RINGBUF_RESET 0
+
+/* Find last (most siginificant) set bit */
+static inline unsigned int fls(unsigned int x)
+{
+       return x ? sizeof(x) * 8 - __builtin_clz(x) : 0;
+}
+
+/* Round up to nearest power of two */
+static inline unsigned int align_power2(unsigned int u)
+{
+       return 1 << fls(u - 1);
+}
+
+/**
+ * l_ringbuf_new:
+ * @size: Minimum size of the ring buffer.
+ *
+ * Create a new ring buffer
+ *
+ * Returns: a newly allocated #l_ringbuf object
+ **/
+LIB_EXPORT struct l_ringbuf *l_ringbuf_new(size_t size)
+{
+       struct l_ringbuf *ringbuf;
+       size_t real_size;
+
+       if (size < 2 || size > UINT_MAX)
+               return NULL;
+
+       /* Find the next power of two for size */
+       real_size = align_power2(size);
+
+       ringbuf = l_new(struct l_ringbuf, 1);
+       ringbuf->buffer = l_malloc(real_size);
+
+       ringbuf->size = real_size;
+       ringbuf->in = RINGBUF_RESET;
+       ringbuf->out = RINGBUF_RESET;
+
+       return ringbuf;
+}
+
+/**
+ * l_ringbuf_free:
+ * @ringbuf: Ring Buffer object
+ *
+ * Free the Ring Buffer object and associated memory.
+ **/
+LIB_EXPORT void l_ringbuf_free(struct l_ringbuf *ringbuf)
+{
+       if (!ringbuf)
+               return;
+
+       l_free(ringbuf->buffer);
+       l_free(ringbuf);
+}
+
+/**
+ * l_ringbuf_set_input_tracing:
+ * @ringbuf: Ring Buffer object
+ * @callback: Callback function
+ * @user_data: user_data for the callback function
+ *
+ * Sets a tracing callback that will be called whenever input data is
+ * processed.  @user_data will be passed to the callback.
+ *
+ * Returns: Whether setting the callback succeeded.
+ **/
+LIB_EXPORT bool l_ringbuf_set_input_tracing(struct l_ringbuf *ringbuf,
+                       l_ringbuf_tracing_func_t callback, void *user_data)
+{
+       if (!ringbuf)
+               return false;
+
+       ringbuf->in_tracing = callback;
+       ringbuf->in_data = user_data;
+
+       return true;
+}
+
+/**
+ * l_ringbuf_capacity:
+ * @ringbuf: Ring Buffer object
+ *
+ * Returns: Total capacity of the Ring Buffer.
+ **/
+LIB_EXPORT size_t l_ringbuf_capacity(struct l_ringbuf *ringbuf)
+{
+       if (!ringbuf)
+               return 0;
+
+       return ringbuf->size;
+}
+
+/**
+ * l_ringbuf_len:
+ * @ringbuf: Ring Buffer object
+ *
+ * Returns: Number of occupied bytes in the ring buffer
+ **/
+LIB_EXPORT size_t l_ringbuf_len(struct l_ringbuf *ringbuf)
+{
+       if (!ringbuf)
+               return 0;
+
+       return ringbuf->in - ringbuf->out;
+}
+
+/**
+ * l_ringbuf_drain:
+ * @ringbuf: Ring Buffer object
+ * @count: Number of bytes to drain
+ *
+ * Drains a number of bytes specified.  The occupied bytes are discarded.
+ *
+ * Returns: Number of bytes drained
+ **/
+LIB_EXPORT size_t l_ringbuf_drain(struct l_ringbuf *ringbuf, size_t count)
+{
+       size_t len;
+
+       if (!ringbuf)
+               return 0;
+
+       len = minsize(count, ringbuf->in - ringbuf->out);
+       if (!len)
+               return 0;
+
+       ringbuf->out += len;
+
+       if (ringbuf->out == ringbuf->in) {
+               ringbuf->in = RINGBUF_RESET;
+               ringbuf->out = RINGBUF_RESET;
+       }
+
+       return len;
+}
+
+/**
+ * l_ringbuf_peek:
+ * @ringbuf: Ring Buffer object
+ * @offset: Offset into the ring buffer
+ * @len_nowrap: Number of contiguous bytes starting from the current offset
+ *
+ * Peeks into the ring buffer at offset specified by @offset.  Since the ring
+ * buffer can wrap around, the stored bytes might be in two contiguous
+ * locations.  Typically offset of 0 is used first.  Then, if len_nowrap
+ * is less than the length returned by l_ringbuf_len, the rest of the data
+ * can be obtained by calling l_ringbuf_peek with offset set to len_nowrap.
+ *
+ * Returns: Pointer into ring buffer internal storage
+ **/
+LIB_EXPORT void *l_ringbuf_peek(struct l_ringbuf *ringbuf, size_t offset,
+                                                       size_t *len_nowrap)
+{
+       if (!ringbuf)
+               return NULL;
+
+       offset = (ringbuf->out + offset) & (ringbuf->size - 1);
+
+       if (len_nowrap) {
+               size_t len = ringbuf->in - ringbuf->out;
+               *len_nowrap = minsize(len, ringbuf->size - offset);
+       }
+
+       return ringbuf->buffer + offset;
+}
+
+/**
+ * l_ringbuf_write:
+ * @ringbuf: Ring Buffer object
+ * @fd: file descriptor to write to
+ *
+ * Tries to write the contents of the ring buffer out to a file descriptor
+ *
+ * Returns: Number of bytes written or -1 if the write failed.
+ **/
+LIB_EXPORT ssize_t l_ringbuf_write(struct l_ringbuf *ringbuf, int fd)
+{
+       size_t len, offset, end;
+       struct iovec iov[2];
+       ssize_t consumed;
+
+       if (!ringbuf || fd < 0)
+               return -1;
+
+       /* Determine how much data is available */
+       len = ringbuf->in - ringbuf->out;
+       if (!len)
+               return 0;
+
+       /* Grab data from buffer starting at offset until the end */
+       offset = ringbuf->out & (ringbuf->size - 1);
+       end = minsize(len, ringbuf->size - offset);
+
+       iov[0].iov_base = ringbuf->buffer + offset;
+       iov[0].iov_len = end;
+
+       /* Use second vector for remainder from the beginning */
+       iov[1].iov_base = ringbuf->buffer;
+       iov[1].iov_len = len - end;
+
+       consumed = writev(fd, iov, 2);
+       if (consumed < 0)
+               return -1;
+
+       ringbuf->out += consumed;
+
+       if (ringbuf->out == ringbuf->in) {
+               ringbuf->in = RINGBUF_RESET;
+               ringbuf->out = RINGBUF_RESET;
+       }
+
+       return consumed;
+}
+
+/**
+ * l_ringbuf_avail:
+ * @ringbuf: Ring Buffer object
+ *
+ * Returns: Number of unoccupied bytes in the ring buffer
+ **/
+LIB_EXPORT size_t l_ringbuf_avail(struct l_ringbuf *ringbuf)
+{
+       if (!ringbuf)
+               return 0;
+
+       return ringbuf->size - ringbuf->in + ringbuf->out;
+}
+
+/**
+ * l_ringbuf_printf:
+ * @ringbuf: Ring Buffer object
+ * @format: printf-style format string
+ *
+ * Writes contents to the ring buffer using printf-style semantics
+ *
+ * Returns: Number of bytes written
+ **/
+LIB_EXPORT int l_ringbuf_printf(struct l_ringbuf *ringbuf,
+                                               const char *format, ...)
+{
+       va_list ap;
+       int len;
+
+       va_start(ap, format);
+       len = l_ringbuf_vprintf(ringbuf, format, ap);
+       va_end(ap);
+
+       return len;
+}
+
+/**
+ * l_ringbuf_printf:
+ * @ringbuf: Ring Buffer object
+ * @format: printf-style format string
+ * @ap: variable argument list
+ *
+ * Writes contents to the ring buffer using printf-style semantics
+ *
+ * Returns: Number of bytes written
+ **/
+LIB_EXPORT int l_ringbuf_vprintf(struct l_ringbuf *ringbuf,
+                                               const char *format, va_list ap)
+{
+       size_t avail;
+       char *str;
+       int len;
+
+       if (!ringbuf || !format)
+               return -1;
+
+       /* Determine maximum length available for string */
+       avail = ringbuf->size - ringbuf->in + ringbuf->out;
+       if (!avail)
+               return -1;
+
+       len = vasprintf(&str, format, ap);
+       if (len < 0)
+               return -1;
+
+       if ((size_t) len > avail) {
+               l_free(str);
+               return -1;
+       }
+
+       len = l_ringbuf_append(ringbuf, str, (size_t) len);
+
+       l_free(str);
+
+       return len;
+}
+
+/**
+ * l_ringbuf_read:
+ * @ringbuf: Ring Buffer object
+ * @fd: file descriptor to read from
+ *
+ * Reads data from a file descriptor given by @fd into the ring buffer.
+ *
+ * Returns: Number of bytes read or -1 if the read failed.
+ **/
+LIB_EXPORT ssize_t l_ringbuf_read(struct l_ringbuf *ringbuf, int fd)
+{
+       size_t avail, offset, end;
+       struct iovec iov[2];
+       ssize_t consumed;
+
+       if (!ringbuf || fd < 0)
+               return -1;
+
+       /* Determine how much can actually be consumed */
+       avail = ringbuf->size - ringbuf->in + ringbuf->out;
+       if (!avail)
+               return -1;
+
+       /* Determine how much to consume before wrapping */
+       offset = ringbuf->in & (ringbuf->size - 1);
+       end = minsize(avail, ringbuf->size - offset);
+
+       iov[0].iov_base = ringbuf->buffer + offset;
+       iov[0].iov_len = end;
+
+       /* Now put the remainder into the second vector */
+       iov[1].iov_base = ringbuf->buffer;
+       iov[1].iov_len = avail - end;
+
+       consumed = readv(fd, iov, 2);
+       if (consumed < 0)
+               return -1;
+
+       if (ringbuf->in_tracing) {
+               size_t len = minsize((size_t) consumed, end);
+
+               ringbuf->in_tracing(ringbuf->buffer + offset, len,
+                                                       ringbuf->in_data);
+
+               if (consumed - len > 0)
+                       ringbuf->in_tracing(ringbuf->buffer, consumed - len,
+                                                       ringbuf->in_data);
+       }
+
+       ringbuf->in += consumed;
+
+       return consumed;
+}
+
+/**
+ * l_ringbuf_append:
+ * @ringbuf: Ring Buffer object
+ * @data: data to be appended
+ * @len: data length
+ *
+ * Appends data to the ring buffer.
+ *
+ * Returns: Number of appended bytes or -1 if the append failed.
+ **/
+ssize_t l_ringbuf_append(struct l_ringbuf *ringbuf, const void *data,
+                                                               size_t len)
+{
+       size_t avail;
+       size_t offset;
+       size_t end;
+       size_t left;
+
+       if (!ringbuf || data == NULL)
+               return -1;
+
+       /* Determine how much can actually be appended */
+       avail = ringbuf->size - ringbuf->in + ringbuf->out;
+
+       if (!avail)
+               return -1;
+
+       /* Determine how much to append before wrapping */
+       offset = ringbuf->in & (ringbuf->size - 1);
+       end = minsize(len, ringbuf->size - offset);
+       memcpy(ringbuf->buffer + offset, data, end);
+
+       if (ringbuf->in_tracing)
+               ringbuf->in_tracing(ringbuf->buffer + offset, end,
+                                               ringbuf->in_data);
+
+       left = minsize(avail - end, len - end);
+
+       if (left > 0) {
+               memcpy(ringbuf->buffer, data + end, left);
+
+               if (ringbuf->in_tracing)
+                       ringbuf->in_tracing(ringbuf->buffer, left,
+                                               ringbuf->in_data);
+       }
+
+       ringbuf->in += end + left;
+
+       return (end + left);
+}
diff --git a/ell/ringbuf.h b/ell/ringbuf.h
new file mode 100644 (file)
index 0000000..ab1d371
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2015  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_RINGBUF_H
+#define __ELL_RINGBUF_H
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdbool.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*l_ringbuf_tracing_func_t)(const void *buf, size_t count,
+                                                       void *user_data);
+
+struct l_ringbuf;
+
+struct l_ringbuf *l_ringbuf_new(size_t size);
+void l_ringbuf_free(struct l_ringbuf *ringbuf);
+
+bool l_ringbuf_set_input_tracing(struct l_ringbuf *ringbuf,
+                       l_ringbuf_tracing_func_t callback, void *user_data);
+
+size_t l_ringbuf_capacity(struct l_ringbuf *ringbuf);
+
+size_t l_ringbuf_len(struct l_ringbuf *ringbuf);
+size_t l_ringbuf_drain(struct l_ringbuf *ringbuf, size_t count);
+void *l_ringbuf_peek(struct l_ringbuf *ringbuf, size_t offset,
+                                                       size_t *len_nowrap);
+ssize_t l_ringbuf_write(struct l_ringbuf *ringbuf, int fd);
+
+size_t l_ringbuf_avail(struct l_ringbuf *ringbuf);
+int l_ringbuf_printf(struct l_ringbuf *ringbuf, const char *format, ...)
+                                       __attribute__((format(printf, 2, 3)));
+int l_ringbuf_vprintf(struct l_ringbuf *ringbuf, const char *format,
+                                       va_list ap);
+ssize_t l_ringbuf_read(struct l_ringbuf *ringbuf, int fd);
+
+ssize_t l_ringbuf_append(struct l_ringbuf *ringbuf, const void *data,
+                                                               size_t len);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_RINGBUF_H */
diff --git a/ell/settings.c b/ell/settings.c
new file mode 100644 (file)
index 0000000..c5e1184
--- /dev/null
@@ -0,0 +1,1433 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if __STDC_VERSION__ <= 199409L
+#define _DEFAULT_SOURCE  /* for strto{u}ll() */
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "util.h"
+#include "strv.h"
+#include "utf8.h"
+#include "string.h"
+#include "queue.h"
+#include "settings.h"
+#include "private.h"
+#include "missing.h"
+#include "pem-private.h"
+
+struct setting_data {
+       char *key;
+       char *value;
+};
+
+struct embedded_group_data {
+       char *name;
+       char type[32];
+       size_t len;
+       char data[0];
+};
+
+struct group_data {
+       char *name;
+       struct l_queue *settings;
+};
+
+struct l_settings {
+       l_settings_debug_cb_t debug_handler;
+       l_settings_destroy_cb_t debug_destroy;
+       void *debug_data;
+       struct l_queue *groups;
+       struct l_queue *embedded_groups;
+};
+
+static void setting_destroy(void *data)
+{
+       struct setting_data *pair = data;
+
+       l_free(pair->key);
+       explicit_bzero(pair->value, strlen(pair->value));
+       l_free(pair->value);
+       l_free(pair);
+}
+
+static void group_destroy(void *data)
+{
+       struct group_data *group = data;
+
+       l_free(group->name);
+       l_queue_destroy(group->settings, setting_destroy);
+
+       l_free(group);
+}
+
+static void embedded_group_destroy(void *data)
+{
+       struct embedded_group_data *group = data;
+
+       l_free(group->name);
+       l_free(group);
+}
+
+LIB_EXPORT struct l_settings *l_settings_new(void)
+{
+       struct l_settings *settings;
+
+       settings = l_new(struct l_settings, 1);
+       settings->groups = l_queue_new();
+       settings->embedded_groups = l_queue_new();
+
+       return settings;
+}
+
+LIB_EXPORT void l_settings_free(struct l_settings *settings)
+{
+       if (unlikely(!settings))
+               return;
+
+       if (settings->debug_destroy)
+               settings->debug_destroy(settings->debug_data);
+
+       l_queue_destroy(settings->groups, group_destroy);
+       l_queue_destroy(settings->embedded_groups, embedded_group_destroy);
+
+       l_free(settings);
+}
+
+static char *unescape_value(const char *value)
+{
+       char *ret;
+       char *n;
+       const char *o;
+
+       ret = l_new(char, strlen(value) + 1);
+
+       for (n = ret, o = value; *o; o++, n++) {
+               if (*o != '\\') {
+                       *n = *o;
+                       continue;
+               }
+
+               o += 1;
+
+               switch (*o) {
+               case 's':
+                       *n = ' ';
+                       break;
+               case 'n':
+                       *n = '\n';
+                       break;
+               case 't':
+                       *n = '\t';
+                       break;
+               case 'r':
+                       *n = '\r';
+                       break;
+               case '\\':
+                       *n = '\\';
+                       break;
+               default:
+                       explicit_bzero(ret, n - ret);
+                       l_free(ret);
+                       return NULL;
+               }
+       }
+
+       return ret;
+}
+
+static char *escape_value(const char *value)
+{
+       size_t i;
+       size_t j;
+       char *ret;
+       bool lead_whitespace;
+
+       for (i = 0, j = 0, lead_whitespace = true; value[i]; i++) {
+               switch (value[i]) {
+               case ' ':
+               case '\t':
+                       if (lead_whitespace)
+                               j += 1;
+
+                       break;
+               case '\n':
+               case '\r':
+               case '\\':
+                       j += 1;
+                       /* fall through */
+               default:
+                       lead_whitespace = false;
+               }
+       }
+
+       ret = l_malloc(i + j + 1);
+
+       for (i = 0, j = 0, lead_whitespace = true; value[i]; i++) {
+               switch (value[i]) {
+               case ' ':
+                       if (lead_whitespace) {
+                               ret[j++] = '\\';
+                               ret[j++] = 's';
+                       } else
+                               ret[j++] = value[i];
+
+                       break;
+               case '\t':
+                       if (lead_whitespace) {
+                               ret[j++] = '\\';
+                               ret[j++] = 't';
+                       } else
+                               ret[j++] = value[i];
+
+                       break;
+               case '\n':
+                       ret[j++] = '\\';
+                       ret[j++] = 'n';
+                       lead_whitespace = false;
+                       break;
+               case '\r':
+                       ret[j++] = '\\';
+                       ret[j++] = 'r';
+                       lead_whitespace = false;
+                       break;
+               case '\\':
+                       ret[j++] = '\\';
+                       ret[j++] = '\\';
+                       lead_whitespace = false;
+                       break;
+               default:
+                       ret[j++] = value[i];
+                       lead_whitespace = false;
+               }
+       }
+
+       ret[j] = '\0';
+
+       return ret;
+}
+
+static ssize_t parse_pem(const char *data, size_t len)
+{
+       const char *ptr;
+       const char *end;
+       size_t count = 0;
+
+       ptr = data;
+       end = data + len;
+
+       while (ptr && ptr < end) {
+               const char *pem_start = ptr;
+
+               if (!pem_next(ptr, len, NULL, NULL, &ptr, true)) {
+                       if (ptr)
+                               return -EINVAL;
+
+                       break;
+               }
+
+               len -= ptr - pem_start;
+               count += ptr - pem_start;
+       }
+
+       return count;
+}
+
+struct group_extension {
+       char *name;
+       ssize_t (*parse)(const char *data, size_t len);
+};
+
+static const struct group_extension pem_extension = {
+       .name = "pem",
+       .parse = parse_pem,
+};
+
+static const struct group_extension *extensions[] = {
+       &pem_extension,
+       NULL
+};
+
+static const struct group_extension *find_group_extension(const char *type,
+                                                               size_t len)
+{
+       unsigned int i;
+
+       for (i = 0; extensions[i]; i++) {
+               if (!strncmp(type, extensions[i]->name, len))
+                       return extensions[i];
+       }
+
+       return NULL;
+}
+
+static ssize_t parse_embedded_group(struct l_settings *setting,
+                                       const char *data,
+                                       size_t line_len, size_t len,
+                                       size_t line)
+{
+       struct embedded_group_data *group;
+       const struct group_extension *ext;
+       const char *ptr;
+       const char *type;
+       size_t type_len;
+       const char *name;
+       size_t name_len;
+       ssize_t bytes;
+
+       /* Must be at least [@a@b] */
+       if (line_len < 6)
+               goto invalid_group;
+
+       /* caller checked data[1] == '@', next char is type */
+       type = data + 2;
+
+       ptr = memchr(type, '@', line_len - 2);
+
+       type_len = ptr - type;
+
+       if (!ptr || type_len > 31 || type_len < 1)
+               goto invalid_group;
+
+       if (ptr + 1 > data + line_len)
+               goto invalid_group;
+
+       name = ptr + 1;
+
+       /* subtract [@@ + type */
+       ptr = memchr(name, ']', line_len - 3 - type_len);
+
+       name_len = ptr - name;
+
+       if (!ptr || name_len < 1)
+               goto invalid_group;
+
+       ext = find_group_extension(type, type_len);
+       if (!ext)
+               goto invalid_group;
+
+       if (ptr + 2 > data + len) {
+               l_util_debug(setting->debug_handler, setting->debug_data,
+                               "Embedded group had no payload");
+               return -EINVAL;
+       }
+
+       bytes = ext->parse(ptr + 2, len - line_len);
+       if (bytes < 0) {
+               l_util_debug(setting->debug_handler, setting->debug_data,
+                               "Failed to parse embedded group data");
+               return -EINVAL;
+       }
+
+       group = l_malloc(sizeof(struct embedded_group_data) + bytes + 1);
+
+       group->name = l_strndup(name, name_len);
+
+       memcpy(group->type, type, type_len);
+       group->type[type_len] = '\0';
+
+       group->len = bytes;
+       memcpy(group->data, ptr + 2, bytes);
+       group->data[bytes] = '\0';
+
+       l_queue_push_tail(setting->embedded_groups, group);
+
+       return bytes;
+
+invalid_group:
+       l_util_debug(setting->debug_handler, setting->debug_data,
+                       "Invalid embedded group at line %zd", line);
+
+       return -EINVAL;
+}
+
+static bool parse_group(struct l_settings *settings, const char *data,
+                       size_t len, size_t line)
+{
+       size_t i = 1;
+       size_t end;
+       struct group_data *group;
+
+       while (i < len && data[i] != ']') {
+               if (l_ascii_isprint(data[i]) == false || data[i] == '[') {
+                       l_util_debug(settings->debug_handler,
+                                       settings->debug_data,
+                                       "Invalid group name at line %zd", line);
+                       return false;
+               }
+
+               i += 1;
+       }
+
+       if (i >= len) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Unterminated group name at line %zd", line);
+               return false;
+       }
+
+       end = i;
+       i += 1;
+
+       while (i < len && l_ascii_isblank(data[i]))
+               i += 1;
+
+       if (i != len) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Junk characters at the end of line %zd", line);
+               return false;
+       }
+
+       group = l_new(struct group_data, 1);
+       group->name = l_strndup(data + 1, end - 1);
+       group->settings = l_queue_new();
+
+       l_queue_push_tail(settings->groups, group);
+
+       return true;
+}
+
+static bool validate_key_character(char c)
+{
+       if (l_ascii_isalnum(c))
+               return true;
+
+       if (c == '_' || c == '-' || c == '.')
+               return true;
+
+       return false;
+}
+
+static unsigned int parse_key(struct l_settings *settings, const char *data,
+                               size_t len, size_t line)
+{
+       unsigned int i;
+       unsigned int end;
+       struct group_data *group;
+       struct setting_data *pair;
+
+       for (i = 0; i < len; i++) {
+               if (validate_key_character(data[i]))
+                       continue;
+
+               if (l_ascii_isblank(data[i]))
+                       break;
+
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Invalid character in Key on line %zd", line);
+
+               return 0;
+       }
+
+       end = i;
+
+       /* Make sure the rest of the characters are blanks */
+       while (i < len) {
+               if (l_ascii_isblank(data[i++]))
+                       continue;
+
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                                       "Garbage after Key on line %zd", line);
+
+               return 0;
+       }
+
+       group = l_queue_peek_tail(settings->groups);
+       pair = l_new(struct setting_data, 1);
+       pair->key = l_strndup(data, end);
+       l_queue_push_head(group->settings, pair);
+
+       return end;
+}
+
+static bool parse_value(struct l_settings *settings, const char *data,
+                       size_t len, size_t line)
+{
+       unsigned int end = len;
+       struct group_data *group;
+       struct setting_data *pair;
+
+       group = l_queue_peek_tail(settings->groups);
+       pair = l_queue_pop_head(group->settings);
+
+       if (!l_utf8_validate(data, len, NULL)) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Invalid UTF8 in value on line: %zd", line);
+
+               l_free(pair->key);
+               l_free(pair);
+
+               return false;
+       }
+
+       pair->value = l_strndup(data, end);
+       l_queue_push_tail(group->settings, pair);
+
+       return true;
+}
+
+static bool parse_keyvalue(struct l_settings *settings, const char *data,
+                               size_t len, size_t line)
+{
+       const char *equal = memchr(data, '=', len);
+
+       if (!equal) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Delimiter '=' not found on line: %zd", line);
+               return false;
+       }
+
+       if (equal == data) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                                       "Empty key on line: %zd", line);
+               return false;
+       }
+
+       if (!parse_key(settings, data, equal - data, line))
+               return false;
+
+       equal += 1;
+       while (equal < data + len && l_ascii_isblank(*equal))
+               equal += 1;
+
+       return parse_value(settings, equal, len - (equal - data), line);
+}
+
+LIB_EXPORT bool l_settings_load_from_data(struct l_settings *settings,
+                                               const char *data, size_t len)
+{
+       size_t pos = 0;
+       bool r = true;
+       bool has_group = false;
+       const char *eol;
+       size_t line = 1;
+       size_t line_len;
+
+       if (unlikely(!settings || !data || !len))
+               return false;
+
+       while (pos < len && r) {
+               if (l_ascii_isblank(data[pos])) {
+                       pos += 1;
+                       continue;
+               }
+
+               if (data[pos] == '\n') {
+                       line += 1;
+                       pos += 1;
+                       continue;
+               }
+
+               eol = memchr(data + pos, '\n', len - pos);
+               if (!eol)
+                       eol = data + len;
+
+               line_len = eol - data - pos;
+
+               if (line_len > 1 && data[pos] == '[' && data[pos + 1] == '@') {
+                       ssize_t ret;
+
+                       ret = parse_embedded_group(settings, data + pos,
+                                                       line_len, len - pos,
+                                                       line);
+                       if (ret < 0)
+                               return false;
+
+                       /*
+                        * This is the offset for the actual raw data, the
+                        * group line will be offset below
+                        */
+                       pos += ret;
+               } else if (data[pos] == '[') {
+                       r = parse_group(settings, data + pos, line_len, line);
+                       if (r)
+                               has_group = true;
+               } else if (data[pos] != '#') {
+                       if (!has_group)
+                               return false;
+
+                       r = parse_keyvalue(settings, data + pos, line_len,
+                                               line);
+               }
+
+               pos += line_len;
+       }
+
+       return r;
+}
+
+LIB_EXPORT char *l_settings_to_data(const struct l_settings *settings,
+                                                               size_t *len)
+{
+       struct l_string *buf;
+       char *ret;
+       const struct l_queue_entry *group_entry;
+
+       if (unlikely(!settings))
+               return NULL;
+
+       buf = l_string_new(255);
+
+       group_entry = l_queue_get_entries(settings->groups);
+       while (group_entry) {
+               struct group_data *group = group_entry->data;
+               const struct l_queue_entry *setting_entry;
+
+               l_string_append_printf(buf, "[%s]\n", group->name);
+
+               setting_entry = l_queue_get_entries(group->settings);
+
+               while (setting_entry) {
+                       struct setting_data *setting = setting_entry->data;
+
+                       l_string_append_printf(buf, "%s=%s\n",
+                                               setting->key, setting->value);
+                       setting_entry = setting_entry->next;
+               }
+
+               if (group_entry->next)
+                       l_string_append_c(buf, '\n');
+
+               group_entry = group_entry->next;
+       }
+
+       group_entry = l_queue_get_entries(settings->embedded_groups);
+
+       if (group_entry && l_queue_length(settings->groups) > 0)
+               l_string_append_c(buf, '\n');
+
+       while (group_entry) {
+               struct embedded_group_data *group = group_entry->data;
+
+               l_string_append_printf(buf, "[@%s@%s]\n%s",
+                                       group->type,
+                                       group->name,
+                                       group->data);
+               if (group_entry->next)
+                       l_string_append_c(buf, '\n');
+
+               group_entry = group_entry->next;
+       }
+
+       ret = l_string_unwrap(buf);
+
+       if (len)
+               *len = strlen(ret);
+
+       return ret;
+}
+
+LIB_EXPORT bool l_settings_load_from_file(struct l_settings *settings,
+                                               const char *filename)
+{
+       int fd;
+       struct stat st;
+       char *data;
+       bool r;
+
+       if (unlikely(!settings || !filename))
+               return false;
+
+       fd = open(filename, O_RDONLY);
+       if (fd < 0) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Could not open %s (%s)", filename,
+                               strerror(errno));
+               return false;
+       }
+
+       if (fstat(fd, &st) < 0) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Could not stat %s (%s)", filename,
+                               strerror(errno));
+               close(fd);
+
+               return false;
+       }
+
+       /* Nothing to do, assume success */
+       if (st.st_size == 0) {
+               close(fd);
+               return true;
+       }
+
+       data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+       if (data == MAP_FAILED) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Could not mmap %s (%s)", filename,
+                               strerror(errno));
+               close(fd);
+
+               return false;
+       }
+
+       r = l_settings_load_from_data(settings, data, st.st_size);
+
+       munmap(data, st.st_size);
+       close(fd);
+
+       return r;
+}
+
+LIB_EXPORT bool l_settings_set_debug(struct l_settings *settings,
+                                       l_settings_debug_cb_t callback,
+                                       void *user_data,
+                                       l_settings_destroy_cb_t destroy)
+{
+       if (unlikely(!settings))
+               return false;
+
+       if (settings->debug_destroy)
+               settings->debug_destroy(settings->debug_data);
+
+       settings->debug_handler = callback;
+       settings->debug_destroy = destroy;
+       settings->debug_data = user_data;
+
+       return true;
+}
+
+static bool group_match(const void *a, const void *b)
+{
+       const struct group_data *group = a;
+       const char *name = b;
+
+       return !strcmp(group->name, name);
+}
+
+struct gather_data {
+       int cur;
+       char **v;
+};
+
+static void gather_groups(void *data, void *user_data)
+{
+       struct group_data *group_data = data;
+       struct gather_data *gather = user_data;
+
+       gather->v[gather->cur++] = l_strdup(group_data->name);
+}
+
+LIB_EXPORT char **l_settings_get_groups(const struct l_settings *settings)
+{
+       char **ret;
+       struct gather_data gather;
+
+       if (unlikely(!settings))
+               return NULL;
+
+       ret = l_new(char *, l_queue_length(settings->groups) + 1);
+       gather.v = ret;
+       gather.cur = 0;
+
+       l_queue_foreach(settings->groups, gather_groups, &gather);
+
+       return ret;
+}
+
+LIB_EXPORT bool l_settings_has_group(const struct l_settings *settings,
+                                       const char *group_name)
+{
+       struct group_data *group;
+
+       if (unlikely(!settings))
+               return false;
+
+       group = l_queue_find(settings->groups, group_match, group_name);
+
+       return !!group;
+}
+
+static bool key_match(const void *a, const void *b)
+{
+       const struct setting_data *setting = a;
+       const char *key = b;
+
+       return !strcmp(setting->key, key);
+}
+
+static void gather_keys(void *data, void *user_data)
+{
+       struct setting_data *setting_data = data;
+       struct gather_data *gather = user_data;
+
+       gather->v[gather->cur++] = l_strdup(setting_data->key);
+}
+
+LIB_EXPORT char **l_settings_get_keys(const struct l_settings *settings,
+                                       const char *group_name)
+{
+       char **ret;
+       struct group_data *group_data;
+       struct gather_data gather;
+
+       if (unlikely(!settings))
+               return NULL;
+
+       group_data = l_queue_find(settings->groups, group_match, group_name);
+       if (!group_data)
+               return NULL;
+
+       ret = l_new(char *, l_queue_length(group_data->settings) + 1);
+       gather.v = ret;
+       gather.cur = 0;
+
+       l_queue_foreach(group_data->settings, gather_keys, &gather);
+
+       return ret;
+}
+
+LIB_EXPORT bool l_settings_has_key(const struct l_settings *settings,
+                                       const char *group_name, const char *key)
+{
+       struct group_data *group;
+       struct setting_data *setting;
+
+       if (unlikely(!settings))
+               return false;
+
+       group = l_queue_find(settings->groups, group_match, group_name);
+       if (!group)
+               return false;
+
+       setting = l_queue_find(group->settings, key_match, key);
+
+       return !!setting;
+}
+
+LIB_EXPORT const char *l_settings_get_value(const struct l_settings *settings,
+                                               const char *group_name,
+                                               const char *key)
+{
+       struct group_data *group;
+       struct setting_data *setting;
+
+       if (unlikely(!settings))
+               return NULL;
+
+       group = l_queue_find(settings->groups, group_match, group_name);
+       if (!group)
+               return NULL;
+
+       setting = l_queue_find(group->settings, key_match, key);
+       if (!setting)
+               return NULL;
+
+       return setting->value;
+}
+
+static bool validate_group_name(const char *group_name)
+{
+       int i;
+
+       for (i = 0; group_name[i]; i++) {
+               if (!l_ascii_isprint(group_name[i]))
+                       return false;
+
+               if (group_name[i] == ']' || group_name[i] == '[')
+                       return false;
+       }
+
+       return true;
+}
+
+static bool validate_key(const char *key)
+{
+       int i;
+
+       for (i = 0; key[i]; i++) {
+               if (!validate_key_character(key[i]))
+                       return false;
+       }
+
+       return true;
+}
+
+static bool set_value(struct l_settings *settings, const char *group_name,
+                       const char *key, char *value)
+{
+       struct group_data *group;
+       struct setting_data *pair;
+
+       if (!validate_group_name(group_name)) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Invalid group name %s", group_name);
+               l_free(value);
+
+               return false;
+       }
+
+       if (!validate_key(key)) {
+               l_util_debug(settings->debug_handler, settings->debug_data,
+                               "Invalid key %s", key);
+               l_free(value);
+
+               return false;
+       }
+
+       group = l_queue_find(settings->groups, group_match, group_name);
+       if (!group) {
+               group = l_new(struct group_data, 1);
+               group->name = l_strdup(group_name);
+               group->settings = l_queue_new();
+
+               l_queue_push_tail(settings->groups, group);
+               goto add_pair;
+       }
+
+       pair = l_queue_find(group->settings, key_match, key);
+       if (!pair) {
+add_pair:
+               pair = l_new(struct setting_data, 1);
+               pair->key = l_strdup(key);
+               pair->value = value;
+               l_queue_push_tail(group->settings, pair);
+
+               return true;
+       }
+
+       l_free(pair->value);
+       pair->value = value;
+
+       return true;
+}
+
+LIB_EXPORT bool l_settings_set_value(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       const char *value)
+{
+       if (unlikely(!settings || !value))
+               return false;
+
+       return set_value(settings, group_name, key, l_strdup(value));
+}
+
+LIB_EXPORT bool l_settings_get_bool(const struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       bool *out)
+{
+       const char *value;
+
+       value = l_settings_get_value(settings, group_name, key);
+       if (!value)
+               return false;
+
+       if (!strcasecmp(value, "true") || !strcmp(value, "1")) {
+               if (out)
+                       *out = true;
+
+               return true;
+       }
+
+       if (!strcasecmp(value, "false") || !strcmp(value, "0")) {
+               if (out)
+                       *out = false;
+
+               return true;
+       }
+
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as a bool", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_bool(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       bool in)
+{
+       static const char *true_str = "true";
+       static const char *false_str = "false";
+       const char *v;
+
+       if (in == false)
+               v = false_str;
+       else
+               v = true_str;
+
+       return l_settings_set_value(settings, group_name, key, v);
+}
+
+LIB_EXPORT bool l_settings_get_int(const struct l_settings *settings,
+                                       const char *group_name,
+                                       const char *key, int *out)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       long int r;
+       int t;
+       char *endp;
+
+       if (!value)
+               return false;
+
+       if (*value == '\0')
+               goto error;
+
+       errno = 0;
+
+       t = r = strtol(value, &endp, 10);
+       if (*endp != '\0')
+               goto error;
+
+       if (unlikely(errno == ERANGE || r != t))
+               goto error;
+
+       if (out)
+               *out = r;
+
+       return true;
+
+error:
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as an int", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_int(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       int in)
+{
+       char buf[64];
+
+       snprintf(buf, sizeof(buf), "%d", in);
+
+       return l_settings_set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT bool l_settings_get_uint(const struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       unsigned int *out)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       unsigned long int r;
+       unsigned int t;
+       char *endp;
+
+       if (!value)
+               return false;
+
+       if (*value == '\0')
+               goto error;
+
+       errno = 0;
+
+       t = r = strtoul(value, &endp, 10);
+       if (*endp != '\0')
+               goto error;
+
+       if (unlikely(errno == ERANGE || r != t))
+               goto error;
+
+       if (out)
+               *out = r;
+
+       return true;
+
+error:
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as a uint", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_uint(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       unsigned int in)
+{
+       char buf[64];
+
+       snprintf(buf, sizeof(buf), "%u", in);
+
+       return l_settings_set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT bool l_settings_get_int64(const struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       int64_t *out)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       int64_t r;
+       char *endp;
+
+       if (!value)
+               return false;
+
+       if (*value == '\0')
+               goto error;
+
+       errno = 0;
+
+       r = strtoll(value, &endp, 10);
+       if (*endp != '\0')
+               goto error;
+
+       if (unlikely(errno == ERANGE))
+               goto error;
+
+       if (out)
+               *out = r;
+
+       return true;
+
+error:
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as an int64", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_int64(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       int64_t in)
+{
+       char buf[64];
+
+       snprintf(buf, sizeof(buf), "%" PRId64, in);
+
+       return l_settings_set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT bool l_settings_get_uint64(const struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       uint64_t *out)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       uint64_t r;
+       char *endp;
+
+       if (!value)
+               return false;
+
+       if (*value == '\0')
+               goto error;
+
+       errno = 0;
+
+       r = strtoull(value, &endp, 10);
+       if (*endp != '\0')
+               goto error;
+
+       if (unlikely(errno == ERANGE))
+               goto error;
+
+       if (out)
+               *out = r;
+
+       return true;
+
+error:
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as a uint64", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_uint64(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       uint64_t in)
+{
+       char buf[64];
+
+       snprintf(buf, sizeof(buf), "%" PRIu64, in);
+
+       return l_settings_set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT char *l_settings_get_string(const struct l_settings *settings,
+                                       const char *group_name, const char *key)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+
+       if (!value)
+               return NULL;
+
+       return unescape_value(value);
+}
+
+LIB_EXPORT bool l_settings_set_string(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       const char *value)
+{
+       char *buf;
+
+       if (unlikely(!settings || !value))
+               return false;
+
+       buf = escape_value(value);
+
+       return set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT char **l_settings_get_string_list(const struct l_settings *settings,
+                                               const char *group_name,
+                                               const char *key,
+                                               const char delimiter)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       char *str;
+       char **ret;
+
+       if (!value)
+               return NULL;
+
+       str = unescape_value(value);
+       if (str == NULL)
+               return NULL;
+
+       ret = l_strsplit(str, delimiter);
+       l_free(str);
+
+       return ret;
+}
+
+LIB_EXPORT bool l_settings_set_string_list(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       char **value, char delimiter)
+{
+       char *buf;
+       char *tmp;
+
+       if (unlikely(!settings || !value))
+               return false;
+
+       tmp = l_strjoinv(value, delimiter);
+       buf = escape_value(tmp);
+       l_free(tmp);
+
+       return set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT bool l_settings_get_double(const struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       double *out)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       char *endp;
+       double r;
+
+       if (!value)
+               return NULL;
+
+       if (*value == '\0')
+               goto error;
+
+       errno = 0;
+
+       r = strtod(value, &endp);
+       if (*endp != '\0')
+               goto error;
+
+       if (unlikely(errno == ERANGE))
+               goto error;
+
+       if (out)
+               *out = r;
+
+       return true;
+
+error:
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as a double", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_double(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       double in)
+{
+       L_AUTO_FREE_VAR(char *, buf);
+
+       buf = l_strdup_printf("%f", in);
+
+       return l_settings_set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT bool l_settings_get_float(const struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       float *out)
+{
+       const char *value = l_settings_get_value(settings, group_name, key);
+       char *endp;
+       float r;
+
+       if (!value)
+               return NULL;
+
+       if (*value == '\0')
+               goto error;
+
+       errno = 0;
+
+       r = strtof(value, &endp);
+       if (*endp != '\0')
+               goto error;
+
+       if (unlikely(errno == ERANGE))
+               goto error;
+
+       if (out)
+               *out = r;
+
+       return true;
+
+error:
+       l_util_debug(settings->debug_handler, settings->debug_data,
+                       "Could not interpret %s as a float", value);
+
+       return false;
+}
+
+LIB_EXPORT bool l_settings_set_float(struct l_settings *settings,
+                                       const char *group_name, const char *key,
+                                       float in)
+{
+       L_AUTO_FREE_VAR(char *, buf);
+
+       buf = l_strdup_printf("%f", in);
+
+       return l_settings_set_value(settings, group_name, key, buf);
+}
+
+LIB_EXPORT bool l_settings_remove_group(struct l_settings *settings,
+                                       const char *group_name)
+{
+       struct group_data *group;
+
+       if (unlikely(!settings))
+               return false;
+
+       group = l_queue_remove_if(settings->groups, group_match, group_name);
+       if (!group)
+               return false;
+
+       group_destroy(group);
+
+       return true;
+}
+
+LIB_EXPORT bool l_settings_remove_key(struct l_settings *settings,
+                                       const char *group_name,
+                                       const char *key)
+{
+       struct group_data *group;
+       struct setting_data *setting;
+
+       if (unlikely(!settings))
+               return false;
+
+       group = l_queue_find(settings->groups, group_match, group_name);
+       if (!group)
+               return false;
+
+       setting = l_queue_remove_if(group->settings, key_match, key);
+       if (!setting)
+               return false;
+
+       setting_destroy(setting);
+
+       return true;
+}
+
+static void gather_embedded_groups(void *data, void *user_data)
+{
+       struct embedded_group_data *group_data = data;
+       struct gather_data *gather = user_data;
+
+       gather->v[gather->cur++] = l_strdup(group_data->name);
+}
+
+LIB_EXPORT char **l_settings_get_embedded_groups(struct l_settings *settings)
+{
+       char **ret;
+       struct gather_data gather;
+
+       if (unlikely(!settings))
+               return NULL;
+
+       ret = l_new(char *, l_queue_length(settings->groups) + 1);
+       gather.v = ret;
+       gather.cur = 0;
+
+       l_queue_foreach(settings->embedded_groups, gather_embedded_groups,
+                               &gather);
+
+       return ret;
+}
+
+static bool embedded_group_match(const void *a, const void *b)
+{
+       const struct embedded_group_data *group = a;
+       const char *name = b;
+
+       return !strcmp(group->name, name);
+}
+
+LIB_EXPORT bool l_settings_has_embedded_group(struct l_settings *settings,
+                                               const char *group)
+{
+       struct embedded_group_data *group_data;
+
+       if (unlikely(!settings))
+               return false;
+
+       group_data = l_queue_find(settings->embedded_groups,
+                                       embedded_group_match, group);
+
+       return group_data != NULL;
+}
+
+LIB_EXPORT const char *l_settings_get_embedded_value(
+                                               struct l_settings *settings,
+                                               const char *group_name,
+                                               const char **out_type)
+{
+       struct embedded_group_data *group;
+
+       if (unlikely(!settings))
+               return false;
+
+       group = l_queue_find(settings->embedded_groups,
+                                       embedded_group_match, group_name);
+       if (!group)
+               return NULL;
+
+       if (out_type)
+               *out_type = group->type;
+
+       return group->data;
+}
diff --git a/ell/settings.h b/ell/settings.h
new file mode 100644 (file)
index 0000000..e4203af
--- /dev/null
@@ -0,0 +1,137 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_SETTINGS_H
+#define __ELL_SETTINGS_H
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_settings;
+
+typedef void (*l_settings_debug_cb_t) (const char *str, void *user_data);
+typedef void (*l_settings_destroy_cb_t) (void *user_data);
+
+struct l_settings *l_settings_new(void);
+void l_settings_free(struct l_settings *settings);
+
+bool l_settings_load_from_data(struct l_settings *settings,
+                                               const char *data, size_t len);
+char *l_settings_to_data(const struct l_settings *settings, size_t *len);
+
+bool l_settings_load_from_file(struct l_settings *settings,
+                                       const char *filename);
+
+bool l_settings_set_debug(struct l_settings *settings,
+                               l_settings_debug_cb_t callback,
+                               void *user_data,
+                               l_settings_destroy_cb_t destroy);
+
+char **l_settings_get_groups(const struct l_settings *settings);
+char **l_settings_get_keys(const struct l_settings *settings,
+                                                       const char *group_name);
+
+bool l_settings_has_group(const struct l_settings *settings,
+                                                       const char *group_name);
+bool l_settings_has_key(const struct l_settings *settings,
+                               const char *group_name, const char *key);
+
+const char *l_settings_get_value(const struct l_settings *settings,
+                                       const char *group_name,
+                                       const char *key);
+bool l_settings_set_value(struct l_settings *settings, const char *group_name,
+                               const char *key, const char *value);
+
+bool l_settings_get_bool(const struct l_settings *settings,
+                               const char *group_name,
+                               const char *key, bool *out);
+bool l_settings_set_bool(struct l_settings *settings, const char *group_name,
+                               const char *key, bool in);
+
+bool l_settings_get_int(const struct l_settings *settings,
+                       const char *group_name, const char *key, int *out);
+bool l_settings_set_int(struct l_settings *settings, const char *group_name,
+                               const char *key, int in);
+
+bool l_settings_get_uint(const struct l_settings *settings,
+                               const char *group_name,
+                               const char *key, unsigned int *out);
+bool l_settings_set_uint(struct l_settings *settings, const char *group_name,
+                               const char *key, unsigned int in);
+
+bool l_settings_get_int64(const struct l_settings *settings,
+                               const char *group_name,
+                               const char *key, int64_t *out);
+bool l_settings_set_int64(struct l_settings *settings, const char *group_name,
+                               const char *key, int64_t in);
+
+bool l_settings_get_uint64(const struct l_settings *settings,
+                               const char *group_name,
+                               const char *key, uint64_t *out);
+bool l_settings_set_uint64(struct l_settings *settings, const char *group_name,
+                               const char *key, uint64_t in);
+
+char *l_settings_get_string(const struct l_settings *settings,
+                               const char *group_name, const char *key);
+bool l_settings_set_string(struct l_settings *settings, const char *group_name,
+                               const char *key, const char *value);
+
+char **l_settings_get_string_list(const struct l_settings *settings,
+                                       const char *group_name,
+                                       const char *key, char delimiter);
+bool l_settings_set_string_list(struct l_settings *settings,
+                                       const char *group_name,
+                                       const char *key, char **list,
+                                       char delimiter);
+
+bool l_settings_get_double(const struct l_settings *settings,
+                               const char *group_name,
+                               const char *key, double *out);
+bool l_settings_set_double(struct l_settings *settings, const char *group_name,
+                               const char *key, double in);
+
+bool l_settings_get_float(const struct l_settings *settings,
+                               const char *group_name,
+                               const char *key, float *out);
+bool l_settings_set_float(struct l_settings *settings, const char *group_name,
+                               const char *key, float in);
+
+bool l_settings_remove_key(struct l_settings *settings, const char *group_name,
+                               const char *key);
+bool l_settings_remove_group(struct l_settings *settings,
+                               const char *group_name);
+
+char **l_settings_get_embedded_groups(struct l_settings *settings);
+bool l_settings_has_embedded_group(struct l_settings *settings,
+                                       const char *group);
+const char *l_settings_get_embedded_value(struct l_settings *settings,
+                                               const char *group_name,
+                                               const char **out_type);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_SETTINGS_H */
diff --git a/ell/signal.c b/ell/signal.c
new file mode 100644 (file)
index 0000000..2afdb45
--- /dev/null
@@ -0,0 +1,268 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/epoll.h>
+#include <sys/signalfd.h>
+
+#include "util.h"
+#include "io.h"
+#include "queue.h"
+#include "signal.h"
+#include "private.h"
+
+/**
+ * SECTION:signal
+ * @short_description: Unix signal support
+ *
+ * Unix signal support
+ */
+
+/**
+ * l_signal:
+ *
+ * Opague object representing the signal.
+ */
+struct l_signal {
+       struct signal_desc *desc;
+       l_signal_notify_cb_t callback;
+       void *user_data;
+       l_signal_destroy_cb_t destroy;
+};
+
+struct signal_desc {
+       uint32_t signo;
+       struct l_queue *callbacks;
+};
+
+static struct l_io *signalfd_io = NULL;
+static struct l_queue *signal_list = NULL;
+static sigset_t signal_mask;
+
+static void handle_callback(struct signal_desc *desc)
+{
+       const struct l_queue_entry *entry;
+
+       for (entry = l_queue_get_entries(desc->callbacks); entry;
+                                                       entry = entry->next) {
+               struct l_signal *signal = entry->data;
+
+               if (signal->callback)
+                       signal->callback(signal->user_data);
+       }
+}
+
+static bool desc_match_signo(const void *a, const void *b)
+{
+       const struct signal_desc *desc = a;
+       uint32_t signo = L_PTR_TO_UINT(b);
+
+       return (desc->signo == signo);
+}
+
+static bool signalfd_read_cb(struct l_io *io, void *user_data)
+{
+       int fd = l_io_get_fd(io);
+       struct signal_desc *desc;
+       struct signalfd_siginfo si;
+       ssize_t result;
+
+       result = read(fd, &si, sizeof(si));
+       if (result != sizeof(si))
+               return true;
+
+       desc = l_queue_find(signal_list, desc_match_signo,
+                                               L_UINT_TO_PTR(si.ssi_signo));
+       if (desc)
+               handle_callback(desc);
+
+       return true;
+}
+
+static bool signalfd_add(int signo)
+{
+       int fd;
+
+       if (!signalfd_io) {
+               fd = -1;
+               sigemptyset(&signal_mask);
+       } else
+               fd = l_io_get_fd(signalfd_io);
+
+       sigaddset(&signal_mask, signo);
+
+       fd = signalfd(fd, &signal_mask, SFD_CLOEXEC);
+       if (fd < 0)
+               return false;
+
+       if (signalfd_io)
+               return true;
+
+       signalfd_io = l_io_new(fd);
+       if (!signalfd_io) {
+               close(fd);
+               return false;
+       }
+
+       l_io_set_close_on_destroy(signalfd_io, true);
+
+       if (!l_io_set_read_handler(signalfd_io, signalfd_read_cb, NULL, NULL)) {
+               l_io_destroy(signalfd_io);
+               return false;
+       }
+
+       signal_list = l_queue_new();
+
+       return true;
+}
+
+static void signalfd_remove(int signo)
+{
+       if (!signalfd_io)
+               return;
+
+       sigdelset(&signal_mask, signo);
+
+       if (!sigisemptyset(&signal_mask)) {
+               signalfd(l_io_get_fd(signalfd_io), &signal_mask, SFD_CLOEXEC);
+               return;
+       }
+
+       l_io_destroy(signalfd_io);
+       signalfd_io = NULL;
+
+       l_queue_destroy(signal_list, NULL);
+       signal_list = NULL;
+}
+
+/**
+ * l_signal_create:
+ * @callback: signal callback function
+ * @user_data: user data provided to signal callback function
+ * @destroy: destroy function for user data
+ *
+ * Create new signal callback handling for a given set of signals.
+ *
+ * Returns: a newly allocated #l_signal object
+ **/
+LIB_EXPORT struct l_signal *l_signal_create(uint32_t signo,
+                               l_signal_notify_cb_t callback,
+                               void *user_data, l_signal_destroy_cb_t destroy)
+{
+       struct l_signal *signal;
+       struct signal_desc *desc;
+       sigset_t mask, oldmask;
+
+       if (signo <= 1 || signo >= _NSIG)
+               return NULL;
+
+       signal = l_new(struct l_signal, 1);
+       signal->callback = callback;
+       signal->destroy = destroy;
+       signal->user_data = user_data;
+
+       desc = l_queue_find(signal_list, desc_match_signo,
+                                               L_UINT_TO_PTR(signo));
+       if (desc)
+               goto done;
+
+       sigemptyset(&mask);
+       sigaddset(&mask, signo);
+
+       if (sigprocmask(SIG_BLOCK, &mask, &oldmask) < 0) {
+               l_free(signal);
+               return NULL;
+       }
+
+       if (!signalfd_add(signo)) {
+               sigprocmask(SIG_SETMASK, &oldmask, NULL);
+               l_free(signal);
+               return NULL;
+       }
+
+       desc = l_new(struct signal_desc, 1);
+       desc->signo = signo;
+       desc->callbacks = l_queue_new();
+
+       l_queue_push_tail(signal_list, desc);
+
+done:
+       l_queue_push_tail(desc->callbacks, signal);
+       signal->desc = desc;
+       return signal;
+}
+
+/**
+ * l_signal_remove:
+ * @signal: signal object
+ *
+ * Remove signal handling.
+ **/
+LIB_EXPORT void l_signal_remove(struct l_signal *signal)
+{
+       struct signal_desc *desc;
+       sigset_t mask;
+
+       if (!signal)
+               return;
+
+       desc = signal->desc;
+       l_queue_remove(desc->callbacks, signal);
+
+       /*
+        * As long as the signal descriptor has callbacks registered, it is
+        * still needed to be active.
+        */
+       if (!l_queue_isempty(desc->callbacks))
+               goto done;
+
+       if (!l_queue_remove(signal_list, desc))
+               goto done;
+
+       sigemptyset(&mask);
+       sigaddset(&mask, desc->signo);
+
+       /*
+        * When the number of signals goes to zero, then this will close
+        * the signalfd file descriptor, otherwise it will only adjust the
+        * signal mask to account for the removed signal.
+        *
+        */
+       signalfd_remove(desc->signo);
+       sigprocmask(SIG_UNBLOCK, &mask, NULL);
+       l_queue_destroy(desc->callbacks, NULL);
+       l_free(desc);
+
+done:
+       if (signal->destroy)
+               signal->destroy(signal->user_data);
+
+       l_free(signal);
+}
diff --git a/ell/signal.h b/ell/signal.h
new file mode 100644 (file)
index 0000000..1d98476
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_SIGNAL_H
+#define __ELL_SIGNAL_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_signal;
+
+typedef void (*l_signal_notify_cb_t) (void *user_data);
+typedef void (*l_signal_destroy_cb_t) (void *user_data);
+
+struct l_signal *l_signal_create(uint32_t signo, l_signal_notify_cb_t callback,
+                               void *user_data, l_signal_destroy_cb_t destroy);
+void l_signal_remove(struct l_signal *signal);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_SIGNAL_H */
diff --git a/ell/siphash-private.h b/ell/siphash-private.h
new file mode 100644 (file)
index 0000000..02e9ed0
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <string.h>
+#include <stdint.h>
+
+void _siphash24(uint8_t out[8], const uint8_t *in, size_t inlen,
+                                               const uint8_t k[16]);
diff --git a/ell/siphash.c b/ell/siphash.c
new file mode 100644 (file)
index 0000000..a37d228
--- /dev/null
@@ -0,0 +1,138 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "siphash-private.h"
+
+/*
+ * Based on public domain SipHash reference C implementation
+ *
+ * Written in 2012 by
+ * Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
+ * Daniel J. Bernstein <djb@cr.yp.to>
+ *
+ */
+
+#define ROTL(x,b) (uint64_t) (((x) << (b)) | ((x) >> (64 - (b))))
+
+#define U32TO8_LE(p, v)                        \
+       (p)[0] = (uint8_t) ((v));       \
+       (p)[1] = (uint8_t) ((v) >>  8); \
+       (p)[2] = (uint8_t) ((v) >> 16); \
+       (p)[3] = (uint8_t) ((v) >> 24);
+
+#define U64TO8_LE(p, v)                                        \
+       U32TO8_LE((p), (uint32_t) ((v)));               \
+       U32TO8_LE((p) + 4, (uint32_t) ((v) >> 32));
+
+#define U8TO64_LE(p)                   \
+       (((uint64_t) ((p)[0])) |        \
+       ((uint64_t) ((p)[1]) <<  8) |   \
+       ((uint64_t) ((p)[2]) << 16) |   \
+       ((uint64_t) ((p)[3]) << 24) |   \
+       ((uint64_t) ((p)[4]) << 32) |   \
+       ((uint64_t) ((p)[5]) << 40) |   \
+       ((uint64_t) ((p)[6]) << 48) |   \
+       ((uint64_t) ((p)[7]) << 56))
+
+#define SIPROUND                               \
+       do {                                    \
+               v0 += v1; v1=ROTL(v1, 13);      \
+               v1 ^= v0; v0=ROTL(v0, 32);      \
+               v2 += v3; v3=ROTL(v3, 16);      \
+               v3 ^= v2;                       \
+               v0 += v3; v3=ROTL(v3, 21);      \
+               v3 ^= v0;                       \
+               v2 += v1; v1=ROTL(v1, 17);      \
+               v1 ^= v2; v2=ROTL(v2, 32);      \
+       } while(0)
+
+void _siphash24(uint8_t out[8], const uint8_t *in, size_t inlen,
+                                               const uint8_t k[16])
+{
+       /* "somepseudorandomlygeneratedbytes" */
+       uint64_t v0 = 0x736f6d6570736575ULL;
+       uint64_t v1 = 0x646f72616e646f6dULL;
+       uint64_t v2 = 0x6c7967656e657261ULL;
+       uint64_t v3 = 0x7465646279746573ULL;
+       uint64_t b;
+       uint64_t k0 = U8TO64_LE(k);
+       uint64_t k1 = U8TO64_LE(k + 8);
+       uint64_t m;
+       const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t));
+       const int left = inlen & 7;
+
+       b = ((uint64_t) inlen) << 56;
+       v3 ^= k1;
+       v2 ^= k0;
+       v1 ^= k1;
+       v0 ^= k0;
+
+       for (; in != end; in += 8) {
+               m = U8TO64_LE(in);
+               v3 ^= m;
+               SIPROUND;
+               SIPROUND;
+               v0 ^= m;
+       }
+
+       switch (left) {
+       case 7:
+               b |= ((uint64_t) in[6]) << 48;
+               /* fall through */
+       case 6:
+               b |= ((uint64_t) in[5]) << 40;
+               /* fall through */
+       case 5:
+               b |= ((uint64_t) in[4]) << 32;
+               /* fall through */
+       case 4:
+               b |= ((uint64_t) in[3]) << 24;
+               /* fall through */
+       case 3:
+               b |= ((uint64_t) in[2]) << 16;
+               /* fall through */
+       case 2:
+               b |= ((uint64_t) in[1]) << 8;
+               /* fall through */
+       case 1:
+               b |= ((uint64_t) in[0]);
+               break;
+       case 0:
+               break;
+       }
+
+       v3 ^= b;
+       SIPROUND;
+       SIPROUND;
+       v0 ^= b;
+       v2 ^= 0xff;
+       SIPROUND;
+       SIPROUND;
+       SIPROUND;
+       SIPROUND;
+       b = v0 ^ v1 ^ v2  ^ v3;
+       U64TO8_LE(out, b);
+}
diff --git a/ell/string.c b/ell/string.c
new file mode 100644 (file)
index 0000000..37806e3
--- /dev/null
@@ -0,0 +1,518 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+
+#include "util.h"
+#include "strv.h"
+#include "string.h"
+#include "private.h"
+
+/**
+ * SECTION:string
+ * @short_description: Growable string buffer
+ *
+ * Growable string buffer support
+ */
+
+/**
+ * l_string:
+ *
+ * Opague object representing the string buffer.
+ */
+struct l_string {
+       size_t max;
+       size_t len;
+       char *str;
+};
+
+static inline size_t next_power(size_t len)
+{
+       size_t n = 1;
+
+       if (len > SIZE_MAX / 2)
+               return SIZE_MAX;
+
+       while (n < len)
+               n = n << 1;
+
+       return n;
+}
+
+static void grow_string(struct l_string *str, size_t extra)
+{
+       if (str->len + extra < str->max)
+               return;
+
+       str->max = next_power(str->len + extra + 1);
+       str->str = l_realloc(str->str, str->max);
+}
+
+/**
+ * l_string_new:
+ * @initial_length: Initial length of the groable string
+ *
+ * Create new growable string.  If the @initial_length is 0, then a safe
+ * default is chosen.
+ *
+ * Returns: a newly allocated #l_string object.
+ **/
+LIB_EXPORT struct l_string *l_string_new(size_t initial_length)
+{
+       static const size_t DEFAULT_INITIAL_LENGTH = 127;
+       struct l_string *ret;
+
+       ret = l_new(struct l_string, 1);
+
+       if (initial_length == 0)
+               initial_length = DEFAULT_INITIAL_LENGTH;
+
+       grow_string(ret, initial_length);
+       ret->str[0] = '\0';
+
+       return ret;
+}
+
+/**
+ * l_string_free:
+ * @string: growable string object
+ *
+ * Free the growable string object and all associated data
+ **/
+LIB_EXPORT void l_string_free(struct l_string *string)
+{
+       if (unlikely(!string))
+               return;
+
+       l_free(string->str);
+       l_free(string);
+}
+
+/**
+ * l_string_unwrap:
+ * @string: growable string object
+ *
+ * Free the growable string object and return the internal string data.
+ * The caller is responsible for freeing the string data using l_free(),
+ * and the string object is no longer usable.
+ *
+ * Returns: @string's internal buffer
+ **/
+LIB_EXPORT char *l_string_unwrap(struct l_string *string)
+{
+       char *result;
+
+       if (unlikely(!string))
+               return NULL;
+
+       result = string->str;
+
+       l_free(string);
+
+       return result;
+}
+
+/**
+ * l_string_append:
+ * @dest: growable string object
+ * @src: C-style string to copy
+ *
+ * Appends the contents of @src to @dest.  The internal buffer of @dest is
+ * grown if necessary.
+ *
+ * Returns: @dest
+ **/
+LIB_EXPORT struct l_string *l_string_append(struct l_string *dest,
+                                               const char *src)
+{
+       size_t size;
+
+       if (unlikely(!dest || !src))
+               return NULL;
+
+       size = strlen(src);
+
+       grow_string(dest, size);
+
+       memcpy(dest->str + dest->len, src, size);
+       dest->len += size;
+       dest->str[dest->len] = '\0';
+
+       return dest;
+}
+
+/**
+ * l_string_append_c:
+ * @dest: growable string object
+ * @c: Character
+ *
+ * Appends character given by @c to @dest.  The internal buffer of @dest is
+ * grown if necessary.
+ *
+ * Returns: @dest
+ **/
+LIB_EXPORT struct l_string *l_string_append_c(struct l_string *dest,
+                                               const char c)
+{
+       if (unlikely(!dest))
+               return NULL;
+
+       grow_string(dest, 1);
+       dest->str[dest->len++] = c;
+       dest->str[dest->len] = '\0';
+
+       return dest;
+}
+
+/**
+ * l_string_append_fixed:
+ * @dest: growable string object
+ * @src: Character array to copy from
+ * @max: Maximum number of characters to copy
+ *
+ * Appends the contents of a fixed size string array @src to @dest.
+ * The internal buffer of @dest is grown if necessary.  Up to a maximum of
+ * @max characters are copied.  If a null is encountered in the first @max
+ * characters, the string is copied only up to the NULL character.
+ *
+ * Returns: @dest
+ **/
+LIB_EXPORT struct l_string *l_string_append_fixed(struct l_string *dest,
+                                                       const char *src,
+                                                       size_t max)
+{
+       const char *nul;
+
+       if (unlikely(!dest || !src || !max))
+               return NULL;
+
+       nul = memchr(src, 0, max);
+       if (nul)
+               max = nul - src;
+
+       grow_string(dest, max);
+
+       memcpy(dest->str + dest->len, src, max);
+       dest->len += max;
+       dest->str[dest->len] = '\0';
+
+       return dest;
+}
+
+/**
+ * l_string_append_vprintf:
+ * @dest: growable string object
+ * @format: the string format.  See the sprintf() documentation
+ * @args: the parameters to insert
+ *
+ * Appends a formatted string to the growable string buffer.  This function
+ * is equivalent to l_string_append_printf except that the arguments are
+ * passed as a va_list.
+ **/
+LIB_EXPORT void l_string_append_vprintf(struct l_string *dest,
+                                       const char *format, va_list args)
+{
+       size_t len;
+       size_t have_space;
+       va_list args_copy;
+
+       if (unlikely(!dest))
+               return;
+
+#if __STDC_VERSION__ > 199409L
+       va_copy(args_copy, args);
+#else
+       __va_copy(args_copy, args);
+#endif
+
+       have_space = dest->max - dest->len;
+       len = vsnprintf(dest->str + dest->len, have_space, format, args);
+
+       if (len >= have_space) {
+               grow_string(dest, len);
+               len = vsprintf(dest->str + dest->len, format, args_copy);
+       }
+
+       dest->len += len;
+
+       va_end(args_copy);
+}
+
+/**
+ * l_string_append_printf:
+ * @dest: growable string object
+ * @format: the string format.  See the sprintf() documentation
+ * @...: the parameters to insert
+ *
+ * Appends a formatted string to the growable string buffer, growing it as
+ * necessary.
+ **/
+LIB_EXPORT void l_string_append_printf(struct l_string *dest,
+                                       const char *format, ...)
+{
+       va_list args;
+
+       if (unlikely(!dest))
+               return;
+
+       va_start(args, format);
+       l_string_append_vprintf(dest, format, args);
+       va_end(args);
+}
+
+/**
+ * l_string_length:
+ * @string: growable string object
+ *
+ * Returns: bytes used in the string.
+ **/
+LIB_EXPORT unsigned int l_string_length(struct l_string *string)
+{
+       if (unlikely(!string))
+               return 0;
+
+       return string->len;
+}
+
+LIB_EXPORT struct l_string *l_string_truncate(struct l_string *string,
+                                                       size_t new_size)
+{
+       if (unlikely(!string))
+               return NULL;
+
+       if (new_size >= string->len)
+               return string;
+
+       string->len = new_size;
+       string->str[new_size] = '\0';
+
+       return string;
+}
+
+struct arg {
+       size_t max_len;
+       size_t cur_len;
+       char *chars;
+};
+
+static inline void arg_init(struct arg *arg)
+{
+       arg->max_len = 0;
+       arg->cur_len = 0;
+       arg->chars = NULL;
+}
+
+static void arg_putchar(struct arg *arg, char ch)
+{
+       if (arg->cur_len == arg->max_len) {
+               arg->max_len += 32; /* Grow by at least 32 bytes */
+               arg->chars = l_realloc(arg->chars, 1 + arg->max_len);
+       }
+
+       arg->chars[arg->cur_len++] = ch;
+       arg->chars[arg->cur_len] = '\0';
+}
+
+static void arg_putmem(struct arg *arg, const void *mem, size_t len)
+{
+       if (len == 0)
+               return;
+
+       if (arg->cur_len + len > arg->max_len) {
+               size_t growby = len * 2;
+
+               if (growby < 32)
+                       growby = 32;
+
+               arg->max_len += growby;
+               arg->chars = l_realloc(arg->chars, 1 + arg->max_len);
+       }
+
+       memcpy(arg->chars + arg->cur_len, mem, len);
+       arg->cur_len += len;
+       arg->chars[arg->cur_len] = '\0';
+}
+
+static bool parse_backslash(struct arg *arg, const char *args, size_t *pos)
+{
+       /* We're at the backslash, not within double quotes */
+       char c = args[*pos + 1];
+
+       switch (c) {
+       case 0:
+               return false;
+       case '\n':
+               break;
+       default:
+               arg_putchar(arg, c);
+               break;
+       }
+
+       *pos += 1;
+       return true;
+}
+
+static bool parse_quoted_backslash(struct arg *arg,
+                                               const char *args, size_t *pos)
+{
+       /* We're at the backslash, within double quotes */
+       char c = args[*pos + 1];
+
+       switch (c) {
+       case 0:
+               return false;
+       case '\n':
+               break;
+       case '"':
+       case '\\':
+               arg_putchar(arg, c);
+               break;
+       default:
+               arg_putchar(arg, '\\');
+               arg_putchar(arg, c);
+               break;
+       }
+
+       *pos += 1;
+       return true;
+}
+
+static bool parse_single_quote(struct arg *arg, const char *args, size_t *pos)
+{
+       /* We're just past the single quote */
+       size_t start = *pos;
+
+       for (; args[*pos]; *pos += 1) {
+               if (args[*pos] != '\'')
+                       continue;
+
+               arg_putmem(arg, args + start, *pos - start);
+               return true;
+       }
+
+       /* Unterminated ' */
+       return false;
+}
+
+static bool parse_double_quote(struct arg *arg, const char *args, size_t *pos)
+{
+       /* We're just past the double quote */
+       for (; args[*pos]; *pos += 1) {
+               char c = args[*pos];
+
+               switch (c) {
+               case '"':
+                       return true;
+               case '\\':
+                       if (!parse_quoted_backslash(arg, args, pos))
+                               return false;
+
+                       break;
+               default:
+                       arg_putchar(arg, c);
+                       break;
+               }
+       }
+
+       /* Unterminated */
+       return false;
+}
+
+static void add_arg(char ***args, char *arg, int *n_args)
+{
+       *args = l_realloc(*args, sizeof(char *) * (2 + *n_args));
+       (*args)[*n_args] = arg;
+       (*args)[*n_args + 1] = NULL;
+
+       *n_args += 1;
+}
+
+LIB_EXPORT char **l_parse_args(const char *args, int *out_n_args)
+{
+       size_t i;
+       struct arg arg;
+       char **ret = l_realloc(NULL, sizeof(char *));
+       int n_args = 0;
+
+       ret[0] = NULL;
+       arg_init(&arg);
+
+       for (i = 0; args[i]; i++) {
+               switch (args[i]) {
+               case '\\':
+                       if (!parse_backslash(&arg, args, &i))
+                               goto error;
+                       break;
+               case '"':
+                       i += 1;
+                       if (!parse_double_quote(&arg, args, &i))
+                               goto error;
+
+                       /* Add an empty string */
+                       if (!arg.cur_len)
+                               add_arg(&ret, l_strdup(""), &n_args);
+
+                       break;
+               case '\'':
+                       i += 1;
+                       if (!parse_single_quote(&arg, args, &i))
+                               goto error;
+
+                       /* Add an empty string */
+                       if (!arg.cur_len)
+                               add_arg(&ret, l_strdup(""), &n_args);
+
+                       break;
+               default:
+                       if (!strchr(" \t", args[i])) {
+                               if (args[i] == '\n')
+                                       goto error;
+
+                               arg_putchar(&arg, args[i]);
+                               continue;
+                       }
+
+                       if (arg.cur_len)
+                               add_arg(&ret, arg.chars, &n_args);
+
+                       arg_init(&arg);
+                       break;
+               }
+       }
+
+       if (arg.cur_len)
+               add_arg(&ret, arg.chars, &n_args);
+
+       if (out_n_args)
+               *out_n_args = n_args;
+
+       return ret;
+
+error:
+       l_free(arg.chars);
+       l_strfreev(ret);
+       return NULL;
+}
diff --git a/ell/string.h b/ell/string.h
new file mode 100644 (file)
index 0000000..c1948ec
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_STRING_H
+#define __ELL_STRING_H
+
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_string;
+
+struct l_string *l_string_new(size_t initial_length);
+void l_string_free(struct l_string *string);
+char *l_string_unwrap(struct l_string *string);
+
+struct l_string *l_string_append(struct l_string *dest, const char *src);
+struct l_string *l_string_append_c(struct l_string *dest, const char c);
+struct l_string *l_string_append_fixed(struct l_string *dest, const char *src,
+                                       size_t max);
+
+void l_string_append_vprintf(struct l_string *dest,
+                                       const char *format, va_list args);
+void l_string_append_printf(struct l_string *dest, const char *format, ...)
+                                       __attribute__((format(printf, 2, 3)));
+
+struct l_string *l_string_truncate(struct l_string *string, size_t new_size);
+
+unsigned int l_string_length(struct l_string *string);
+
+char **l_parse_args(const char *args, int *out_n_args);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_STRING_H */
diff --git a/ell/strv.c b/ell/strv.c
new file mode 100644 (file)
index 0000000..7c7dbf5
--- /dev/null
@@ -0,0 +1,361 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+
+#include "util.h"
+#include "strv.h"
+#include "private.h"
+
+/**
+ * SECTION:strv
+ * @short_description: String array functions
+ *
+ * String array functions
+ */
+
+/**
+ * l_strfreev:
+ * @strlist: String list to free
+ *
+ * Frees a list of strings
+ **/
+LIB_EXPORT void l_strfreev(char **strlist)
+{
+       l_strv_free(strlist);
+}
+
+/**
+ * l_strsplit:
+ * @str: String to split
+ * @sep: The delimiter character
+ *
+ * Splits a string into pieces which do not contain the delimiter character.
+ * As a special case, an empty string is returned as an empty array, e.g.
+ * an array with just the NULL element.
+ *
+ * Note that this function only works with ASCII delimiters.
+ *
+ * Returns: A newly allocated %NULL terminated string array.  This array
+ * should be freed using l_strfreev().
+ **/
+LIB_EXPORT char **l_strsplit(const char *str, const char sep)
+{
+       int len;
+       int i;
+       const char *p;
+       char **ret;
+
+       if (unlikely(!str))
+               return NULL;
+
+       if (str[0] == '\0')
+               return l_new(char *, 1);
+
+       for (p = str, len = 1; *p; p++)
+               if (*p == sep)
+                       len += 1;
+
+       ret = l_new(char *, len + 1);
+
+       i = 0;
+       p = str;
+       len = 0;
+
+       while (p[len]) {
+               if (p[len] != sep) {
+                       len += 1;
+                       continue;
+               }
+
+               ret[i++] = l_strndup(p, len);
+               p += len + 1;
+               len = 0;
+       }
+
+       ret[i++] = l_strndup(p, len);
+
+       return ret;
+}
+
+/**
+ * l_strsplit_set:
+ * @str: String to split
+ * @separators: A set of delimiters
+ *
+ * Splits a string into pieces which do not contain the delimiter characters
+ * that can be found in @separators.
+ * As a special case, an empty string is returned as an empty array, e.g.
+ * an array with just the NULL element.
+ *
+ * Note that this function only works with ASCII delimiters.
+ *
+ * Returns: A newly allocated %NULL terminated string array.  This array
+ * should be freed using l_strfreev().
+ **/
+LIB_EXPORT char **l_strsplit_set(const char *str, const char *separators)
+{
+       int len;
+       int i;
+       const char *p;
+       char **ret;
+       bool sep_table[256];
+
+       if (unlikely(!str))
+               return NULL;
+
+       if (str[0] == '\0')
+               return l_new(char *, 1);
+
+       memset(sep_table, 0, sizeof(sep_table));
+
+       for (p = separators; *p; p++)
+               sep_table[(unsigned char) *p] = true;
+
+       for (p = str, len = 1; *p; p++)
+               if (sep_table[(unsigned char) *p] == true)
+                       len += 1;
+
+       ret = l_new(char *, len + 1);
+
+       i = 0;
+       p = str;
+       len = 0;
+
+       while (p[len]) {
+               if (sep_table[(unsigned char) p[len]] != true) {
+                       len += 1;
+                       continue;
+               }
+
+               ret[i++] = l_strndup(p, len);
+               p += len + 1;
+               len = 0;
+       }
+
+       ret[i++] = l_strndup(p, len);
+
+       return ret;
+}
+
+/**
+ * l_strjoinv:
+ * @str_array: a %NULL terminated array of strings to join
+ * @delim: Delimiting character
+ *
+ * Joins strings contanied in the @str_array into one long string delimited
+ * by @delim.
+ *
+ * Returns: A newly allocated string that should be freed using l_free()
+ */
+LIB_EXPORT char *l_strjoinv(char **str_array, const char delim)
+{
+       size_t len = 0;
+       unsigned int i;
+       char *ret;
+       char *p;
+
+       if (unlikely(!str_array))
+               return NULL;
+
+       if (!str_array[0])
+               return l_strdup("");
+
+       for (i = 0; str_array[i]; i++)
+               len += strlen(str_array[i]);
+
+       len += 1 + i - 1;
+
+       ret = l_malloc(len);
+
+       p = stpcpy(ret, str_array[0]);
+
+       for (i = 1; str_array[i]; i++) {
+               *p++ = delim;
+               p = stpcpy(p, str_array[i]);
+       }
+
+       return ret;
+}
+
+/**
+ * l_strv_new:
+ *
+ * Returns: new emptry string array
+ **/
+LIB_EXPORT char **l_strv_new(void)
+{
+       return l_new(char *, 1);
+}
+
+/**
+ * l_strv_free:
+ * @str_array: a %NULL terminated array of strings
+ *
+ * Frees strings in @str_array and @str_array itself
+ **/
+LIB_EXPORT void l_strv_free(char **str_array)
+{
+       if (likely(str_array)) {
+               int i;
+
+               for (i = 0; str_array[i]; i++)
+                       l_free(str_array[i]);
+
+               l_free(str_array);
+       }
+}
+
+/**
+ * l_strv_length:
+ * @str_array: a %NULL terminated array of strings
+ *
+ * Returns: the number of strings in @str_array
+ */
+LIB_EXPORT unsigned int l_strv_length(char **str_array)
+{
+       unsigned int i = 0;
+
+       if (unlikely(!str_array))
+               return 0;
+
+       while (str_array[i])
+               i += 1;
+
+       return i;
+}
+
+/**
+ * l_strv_contains:
+ * @str_array: a %NULL terminated array of strings
+ * @item: An item to search for, must be not %NULL
+ *
+ * Returns: #true if @str_array contains item
+ */
+LIB_EXPORT bool l_strv_contains(char **str_array, const char *item)
+{
+       unsigned int i = 0;
+
+       if (unlikely(!str_array || !item))
+               return false;
+
+       while (str_array[i]) {
+               if (!strcmp(str_array[i], item))
+                       return true;
+
+               i += 1;
+       }
+
+       return false;
+}
+
+/**
+ * l_strv_append:
+ * @str_array: a %NULL terminated array of strings or %NULL
+ * @str: A string to be appened at the end of @str_array
+ *
+ * Returns: New %NULL terminated array of strings with @str added
+ */
+LIB_EXPORT char **l_strv_append(char **str_array, const char *str)
+{
+       char **ret;
+       unsigned int i, len;
+
+       if (unlikely(!str))
+               return str_array;
+
+       len = l_strv_length(str_array);
+       ret = l_new(char *, len + 2);
+
+       for (i = 0; i < len; i++)
+               ret[i] = str_array[i];
+
+       ret[i] = l_strdup(str);
+
+       l_free(str_array);
+
+       return ret;
+}
+
+LIB_EXPORT char **l_strv_append_printf(char **str_array,
+                                               const char *format, ...)
+{
+       va_list args;
+       char **ret;
+
+       va_start(args, format);
+       ret = l_strv_append_vprintf(str_array, format, args);
+       va_end(args);
+
+       return ret;
+}
+
+LIB_EXPORT char **l_strv_append_vprintf(char **str_array,
+                                       const char *format, va_list args)
+{
+       char **ret;
+       unsigned int i, len;
+
+       if (unlikely(!format))
+               return str_array;
+
+       len = l_strv_length(str_array);
+       ret = l_new(char *, len + 2);
+
+       for (i = 0; i < len; i++)
+               ret[i] = str_array[i];
+
+       ret[i] = l_strdup_vprintf(format, args);
+
+       l_free(str_array);
+
+       return ret;
+}
+
+/**
+ * l_strv_copy:
+ * @str_array: a %NULL terminated array of strings or %NULL
+ *
+ * Returns: An independent copy of @str_array.
+ */
+LIB_EXPORT char **l_strv_copy(char **str_array)
+{
+       int i, len;
+       char **copy;
+
+       if (unlikely(!str_array))
+               return NULL;
+
+       for (len = 0; str_array[len]; len++);
+
+       copy = l_malloc(sizeof(char *) * (len + 1));
+
+       for (i = len; i >= 0; i--)
+               copy[i] = l_strdup(str_array[i]);
+
+       return copy;
+}
diff --git a/ell/strv.h b/ell/strv.h
new file mode 100644 (file)
index 0000000..b0ec17c
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_STRV_H
+#define __ELL_STRV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void l_strfreev(char **strlist);
+char **l_strsplit(const char *str, const char sep);
+char **l_strsplit_set(const char *str, const char *separators);
+char *l_strjoinv(char **str_array, const char delim);
+
+char **l_strv_new(void);
+void l_strv_free(char **str_array);
+unsigned int l_strv_length(char **str_array);
+bool l_strv_contains(char **str_array, const char *item);
+char **l_strv_append(char **str_array, const char *str);
+char **l_strv_append_printf(char **str_array, const char *format, ...)
+                                       __attribute__((format(printf, 2, 3)));
+char **l_strv_append_vprintf(char **str_array, const char *format,
+                                                       va_list args);
+char **l_strv_copy(char **str_array);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_STRV_H */
diff --git a/ell/test.c b/ell/test.c
new file mode 100644 (file)
index 0000000..cdae8df
--- /dev/null
@@ -0,0 +1,129 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "log.h"
+#include "test.h"
+#include "private.h"
+
+/**
+ * SECTION:test
+ * @short_description: Unit test framework
+ *
+ * Unit test framework
+ */
+
+struct test {
+       const char *name;
+       l_test_func_t function;
+       const void *test_data;
+       struct test *next;
+};
+
+static struct test *test_head;
+static struct test *test_tail;
+
+/**
+ * l_test_init:
+ * @argc: pointer to @argc parameter of main() function
+ * @argv: pointer to @argv parameter of main() function
+ *
+ * Initialize testing framework.
+ **/
+LIB_EXPORT void l_test_init(int *argc, char ***argv)
+{
+       test_head = NULL;
+       test_tail = NULL;
+
+       l_log_set_stderr();
+}
+
+/**
+ * l_test_run:
+ *
+ * Run all configured tests.
+ *
+ * Returns: 0 on success
+ **/
+LIB_EXPORT int l_test_run(void)
+{
+       struct test *test = test_head;
+
+       while (test) {
+               struct test *tmp = test;
+
+               printf("TEST: %s\n", test->name);
+
+               test->function(test->test_data);
+
+               test = test->next;
+
+               free(tmp);
+       }
+
+       test_head = NULL;
+       test_tail = NULL;
+
+       return 0;
+}
+
+/**
+ * l_test_add:
+ * @name: test name
+ * @function: test function
+ * @test_data: test data
+ *
+ * Add new test.
+ **/
+LIB_EXPORT void l_test_add(const char *name, l_test_func_t function,
+                                               const void *test_data)
+{
+       struct test *test;
+
+       if (unlikely(!name || !function))
+               return;
+
+       test = malloc(sizeof(struct test));
+       if (!test)
+               return;
+
+       memset(test, 0, sizeof(struct test));
+       test->name = name;
+       test->function = function;
+       test->test_data = test_data;
+       test->next = NULL;
+
+       if (test_tail)
+               test_tail->next = test;
+
+       test_tail = test;
+
+       if (!test_head)
+               test_head = test;
+}
diff --git a/ell/test.h b/ell/test.h
new file mode 100644 (file)
index 0000000..f81d438
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_TEST_H
+#define __ELL_TEST_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*l_test_func_t) (const void *test_data);
+
+void l_test_init(int *argc, char ***argv);
+int l_test_run(void);
+
+void l_test_add(const char *name, l_test_func_t function,
+                                       const void *test_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_TEST_H */
diff --git a/ell/time.c b/ell/time.c
new file mode 100644 (file)
index 0000000..6150d03
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <time.h>
+
+#include "time.h"
+#include "private.h"
+
+/**
+ * l_time_now:
+ *
+ * Get the running clocktime in microseconds
+ *
+ * Returns: Current clock time in microseconds
+ **/
+LIB_EXPORT uint64_t l_time_now(void)
+{
+       struct timespec now;
+
+       clock_gettime(CLOCK_BOOTTIME, &now);
+
+       return now.tv_sec * 1000000 + now.tv_nsec / 1000;
+}
+
+/**
+ * l_time_after
+ *
+ * Returns: True if time a is after time b
+ **/
+
+/**
+ * l_time_before
+ *
+ * Returns: True if time a is before time b
+ **/
+
+/**
+ * l_time_offset
+ *
+ * @time: Start time to calculate offset
+ * @offset: Amount of time to add to 'time'
+ *
+ * Adds an offset to a time value. This checks for overflow, and if detected
+ * returns UINT64_MAX.
+ *
+ * Returns: A time value 'time' + 'offset'. Or UINT64_MAX if time + offset
+ * exceeds UINT64_MAX.
+ **/
diff --git a/ell/time.h b/ell/time.h
new file mode 100644 (file)
index 0000000..6976280
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_TIME_H
+#define __ELL_TIME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define L_USEC_PER_SEC 1000000ULL
+#define L_MSEC_PER_SEC 1000ULL
+#define L_USEC_PER_MSEC 1000ULL
+#define L_NSEC_PER_SEC  1000000000ULL
+#define L_NSEC_PER_MSEC 1000000ULL
+#define L_NSEC_PER_USEC 1000ULL
+#define L_TIME_INVALID ((uint64_t) -1)
+
+uint64_t l_time_now(void);
+
+static inline bool l_time_after(uint64_t a, uint64_t b)
+{
+       return a > b;
+}
+
+static inline bool l_time_before(uint64_t a, uint64_t b)
+{
+       return l_time_after(b, a);
+}
+
+static inline uint64_t l_time_offset(uint64_t time, uint64_t offset)
+{
+       /* check overflow */
+       if (offset > UINT64_MAX - time)
+               return UINT64_MAX;
+
+       return time + offset;
+}
+
+static inline uint64_t l_time_diff(uint64_t a, uint64_t b)
+{
+       return (a < b) ? b - a : a - b;
+}
+
+static inline uint64_t l_time_to_secs(uint64_t time)
+{
+       return time / L_USEC_PER_SEC;
+}
+
+static inline uint64_t l_time_to_msecs(uint64_t time)
+{
+       return time / L_USEC_PER_MSEC;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_TIME_H */
diff --git a/ell/timeout.c b/ell/timeout.c
new file mode 100644 (file)
index 0000000..1f2cddb
--- /dev/null
@@ -0,0 +1,313 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/epoll.h>
+#include <sys/timerfd.h>
+#include <time.h>
+#include <limits.h>
+
+#include "util.h"
+#include "timeout.h"
+#include "private.h"
+
+/**
+ * SECTION:timeout
+ * @short_description: Timeout support
+ *
+ * Timeout support
+ */
+
+/**
+ * l_timeout:
+ *
+ * Opague object representing the timeout.
+ */
+struct l_timeout {
+       int fd;
+       l_timeout_notify_cb_t callback;
+       l_timeout_destroy_cb_t destroy;
+       void *user_data;
+};
+
+static void timeout_destroy(void *user_data)
+{
+       struct l_timeout *timeout = user_data;
+
+       close(timeout->fd);
+       timeout->fd = -1;
+
+       if (timeout->destroy)
+               timeout->destroy(timeout->user_data);
+}
+
+static void timeout_callback(int fd, uint32_t events, void *user_data)
+{
+       struct l_timeout *timeout = user_data;
+       uint64_t expired;
+       ssize_t result;
+
+       result = read(timeout->fd, &expired, sizeof(expired));
+       if (result != sizeof(expired))
+               return;
+
+       if (timeout->callback)
+               timeout->callback(timeout, timeout->user_data);
+}
+
+static inline int timeout_set(int fd, unsigned int seconds, long nanoseconds)
+{
+       struct itimerspec itimer;
+
+       memset(&itimer, 0, sizeof(itimer));
+       itimer.it_interval.tv_sec = 0;
+       itimer.it_interval.tv_nsec = 0;
+       itimer.it_value.tv_sec = seconds;
+       itimer.it_value.tv_nsec = nanoseconds;
+
+       return timerfd_settime(fd, 0, &itimer, NULL);
+}
+
+static bool convert_ms(unsigned long milliseconds, unsigned int *seconds,
+                       long *nanoseconds)
+{
+       unsigned long big_seconds = milliseconds / 1000;
+
+       if (big_seconds > UINT_MAX)
+               return false;
+
+       *seconds = big_seconds;
+       *nanoseconds = (milliseconds % 1000) * 1000000L;
+
+       return true;
+}
+
+/**
+ * timeout_create_with_nanoseconds:
+ * @seconds: number of seconds
+ * @nanoseconds: number of nanoseconds
+ * @callback: timeout callback function
+ * @user_data: user data provided to timeout callback function
+ * @destroy: destroy function for user data
+ *
+ * Create new timeout callback handling.
+ *
+ * The timeout will only fire once. The timeout handling needs to be rearmed
+ * with one of the l_timeout_modify functions to trigger again.
+ *
+ * Returns: a newly allocated #l_timeout object. On failure, the function
+ * returns NULL.
+ **/
+static struct l_timeout *timeout_create_with_nanoseconds(unsigned int seconds,
+                       long nanoseconds, l_timeout_notify_cb_t callback,
+                       void *user_data, l_timeout_destroy_cb_t destroy)
+{
+       struct l_timeout *timeout;
+       int err;
+
+       if (unlikely(!callback))
+               return NULL;
+
+       timeout = l_new(struct l_timeout, 1);
+
+       timeout->callback = callback;
+       timeout->destroy = destroy;
+       timeout->user_data = user_data;
+
+       timeout->fd = timerfd_create(CLOCK_MONOTONIC,
+                                       TFD_NONBLOCK | TFD_CLOEXEC);
+       if (timeout->fd < 0) {
+               l_free(timeout);
+               return NULL;
+       }
+
+       if (seconds > 0 || nanoseconds > 0) {
+               if (timeout_set(timeout->fd, seconds, nanoseconds) < 0) {
+                       close(timeout->fd);
+                       l_free(timeout);
+                       return NULL;
+               }
+       }
+
+       err = watch_add(timeout->fd, EPOLLIN | EPOLLONESHOT, timeout_callback,
+                       timeout, timeout_destroy);
+
+       if (err < 0) {
+               l_free(timeout);
+               return NULL;
+       }
+
+       return timeout;
+}
+
+/**
+ * l_timeout_create:
+ * @seconds: timeout in seconds
+ * @callback: timeout callback function
+ * @user_data: user data provided to timeout callback function
+ * @destroy: destroy function for user data
+ *
+ * Create new timeout callback handling.
+ *
+ * The timeout will only fire once. The timeout handling needs to be rearmed
+ * with one of the l_timeout_modify functions to trigger again.
+ *
+ * Returns: a newly allocated #l_timeout object. On failure, the function
+ * returns NULL.
+ **/
+LIB_EXPORT struct l_timeout *l_timeout_create(unsigned int seconds,
+                       l_timeout_notify_cb_t callback,
+                       void *user_data, l_timeout_destroy_cb_t destroy)
+{
+       return timeout_create_with_nanoseconds(seconds, 0, callback,
+                                                       user_data, destroy);
+}
+
+/**
+ * l_timeout_create_ms:
+ * @milliseconds: timeout in milliseconds
+ * @callback: timeout callback function
+ * @user_data: user data provided to timeout callback function
+ * @destroy: destroy function for user data
+ *
+ * Create new timeout callback handling.
+ *
+ * The timeout will only fire once. The timeout handling needs to be rearmed
+ * with one of the l_timeout_modify functions to trigger again.
+ *
+ * Returns: a newly allocated #l_timeout object. On failure, the function
+ * returns NULL.
+ **/
+LIB_EXPORT struct l_timeout *l_timeout_create_ms(unsigned long milliseconds,
+                       l_timeout_notify_cb_t callback,
+                       void *user_data, l_timeout_destroy_cb_t destroy)
+{
+       unsigned int seconds;
+       long nanoseconds;
+
+       if (!convert_ms(milliseconds, &seconds, &nanoseconds))
+               return NULL;
+
+       return timeout_create_with_nanoseconds(seconds, nanoseconds, callback,
+                                               user_data, destroy);
+}
+
+/**
+ * l_timeout_modify:
+ * @timeout: timeout object
+ * @seconds: timeout in seconds
+ *
+ * Modify an existing @timeout and rearm it.
+ **/
+LIB_EXPORT void l_timeout_modify(struct l_timeout *timeout,
+                                       unsigned int seconds)
+{
+       if (unlikely(!timeout))
+               return;
+
+       if (unlikely(timeout->fd < 0))
+               return;
+
+       if (seconds > 0) {
+               if (timeout_set(timeout->fd, seconds, 0) < 0)
+                       return;
+       }
+
+       watch_modify(timeout->fd, EPOLLIN | EPOLLONESHOT, true);
+}
+
+/**
+ * l_timeout_modify_ms:
+ * @timeout: timeout object
+ * @milliseconds: number of milliseconds
+ *
+ * Modify an existing @timeout and rearm it.
+ **/
+LIB_EXPORT void l_timeout_modify_ms(struct l_timeout *timeout,
+                                       unsigned long milliseconds)
+{
+       if (unlikely(!timeout))
+               return;
+
+       if (unlikely(timeout->fd < 0))
+               return;
+
+       if (milliseconds > 0) {
+               unsigned int sec;
+               long nanosec;
+
+               if (!convert_ms(milliseconds, &sec, &nanosec) ||
+                       timeout_set(timeout->fd, sec, nanosec) < 0)
+                       return;
+       }
+
+       watch_modify(timeout->fd, EPOLLIN | EPOLLONESHOT, true);
+}
+
+/**
+ * l_timeout_remove:
+ * @timeout: timeout object
+ *
+ * Remove timeout handling.
+ **/
+LIB_EXPORT void l_timeout_remove(struct l_timeout *timeout)
+{
+       if (unlikely(!timeout))
+               return;
+
+       watch_remove(timeout->fd);
+
+       l_free(timeout);
+}
+
+/**
+ * l_timeout_set_callback:
+ * @timeout: timeout object
+ * @callback: The new callback
+ * @user_data: The new user_data
+ * @destroy: The new destroy function
+ *
+ * Sets the new notify callback for @timeout.  If the old user_data object had
+ * a destroy function set, then that function will be called.
+ */
+LIB_EXPORT void l_timeout_set_callback(struct l_timeout *timeout,
+                                       l_timeout_notify_cb_t callback,
+                                       void *user_data,
+                                       l_timeout_destroy_cb_t destroy)
+{
+       if (unlikely(!timeout))
+               return;
+
+       if (timeout->destroy)
+               timeout->destroy(timeout->user_data);
+
+       timeout->callback = callback;
+       timeout->user_data = user_data;
+       timeout->destroy = destroy;
+}
diff --git a/ell/timeout.h b/ell/timeout.h
new file mode 100644 (file)
index 0000000..889a287
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_TIMEOUT_H
+#define __ELL_TIMEOUT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct l_timeout;
+
+typedef void (*l_timeout_notify_cb_t) (struct l_timeout *timeout,
+                                               void *user_data);
+typedef void (*l_timeout_destroy_cb_t) (void *user_data);
+
+struct l_timeout *l_timeout_create(unsigned int seconds,
+                       l_timeout_notify_cb_t callback,
+                       void *user_data, l_timeout_destroy_cb_t destroy);
+struct l_timeout *l_timeout_create_ms(unsigned long milliseconds,
+                       l_timeout_notify_cb_t callback,
+                       void *user_data, l_timeout_destroy_cb_t destroy);
+void l_timeout_modify(struct l_timeout *timeout,
+                               unsigned int seconds);
+void l_timeout_modify_ms(struct l_timeout *timeout,
+                               unsigned long milliseconds);
+void l_timeout_remove(struct l_timeout *timeout);
+void l_timeout_set_callback(struct l_timeout *timeout,
+                               l_timeout_notify_cb_t callback, void *user_data,
+                               l_timeout_destroy_cb_t destroy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_TIMEOUT_H */
diff --git a/ell/tls-extensions.c b/ell/tls-extensions.c
new file mode 100644 (file)
index 0000000..2e2d9da
--- /dev/null
@@ -0,0 +1,907 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <errno.h>
+
+#include "util.h"
+#include "tls.h"
+#include "cipher.h"
+#include "checksum.h"
+#include "cert.h"
+#include "tls-private.h"
+
+/* RFC 7919, Section A.1 */
+static const uint8_t tls_ffdhe2048_prime[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xad, 0xf8, 0x54, 0x58,
+       0xa2, 0xbb, 0x4a, 0x9a, 0xaf, 0xdc, 0x56, 0x20, 0x27, 0x3d, 0x3c, 0xf1,
+       0xd8, 0xb9, 0xc5, 0x83, 0xce, 0x2d, 0x36, 0x95, 0xa9, 0xe1, 0x36, 0x41,
+       0x14, 0x64, 0x33, 0xfb, 0xcc, 0x93, 0x9d, 0xce, 0x24, 0x9b, 0x3e, 0xf9,
+       0x7d, 0x2f, 0xe3, 0x63, 0x63, 0x0c, 0x75, 0xd8, 0xf6, 0x81, 0xb2, 0x02,
+       0xae, 0xc4, 0x61, 0x7a, 0xd3, 0xdf, 0x1e, 0xd5, 0xd5, 0xfd, 0x65, 0x61,
+       0x24, 0x33, 0xf5, 0x1f, 0x5f, 0x06, 0x6e, 0xd0, 0x85, 0x63, 0x65, 0x55,
+       0x3d, 0xed, 0x1a, 0xf3, 0xb5, 0x57, 0x13, 0x5e, 0x7f, 0x57, 0xc9, 0x35,
+       0x98, 0x4f, 0x0c, 0x70, 0xe0, 0xe6, 0x8b, 0x77, 0xe2, 0xa6, 0x89, 0xda,
+       0xf3, 0xef, 0xe8, 0x72, 0x1d, 0xf1, 0x58, 0xa1, 0x36, 0xad, 0xe7, 0x35,
+       0x30, 0xac, 0xca, 0x4f, 0x48, 0x3a, 0x79, 0x7a, 0xbc, 0x0a, 0xb1, 0x82,
+       0xb3, 0x24, 0xfb, 0x61, 0xd1, 0x08, 0xa9, 0x4b, 0xb2, 0xc8, 0xe3, 0xfb,
+       0xb9, 0x6a, 0xda, 0xb7, 0x60, 0xd7, 0xf4, 0x68, 0x1d, 0x4f, 0x42, 0xa3,
+       0xde, 0x39, 0x4d, 0xf4, 0xae, 0x56, 0xed, 0xe7, 0x63, 0x72, 0xbb, 0x19,
+       0x0b, 0x07, 0xa7, 0xc8, 0xee, 0x0a, 0x6d, 0x70, 0x9e, 0x02, 0xfc, 0xe1,
+       0xcd, 0xf7, 0xe2, 0xec, 0xc0, 0x34, 0x04, 0xcd, 0x28, 0x34, 0x2f, 0x61,
+       0x91, 0x72, 0xfe, 0x9c, 0xe9, 0x85, 0x83, 0xff, 0x8e, 0x4f, 0x12, 0x32,
+       0xee, 0xf2, 0x81, 0x83, 0xc3, 0xfe, 0x3b, 0x1b, 0x4c, 0x6f, 0xad, 0x73,
+       0x3b, 0xb5, 0xfc, 0xbc, 0x2e, 0xc2, 0x20, 0x05, 0xc5, 0x8e, 0xf1, 0x83,
+       0x7d, 0x16, 0x83, 0xb2, 0xc6, 0xf3, 0x4a, 0x26, 0xc1, 0xb2, 0xef, 0xfa,
+       0x88, 0x6b, 0x42, 0x38, 0x61, 0x28, 0x5c, 0x97, 0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff,
+};
+
+/* RFC 7919, Section A.2 */
+static const uint8_t tls_ffdhe3072_prime[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xad, 0xf8, 0x54, 0x58,
+       0xa2, 0xbb, 0x4a, 0x9a, 0xaf, 0xdc, 0x56, 0x20, 0x27, 0x3d, 0x3c, 0xf1,
+       0xd8, 0xb9, 0xc5, 0x83, 0xce, 0x2d, 0x36, 0x95, 0xa9, 0xe1, 0x36, 0x41,
+       0x14, 0x64, 0x33, 0xfb, 0xcc, 0x93, 0x9d, 0xce, 0x24, 0x9b, 0x3e, 0xf9,
+       0x7d, 0x2f, 0xe3, 0x63, 0x63, 0x0c, 0x75, 0xd8, 0xf6, 0x81, 0xb2, 0x02,
+       0xae, 0xc4, 0x61, 0x7a, 0xd3, 0xdf, 0x1e, 0xd5, 0xd5, 0xfd, 0x65, 0x61,
+       0x24, 0x33, 0xf5, 0x1f, 0x5f, 0x06, 0x6e, 0xd0, 0x85, 0x63, 0x65, 0x55,
+       0x3d, 0xed, 0x1a, 0xf3, 0xb5, 0x57, 0x13, 0x5e, 0x7f, 0x57, 0xc9, 0x35,
+       0x98, 0x4f, 0x0c, 0x70, 0xe0, 0xe6, 0x8b, 0x77, 0xe2, 0xa6, 0x89, 0xda,
+       0xf3, 0xef, 0xe8, 0x72, 0x1d, 0xf1, 0x58, 0xa1, 0x36, 0xad, 0xe7, 0x35,
+       0x30, 0xac, 0xca, 0x4f, 0x48, 0x3a, 0x79, 0x7a, 0xbc, 0x0a, 0xb1, 0x82,
+       0xb3, 0x24, 0xfb, 0x61, 0xd1, 0x08, 0xa9, 0x4b, 0xb2, 0xc8, 0xe3, 0xfb,
+       0xb9, 0x6a, 0xda, 0xb7, 0x60, 0xd7, 0xf4, 0x68, 0x1d, 0x4f, 0x42, 0xa3,
+       0xde, 0x39, 0x4d, 0xf4, 0xae, 0x56, 0xed, 0xe7, 0x63, 0x72, 0xbb, 0x19,
+       0x0b, 0x07, 0xa7, 0xc8, 0xee, 0x0a, 0x6d, 0x70, 0x9e, 0x02, 0xfc, 0xe1,
+       0xcd, 0xf7, 0xe2, 0xec, 0xc0, 0x34, 0x04, 0xcd, 0x28, 0x34, 0x2f, 0x61,
+       0x91, 0x72, 0xfe, 0x9c, 0xe9, 0x85, 0x83, 0xff, 0x8e, 0x4f, 0x12, 0x32,
+       0xee, 0xf2, 0x81, 0x83, 0xc3, 0xfe, 0x3b, 0x1b, 0x4c, 0x6f, 0xad, 0x73,
+       0x3b, 0xb5, 0xfc, 0xbc, 0x2e, 0xc2, 0x20, 0x05, 0xc5, 0x8e, 0xf1, 0x83,
+       0x7d, 0x16, 0x83, 0xb2, 0xc6, 0xf3, 0x4a, 0x26, 0xc1, 0xb2, 0xef, 0xfa,
+       0x88, 0x6b, 0x42, 0x38, 0x61, 0x1f, 0xcf, 0xdc, 0xde, 0x35, 0x5b, 0x3b,
+       0x65, 0x19, 0x03, 0x5b, 0xbc, 0x34, 0xf4, 0xde, 0xf9, 0x9c, 0x02, 0x38,
+       0x61, 0xb4, 0x6f, 0xc9, 0xd6, 0xe6, 0xc9, 0x07, 0x7a, 0xd9, 0x1d, 0x26,
+       0x91, 0xf7, 0xf7, 0xee, 0x59, 0x8c, 0xb0, 0xfa, 0xc1, 0x86, 0xd9, 0x1c,
+       0xae, 0xfe, 0x13, 0x09, 0x85, 0x13, 0x92, 0x70, 0xb4, 0x13, 0x0c, 0x93,
+       0xbc, 0x43, 0x79, 0x44, 0xf4, 0xfd, 0x44, 0x52, 0xe2, 0xd7, 0x4d, 0xd3,
+       0x64, 0xf2, 0xe2, 0x1e, 0x71, 0xf5, 0x4b, 0xff, 0x5c, 0xae, 0x82, 0xab,
+       0x9c, 0x9d, 0xf6, 0x9e, 0xe8, 0x6d, 0x2b, 0xc5, 0x22, 0x36, 0x3a, 0x0d,
+       0xab, 0xc5, 0x21, 0x97, 0x9b, 0x0d, 0xea, 0xda, 0x1d, 0xbf, 0x9a, 0x42,
+       0xd5, 0xc4, 0x48, 0x4e, 0x0a, 0xbc, 0xd0, 0x6b, 0xfa, 0x53, 0xdd, 0xef,
+       0x3c, 0x1b, 0x20, 0xee, 0x3f, 0xd5, 0x9d, 0x7c, 0x25, 0xe4, 0x1d, 0x2b,
+       0x66, 0xc6, 0x2e, 0x37, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+};
+
+/* RFC 7919, Section A.3 */
+static const uint8_t tls_ffdhe4096_prime[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xad, 0xf8, 0x54, 0x58,
+       0xa2, 0xbb, 0x4a, 0x9a, 0xaf, 0xdc, 0x56, 0x20, 0x27, 0x3d, 0x3c, 0xf1,
+       0xd8, 0xb9, 0xc5, 0x83, 0xce, 0x2d, 0x36, 0x95, 0xa9, 0xe1, 0x36, 0x41,
+       0x14, 0x64, 0x33, 0xfb, 0xcc, 0x93, 0x9d, 0xce, 0x24, 0x9b, 0x3e, 0xf9,
+       0x7d, 0x2f, 0xe3, 0x63, 0x63, 0x0c, 0x75, 0xd8, 0xf6, 0x81, 0xb2, 0x02,
+       0xae, 0xc4, 0x61, 0x7a, 0xd3, 0xdf, 0x1e, 0xd5, 0xd5, 0xfd, 0x65, 0x61,
+       0x24, 0x33, 0xf5, 0x1f, 0x5f, 0x06, 0x6e, 0xd0, 0x85, 0x63, 0x65, 0x55,
+       0x3d, 0xed, 0x1a, 0xf3, 0xb5, 0x57, 0x13, 0x5e, 0x7f, 0x57, 0xc9, 0x35,
+       0x98, 0x4f, 0x0c, 0x70, 0xe0, 0xe6, 0x8b, 0x77, 0xe2, 0xa6, 0x89, 0xda,
+       0xf3, 0xef, 0xe8, 0x72, 0x1d, 0xf1, 0x58, 0xa1, 0x36, 0xad, 0xe7, 0x35,
+       0x30, 0xac, 0xca, 0x4f, 0x48, 0x3a, 0x79, 0x7a, 0xbc, 0x0a, 0xb1, 0x82,
+       0xb3, 0x24, 0xfb, 0x61, 0xd1, 0x08, 0xa9, 0x4b, 0xb2, 0xc8, 0xe3, 0xfb,
+       0xb9, 0x6a, 0xda, 0xb7, 0x60, 0xd7, 0xf4, 0x68, 0x1d, 0x4f, 0x42, 0xa3,
+       0xde, 0x39, 0x4d, 0xf4, 0xae, 0x56, 0xed, 0xe7, 0x63, 0x72, 0xbb, 0x19,
+       0x0b, 0x07, 0xa7, 0xc8, 0xee, 0x0a, 0x6d, 0x70, 0x9e, 0x02, 0xfc, 0xe1,
+       0xcd, 0xf7, 0xe2, 0xec, 0xc0, 0x34, 0x04, 0xcd, 0x28, 0x34, 0x2f, 0x61,
+       0x91, 0x72, 0xfe, 0x9c, 0xe9, 0x85, 0x83, 0xff, 0x8e, 0x4f, 0x12, 0x32,
+       0xee, 0xf2, 0x81, 0x83, 0xc3, 0xfe, 0x3b, 0x1b, 0x4c, 0x6f, 0xad, 0x73,
+       0x3b, 0xb5, 0xfc, 0xbc, 0x2e, 0xc2, 0x20, 0x05, 0xc5, 0x8e, 0xf1, 0x83,
+       0x7d, 0x16, 0x83, 0xb2, 0xc6, 0xf3, 0x4a, 0x26, 0xc1, 0xb2, 0xef, 0xfa,
+       0x88, 0x6b, 0x42, 0x38, 0x61, 0x1f, 0xcf, 0xdc, 0xde, 0x35, 0x5b, 0x3b,
+       0x65, 0x19, 0x03, 0x5b, 0xbc, 0x34, 0xf4, 0xde, 0xf9, 0x9c, 0x02, 0x38,
+       0x61, 0xb4, 0x6f, 0xc9, 0xd6, 0xe6, 0xc9, 0x07, 0x7a, 0xd9, 0x1d, 0x26,
+       0x91, 0xf7, 0xf7, 0xee, 0x59, 0x8c, 0xb0, 0xfa, 0xc1, 0x86, 0xd9, 0x1c,
+       0xae, 0xfe, 0x13, 0x09, 0x85, 0x13, 0x92, 0x70, 0xb4, 0x13, 0x0c, 0x93,
+       0xbc, 0x43, 0x79, 0x44, 0xf4, 0xfd, 0x44, 0x52, 0xe2, 0xd7, 0x4d, 0xd3,
+       0x64, 0xf2, 0xe2, 0x1e, 0x71, 0xf5, 0x4b, 0xff, 0x5c, 0xae, 0x82, 0xab,
+       0x9c, 0x9d, 0xf6, 0x9e, 0xe8, 0x6d, 0x2b, 0xc5, 0x22, 0x36, 0x3a, 0x0d,
+       0xab, 0xc5, 0x21, 0x97, 0x9b, 0x0d, 0xea, 0xda, 0x1d, 0xbf, 0x9a, 0x42,
+       0xd5, 0xc4, 0x48, 0x4e, 0x0a, 0xbc, 0xd0, 0x6b, 0xfa, 0x53, 0xdd, 0xef,
+       0x3c, 0x1b, 0x20, 0xee, 0x3f, 0xd5, 0x9d, 0x7c, 0x25, 0xe4, 0x1d, 0x2b,
+       0x66, 0x9e, 0x1e, 0xf1, 0x6e, 0x6f, 0x52, 0xc3, 0x16, 0x4d, 0xf4, 0xfb,
+       0x79, 0x30, 0xe9, 0xe4, 0xe5, 0x88, 0x57, 0xb6, 0xac, 0x7d, 0x5f, 0x42,
+       0xd6, 0x9f, 0x6d, 0x18, 0x77, 0x63, 0xcf, 0x1d, 0x55, 0x03, 0x40, 0x04,
+       0x87, 0xf5, 0x5b, 0xa5, 0x7e, 0x31, 0xcc, 0x7a, 0x71, 0x35, 0xc8, 0x86,
+       0xef, 0xb4, 0x31, 0x8a, 0xed, 0x6a, 0x1e, 0x01, 0x2d, 0x9e, 0x68, 0x32,
+       0xa9, 0x07, 0x60, 0x0a, 0x91, 0x81, 0x30, 0xc4, 0x6d, 0xc7, 0x78, 0xf9,
+       0x71, 0xad, 0x00, 0x38, 0x09, 0x29, 0x99, 0xa3, 0x33, 0xcb, 0x8b, 0x7a,
+       0x1a, 0x1d, 0xb9, 0x3d, 0x71, 0x40, 0x00, 0x3c, 0x2a, 0x4e, 0xce, 0xa9,
+       0xf9, 0x8d, 0x0a, 0xcc, 0x0a, 0x82, 0x91, 0xcd, 0xce, 0xc9, 0x7d, 0xcf,
+       0x8e, 0xc9, 0xb5, 0x5a, 0x7f, 0x88, 0xa4, 0x6b, 0x4d, 0xb5, 0xa8, 0x51,
+       0xf4, 0x41, 0x82, 0xe1, 0xc6, 0x8a, 0x00, 0x7e, 0x5e, 0x65, 0x5f, 0x6a,
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+};
+
+/* RFC 7919, Section A.4 */
+static const uint8_t tls_ffdhe6144_prime[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xad, 0xf8, 0x54, 0x58,
+       0xa2, 0xbb, 0x4a, 0x9a, 0xaf, 0xdc, 0x56, 0x20, 0x27, 0x3d, 0x3c, 0xf1,
+       0xd8, 0xb9, 0xc5, 0x83, 0xce, 0x2d, 0x36, 0x95, 0xa9, 0xe1, 0x36, 0x41,
+       0x14, 0x64, 0x33, 0xfb, 0xcc, 0x93, 0x9d, 0xce, 0x24, 0x9b, 0x3e, 0xf9,
+       0x7d, 0x2f, 0xe3, 0x63, 0x63, 0x0c, 0x75, 0xd8, 0xf6, 0x81, 0xb2, 0x02,
+       0xae, 0xc4, 0x61, 0x7a, 0xd3, 0xdf, 0x1e, 0xd5, 0xd5, 0xfd, 0x65, 0x61,
+       0x24, 0x33, 0xf5, 0x1f, 0x5f, 0x06, 0x6e, 0xd0, 0x85, 0x63, 0x65, 0x55,
+       0x3d, 0xed, 0x1a, 0xf3, 0xb5, 0x57, 0x13, 0x5e, 0x7f, 0x57, 0xc9, 0x35,
+       0x98, 0x4f, 0x0c, 0x70, 0xe0, 0xe6, 0x8b, 0x77, 0xe2, 0xa6, 0x89, 0xda,
+       0xf3, 0xef, 0xe8, 0x72, 0x1d, 0xf1, 0x58, 0xa1, 0x36, 0xad, 0xe7, 0x35,
+       0x30, 0xac, 0xca, 0x4f, 0x48, 0x3a, 0x79, 0x7a, 0xbc, 0x0a, 0xb1, 0x82,
+       0xb3, 0x24, 0xfb, 0x61, 0xd1, 0x08, 0xa9, 0x4b, 0xb2, 0xc8, 0xe3, 0xfb,
+       0xb9, 0x6a, 0xda, 0xb7, 0x60, 0xd7, 0xf4, 0x68, 0x1d, 0x4f, 0x42, 0xa3,
+       0xde, 0x39, 0x4d, 0xf4, 0xae, 0x56, 0xed, 0xe7, 0x63, 0x72, 0xbb, 0x19,
+       0x0b, 0x07, 0xa7, 0xc8, 0xee, 0x0a, 0x6d, 0x70, 0x9e, 0x02, 0xfc, 0xe1,
+       0xcd, 0xf7, 0xe2, 0xec, 0xc0, 0x34, 0x04, 0xcd, 0x28, 0x34, 0x2f, 0x61,
+       0x91, 0x72, 0xfe, 0x9c, 0xe9, 0x85, 0x83, 0xff, 0x8e, 0x4f, 0x12, 0x32,
+       0xee, 0xf2, 0x81, 0x83, 0xc3, 0xfe, 0x3b, 0x1b, 0x4c, 0x6f, 0xad, 0x73,
+       0x3b, 0xb5, 0xfc, 0xbc, 0x2e, 0xc2, 0x20, 0x05, 0xc5, 0x8e, 0xf1, 0x83,
+       0x7d, 0x16, 0x83, 0xb2, 0xc6, 0xf3, 0x4a, 0x26, 0xc1, 0xb2, 0xef, 0xfa,
+       0x88, 0x6b, 0x42, 0x38, 0x61, 0x1f, 0xcf, 0xdc, 0xde, 0x35, 0x5b, 0x3b,
+       0x65, 0x19, 0x03, 0x5b, 0xbc, 0x34, 0xf4, 0xde, 0xf9, 0x9c, 0x02, 0x38,
+       0x61, 0xb4, 0x6f, 0xc9, 0xd6, 0xe6, 0xc9, 0x07, 0x7a, 0xd9, 0x1d, 0x26,
+       0x91, 0xf7, 0xf7, 0xee, 0x59, 0x8c, 0xb0, 0xfa, 0xc1, 0x86, 0xd9, 0x1c,
+       0xae, 0xfe, 0x13, 0x09, 0x85, 0x13, 0x92, 0x70, 0xb4, 0x13, 0x0c, 0x93,
+       0xbc, 0x43, 0x79, 0x44, 0xf4, 0xfd, 0x44, 0x52, 0xe2, 0xd7, 0x4d, 0xd3,
+       0x64, 0xf2, 0xe2, 0x1e, 0x71, 0xf5, 0x4b, 0xff, 0x5c, 0xae, 0x82, 0xab,
+       0x9c, 0x9d, 0xf6, 0x9e, 0xe8, 0x6d, 0x2b, 0xc5, 0x22, 0x36, 0x3a, 0x0d,
+       0xab, 0xc5, 0x21, 0x97, 0x9b, 0x0d, 0xea, 0xda, 0x1d, 0xbf, 0x9a, 0x42,
+       0xd5, 0xc4, 0x48, 0x4e, 0x0a, 0xbc, 0xd0, 0x6b, 0xfa, 0x53, 0xdd, 0xef,
+       0x3c, 0x1b, 0x20, 0xee, 0x3f, 0xd5, 0x9d, 0x7c, 0x25, 0xe4, 0x1d, 0x2b,
+       0x66, 0x9e, 0x1e, 0xf1, 0x6e, 0x6f, 0x52, 0xc3, 0x16, 0x4d, 0xf4, 0xfb,
+       0x79, 0x30, 0xe9, 0xe4, 0xe5, 0x88, 0x57, 0xb6, 0xac, 0x7d, 0x5f, 0x42,
+       0xd6, 0x9f, 0x6d, 0x18, 0x77, 0x63, 0xcf, 0x1d, 0x55, 0x03, 0x40, 0x04,
+       0x87, 0xf5, 0x5b, 0xa5, 0x7e, 0x31, 0xcc, 0x7a, 0x71, 0x35, 0xc8, 0x86,
+       0xef, 0xb4, 0x31, 0x8a, 0xed, 0x6a, 0x1e, 0x01, 0x2d, 0x9e, 0x68, 0x32,
+       0xa9, 0x07, 0x60, 0x0a, 0x91, 0x81, 0x30, 0xc4, 0x6d, 0xc7, 0x78, 0xf9,
+       0x71, 0xad, 0x00, 0x38, 0x09, 0x29, 0x99, 0xa3, 0x33, 0xcb, 0x8b, 0x7a,
+       0x1a, 0x1d, 0xb9, 0x3d, 0x71, 0x40, 0x00, 0x3c, 0x2a, 0x4e, 0xce, 0xa9,
+       0xf9, 0x8d, 0x0a, 0xcc, 0x0a, 0x82, 0x91, 0xcd, 0xce, 0xc9, 0x7d, 0xcf,
+       0x8e, 0xc9, 0xb5, 0x5a, 0x7f, 0x88, 0xa4, 0x6b, 0x4d, 0xb5, 0xa8, 0x51,
+       0xf4, 0x41, 0x82, 0xe1, 0xc6, 0x8a, 0x00, 0x7e, 0x5e, 0x0d, 0xd9, 0x02,
+       0x0b, 0xfd, 0x64, 0xb6, 0x45, 0x03, 0x6c, 0x7a, 0x4e, 0x67, 0x7d, 0x2c,
+       0x38, 0x53, 0x2a, 0x3a, 0x23, 0xba, 0x44, 0x42, 0xca, 0xf5, 0x3e, 0xa6,
+       0x3b, 0xb4, 0x54, 0x32, 0x9b, 0x76, 0x24, 0xc8, 0x91, 0x7b, 0xdd, 0x64,
+       0xb1, 0xc0, 0xfd, 0x4c, 0xb3, 0x8e, 0x8c, 0x33, 0x4c, 0x70, 0x1c, 0x3a,
+       0xcd, 0xad, 0x06, 0x57, 0xfc, 0xcf, 0xec, 0x71, 0x9b, 0x1f, 0x5c, 0x3e,
+       0x4e, 0x46, 0x04, 0x1f, 0x38, 0x81, 0x47, 0xfb, 0x4c, 0xfd, 0xb4, 0x77,
+       0xa5, 0x24, 0x71, 0xf7, 0xa9, 0xa9, 0x69, 0x10, 0xb8, 0x55, 0x32, 0x2e,
+       0xdb, 0x63, 0x40, 0xd8, 0xa0, 0x0e, 0xf0, 0x92, 0x35, 0x05, 0x11, 0xe3,
+       0x0a, 0xbe, 0xc1, 0xff, 0xf9, 0xe3, 0xa2, 0x6e, 0x7f, 0xb2, 0x9f, 0x8c,
+       0x18, 0x30, 0x23, 0xc3, 0x58, 0x7e, 0x38, 0xda, 0x00, 0x77, 0xd9, 0xb4,
+       0x76, 0x3e, 0x4e, 0x4b, 0x94, 0xb2, 0xbb, 0xc1, 0x94, 0xc6, 0x65, 0x1e,
+       0x77, 0xca, 0xf9, 0x92, 0xee, 0xaa, 0xc0, 0x23, 0x2a, 0x28, 0x1b, 0xf6,
+       0xb3, 0xa7, 0x39, 0xc1, 0x22, 0x61, 0x16, 0x82, 0x0a, 0xe8, 0xdb, 0x58,
+       0x47, 0xa6, 0x7c, 0xbe, 0xf9, 0xc9, 0x09, 0x1b, 0x46, 0x2d, 0x53, 0x8c,
+       0xd7, 0x2b, 0x03, 0x74, 0x6a, 0xe7, 0x7f, 0x5e, 0x62, 0x29, 0x2c, 0x31,
+       0x15, 0x62, 0xa8, 0x46, 0x50, 0x5d, 0xc8, 0x2d, 0xb8, 0x54, 0x33, 0x8a,
+       0xe4, 0x9f, 0x52, 0x35, 0xc9, 0x5b, 0x91, 0x17, 0x8c, 0xcf, 0x2d, 0xd5,
+       0xca, 0xce, 0xf4, 0x03, 0xec, 0x9d, 0x18, 0x10, 0xc6, 0x27, 0x2b, 0x04,
+       0x5b, 0x3b, 0x71, 0xf9, 0xdc, 0x6b, 0x80, 0xd6, 0x3f, 0xdd, 0x4a, 0x8e,
+       0x9a, 0xdb, 0x1e, 0x69, 0x62, 0xa6, 0x95, 0x26, 0xd4, 0x31, 0x61, 0xc1,
+       0xa4, 0x1d, 0x57, 0x0d, 0x79, 0x38, 0xda, 0xd4, 0xa4, 0x0e, 0x32, 0x9c,
+       0xd0, 0xe4, 0x0e, 0x65, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+};
+
+/* RFC 7919, Section A.5 */
+static const uint8_t tls_ffdhe8192_prime[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xad, 0xf8, 0x54, 0x58,
+       0xa2, 0xbb, 0x4a, 0x9a, 0xaf, 0xdc, 0x56, 0x20, 0x27, 0x3d, 0x3c, 0xf1,
+       0xd8, 0xb9, 0xc5, 0x83, 0xce, 0x2d, 0x36, 0x95, 0xa9, 0xe1, 0x36, 0x41,
+       0x14, 0x64, 0x33, 0xfb, 0xcc, 0x93, 0x9d, 0xce, 0x24, 0x9b, 0x3e, 0xf9,
+       0x7d, 0x2f, 0xe3, 0x63, 0x63, 0x0c, 0x75, 0xd8, 0xf6, 0x81, 0xb2, 0x02,
+       0xae, 0xc4, 0x61, 0x7a, 0xd3, 0xdf, 0x1e, 0xd5, 0xd5, 0xfd, 0x65, 0x61,
+       0x24, 0x33, 0xf5, 0x1f, 0x5f, 0x06, 0x6e, 0xd0, 0x85, 0x63, 0x65, 0x55,
+       0x3d, 0xed, 0x1a, 0xf3, 0xb5, 0x57, 0x13, 0x5e, 0x7f, 0x57, 0xc9, 0x35,
+       0x98, 0x4f, 0x0c, 0x70, 0xe0, 0xe6, 0x8b, 0x77, 0xe2, 0xa6, 0x89, 0xda,
+       0xf3, 0xef, 0xe8, 0x72, 0x1d, 0xf1, 0x58, 0xa1, 0x36, 0xad, 0xe7, 0x35,
+       0x30, 0xac, 0xca, 0x4f, 0x48, 0x3a, 0x79, 0x7a, 0xbc, 0x0a, 0xb1, 0x82,
+       0xb3, 0x24, 0xfb, 0x61, 0xd1, 0x08, 0xa9, 0x4b, 0xb2, 0xc8, 0xe3, 0xfb,
+       0xb9, 0x6a, 0xda, 0xb7, 0x60, 0xd7, 0xf4, 0x68, 0x1d, 0x4f, 0x42, 0xa3,
+       0xde, 0x39, 0x4d, 0xf4, 0xae, 0x56, 0xed, 0xe7, 0x63, 0x72, 0xbb, 0x19,
+       0x0b, 0x07, 0xa7, 0xc8, 0xee, 0x0a, 0x6d, 0x70, 0x9e, 0x02, 0xfc, 0xe1,
+       0xcd, 0xf7, 0xe2, 0xec, 0xc0, 0x34, 0x04, 0xcd, 0x28, 0x34, 0x2f, 0x61,
+       0x91, 0x72, 0xfe, 0x9c, 0xe9, 0x85, 0x83, 0xff, 0x8e, 0x4f, 0x12, 0x32,
+       0xee, 0xf2, 0x81, 0x83, 0xc3, 0xfe, 0x3b, 0x1b, 0x4c, 0x6f, 0xad, 0x73,
+       0x3b, 0xb5, 0xfc, 0xbc, 0x2e, 0xc2, 0x20, 0x05, 0xc5, 0x8e, 0xf1, 0x83,
+       0x7d, 0x16, 0x83, 0xb2, 0xc6, 0xf3, 0x4a, 0x26, 0xc1, 0xb2, 0xef, 0xfa,
+       0x88, 0x6b, 0x42, 0x38, 0x61, 0x1f, 0xcf, 0xdc, 0xde, 0x35, 0x5b, 0x3b,
+       0x65, 0x19, 0x03, 0x5b, 0xbc, 0x34, 0xf4, 0xde, 0xf9, 0x9c, 0x02, 0x38,
+       0x61, 0xb4, 0x6f, 0xc9, 0xd6, 0xe6, 0xc9, 0x07, 0x7a, 0xd9, 0x1d, 0x26,
+       0x91, 0xf7, 0xf7, 0xee, 0x59, 0x8c, 0xb0, 0xfa, 0xc1, 0x86, 0xd9, 0x1c,
+       0xae, 0xfe, 0x13, 0x09, 0x85, 0x13, 0x92, 0x70, 0xb4, 0x13, 0x0c, 0x93,
+       0xbc, 0x43, 0x79, 0x44, 0xf4, 0xfd, 0x44, 0x52, 0xe2, 0xd7, 0x4d, 0xd3,
+       0x64, 0xf2, 0xe2, 0x1e, 0x71, 0xf5, 0x4b, 0xff, 0x5c, 0xae, 0x82, 0xab,
+       0x9c, 0x9d, 0xf6, 0x9e, 0xe8, 0x6d, 0x2b, 0xc5, 0x22, 0x36, 0x3a, 0x0d,
+       0xab, 0xc5, 0x21, 0x97, 0x9b, 0x0d, 0xea, 0xda, 0x1d, 0xbf, 0x9a, 0x42,
+       0xd5, 0xc4, 0x48, 0x4e, 0x0a, 0xbc, 0xd0, 0x6b, 0xfa, 0x53, 0xdd, 0xef,
+       0x3c, 0x1b, 0x20, 0xee, 0x3f, 0xd5, 0x9d, 0x7c, 0x25, 0xe4, 0x1d, 0x2b,
+       0x66, 0x9e, 0x1e, 0xf1, 0x6e, 0x6f, 0x52, 0xc3, 0x16, 0x4d, 0xf4, 0xfb,
+       0x79, 0x30, 0xe9, 0xe4, 0xe5, 0x88, 0x57, 0xb6, 0xac, 0x7d, 0x5f, 0x42,
+       0xd6, 0x9f, 0x6d, 0x18, 0x77, 0x63, 0xcf, 0x1d, 0x55, 0x03, 0x40, 0x04,
+       0x87, 0xf5, 0x5b, 0xa5, 0x7e, 0x31, 0xcc, 0x7a, 0x71, 0x35, 0xc8, 0x86,
+       0xef, 0xb4, 0x31, 0x8a, 0xed, 0x6a, 0x1e, 0x01, 0x2d, 0x9e, 0x68, 0x32,
+       0xa9, 0x07, 0x60, 0x0a, 0x91, 0x81, 0x30, 0xc4, 0x6d, 0xc7, 0x78, 0xf9,
+       0x71, 0xad, 0x00, 0x38, 0x09, 0x29, 0x99, 0xa3, 0x33, 0xcb, 0x8b, 0x7a,
+       0x1a, 0x1d, 0xb9, 0x3d, 0x71, 0x40, 0x00, 0x3c, 0x2a, 0x4e, 0xce, 0xa9,
+       0xf9, 0x8d, 0x0a, 0xcc, 0x0a, 0x82, 0x91, 0xcd, 0xce, 0xc9, 0x7d, 0xcf,
+       0x8e, 0xc9, 0xb5, 0x5a, 0x7f, 0x88, 0xa4, 0x6b, 0x4d, 0xb5, 0xa8, 0x51,
+       0xf4, 0x41, 0x82, 0xe1, 0xc6, 0x8a, 0x00, 0x7e, 0x5e, 0x0d, 0xd9, 0x02,
+       0x0b, 0xfd, 0x64, 0xb6, 0x45, 0x03, 0x6c, 0x7a, 0x4e, 0x67, 0x7d, 0x2c,
+       0x38, 0x53, 0x2a, 0x3a, 0x23, 0xba, 0x44, 0x42, 0xca, 0xf5, 0x3e, 0xa6,
+       0x3b, 0xb4, 0x54, 0x32, 0x9b, 0x76, 0x24, 0xc8, 0x91, 0x7b, 0xdd, 0x64,
+       0xb1, 0xc0, 0xfd, 0x4c, 0xb3, 0x8e, 0x8c, 0x33, 0x4c, 0x70, 0x1c, 0x3a,
+       0xcd, 0xad, 0x06, 0x57, 0xfc, 0xcf, 0xec, 0x71, 0x9b, 0x1f, 0x5c, 0x3e,
+       0x4e, 0x46, 0x04, 0x1f, 0x38, 0x81, 0x47, 0xfb, 0x4c, 0xfd, 0xb4, 0x77,
+       0xa5, 0x24, 0x71, 0xf7, 0xa9, 0xa9, 0x69, 0x10, 0xb8, 0x55, 0x32, 0x2e,
+       0xdb, 0x63, 0x40, 0xd8, 0xa0, 0x0e, 0xf0, 0x92, 0x35, 0x05, 0x11, 0xe3,
+       0x0a, 0xbe, 0xc1, 0xff, 0xf9, 0xe3, 0xa2, 0x6e, 0x7f, 0xb2, 0x9f, 0x8c,
+       0x18, 0x30, 0x23, 0xc3, 0x58, 0x7e, 0x38, 0xda, 0x00, 0x77, 0xd9, 0xb4,
+       0x76, 0x3e, 0x4e, 0x4b, 0x94, 0xb2, 0xbb, 0xc1, 0x94, 0xc6, 0x65, 0x1e,
+       0x77, 0xca, 0xf9, 0x92, 0xee, 0xaa, 0xc0, 0x23, 0x2a, 0x28, 0x1b, 0xf6,
+       0xb3, 0xa7, 0x39, 0xc1, 0x22, 0x61, 0x16, 0x82, 0x0a, 0xe8, 0xdb, 0x58,
+       0x47, 0xa6, 0x7c, 0xbe, 0xf9, 0xc9, 0x09, 0x1b, 0x46, 0x2d, 0x53, 0x8c,
+       0xd7, 0x2b, 0x03, 0x74, 0x6a, 0xe7, 0x7f, 0x5e, 0x62, 0x29, 0x2c, 0x31,
+       0x15, 0x62, 0xa8, 0x46, 0x50, 0x5d, 0xc8, 0x2d, 0xb8, 0x54, 0x33, 0x8a,
+       0xe4, 0x9f, 0x52, 0x35, 0xc9, 0x5b, 0x91, 0x17, 0x8c, 0xcf, 0x2d, 0xd5,
+       0xca, 0xce, 0xf4, 0x03, 0xec, 0x9d, 0x18, 0x10, 0xc6, 0x27, 0x2b, 0x04,
+       0x5b, 0x3b, 0x71, 0xf9, 0xdc, 0x6b, 0x80, 0xd6, 0x3f, 0xdd, 0x4a, 0x8e,
+       0x9a, 0xdb, 0x1e, 0x69, 0x62, 0xa6, 0x95, 0x26, 0xd4, 0x31, 0x61, 0xc1,
+       0xa4, 0x1d, 0x57, 0x0d, 0x79, 0x38, 0xda, 0xd4, 0xa4, 0x0e, 0x32, 0x9c,
+       0xcf, 0xf4, 0x6a, 0xaa, 0x36, 0xad, 0x00, 0x4c, 0xf6, 0x00, 0xc8, 0x38,
+       0x1e, 0x42, 0x5a, 0x31, 0xd9, 0x51, 0xae, 0x64, 0xfd, 0xb2, 0x3f, 0xce,
+       0xc9, 0x50, 0x9d, 0x43, 0x68, 0x7f, 0xeb, 0x69, 0xed, 0xd1, 0xcc, 0x5e,
+       0x0b, 0x8c, 0xc3, 0xbd, 0xf6, 0x4b, 0x10, 0xef, 0x86, 0xb6, 0x31, 0x42,
+       0xa3, 0xab, 0x88, 0x29, 0x55, 0x5b, 0x2f, 0x74, 0x7c, 0x93, 0x26, 0x65,
+       0xcb, 0x2c, 0x0f, 0x1c, 0xc0, 0x1b, 0xd7, 0x02, 0x29, 0x38, 0x88, 0x39,
+       0xd2, 0xaf, 0x05, 0xe4, 0x54, 0x50, 0x4a, 0xc7, 0x8b, 0x75, 0x82, 0x82,
+       0x28, 0x46, 0xc0, 0xba, 0x35, 0xc3, 0x5f, 0x5c, 0x59, 0x16, 0x0c, 0xc0,
+       0x46, 0xfd, 0x82, 0x51, 0x54, 0x1f, 0xc6, 0x8c, 0x9c, 0x86, 0xb0, 0x22,
+       0xbb, 0x70, 0x99, 0x87, 0x6a, 0x46, 0x0e, 0x74, 0x51, 0xa8, 0xa9, 0x31,
+       0x09, 0x70, 0x3f, 0xee, 0x1c, 0x21, 0x7e, 0x6c, 0x38, 0x26, 0xe5, 0x2c,
+       0x51, 0xaa, 0x69, 0x1e, 0x0e, 0x42, 0x3c, 0xfc, 0x99, 0xe9, 0xe3, 0x16,
+       0x50, 0xc1, 0x21, 0x7b, 0x62, 0x48, 0x16, 0xcd, 0xad, 0x9a, 0x95, 0xf9,
+       0xd5, 0xb8, 0x01, 0x94, 0x88, 0xd9, 0xc0, 0xa0, 0xa1, 0xfe, 0x30, 0x75,
+       0xa5, 0x77, 0xe2, 0x31, 0x83, 0xf8, 0x1d, 0x4a, 0x3f, 0x2f, 0xa4, 0x57,
+       0x1e, 0xfc, 0x8c, 0xe0, 0xba, 0x8a, 0x4f, 0xe8, 0xb6, 0x85, 0x5d, 0xfe,
+       0x72, 0xb0, 0xa6, 0x6e, 0xde, 0xd2, 0xfb, 0xab, 0xfb, 0xe5, 0x8a, 0x30,
+       0xfa, 0xfa, 0xbe, 0x1c, 0x5d, 0x71, 0xa8, 0x7e, 0x2f, 0x74, 0x1e, 0xf8,
+       0xc1, 0xfe, 0x86, 0xfe, 0xa6, 0xbb, 0xfd, 0xe5, 0x30, 0x67, 0x7f, 0x0d,
+       0x97, 0xd1, 0x1d, 0x49, 0xf7, 0xa8, 0x44, 0x3d, 0x08, 0x22, 0xe5, 0x06,
+       0xa9, 0xf4, 0x61, 0x4e, 0x01, 0x1e, 0x2a, 0x94, 0x83, 0x8f, 0xf8, 0x8c,
+       0xd6, 0x8c, 0x8b, 0xb7, 0xc5, 0xc6, 0x42, 0x4c, 0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff,
+};
+
+/* RFC 3526, Section 3 */
+static const uint8_t tls_dh14_prime[] = {
+       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc9, 0x0f, 0xda, 0xa2,
+       0x21, 0x68, 0xc2, 0x34, 0xc4, 0xc6, 0x62, 0x8b, 0x80, 0xdc, 0x1c, 0xd1,
+       0x29, 0x02, 0x4e, 0x08, 0x8a, 0x67, 0xcc, 0x74, 0x02, 0x0b, 0xbe, 0xa6,
+       0x3b, 0x13, 0x9b, 0x22, 0x51, 0x4a, 0x08, 0x79, 0x8e, 0x34, 0x04, 0xdd,
+       0xef, 0x95, 0x19, 0xb3, 0xcd, 0x3a, 0x43, 0x1b, 0x30, 0x2b, 0x0a, 0x6d,
+       0xf2, 0x5f, 0x14, 0x37, 0x4f, 0xe1, 0x35, 0x6d, 0x6d, 0x51, 0xc2, 0x45,
+       0xe4, 0x85, 0xb5, 0x76, 0x62, 0x5e, 0x7e, 0xc6, 0xf4, 0x4c, 0x42, 0xe9,
+       0xa6, 0x37, 0xed, 0x6b, 0x0b, 0xff, 0x5c, 0xb6, 0xf4, 0x06, 0xb7, 0xed,
+       0xee, 0x38, 0x6b, 0xfb, 0x5a, 0x89, 0x9f, 0xa5, 0xae, 0x9f, 0x24, 0x11,
+       0x7c, 0x4b, 0x1f, 0xe6, 0x49, 0x28, 0x66, 0x51, 0xec, 0xe4, 0x5b, 0x3d,
+       0xc2, 0x00, 0x7c, 0xb8, 0xa1, 0x63, 0xbf, 0x05, 0x98, 0xda, 0x48, 0x36,
+       0x1c, 0x55, 0xd3, 0x9a, 0x69, 0x16, 0x3f, 0xa8, 0xfd, 0x24, 0xcf, 0x5f,
+       0x83, 0x65, 0x5d, 0x23, 0xdc, 0xa3, 0xad, 0x96, 0x1c, 0x62, 0xf3, 0x56,
+       0x20, 0x85, 0x52, 0xbb, 0x9e, 0xd5, 0x29, 0x07, 0x70, 0x96, 0x96, 0x6d,
+       0x67, 0x0c, 0x35, 0x4e, 0x4a, 0xbc, 0x98, 0x04, 0xf1, 0x74, 0x6c, 0x08,
+       0xca, 0x18, 0x21, 0x7c, 0x32, 0x90, 0x5e, 0x46, 0x2e, 0x36, 0xce, 0x3b,
+       0xe3, 0x9e, 0x77, 0x2c, 0x18, 0x0e, 0x86, 0x03, 0x9b, 0x27, 0x83, 0xa2,
+       0xec, 0x07, 0xa2, 0x8f, 0xb5, 0xc5, 0x5d, 0xf0, 0x6f, 0x4c, 0x52, 0xc9,
+       0xde, 0x2b, 0xcb, 0xf6, 0x95, 0x58, 0x17, 0x18, 0x39, 0x95, 0x49, 0x7c,
+       0xea, 0x95, 0x6a, 0xe5, 0x15, 0xd2, 0x26, 0x18, 0x98, 0xfa, 0x05, 0x10,
+       0x15, 0x72, 0x8e, 0x5a, 0x8a, 0xac, 0xaa, 0x68, 0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff,
+};
+
+static const struct tls_named_group tls_group_pref[] = {
+       { "secp256r1", 23, TLS_GROUP_TYPE_EC },
+       { "secp384r1", 24, TLS_GROUP_TYPE_EC },
+       {
+               "ffdhe2048", 256, TLS_GROUP_TYPE_FF,
+               .ff = {
+                       .prime = tls_ffdhe2048_prime,
+                       .prime_len = sizeof(tls_ffdhe2048_prime),
+                       .generator = 2,
+               },
+       },
+       {
+               "ffdhe3072", 257, TLS_GROUP_TYPE_FF,
+               .ff = {
+                       .prime = tls_ffdhe3072_prime,
+                       .prime_len = sizeof(tls_ffdhe3072_prime),
+                       .generator = 2,
+               },
+       },
+       {
+               "ffdhe4096", 258, TLS_GROUP_TYPE_FF,
+               .ff = {
+                       .prime = tls_ffdhe4096_prime,
+                       .prime_len = sizeof(tls_ffdhe4096_prime),
+                       .generator = 2,
+               },
+       },
+       {
+               "ffdhe6144", 259, TLS_GROUP_TYPE_FF,
+               .ff = {
+                       .prime = tls_ffdhe6144_prime,
+                       .prime_len = sizeof(tls_ffdhe6144_prime),
+                       .generator = 2,
+               },
+       },
+       {
+               "ffdhe8192", 260, TLS_GROUP_TYPE_FF,
+               .ff = {
+                       .prime = tls_ffdhe8192_prime,
+                       .prime_len = sizeof(tls_ffdhe8192_prime),
+                       .generator = 2,
+               },
+       },
+};
+
+/*
+ * For now hardcode a default group for non-RFC7919 clients - same group
+ * as some other TLS servers use, which is actually a downside because the
+ * more common the group parameters are the less secure they are assumed
+ * to be, but it is also a test that the group is sufficiently good.
+ *
+ * Eventually we need to make this configurable so that a unique
+ * likely-prime number generated by either 'openssl dhparam' or
+ * 'ssh-keygen -G' can be set, or parse /etc/ssh/moduli to select
+ * a random pre-generated FFDH group each time.
+ */
+static const struct tls_named_group tls_default_ffdh_group = {
+       "RFC3526/Oakley Group 14", 0, TLS_GROUP_TYPE_FF,
+       .ff = {
+               .prime = tls_dh14_prime,
+               .prime_len = sizeof(tls_dh14_prime),
+               .generator = 2,
+       },
+};
+
+/* RFC 8422, Section 5.1 + RFC 7919 */
+static ssize_t tls_elliptic_curves_client_write(struct l_tls *tls,
+                                               uint8_t *buf, size_t len)
+{
+       uint8_t *ptr = buf;
+       unsigned int i;
+
+       if (len < 2 + L_ARRAY_SIZE(tls_group_pref) * 2)
+               return -ENOMEM;
+
+       l_put_be16(L_ARRAY_SIZE(tls_group_pref) * 2, ptr);
+       ptr += 2;
+
+       for (i = 0; i < L_ARRAY_SIZE(tls_group_pref); i++) {
+               l_put_be16(tls_group_pref[i].id, ptr);
+               ptr += 2;
+       }
+
+       return ptr - buf;
+}
+
+static bool tls_elliptic_curves_client_handle(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       bool ffdh_offered = false;
+
+       if (len < 2)
+               return false;
+
+       if (l_get_be16(buf) != len - 2 || (len & 1))
+               return false;
+
+       buf += 2;
+       len -= 2;
+
+       /*
+        * We select one group for DH and one group for ECDH and we'll
+        * let the cipher suite selection logic decide which one is actually
+        * used.  It will take into account the client's cipher suite
+        * preference but it could just as well look at the strengths of
+        * the groups chosen.  This is not done for simplicity but RFC 7919
+        * suggests the Supported Groups should actually overrule the
+        * cipher suite preference list in case of a conflict:
+        * "A server that encounters such a contradiction when selecting
+        * between an ECDHE or FFDHE key exchange mechanism while trying
+        * to respect client preferences SHOULD give priority to the
+        * Supported Groups extension (...) but MAY resolve the
+        * contradiction any way it sees fit."
+        *
+        * Not implemented: "If a non-anonymous FFDHE cipher suite is
+        * selected and the TLS client has used this extension to offer
+        * an FFDHE group of comparable or greater strength than the server's
+        * public key, the server SHOULD select an FFDHE group at least
+        * as strong as the server's public key."
+        */
+
+       while (len) {
+               unsigned int i;
+               uint16_t id;
+               const struct tls_named_group *group = NULL;
+
+               id = l_get_be16(buf);
+               buf += 2;
+               len -= 2;
+
+               if (id >> 8 == 1)       /* RFC 7919 ids */
+                       ffdh_offered = true;
+
+               for (i = 0; i < L_ARRAY_SIZE(tls_group_pref); i++)
+                       if (tls_group_pref[i].id == id) {
+                               group = &tls_group_pref[i];
+                               break;
+                       }
+
+               if (!group)
+                       continue;
+
+               switch (group->type) {
+               case TLS_GROUP_TYPE_EC:
+                       if (!tls->negotiated_curve)
+                               tls->negotiated_curve = group;
+
+                       break;
+               case TLS_GROUP_TYPE_FF:
+                       if (!tls->negotiated_ff_group)
+                               tls->negotiated_ff_group = group;
+
+                       break;
+               }
+       }
+
+       /*
+        * Note we need to treat DH slightly differently from ECDH groups
+        * here because the extension is defined in RFC 8422 and if the
+        * client offers no elliptic curves we can't use ECDH at all:
+        * "If a server (...) is unable to complete the ECC handshake while
+        * restricting itself to the enumerated curves (...), it MUST NOT
+        * negotiate the use of an ECC cipher suite.  Depending on what
+        * other cipher suites are proposed by the client and supported by
+        * the server, this may result in a fatal handshake failure alert
+        * due to the lack of common cipher suites."
+        *
+        * On the other hand if the client offers no FFDH groups we can
+        * only assume the client is okay with us picking a group.  Note
+        * the "includes any FFDHE group" part in RFC 7919 Section 4:
+        * "If a compatible TLS server receives a Supported Groups
+        * extension from a client that includes any FFDHE group (i.e.,
+        * any codepoint between 256 and 511, inclusive, even if unknown
+        * to the server), and if none of the client-proposed FFDHE groups
+        * are known and acceptable to the server, then the server MUST
+        * NOT select an FFDHE cipher suite."
+        */
+
+       if (tls->negotiated_curve)
+               TLS_DEBUG("Negotiated %s", tls->negotiated_curve->name);
+       else
+               TLS_DEBUG("non-fatal: No common supported elliptic curves "
+                               "for ECDHE");
+
+       if (tls->negotiated_ff_group)
+               TLS_DEBUG("Negotiated %s", tls->negotiated_ff_group->name);
+       else if (ffdh_offered)
+               TLS_DEBUG("non-fatal: No common supported finite-field groups "
+                               "for DHE");
+       else
+               tls->negotiated_ff_group = &tls_default_ffdh_group;
+
+       return true;
+}
+
+static bool tls_elliptic_curves_client_absent(struct l_tls *tls)
+{
+       unsigned int i;
+
+       for (i = 0; i < L_ARRAY_SIZE(tls_group_pref); i++)
+               if (tls_group_pref[i].type == TLS_GROUP_TYPE_EC) {
+                       tls->negotiated_curve = &tls_group_pref[i];
+                       break;
+               }
+
+       tls->negotiated_ff_group = &tls_default_ffdh_group;
+
+       return true;
+}
+
+static bool tls_ec_point_formats_client_handle(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       if (len < 2)
+               return false;
+
+       if (buf[0] != len - 1)
+               return false;
+
+       if (!memchr(buf + 1, 0, len - 1)) {
+               TLS_DEBUG("Uncompressed point format missing");
+               return false;
+       }
+
+       return true;
+}
+
+/*
+ * For compatibility with clients respond to a valid Client Hello Supported
+ * Point Formats extension with the hardcoded confirmation that we do
+ * support the single valid point format.  As a client we never send this
+ * extension so we never have to handle a server response to it either.
+ */
+static ssize_t tls_ec_point_formats_server_write(struct l_tls *tls,
+                                               uint8_t *buf, size_t len)
+{
+       if (len < 2)
+               return -ENOMEM;
+
+       buf[0] = 0x01;  /* ec_point_format_list length */
+       buf[1] = 0x00;  /* uncompressed */
+       return 2;
+}
+
+/*
+ * This is used to append the list of signature algorithm and hash type
+ * combinations we support to the Signature Algorithms client hello
+ * extension (on the client) and the Certificate Request message (on the
+ * server).  In both cases we need to list the algorithms we support for
+ * two use cases: certificate chain verification and signing/verifying
+ * Server Key Exchange params (server->client) or Certificate Verify
+ * data (client->server).
+ *
+ * For the server side RFC 5462, Section 7.4.1.4.1 says:
+ * "If the client [...] is willing to use them for verifying
+ * messages sent by the server, i.e., server certificates and
+ * server key exchange [...] it MUST send the
+ * signature_algorithms extension, listing the algorithms it
+ * is willing to accept."
+ *
+ * As for the certificate chains we mostly rely on the kernel to do
+ * this so when we receive the list we do not currently verify the
+ * that the whole chain uses only algorithms from the list on either
+ * side (TODO). But we know that the chain verification in the kernel
+ * can use a superset of the hash algorithms l_checksum supports.
+ * For the Server Key Exchange and Certificate Verify signatures we
+ * use l_checksum but we need to map the TLS-specific hash IDs to
+ * enum l_checksum_type using the tls_handshake_hash_data list in
+ * signature->sign() and signature->verify(), so we use
+ * tls_handshake_hash_data as the definitive list of allowed hash
+ * algorithms.
+ *
+ * Our supported signature algorithms can work with any hash type so we
+ * basically have to send all possible combinations of the signature
+ * algorithm IDs from the supported cipher suites (except anonymous)
+ * with the hash algorithms we can use for signature verification,
+ * i.e. those in the tls_handshake_hash_data table.
+ */
+ssize_t tls_write_signature_algorithms(struct l_tls *tls,
+                                       uint8_t *buf, size_t len)
+{
+       uint8_t *ptr = buf;
+       unsigned int i, j;
+       struct tls_cipher_suite **suite;
+       uint8_t sig_alg_ids[16];
+       uint8_t hash_ids[16];
+       unsigned int sig_alg_cnt = 0;
+       unsigned int hash_cnt = 0;
+
+       for (suite = tls->cipher_suite_pref_list; *suite; suite++) {
+               uint8_t id;
+
+               if (!(*suite)->signature)
+                       continue;
+
+               id = (*suite)->signature->id;
+
+               if (memchr(sig_alg_ids, id, sig_alg_cnt))
+                       continue;
+
+               if (!tls_cipher_suite_is_compatible(tls, *suite, NULL))
+                       continue;
+
+               if (sig_alg_cnt >= sizeof(sig_alg_ids))
+                       return -ENOMEM;
+
+               sig_alg_ids[sig_alg_cnt++] = id;
+       }
+
+       for (i = 0; i < __HANDSHAKE_HASH_COUNT; i++) {
+               const struct tls_hash_algorithm *hash =
+                       &tls_handshake_hash_data[i];
+               bool supported;
+
+               /*
+                * The hash types in the Signature Algorithms extension are
+                * all supported hashes but the ones in the Certificate
+                * Request (server->client) must be in the set for which we
+                * maintain handshake message hashes because that is going
+                * to be used in Certificate Verify.
+                */
+               if (tls->server)
+                       supported = !!tls->handshake_hash[i];
+               else
+                       supported = l_checksum_is_supported(hash->l_id, false);
+
+               if (supported)
+                       hash_ids[hash_cnt++] = hash->tls_id;
+       }
+
+       if (len < 2 + sig_alg_cnt * hash_cnt * 2)
+               return -ENOMEM;
+
+       l_put_be16(sig_alg_cnt * hash_cnt * 2, ptr);
+       ptr += 2;
+
+       for (i = 0; i < sig_alg_cnt; i++)
+               for (j = 0; j < hash_cnt; j++) {
+                       *ptr++ = hash_ids[j];
+                       *ptr++ = sig_alg_ids[i];
+               }
+
+       return ptr - buf;
+}
+
+ssize_t tls_parse_signature_algorithms(struct l_tls *tls,
+                                       const uint8_t *buf, size_t len)
+{
+       const uint8_t *ptr = buf;
+       enum handshake_hash_type first_supported, hash;
+       const struct tls_hash_algorithm *preferred;
+       struct tls_cipher_suite **suite;
+       uint8_t sig_alg_ids[16];
+       unsigned int sig_alg_cnt = 0;
+
+       /*
+        * This only makes sense as a variable-length field, assume
+        * there's a typo in RFC5246 7.4.4 here.
+        */
+       if (len < 4)
+               return -EINVAL;
+
+       if (l_get_be16(ptr) > len - 2)
+               return -EINVAL;
+
+       len = l_get_be16(ptr);
+       ptr += 2;
+
+       if (len & 1)
+               return -EINVAL;
+
+       for (suite = tls->cipher_suite_pref_list; *suite; suite++) {
+               uint8_t id;
+
+               if (!(*suite)->signature)
+                       continue;
+
+               id = (*suite)->signature->id;
+
+               if (memchr(sig_alg_ids, id, sig_alg_cnt))
+                       continue;
+
+               if (!tls_cipher_suite_is_compatible(tls, *suite, NULL))
+                       continue;
+
+               if (sig_alg_cnt >= sizeof(sig_alg_ids))
+                       return -ENOMEM;
+
+               sig_alg_ids[sig_alg_cnt++] = id;
+       }
+
+       /*
+        * In 1.2 we force our preference for SHA256/SHA384 (depending on
+        * cipher suite's PRF hmac) if it is supported by the peer because
+        * that must be supported anyway for the PRF and the Finished hash
+        * meaning that we only need to keep one hash instead of two.
+        * If not available fall back to the first common hash algorithm.
+        */
+       first_supported = -1;
+
+       if (tls->prf_hmac)
+               preferred = tls->prf_hmac;
+       else
+               preferred = &tls_handshake_hash_data[HANDSHAKE_HASH_SHA256];
+
+       while (len) {
+               uint8_t hash_id = *ptr++;
+               uint8_t sig_alg_id = *ptr++;
+               bool supported;
+
+               len -= 2;
+
+               /* Ignore hash types for signatures other than ours */
+               if (tls->pending.cipher_suite &&
+                               (!tls->pending.cipher_suite->signature ||
+                                tls->pending.cipher_suite->signature->id !=
+                                sig_alg_id))
+                       continue;
+               else if (!tls->pending.cipher_suite &&
+                               !memchr(sig_alg_ids, sig_alg_id, sig_alg_cnt))
+                       continue;
+
+               if (hash_id == preferred->tls_id) {
+                       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+                               if (&tls_handshake_hash_data[hash] == preferred)
+                                       break;
+                       break;
+               }
+
+               if ((int) first_supported != -1)
+                       continue;
+
+               for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+                       if (hash_id == tls_handshake_hash_data[hash].tls_id)
+                               break;
+
+               if (hash == __HANDSHAKE_HASH_COUNT)
+                       continue;
+
+               if (tls->server)
+                       supported = l_checksum_is_supported(
+                                       tls_handshake_hash_data[hash].l_id,
+                                       false);
+               else
+                       supported = !!tls->handshake_hash[hash];
+
+               if (supported)
+                       first_supported = hash;
+       }
+
+       if (len)
+               tls->signature_hash = hash;
+       else if ((int) first_supported != -1)
+               tls->signature_hash = first_supported;
+       else
+               return -ENOTSUP;
+
+       return ptr + len - buf;
+}
+
+/* RFC 5462, Section 7.4.1.4.1 */
+static ssize_t tls_signature_algorithms_client_write(struct l_tls *tls,
+                                               uint8_t *buf, size_t len)
+{
+       /*
+        * "Note: this extension is not meaningful for TLS versions
+        * prior to 1.2.  Clients MUST NOT offer it if they are offering
+        * prior versions."
+        */
+       if (tls->max_version < L_TLS_V12)
+               return -ENOMSG;
+
+       return tls_write_signature_algorithms(tls, buf, len);
+}
+
+static bool tls_signature_algorithms_client_handle(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       ssize_t ret;
+
+       /*
+        * "However, even if clients do offer it, the rules specified in
+        * [TLSEXT] require servers to ignore extensions they do not
+        * understand."
+        */
+       if (tls->max_version < L_TLS_V12)
+               return true;
+
+       ret = tls_parse_signature_algorithms(tls, buf, len);
+
+       if (ret == -ENOTSUP)
+               TLS_DEBUG("No common signature algorithms");
+
+       /*
+        * TODO: also check our certificate chain against the parsed
+        * signature algorithms.
+        */
+
+       return ret == (ssize_t) len;
+}
+
+static bool tls_signature_algorithms_client_absent(struct l_tls *tls)
+{
+       /*
+        * "If the client does not send the signature_algorithms extension,
+        * the server MUST do the following:
+        *    - [...] behave as if client had sent the value {sha1,rsa}.
+        *    - [...] behave as if client had sent the value {sha1,dsa}.
+        *    - [...] behave as if client had sent the value {sha1,ecdsa}.
+        */
+       if (tls->max_version >= L_TLS_V12)
+               tls->signature_hash = HANDSHAKE_HASH_SHA1;
+
+       return true;
+}
+
+const struct tls_hello_extension tls_extensions[] = {
+       {
+               "Supported Groups", "elliptic_curves", 10,
+               tls_elliptic_curves_client_write,
+               tls_elliptic_curves_client_handle,
+               tls_elliptic_curves_client_absent,
+               NULL, NULL, NULL,
+       },
+       {
+               "Supported Point Formats", "ec_point_formats", 11,
+               NULL,
+               tls_ec_point_formats_client_handle,
+               NULL,
+               tls_ec_point_formats_server_write,
+               NULL, NULL,
+       },
+       {
+               "Signature Algorithms", "signature_algoritms", 13,
+               tls_signature_algorithms_client_write,
+               tls_signature_algorithms_client_handle,
+               tls_signature_algorithms_client_absent,
+               NULL, NULL, NULL,
+       },
+       {}
+};
+
+const struct tls_named_group *tls_find_group(uint16_t id)
+{
+       unsigned int i;
+
+       for (i = 0; i < L_ARRAY_SIZE(tls_group_pref); i++)
+               if (tls_group_pref[i].id == id)
+                       return &tls_group_pref[i];
+
+       return NULL;
+}
+
+const struct tls_named_group *tls_find_ff_group(const uint8_t *prime,
+                                               size_t prime_len,
+                                               const uint8_t *generator,
+                                               size_t generator_len)
+{
+       unsigned int i;
+
+       if (generator_len != 1)
+               return NULL;
+
+       for (i = 0; i < L_ARRAY_SIZE(tls_group_pref); i++) {
+               const struct tls_named_group *g = &tls_group_pref[i];
+
+               if (g->type != TLS_GROUP_TYPE_FF)
+                       continue;
+
+               if (g->ff.prime_len != prime_len ||
+                               memcmp(prime, g->ff.prime, prime_len))
+                       continue;
+
+               if (g->ff.generator != *generator)
+                       continue;
+
+               return g;
+       }
+
+       return NULL;
+}
diff --git a/ell/tls-private.h b/ell/tls-private.h
new file mode 100644 (file)
index 0000000..908c622
--- /dev/null
@@ -0,0 +1,360 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#define TLS_MAX_VERSION        L_TLS_V12
+#define TLS_MIN_VERSION        L_TLS_V10
+
+enum tls_cipher_type {
+       TLS_CIPHER_STREAM,
+       TLS_CIPHER_BLOCK,
+       TLS_CIPHER_AEAD,
+};
+
+struct tls_bulk_encryption_algorithm {
+       enum tls_cipher_type cipher_type;
+       union {
+               enum l_cipher_type l_id;
+               enum l_aead_cipher_type l_aead_id;
+       };
+       size_t key_length;
+       size_t iv_length;
+       size_t fixed_iv_length;
+       size_t block_length;
+       size_t auth_tag_length;
+};
+
+struct tls_hash_algorithm {
+       uint8_t tls_id;
+       enum l_checksum_type l_id;
+       const char *name;
+};
+
+/*
+ * Support the minimum required set of handshake hash types for the
+ * Certificate Verify digital signature and the Finished PRF seed so we
+ * don't have to accumulate all of messages full contents until the
+ * Finished message.  If we're sent a hash of a different type (in TLS 1.2+)
+ * and need to verify we'll give up.
+ * SHA1 and MD5 are explicitly required by versions < 1.2 and 1.2 requires
+ * that the Finished hash is the same as used for the PRF so we need to
+ * keep at least the hashes our supported cipher suites specify for the PRF.
+ */
+enum handshake_hash_type {
+       HANDSHAKE_HASH_SHA384,
+       HANDSHAKE_HASH_SHA256,
+       HANDSHAKE_HASH_MD5,
+       HANDSHAKE_HASH_SHA1,
+       __HANDSHAKE_HASH_COUNT,
+};
+#define HANDSHAKE_HASH_MAX_SIZE        48
+
+extern const struct tls_hash_algorithm tls_handshake_hash_data[];
+
+typedef bool (*tls_get_hash_t)(struct l_tls *tls,
+                               enum handshake_hash_type type,
+                               const uint8_t *data, size_t data_len,
+                               uint8_t *out, size_t *out_len);
+
+struct tls_signature_algorithm {
+       uint8_t id;
+
+       bool (*validate_cert_key_type)(struct l_cert *cert);
+
+       ssize_t (*sign)(struct l_tls *tls, uint8_t *out, size_t out_len,
+                       tls_get_hash_t get_hash,
+                       const uint8_t *data, size_t data_len);
+       bool (*verify)(struct l_tls *tls, const uint8_t *in, size_t in_len,
+                       tls_get_hash_t get_hash,
+                       const uint8_t *data, size_t data_len);
+};
+
+struct tls_key_exchange_algorithm {
+       bool need_ecc;
+       bool need_ffdh;
+
+       bool (*send_server_key_exchange)(struct l_tls *tls);
+       void (*handle_server_key_exchange)(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len);
+
+       bool (*send_client_key_exchange)(struct l_tls *tls);
+       void (*handle_client_key_exchange)(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len);
+
+       void (*free_params)(struct l_tls *tls);
+};
+
+struct tls_mac_algorithm {
+       uint8_t id;
+       enum l_checksum_type hmac_type;
+       size_t mac_length;
+};
+
+struct tls_cipher_suite {
+       uint8_t id[2];
+       const char *name;
+       int verify_data_length;
+
+       struct tls_bulk_encryption_algorithm *encryption;
+       struct tls_signature_algorithm *signature;
+       struct tls_key_exchange_algorithm *key_xchg;
+       struct tls_mac_algorithm *mac;
+       enum l_checksum_type prf_hmac;
+};
+
+extern struct tls_cipher_suite *tls_cipher_suite_pref[];
+
+struct tls_compression_method {
+       int id;
+       const char *name;
+};
+
+struct tls_hello_extension {
+       const char *name;
+       const char *short_name;
+       uint16_t id;
+       ssize_t (*client_write)(struct l_tls *tls, uint8_t *buf, size_t len);
+       /* Handle a Client Hello extension (on server), can't be NULL */
+       bool (*client_handle)(struct l_tls *tls,
+                               const uint8_t *buf, size_t len);
+       /* Handle a Client Hello extension's absence (on server) */
+       bool (*client_handle_absent)(struct l_tls *tls);
+       ssize_t (*server_write)(struct l_tls *tls, uint8_t *buf, size_t len);
+       /* Handle a Server Hello extension (on client) */
+       bool (*server_handle)(struct l_tls *tls,
+                               const uint8_t *buf, size_t len);
+       /* Handle a Server Hello extension's absence (on client) */
+       bool (*server_handle_absent)(struct l_tls *tls);
+};
+
+extern const struct tls_hello_extension tls_extensions[];
+
+struct tls_named_group {
+       const char *name;
+       uint16_t id;
+       enum {
+               TLS_GROUP_TYPE_EC,
+               TLS_GROUP_TYPE_FF,
+       } type;
+       union {
+               struct {
+                       const uint8_t *prime;
+                       size_t prime_len;
+                       unsigned int generator;
+               } ff;
+       };
+};
+
+enum tls_handshake_state {
+       TLS_HANDSHAKE_WAIT_START,
+       TLS_HANDSHAKE_WAIT_HELLO,
+       TLS_HANDSHAKE_WAIT_CERTIFICATE,
+       TLS_HANDSHAKE_WAIT_KEY_EXCHANGE,
+       TLS_HANDSHAKE_WAIT_HELLO_DONE,
+       TLS_HANDSHAKE_WAIT_CERTIFICATE_VERIFY,
+       TLS_HANDSHAKE_WAIT_CHANGE_CIPHER_SPEC,
+       TLS_HANDSHAKE_WAIT_FINISHED,
+       TLS_HANDSHAKE_DONE,
+};
+
+enum tls_content_type {
+       TLS_CT_CHANGE_CIPHER_SPEC       = 20,
+       TLS_CT_ALERT                    = 21,
+       TLS_CT_HANDSHAKE                = 22,
+       TLS_CT_APPLICATION_DATA         = 23,
+};
+
+enum tls_handshake_type {
+       TLS_HELLO_REQUEST       = 0,
+       TLS_CLIENT_HELLO        = 1,
+       TLS_SERVER_HELLO        = 2,
+       TLS_CERTIFICATE         = 11,
+       TLS_SERVER_KEY_EXCHANGE = 12,
+       TLS_CERTIFICATE_REQUEST = 13,
+       TLS_SERVER_HELLO_DONE   = 14,
+       TLS_CERTIFICATE_VERIFY  = 15,
+       TLS_CLIENT_KEY_EXCHANGE = 16,
+       TLS_FINISHED            = 20,
+};
+
+struct l_tls {
+       bool server;
+
+       l_tls_write_cb_t tx, rx;
+       l_tls_ready_cb_t ready_handle;
+       l_tls_disconnect_cb_t disconnected;
+       void *user_data;
+       l_tls_debug_cb_t debug_handler;
+       l_tls_destroy_cb_t debug_destroy;
+       void *debug_data;
+       enum l_tls_version min_version;
+       enum l_tls_version max_version;
+
+       struct l_queue *ca_certs;
+       struct l_certchain *cert;
+       struct l_key *priv_key;
+       size_t priv_key_size;
+       char **subject_mask;
+
+       struct tls_cipher_suite **cipher_suite_pref_list;
+
+       bool in_callback;
+       bool pending_destroy;
+
+       /* Record layer */
+
+       uint8_t *record_buf;
+       int record_buf_len;
+       int record_buf_max_len;
+       bool record_flush;
+
+       uint8_t *message_buf;
+       int message_buf_len;
+       int message_buf_max_len;
+       enum tls_content_type message_content_type;
+
+       /* Handshake protocol layer */
+
+       enum tls_handshake_state state;
+       struct l_checksum *handshake_hash[__HANDSHAKE_HASH_COUNT];
+       uint8_t prev_digest[__HANDSHAKE_HASH_COUNT][HANDSHAKE_HASH_MAX_SIZE];
+
+       enum l_tls_version client_version;
+       enum l_tls_version negotiated_version;
+       bool cert_requested, cert_sent;
+       bool peer_authenticated;
+       struct l_cert *peer_cert;
+       struct l_key *peer_pubkey;
+       size_t peer_pubkey_size;
+       enum handshake_hash_type signature_hash;
+       const struct tls_hash_algorithm *prf_hmac;
+       const struct tls_named_group *negotiated_curve;
+       const struct tls_named_group *negotiated_ff_group;
+
+       /* SecurityParameters current and pending */
+
+       struct {
+               struct tls_cipher_suite *cipher_suite;
+               struct tls_compression_method *compression_method;
+               uint8_t master_secret[48];
+               uint8_t client_random[32];
+               uint8_t server_random[32];
+               /*
+                * Max key block size per 6.3 v1.1 is 136 bytes but if we
+                * allow AES_256_CBC_SHA256 with v1.0 we get 128 per section
+                * 6.3 v1.2 + two IVs of 32 bytes.
+                */
+               uint8_t key_block[192];
+               void *key_xchg_params;
+       } pending;
+
+       enum tls_cipher_type cipher_type[2];
+       struct tls_cipher_suite *cipher_suite[2];
+       union {
+               struct l_cipher *cipher[2];
+               struct l_aead_cipher *aead_cipher[2];
+       };
+       struct l_checksum *mac[2];
+       size_t mac_length[2];
+       size_t block_length[2];
+       size_t record_iv_length[2];
+       size_t fixed_iv_length[2];
+       uint8_t fixed_iv[2][32];
+       size_t auth_tag_length[2];
+       uint64_t seq_num[2];
+       /*
+        * Some of the key and IV parts of the "current" state are kept
+        * inside the cipher and mac states in the kernel so we don't
+        * duplicate them here.
+        */
+
+       bool ready;
+};
+
+bool tls10_prf(const void *secret, size_t secret_len,
+               const char *label,
+               const void *seed, size_t seed_len,
+               uint8_t *out, size_t out_len);
+
+bool tls12_prf(enum l_checksum_type type,
+               const void *secret, size_t secret_len,
+               const char *label,
+               const void *seed, size_t seed_len,
+               uint8_t *out, size_t out_len);
+
+void tls_disconnect(struct l_tls *tls, enum l_tls_alert_desc desc,
+                       enum l_tls_alert_desc local_desc);
+
+void tls_tx_record(struct l_tls *tls, enum tls_content_type type,
+                       const uint8_t *data, size_t len);
+bool tls_handle_message(struct l_tls *tls, const uint8_t *message,
+                       int len, enum tls_content_type type, uint16_t version);
+
+#define TLS_HANDSHAKE_HEADER_SIZE      4
+
+void tls_tx_handshake(struct l_tls *tls, int type, uint8_t *buf, size_t length);
+
+bool tls_cipher_suite_is_compatible(struct l_tls *tls,
+                                       const struct tls_cipher_suite *suite,
+                                       const char **error);
+
+/* Optionally limit allowed cipher suites to a custom set */
+bool tls_set_cipher_suites(struct l_tls *tls, const char **suite_list);
+
+void tls_generate_master_secret(struct l_tls *tls,
+                               const uint8_t *pre_master_secret,
+                               int pre_master_secret_len);
+
+const struct tls_named_group *tls_find_group(uint16_t id);
+const struct tls_named_group *tls_find_ff_group(const uint8_t *prime,
+                                               size_t prime_len,
+                                               const uint8_t *generator,
+                                               size_t generator_len);
+
+ssize_t tls_write_signature_algorithms(struct l_tls *tls,
+                                       uint8_t *buf, size_t len);
+ssize_t tls_parse_signature_algorithms(struct l_tls *tls,
+                                       const uint8_t *buf, size_t len);
+
+int tls_parse_certificate_list(const void *data, size_t len,
+                               struct l_certchain **out_certchain);
+
+#define TLS_DEBUG(fmt, args...)        \
+       l_util_debug(tls->debug_handler, tls->debug_data, "%s:%i " fmt, \
+                       __func__, __LINE__, ## args)
+#define TLS_SET_STATE(new_state)       \
+       do {    \
+               TLS_DEBUG("New state %s",       \
+                               tls_handshake_state_to_str(new_state)); \
+               tls->state = new_state; \
+       } while (0)
+#define TLS_DISCONNECT(desc, local_desc, fmt, args...) \
+       do {    \
+               TLS_DEBUG("Disconnect desc=%s local-desc=%s reason=" fmt,\
+                               l_tls_alert_to_str(desc),       \
+                               l_tls_alert_to_str(local_desc), ## args);\
+               tls_disconnect(tls, desc, local_desc);  \
+       } while (0)
+
+#define TLS_VER_FMT            "1.%i"
+#define TLS_VER_ARGS(version)  (((version) & 0xff) - 1)
+
+const char *tls_handshake_state_to_str(enum tls_handshake_state state);
diff --git a/ell/tls-record.c b/ell/tls-record.c
new file mode 100644 (file)
index 0000000..505263d
--- /dev/null
@@ -0,0 +1,643 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <alloca.h>
+
+#include "private.h"
+#include "tls.h"
+#include "checksum.h"
+#include "cipher.h"
+#include "cert.h"
+#include "tls-private.h"
+#include "random.h"
+
+/* Implementation-specific max Record Layer fragment size (must be < 16kB) */
+#define TX_RECORD_MAX_LEN      4096
+
+/* TLSPlaintext + TLSCompressed + TLSCiphertext headers + seq_num sizes */
+#define TX_RECORD_MAX_HEADERS  (5 + 5 + 8 + 5)
+#define TX_RECORD_MAX_MAC      64
+
+/* Head room and tail room for the buffer passed to the cipher */
+#define TX_RECORD_HEADROOM     TX_RECORD_MAX_HEADERS
+#define TX_RECORD_TAILROOM     TX_RECORD_MAX_MAC
+
+static void tls_write_mac(struct l_tls *tls, uint8_t *compressed,
+                               uint16_t compressed_len, uint8_t *out_buf,
+                               bool txrx)
+{
+       uint8_t *in_buf;
+
+       /* Prepend the sequence number to the TLSCompressed buffer */
+       in_buf = compressed - 8;
+       l_put_be64(tls->seq_num[txrx]++, in_buf);
+
+       if (tls->mac[txrx]) {
+               l_checksum_reset(tls->mac[txrx]);
+               l_checksum_update(tls->mac[txrx], in_buf, compressed_len + 8);
+               l_checksum_get_digest(tls->mac[txrx], out_buf,
+                                       tls->mac_length[txrx]);
+       }
+}
+
+static void tls_tx_record_plaintext(struct l_tls *tls,
+                                       uint8_t *plaintext,
+                                       uint16_t plaintext_len)
+{
+       uint8_t *compressed;
+       uint16_t compressed_len;
+       uint8_t *cipher_input;
+       uint16_t cipher_input_len;
+       uint8_t *ciphertext;
+       uint16_t ciphertext_len;
+       uint8_t padding_length;
+       uint8_t buf[TX_RECORD_HEADROOM + TX_RECORD_MAX_LEN +
+                               TX_RECORD_TAILROOM];
+       uint8_t iv[32];
+       uint8_t *assocdata;
+       int offset;
+
+       /*
+        * TODO: if DEFLATE is selected in current state, use a new buffer
+        * on stack to write a TLSCompressed structure there, otherwise use
+        * the provided buffer.  Since only null compression is supported
+        * today we always use the provided buffer.
+        */
+       compressed_len = plaintext_len - 5;
+       compressed = plaintext;
+
+       /* Build a TLSCompressed struct */
+       compressed[0] = plaintext[0]; /* Copy type and version fields */
+       compressed[1] = plaintext[1];
+       compressed[2] = plaintext[2];
+       compressed[3] = compressed_len >> 8;
+       compressed[4] = compressed_len >> 0;
+
+       switch (tls->cipher_type[1]) {
+       case TLS_CIPHER_STREAM:
+               /* Append the MAC after TLSCompressed.fragment, if needed */
+               tls_write_mac(tls, compressed, compressed_len + 5,
+                               compressed + compressed_len + 5, true);
+
+               cipher_input = compressed + 5;
+               cipher_input_len = compressed_len + tls->mac_length[1];
+
+               if (!tls->cipher[1]) {
+                       ciphertext = cipher_input;
+                       ciphertext_len = cipher_input_len;
+               } else {
+                       ciphertext = buf + TX_RECORD_HEADROOM;
+                       ciphertext_len = cipher_input_len;
+                       l_cipher_encrypt(tls->cipher[1], cipher_input,
+                                               ciphertext, cipher_input_len);
+               }
+
+               break;
+
+       case TLS_CIPHER_BLOCK:
+               /* Append the MAC after TLSCompressed.fragment, if needed */
+               cipher_input = compressed + 5;
+               tls_write_mac(tls, compressed, compressed_len + 5,
+                               cipher_input + compressed_len, true);
+               cipher_input_len = compressed_len + tls->mac_length[1];
+
+               /* Add minimum padding */
+               padding_length = (~cipher_input_len) &
+                       (tls->block_length[1] - 1);
+               memset(cipher_input + cipher_input_len, padding_length,
+                               padding_length + 1);
+               cipher_input_len += padding_length + 1;
+
+               /* Generate an IV */
+               ciphertext = buf + TX_RECORD_HEADROOM;
+
+               offset = 0;
+
+               if (tls->negotiated_version >= L_TLS_V12) {
+                       l_getrandom(ciphertext, tls->record_iv_length[1]);
+
+                       l_cipher_set_iv(tls->cipher[1], ciphertext,
+                                       tls->record_iv_length[1]);
+
+                       offset = tls->record_iv_length[1];
+               } else if (tls->negotiated_version >= L_TLS_V11) {
+                       l_getrandom(iv, tls->record_iv_length[1]);
+
+                       l_cipher_encrypt(tls->cipher[1], iv, ciphertext,
+                                               tls->record_iv_length[1]);
+
+                       offset = tls->record_iv_length[1];
+               }
+
+               l_cipher_encrypt(tls->cipher[1], cipher_input,
+                                       ciphertext + offset, cipher_input_len);
+               ciphertext_len = offset + cipher_input_len;
+
+               break;
+
+       case TLS_CIPHER_AEAD:
+               /* Prepend seq_num to TLSCompressed.type + .version + .length */
+               assocdata = compressed - 8;
+               l_put_be64(tls->seq_num[1]++, assocdata);
+
+               cipher_input = compressed + 5;
+               cipher_input_len = compressed_len;
+
+               /*
+                * Build the IV.  The explicit part generation method is
+                * actually cipher suite-specific but our only AEAD cipher
+                * suites only require this part to be unique for each
+                * record.  For future suites there may need to be a callback
+                * that generates the per-record IV or an enum for the suite
+                * to select one of a few IV types.
+                *
+                * Note kernel's rfc4106(gcm(...)) algorithm could potentially
+                * be used to build the IV.
+                */
+               memcpy(iv, tls->fixed_iv[1], tls->fixed_iv_length[1]);
+               l_put_le64(tls->seq_num[1], iv + tls->fixed_iv_length[1]);
+
+               if (tls->record_iv_length[1] > 8)
+                       memset(iv + tls->fixed_iv_length[1] + 8, 42,
+                               tls->record_iv_length[1] - 8);
+
+               /* Build the GenericAEADCipher struct */
+               ciphertext = buf + TX_RECORD_HEADROOM;
+               memcpy(ciphertext, iv + tls->fixed_iv_length[1],
+                       tls->record_iv_length[1]);
+               l_aead_cipher_encrypt(tls->aead_cipher[1],
+                                       cipher_input, cipher_input_len,
+                                       assocdata, 13,
+                                       iv, tls->fixed_iv_length[1] +
+                                       tls->record_iv_length[1],
+                                       ciphertext + tls->record_iv_length[1],
+                                       cipher_input_len +
+                                       tls->auth_tag_length[1]);
+
+               ciphertext_len = tls->record_iv_length[1] +
+                       cipher_input_len + tls->auth_tag_length[1];
+
+               break;
+
+       default:
+               return;
+       }
+
+       /* Build a TLSCiphertext struct */
+       ciphertext -= 5;
+       ciphertext[0] = plaintext[0]; /* Copy type and version fields */
+       ciphertext[1] = plaintext[1];
+       ciphertext[2] = plaintext[2];
+       ciphertext[3] = ciphertext_len >> 8;
+       ciphertext[4] = ciphertext_len >> 0;
+
+       tls->tx(ciphertext, ciphertext_len + 5, tls->user_data);
+}
+
+void tls_tx_record(struct l_tls *tls, enum tls_content_type type,
+                       const uint8_t *data, size_t len)
+{
+       uint8_t buf[TX_RECORD_HEADROOM + TX_RECORD_MAX_LEN +
+                               TX_RECORD_TAILROOM];
+       uint8_t *fragment, *plaintext;
+       uint16_t fragment_len;
+       uint16_t version = tls->negotiated_version ?: tls->min_version;
+
+       if (type == TLS_CT_ALERT)
+               tls->record_flush = true;
+
+       while (len) {
+               fragment = buf + TX_RECORD_HEADROOM;
+               fragment_len = len < TX_RECORD_MAX_LEN ?
+                       len : TX_RECORD_MAX_LEN;
+
+               /* Build a TLSPlaintext struct */
+               plaintext = fragment - 5;
+               plaintext[0] = type;
+               plaintext[1] = (uint8_t) (version >> 8);
+               plaintext[2] = (uint8_t) (version >> 0);
+               plaintext[3] = fragment_len >> 8;
+               plaintext[4] = fragment_len >> 0;
+               memcpy(plaintext + 5, data, fragment_len);
+
+               tls_tx_record_plaintext(tls, plaintext, fragment_len + 5);
+
+               data += fragment_len;
+               len -= fragment_len;
+       }
+}
+
+static bool tls_handle_plaintext(struct l_tls *tls, const uint8_t *plaintext,
+                                       int len, uint8_t type, uint16_t version)
+{
+       if (len > (1 << 14)) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "Plaintext message too long: %i", len);
+               return false;
+       }
+
+       switch (type) {
+       case TLS_CT_CHANGE_CIPHER_SPEC:
+       case TLS_CT_APPLICATION_DATA:
+               return tls_handle_message(tls, plaintext, len, type, version);
+
+       /*
+        * We need to perform input reassembly twice at different levels:
+        * once to make sure we're handling complete TLSCiphertext messages,
+        * in l_tls_handle_rx(), and again here so that the Alert and
+        * Handshake message type handlers deal with complete messages.
+        * This does not affect ChangeCipherSpec messages because they're
+        * just a single byte and there are never more than one such message
+        * in a row.  Similarly it doesn't affect application data because
+        * the application is not guaranteed that message boundaries are
+        * preserved in any way and we don't know its message lengths anyway.
+        * It does affect Alert because these messages are 2 byte long and
+        * could potentially be split over two TLSPlaintext messages but
+        * there are never more than one Alert in a TLSPlaintext for the same
+        * reason as with ChangeCipherSpec.  Handshake messages are the
+        * most affected although the need to do the reassembly twice still
+        * seems wasteful considering most of these messages are sent in
+        * plaintext and TLSCiphertext maps to TLSPlaintext records.
+        */
+       case TLS_CT_ALERT:
+       case TLS_CT_HANDSHAKE:
+               break;
+
+       default:
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "Unknown content type %i", type);
+               return false;
+       }
+
+       if (tls->message_buf_len && type != tls->message_content_type) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "Message fragment type %i doesn't match "
+                               "previous type %i", type,
+                               tls->message_content_type);
+               return false;
+       }
+
+       tls->message_content_type = type;
+
+       while (1) {
+               int header_len, need_len;
+               int chunk_len;
+
+               /* Do we have a full header in tls->message_buf? */
+               header_len = (type == TLS_CT_ALERT) ? 2 : 4;
+               need_len = header_len;
+
+               if (tls->message_buf_len >= header_len) {
+                       if (type == TLS_CT_HANDSHAKE) {
+                               uint32_t hs_len = (tls->message_buf[1] << 16) |
+                                       (tls->message_buf[2] << 8) |
+                                       (tls->message_buf[3] << 0);
+                               if (hs_len > (1 << 14)) {
+                                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR,
+                                                       0, "Handshake message "
+                                                       "too long: %i",
+                                                       (int) hs_len);
+                                       return false;
+                               }
+
+                               need_len += hs_len;
+                       }
+
+                       /* Do we have a full structure? */
+                       if (tls->message_buf_len == need_len) {
+                               if (!tls_handle_message(tls, tls->message_buf,
+                                                       need_len, type,
+                                                       version))
+                                       return false;
+
+                               tls->message_buf_len = 0;
+
+                               if (tls->record_flush)
+                                       break;
+
+                               continue;
+                       }
+
+                       if (!len)
+                               break;
+               }
+
+               /* Try to fill up tls->message_buf up to need_len */
+               if (tls->message_buf_max_len < need_len) {
+                       tls->message_buf_max_len = need_len;
+                       tls->message_buf =
+                               l_realloc(tls->message_buf, need_len);
+               }
+
+               need_len -= tls->message_buf_len;
+               chunk_len = need_len;
+               if (len < chunk_len)
+                       chunk_len = len;
+
+               memcpy(tls->message_buf + tls->message_buf_len, plaintext,
+                               chunk_len);
+               tls->message_buf_len += chunk_len;
+               plaintext += chunk_len;
+               len -= chunk_len;
+
+               if (chunk_len < need_len)
+                       break;
+       }
+
+       return true;
+}
+
+static bool tls_handle_ciphertext(struct l_tls *tls)
+{
+       uint8_t type;
+       uint16_t version;
+       uint16_t fragment_len;
+       uint8_t mac_buf[TX_RECORD_MAX_MAC], i, padding_len;
+       int cipher_output_len, error;
+       uint8_t *compressed;
+       int compressed_len;
+       uint8_t iv[32];
+       uint8_t *assocdata;
+
+       type = tls->record_buf[0];
+       version = l_get_be16(tls->record_buf + 1);
+       fragment_len = l_get_be16(tls->record_buf + 3);
+
+       if (fragment_len > (1 << 14) + 2048) {
+               TLS_DISCONNECT(TLS_ALERT_RECORD_OVERFLOW, 0,
+                               "Record fragment too long: %u", fragment_len);
+               return false;
+       }
+
+       if ((tls->negotiated_version && tls->negotiated_version != version) ||
+                       (!tls->negotiated_version &&
+                        tls->record_buf[1] != 0x03 /* Appending E.1 */)) {
+               TLS_DISCONNECT(TLS_ALERT_PROTOCOL_VERSION, 0,
+                               "Record version mismatch: %02x", version);
+               return false;
+       }
+
+       if (fragment_len < tls->mac_length[0]) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "Record fragment too short: %u", fragment_len);
+               return false;
+       }
+
+       compressed = alloca(8 + 5 + fragment_len);
+       /* Copy the type and version fields */
+       compressed[8] = type;
+       l_put_be16(version, compressed + 9);
+
+       switch (tls->cipher_type[0]) {
+       case TLS_CIPHER_STREAM:
+               cipher_output_len = fragment_len;
+               compressed_len = cipher_output_len - tls->mac_length[0];
+               l_put_be16(compressed_len, compressed + 11);
+
+               if (!tls->cipher[0])
+                       memcpy(compressed + 13, tls->record_buf + 5,
+                                       cipher_output_len);
+               else if (!l_cipher_decrypt(tls->cipher[0], tls->record_buf + 5,
+                                               compressed + 13,
+                                               cipher_output_len)) {
+                       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                       "Decrypting record fragment failed");
+                       return false;
+               }
+
+               /* Calculate the MAC if needed */
+               tls_write_mac(tls, compressed + 8, 5 + compressed_len,
+                               mac_buf, false);
+
+               if (memcmp(mac_buf, compressed + 13 + compressed_len,
+                                                       tls->mac_length[0])) {
+                       TLS_DISCONNECT(TLS_ALERT_BAD_RECORD_MAC, 0,
+                                       "Record fragment MAC mismatch");
+                       return false;
+               }
+
+               compressed += 13;
+
+               break;
+
+       case TLS_CIPHER_BLOCK:
+               i = 0;
+               if (tls->negotiated_version >= L_TLS_V11)
+                       i = tls->record_iv_length[0];
+
+               if (fragment_len <= tls->mac_length[0] + i) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "Record fragment too short: %u",
+                                       fragment_len);
+                       return false;
+               }
+
+               cipher_output_len = fragment_len - i;
+
+               if (cipher_output_len % tls->block_length[0] != 0) {
+                       /*
+                        * In strict TLS 1.0 TLS_ALERT_DECRYPT_FAIL_RESERVED
+                        * should be returned here but that was declared
+                        * unsafe in the TLS 1.1 spec.
+                        */
+                       TLS_DISCONNECT(TLS_ALERT_BAD_RECORD_MAC, 0,
+                                       "Fragment data len %i not a multiple "
+                                       "of block length %zi",
+                                       cipher_output_len,
+                                       tls->block_length[0]);
+                       return false;
+               }
+
+               if (tls->negotiated_version >= L_TLS_V12) {
+                       if (!l_cipher_set_iv(tls->cipher[0],
+                                               tls->record_buf + 5,
+                                               tls->record_iv_length[0])) {
+                               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                               "Setting fragment IV failed");
+                               return false;
+                       }
+               } else if (tls->negotiated_version >= L_TLS_V11)
+                       if (!l_cipher_decrypt(tls->cipher[0],
+                                               tls->record_buf + 5, iv,
+                                               tls->record_iv_length[0])) {
+                               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                               "Setting fragment IV failed");
+                               return false;
+                       }
+
+               if (!l_cipher_decrypt(tls->cipher[0], tls->record_buf + 5 + i,
+                                       compressed + 13, cipher_output_len)) {
+                       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                       "Fragment decryption failed");
+                       return false;
+               }
+
+               /*
+                * RFC 5246, page 24:
+                * In order to defend against this attack, implementations
+                * MUST ensure that record processing time is essentially the
+                * same whether or not the padding is correct.  In general,
+                * the best way to do this is to compute the MAC even if the
+                * padding is incorrect, and only then reject the packet.  For
+                * instance, if the pad appears to be incorrect, the
+                * implementation might assume a zero-length pad and then
+                * compute the MAC.
+                */
+               padding_len = compressed[13 + cipher_output_len - 1];
+               error = 0;
+               if (padding_len + tls->mac_length[0] + 1 >
+                               (size_t) cipher_output_len) {
+                       /*
+                        * In strict TLS 1.0 TLS_ALERT_DECRYPT_FAIL_RESERVED
+                        * should be returned here but that was declared
+                        * unsafe in the TLS 1.1 spec.
+                        */
+                       padding_len = 0;
+                       error = 1;
+               }
+
+               compressed_len = cipher_output_len - 1 - padding_len -
+                       tls->mac_length[0];
+               l_put_be16(compressed_len, compressed + 11);
+
+               for (i = 0; i < padding_len; i++)
+                       if (compressed[13 + cipher_output_len - 1 -
+                                       padding_len + i] != padding_len)
+                               error = 1;
+
+               /* Calculate the MAC if needed */
+               tls_write_mac(tls, compressed + 8, 5 + compressed_len,
+                               mac_buf, false);
+
+               if ((tls->mac_length[0] && memcmp(mac_buf, compressed + 13 +
+                                       compressed_len, tls->mac_length[0])) ||
+                               error) {
+                       TLS_DISCONNECT(TLS_ALERT_BAD_RECORD_MAC, 0,
+                                       "Record fragment MAC mismatch");
+                       return false;
+               }
+
+               compressed += 13;
+
+               break;
+
+       case TLS_CIPHER_AEAD:
+               if (fragment_len <= tls->record_iv_length[0] +
+                               tls->auth_tag_length[0]) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "Record fragment too short: %u",
+                                       fragment_len);
+                       return false;
+               }
+
+               compressed_len = fragment_len - tls->record_iv_length[0] -
+                       tls->auth_tag_length[0];
+               l_put_be16(compressed_len, compressed + 11);
+
+               /* Prepend seq_num to TLSCompressed.type + .version + .length */
+               assocdata = compressed;
+               l_put_be64(tls->seq_num[0]++, assocdata);
+               compressed += 13;
+
+               /* Build the IV */
+               memcpy(iv, tls->fixed_iv[0], tls->fixed_iv_length[0]);
+               memcpy(iv + tls->fixed_iv_length[0], tls->record_buf + 5,
+                       tls->record_iv_length[0]);
+
+               if (!l_aead_cipher_decrypt(tls->aead_cipher[0],
+                               tls->record_buf + 5 + tls->record_iv_length[0],
+                               fragment_len - tls->record_iv_length[0],
+                               assocdata, 13, iv, tls->fixed_iv_length[0] +
+                               tls->record_iv_length[0],
+                               compressed, compressed_len)) {
+                       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                       "Decrypting record fragment failed");
+                       return false;
+               }
+
+               break;
+
+       default:
+               return false;
+       }
+
+       /* DEFLATE not supported so just pass on compressed / compressed_len */
+
+       return tls_handle_plaintext(tls, compressed, compressed_len,
+                                       type, version);
+}
+
+LIB_EXPORT void l_tls_handle_rx(struct l_tls *tls, const uint8_t *data,
+                               size_t len)
+{
+       int need_len;
+       int chunk_len;
+
+       tls->record_flush = false;
+
+       /* Reassemble TLSCiphertext structures from the received chunks */
+
+       while (1) {
+               /* Do we have a full header in tls->record_buf? */
+               if (tls->record_buf_len >= 5) {
+                       need_len = 5 + l_get_be16(tls->record_buf + 3);
+
+                       /* Do we have a full structure? */
+                       if (tls->record_buf_len == need_len) {
+                               if (!tls_handle_ciphertext(tls))
+                                       return;
+
+                               tls->record_buf_len = 0;
+                               need_len = 5;
+
+                               if (tls->record_flush)
+                                       break;
+                       }
+
+                       if (!len)
+                               break;
+               } else
+                       need_len = 5;
+
+               /* Try to fill up tls->record_buf up to need_len */
+               if (tls->record_buf_max_len < need_len) {
+                       tls->record_buf_max_len = need_len;
+                       tls->record_buf = l_realloc(tls->record_buf, need_len);
+               }
+
+               need_len -= tls->record_buf_len;
+               chunk_len = need_len;
+               if (len < (size_t) chunk_len)
+                       chunk_len = len;
+
+               memcpy(tls->record_buf + tls->record_buf_len, data, chunk_len);
+               tls->record_buf_len += chunk_len;
+               data += chunk_len;
+               len -= chunk_len;
+
+               if (chunk_len < need_len)
+                       break;
+       }
+}
diff --git a/ell/tls-suites.c b/ell/tls-suites.c
new file mode 100644 (file)
index 0000000..91bc2cf
--- /dev/null
@@ -0,0 +1,1373 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <strings.h>
+
+#include "util.h"
+#include "tls.h"
+#include "cipher.h"
+#include "checksum.h"
+#include "cert.h"
+#include "tls-private.h"
+#include "key.h"
+#include "random.h"
+#include "ecc.h"
+#include "ecdh.h"
+#include "missing.h"
+
+static bool tls_rsa_validate_cert_key(struct l_cert *cert)
+{
+       return l_cert_get_pubkey_type(cert) == L_CERT_KEY_RSA;
+}
+
+static ssize_t tls_rsa_sign(struct l_tls *tls, uint8_t *out, size_t out_len,
+                               tls_get_hash_t get_hash,
+                               const uint8_t *data, size_t data_len)
+{
+       ssize_t result = -EMSGSIZE;
+       enum l_checksum_type sign_checksum_type;
+       uint8_t sign_input[HANDSHAKE_HASH_MAX_SIZE + 36];
+       size_t sign_input_len;
+       uint8_t *ptr = out;
+
+       if (!tls->priv_key || !tls->priv_key_size) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, TLS_ALERT_BAD_CERT,
+                               "No private key loaded");
+
+               return -ENOKEY;
+       }
+
+       if (tls->negotiated_version >= L_TLS_V12) {
+               const struct tls_hash_algorithm *hash_type =
+                       &tls_handshake_hash_data[tls->signature_hash];
+
+               /* Build the DigitallySigned struct */
+               if (out_len < 2) /* Is there space for the algorithm IDs */
+                       goto error;
+
+               get_hash(tls, tls->signature_hash, data, data_len,
+                               sign_input, &sign_input_len);
+               sign_checksum_type = hash_type->l_id;
+
+               *ptr++ = hash_type->tls_id;
+               *ptr++ = 1;     /* RSA_sign */
+               out_len -= 2;
+       } else {
+               get_hash(tls, HANDSHAKE_HASH_MD5, data, data_len,
+                               sign_input + 0, NULL);
+               get_hash(tls, HANDSHAKE_HASH_SHA1, data, data_len,
+                               sign_input + 16, NULL);
+               sign_checksum_type = L_CHECKSUM_NONE;
+               sign_input_len = 36;
+       }
+
+       if (out_len < tls->priv_key_size + 2)
+               goto error;
+
+       l_put_be16(tls->priv_key_size, ptr);
+       result = l_key_sign(tls->priv_key, L_KEY_RSA_PKCS1_V1_5,
+                               sign_checksum_type, sign_input, ptr + 2,
+                               sign_input_len, tls->priv_key_size);
+       ptr += tls->priv_key_size + 2;
+
+       if (result == (ssize_t) tls->priv_key_size)
+               return ptr - out; /* Success */
+
+error:
+       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                       "Signing the hash failed: %s",
+                       strerror(-result));
+       return result;
+}
+
+static bool tls_rsa_verify(struct l_tls *tls, const uint8_t *in, size_t in_len,
+                               tls_get_hash_t get_hash,
+                               const uint8_t *data, size_t data_len)
+{
+       enum l_checksum_type sign_checksum_type;
+       uint8_t expected[HANDSHAKE_HASH_MAX_SIZE + 36];
+       size_t expected_len;
+       unsigned int offset;
+       bool success;
+
+       /* 2 bytes for SignatureAndHashAlgorithm if version >= 1.2 */
+       offset = 2;
+       if (tls->negotiated_version < L_TLS_V12)
+               offset = 0;
+
+       if (in_len < offset + 2 ||
+                       (size_t) l_get_be16(in + offset) + offset + 2 !=
+                       in_len) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0, "Signature msg too "
+                               "short (%zi) or signature length doesn't match",
+                               in_len);
+
+               return false;
+       }
+
+       /* Only the default hash type supported */
+       if (in_len != offset + 2 + tls->peer_pubkey_size) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "Signature length %zi not equal %zi", in_len,
+                               offset + 2 + tls->peer_pubkey_size);
+
+               return false;
+       }
+
+       if (tls->negotiated_version >= L_TLS_V12) {
+               enum handshake_hash_type hash;
+
+               /* Only RSA supported */
+               if (in[1] != 1 /* RSA_sign */) {
+                       TLS_DISCONNECT(TLS_ALERT_DECRYPT_ERROR, 0,
+                                       "Unknown signature algorithm %i",
+                                       in[1]);
+
+                       return false;
+               }
+
+               for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+                       if (tls_handshake_hash_data[hash].tls_id == in[0])
+                               break;
+
+               if (hash == __HANDSHAKE_HASH_COUNT) {
+                       TLS_DISCONNECT(TLS_ALERT_DECRYPT_ERROR, 0,
+                                       "Unknown hash type %i", in[0]);
+                       return false;
+               }
+
+               get_hash(tls, hash, data, data_len, expected, &expected_len);
+               sign_checksum_type = tls_handshake_hash_data[hash].l_id;
+
+               /*
+                * Note: Next we let the l_key_verify's underlying kernel
+                * operation prepend the OID to the hash to build the
+                * DigestInfo struct.  However according to 4.7 we need to
+                * support at least two forms of the signed content in the
+                * verification:
+                *  - DigestInfo with NULL AlgorithmIdentifier.parameters,
+                *  - DigestInfo with empty AlgorithmIdentifier.parameters,
+                *
+                * while the kernel only understands the former encoding.
+                * Note PKCS#1 versions 2.0 and later section A.2.4 do
+                * mandate NULL AlgorithmIdentifier.parameters.
+                *
+                * Additionally PKCS#1 v1.5 said BER is used in place of DER
+                * for DigestInfo encoding which adds more ambiguity in the
+                * encoding.
+                */
+       } else {
+               get_hash(tls, HANDSHAKE_HASH_MD5, data, data_len,
+                               expected + 0, NULL);
+               get_hash(tls, HANDSHAKE_HASH_SHA1, data, data_len,
+                               expected + 16, NULL);
+               expected_len = 36;
+               sign_checksum_type = L_CHECKSUM_NONE;
+
+               /*
+                * Note: Within the RSA padding for signatures PKCS#1 1.5
+                * allows the block format to be either 0 or 1, while PKCS#1
+                * v2.0+ mandates block type 1 making the signatures
+                * unambiguous.  TLS 1.0 doesn't additionally specify which
+                * block type is to be used (TLS 1.2 does) meaning that both
+                * PKCS#1 v1.5 types are allowed.  The l_key_verify's
+                * underlying kernel implementation only accepts block type
+                * 1.  If this ever becomes an issue we'd need to go back to
+                * using L_KEY_RSA_RAW and our own PKCS#1 v1.5 verify logic.
+                */
+       }
+
+       success = l_key_verify(tls->peer_pubkey, L_KEY_RSA_PKCS1_V1_5,
+                               sign_checksum_type, expected, in + offset + 2,
+                               expected_len, tls->peer_pubkey_size);
+
+       if (!success)
+               TLS_DISCONNECT(TLS_ALERT_DECRYPT_ERROR, 0,
+                               "Peer signature verification failed");
+       else
+               TLS_DEBUG("Peer signature verified");
+
+       return success;
+}
+
+static struct tls_signature_algorithm tls_rsa_signature = {
+       .id = 1, /* SignatureAlgorithm.rsa */
+       .validate_cert_key_type = tls_rsa_validate_cert_key,
+       .sign = tls_rsa_sign,
+       .verify = tls_rsa_verify,
+};
+
+static bool tls_send_rsa_client_key_xchg(struct l_tls *tls)
+{
+       uint8_t buf[1024 + 32];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       uint8_t pre_master_secret[48];
+       ssize_t bytes_encrypted;
+
+       if (!tls->peer_pubkey) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Peer public key not received");
+
+               return false;
+       }
+
+       /* Must match the version in tls_send_client_hello */
+       pre_master_secret[0] = (uint8_t) (tls->max_version >> 8);
+       pre_master_secret[1] = (uint8_t) (tls->max_version >> 0);
+
+       l_getrandom(pre_master_secret + 2, 46);
+
+       if (tls->peer_pubkey_size + 32 > (int) sizeof(buf)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Peer public key too big: %zi",
+                               tls->peer_pubkey_size);
+
+               return false;
+       }
+
+       l_put_be16(tls->peer_pubkey_size, ptr);
+       bytes_encrypted = l_key_encrypt(tls->peer_pubkey,
+                                       L_KEY_RSA_PKCS1_V1_5, L_CHECKSUM_NONE,
+                                       pre_master_secret, ptr + 2, 48,
+                                       tls->peer_pubkey_size);
+       ptr += tls->peer_pubkey_size + 2;
+
+       if (bytes_encrypted != (ssize_t) tls->peer_pubkey_size) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Encrypting PreMasterSecret failed: %s",
+                               strerror(-bytes_encrypted));
+
+               return false;
+       }
+
+       tls_tx_handshake(tls, TLS_CLIENT_KEY_EXCHANGE, buf, ptr - buf);
+
+       tls_generate_master_secret(tls, pre_master_secret, 48);
+       explicit_bzero(pre_master_secret, 48);
+
+       return true;
+}
+
+static void tls_handle_rsa_client_key_xchg(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       uint8_t pre_master_secret[48], random_secret[46];
+       ssize_t bytes_decrypted;
+
+       if (!tls->priv_key || !tls->priv_key_size) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, TLS_ALERT_BAD_CERT,
+                               "No private key");
+
+               return;
+       }
+
+       if (len != tls->priv_key_size + 2) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "ClientKeyExchange len %zi not %zi", len,
+                               tls->priv_key_size + 2);
+
+               return;
+       }
+
+       len = l_get_be16(buf);
+
+       if (len != tls->priv_key_size) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "EncryptedPreMasterSecret len %zi not %zi",
+                               len, tls->priv_key_size);
+
+               return;
+       }
+
+       bytes_decrypted = l_key_decrypt(tls->priv_key, L_KEY_RSA_PKCS1_V1_5,
+                                       L_CHECKSUM_NONE, buf + 2,
+                                       pre_master_secret, tls->priv_key_size,
+                                       48);
+
+       /*
+        * Assume correct premaster secret client version which according
+        * to the TLS1.2 spec is unlikely in client implementations SSLv3
+        * and prior.  Spec suggests either not supporting them or adding
+        * a configurable override for <= SSLv3 clients.  For now we have
+        * no need to support them.
+        *
+        * On any decode error randomise the Pre Master Secret as per the
+        * countermeasures in 7.4.7.1 and don't generate any alerts.
+        */
+       l_getrandom(random_secret, 46);
+
+       pre_master_secret[0] = tls->client_version >> 8;
+       pre_master_secret[1] = tls->client_version >> 0;
+
+       if (bytes_decrypted != 48) {
+               memcpy(pre_master_secret + 2, random_secret, 46);
+
+               TLS_DEBUG("Error decrypting PreMasterSecret: %s",
+                               strerror(-bytes_decrypted));
+       }
+
+       tls_generate_master_secret(tls, pre_master_secret, 48);
+       explicit_bzero(pre_master_secret, 48);
+       explicit_bzero(random_secret, 46);
+}
+
+static struct tls_key_exchange_algorithm tls_rsa_key_xchg = {
+       .send_client_key_exchange = tls_send_rsa_client_key_xchg,
+       .handle_client_key_exchange = tls_handle_rsa_client_key_xchg,
+};
+
+/* Used by both DHE and ECDHE */
+static bool tls_get_dh_params_hash(struct l_tls *tls,
+                                       enum handshake_hash_type type,
+                                       const uint8_t *data, size_t data_len,
+                                       uint8_t *out, size_t *out_len)
+{
+       struct l_checksum *checksum;
+       ssize_t ret;
+
+       /*
+        * The ServerKeyExchange signature hash input format for RSA_sign is
+        * not really specified in either RFC 8422 or RFC 5246 explicitly
+        * but we use this format by analogy to DHE_RSA which uses RSA_sign
+        * as well.  Also matches ecdsa, ed25519 and ed448 formats.
+        */
+       struct iovec iov[] = {
+               { .iov_base = tls->pending.client_random, .iov_len = 32 },
+               { .iov_base = tls->pending.server_random, .iov_len = 32 },
+               { .iov_base = (void *) data, .iov_len = data_len },
+       };
+
+       checksum = l_checksum_new(tls_handshake_hash_data[type].l_id);
+       if (!checksum)
+               return false;
+
+       l_checksum_updatev(checksum, iov, L_ARRAY_SIZE(iov));
+       ret = l_checksum_get_digest(checksum, out, HANDSHAKE_HASH_MAX_SIZE);
+       l_checksum_free(checksum);
+
+       if (ret < 0)
+               return false;
+
+       if (out_len)
+               *out_len = ret;
+
+       return true;
+}
+
+struct tls_ecdhe_params {
+       const struct l_ecc_curve *curve;
+       struct l_ecc_scalar *private;
+       struct l_ecc_point *public;
+};
+
+static void tls_free_ecdhe_params(struct l_tls *tls)
+{
+       struct tls_ecdhe_params *params = tls->pending.key_xchg_params;
+
+       if (!params)
+               return;
+
+       tls->pending.key_xchg_params = NULL;
+
+       l_ecc_scalar_free(params->private);
+       l_ecc_point_free(params->public);
+       l_free(params);
+}
+
+static size_t tls_write_ecpoint(uint8_t *buf, size_t len,
+                               const struct tls_named_group *curve,
+                               const struct l_ecc_point *point)
+{
+       size_t point_bytes;
+
+       /* RFC 8422, Section 5.4.1 */
+       point_bytes = l_ecc_point_get_data(point, buf + 2, len - 2);
+       buf[0] = 1 + point_bytes;               /* length */
+       buf[1] = 4;                             /* form: uncompressed */
+       return 2 + point_bytes;
+}
+
+static size_t tls_write_server_ecdh_params(struct l_tls *tls, uint8_t *buf, size_t len)
+{
+       struct tls_ecdhe_params *params = tls->pending.key_xchg_params;
+
+       /* RFC 8422, Section 5.4 */
+       buf[0] = 3;                             /* curve_type: named_curve */
+       l_put_be16(tls->negotiated_curve->id, buf + 1);
+       return 3 + tls_write_ecpoint(buf + 3, len - 3, tls->negotiated_curve,
+                                       params->public);
+}
+
+static bool tls_send_ecdhe_server_key_xchg(struct l_tls *tls)
+{
+       uint8_t buf[1024];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       struct tls_ecdhe_params *params;
+       ssize_t sign_len;
+       const uint8_t *server_ecdh_params_ptr;
+
+       /*
+        * RFC 8422, Section 5.4
+        *
+        * If we're getting here we can assume that tls->pending.key_xchg_params
+        * is NULL, tls->priv_key is our signing key and tls->negotiated_curve
+        * is non-NULL.
+        */
+
+       params = l_new(struct tls_ecdhe_params, 1);
+       params->curve = l_ecc_curve_get_tls_group(tls->negotiated_curve->id);
+       tls->pending.key_xchg_params = params;
+
+       if (!l_ecdh_generate_key_pair(params->curve,
+                                       &params->private, &params->public)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Generating ECDH key pair failed");
+               return false;
+       }
+
+       server_ecdh_params_ptr = ptr;
+       ptr += tls_write_server_ecdh_params(tls, ptr, buf + sizeof(buf) - ptr);
+
+       if (tls->pending.cipher_suite->signature) {
+               sign_len = tls->pending.cipher_suite->signature->sign(tls, ptr,
+                                               buf + sizeof(buf) - ptr,
+                                               tls_get_dh_params_hash,
+                                               server_ecdh_params_ptr,
+                                               ptr - server_ecdh_params_ptr);
+               if (sign_len < 0)
+                       return false;
+
+               ptr += sign_len;
+       }
+
+       tls_tx_handshake(tls, TLS_SERVER_KEY_EXCHANGE, buf, ptr - buf);
+
+       return true;
+}
+
+static void tls_handle_ecdhe_server_key_xchg(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       struct tls_ecdhe_params *params;
+       uint16_t namedcurve;
+       const uint8_t *server_ecdh_params_ptr = buf;
+       size_t point_bytes;
+
+       /* RFC 8422, Section 5.4 */
+
+       if (len < 5)
+               goto decode_error;
+
+       if (*buf != 3) {
+               TLS_DISCONNECT(TLS_ALERT_ILLEGAL_PARAM, 0,
+                               "Unsupported (deprecated?) ECCurveType %u",
+                               *buf);
+               return;
+       }
+
+       namedcurve = l_get_be16(buf + 1);
+       buf += 3;
+       len -= 3;
+
+       tls->negotiated_curve = tls_find_group(namedcurve);
+
+       if (!tls->negotiated_curve ||
+                       tls->negotiated_curve->type != TLS_GROUP_TYPE_EC) {
+               TLS_DISCONNECT(TLS_ALERT_ILLEGAL_PARAM, 0,
+                               "Unsupported NamedCurve %u", namedcurve);
+               return;
+       }
+
+       TLS_DEBUG("Negotiated %s", tls->negotiated_curve->name);
+
+       if (*buf < 1)
+               goto decode_error;
+
+       point_bytes = *buf++ - 1;
+
+       if (*buf != 4) {        /* uncompressed */
+               TLS_DISCONNECT(TLS_ALERT_ILLEGAL_PARAM, 0,
+                               "Unsupported (deprecated?) PointConversionForm "
+                               "%u", *buf);
+               return;
+       }
+
+       buf++;
+       len -= 2;
+
+       if (len < point_bytes)
+               goto decode_error;
+
+       /*
+        * RFC 8422, Section 5.11: "A receiving party MUST check that the
+        * x and y parameters from the peer's public value satisfy the
+        * curve equation, y^2 = x^3 + ax + b mod p."
+        * This happens in l_ecc_point_from_data when the L_ECC_POINT_TYPE_FULL
+        * format is used.
+        */
+       params = l_new(struct tls_ecdhe_params, 1);
+       params->curve = l_ecc_curve_get_tls_group(tls->negotiated_curve->id);
+       params->public = l_ecc_point_from_data(params->curve,
+                                               L_ECC_POINT_TYPE_FULL,
+                                               buf, len);
+       tls->pending.key_xchg_params = params;
+       buf += point_bytes;
+       len -= point_bytes;
+
+       if (!params->public || point_bytes !=
+                       2 * l_ecc_curve_get_scalar_bytes(params->curve)) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "ServerKeyExchange.params.public decode error");
+               return;
+       }
+
+       if (tls->pending.cipher_suite->signature) {
+               if (!tls->pending.cipher_suite->signature->verify(tls, buf, len,
+                                               tls_get_dh_params_hash,
+                                               server_ecdh_params_ptr,
+                                               buf - server_ecdh_params_ptr))
+                       return;
+       } else {
+               if (len)
+                       goto decode_error;
+       }
+
+       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_HELLO_DONE);
+
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "ServerKeyExchange decode error");
+}
+
+static bool tls_send_ecdhe_client_key_xchg(struct l_tls *tls)
+{
+       uint8_t buf[1024];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       uint8_t pre_master_secret[128];
+       ssize_t pre_master_secret_len;
+       struct tls_ecdhe_params *params = tls->pending.key_xchg_params;
+       struct l_ecc_point *our_public;
+       struct l_ecc_scalar *secret;
+
+       /* RFC 8422, Section 5.7 */
+
+       if (!l_ecdh_generate_key_pair(params->curve,
+                                       &params->private, &our_public)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Generating ECDH key pair failed");
+               return false;
+       }
+
+       ptr += tls_write_ecpoint(ptr, buf + sizeof(buf) - ptr,
+                                       tls->negotiated_curve, our_public);
+       l_ecc_point_free(our_public);
+
+       /*
+        * Neither 5.4 or 5.7 "Actions" paragraphs say when the ECDH shared
+        * secret is calculated but we can either do this in
+        * tls_handle_ecdhe_server_key_xchg or here.  In both cases we only
+        * need to store the public key in the client's key_xchg_params and
+        * can free all of the params after sending the ClientKeyExchange.
+        * By doing this calculation here we're aligned with RSA and also
+        * with the server mode where the shared secret can only be
+        * calculated after the ClientKeyExchange is received.
+        */
+       if (!l_ecdh_generate_shared_secret(params->private, params->public,
+                                               &secret)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Generating ECDH shared-secret failed");
+               return false;
+       }
+
+       tls_free_ecdhe_params(tls);
+       pre_master_secret_len = l_ecc_scalar_get_data(secret,
+                                               pre_master_secret,
+                                               sizeof(pre_master_secret));
+       l_ecc_scalar_free(secret);
+
+       if (pre_master_secret_len < 0) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "l_ecc_scalar_get_data(secret) failed");
+               return false;
+       }
+
+       tls_tx_handshake(tls, TLS_CLIENT_KEY_EXCHANGE, buf, ptr - buf);
+
+       tls_generate_master_secret(tls, pre_master_secret,
+                                       pre_master_secret_len);
+       explicit_bzero(pre_master_secret, pre_master_secret_len);
+
+       return true;
+}
+
+static void tls_handle_ecdhe_client_key_xchg(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       struct tls_ecdhe_params *params = tls->pending.key_xchg_params;
+       uint8_t pre_master_secret[128];
+       ssize_t pre_master_secret_len;
+       struct l_ecc_point *other_public;
+       struct l_ecc_scalar *secret;
+       size_t point_bytes = 2 * l_ecc_curve_get_scalar_bytes(params->curve);
+
+       /* RFC 8422, Section 5.7 */
+
+       if (len < 2)
+               goto decode_error;
+
+       if (*buf++ != 1 + point_bytes)
+               goto decode_error;
+
+       if (*buf != 4) {        /* uncompressed */
+               TLS_DISCONNECT(TLS_ALERT_ILLEGAL_PARAM, 0,
+                               "Unsupported (deprecated?) PointConversionForm "
+                               "%u", *buf);
+               return;
+       }
+
+       buf++;
+       len -= 2;
+
+       if (len != point_bytes)
+               goto decode_error;
+
+       /*
+        * RFC 8422, Section 5.11: "A receiving party MUST check that the
+        * x and y parameters from the peer's public value satisfy the
+        * curve equation, y^2 = x^3 + ax + b mod p."
+        * This happens in l_ecc_point_from_data when the L_ECC_POINT_TYPE_FULL
+        * format is used.
+        */
+       other_public = l_ecc_point_from_data(params->curve,
+                                               L_ECC_POINT_TYPE_FULL,
+                                               buf, len);
+       if (!other_public) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "ClientKeyExchange.exchange_keys.ecdh_Yc "
+                               "decode error");
+               return;
+       }
+
+       if (!l_ecdh_generate_shared_secret(params->private, other_public,
+                                               &secret)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Generating ECDH shared-secret failed");
+               return;
+       }
+
+       tls_free_ecdhe_params(tls);
+       l_ecc_point_free(other_public);
+       pre_master_secret_len = l_ecc_scalar_get_data(secret,
+                                               pre_master_secret,
+                                               sizeof(pre_master_secret));
+       l_ecc_scalar_free(secret);
+
+       if (pre_master_secret_len < 0) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "l_ecc_scalar_get_data(secret) failed");
+               return;
+       }
+
+       tls_generate_master_secret(tls, pre_master_secret,
+                                       pre_master_secret_len);
+       explicit_bzero(pre_master_secret, pre_master_secret_len);
+
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "ClientKeyExchange decode error");
+}
+
+static struct tls_key_exchange_algorithm tls_ecdhe = {
+       .need_ecc = true,
+       .send_server_key_exchange = tls_send_ecdhe_server_key_xchg,
+       .handle_server_key_exchange = tls_handle_ecdhe_server_key_xchg,
+       .send_client_key_exchange = tls_send_ecdhe_client_key_xchg,
+       .handle_client_key_exchange = tls_handle_ecdhe_client_key_xchg,
+       .free_params = tls_free_ecdhe_params,
+};
+
+/* Maximum FF DH prime modulus size in bytes */
+#define TLS_DHE_MAX_SIZE 1024
+
+struct tls_dhe_params {
+       size_t prime_len;
+       struct l_key *prime;
+       struct l_key *generator;
+       struct l_key *private;
+       struct l_key *public;
+};
+
+static void tls_free_dhe_params(struct l_tls *tls)
+{
+       struct tls_dhe_params *params = tls->pending.key_xchg_params;
+
+       if (!params)
+               return;
+
+       tls->pending.key_xchg_params = NULL;
+
+       l_key_free(params->prime);
+       l_key_free(params->generator);
+       l_key_free(params->private);
+       l_key_free(params->public);
+       l_free(params);
+}
+
+static bool tls_send_dhe_server_key_xchg(struct l_tls *tls)
+{
+       uint8_t buf[1024 + TLS_DHE_MAX_SIZE * 3];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       struct tls_dhe_params *params;
+       const uint8_t *prime_buf;
+       uint8_t generator_buf = tls->negotiated_ff_group->ff.generator;
+       uint8_t public_buf[TLS_DHE_MAX_SIZE];
+       size_t public_len;
+       unsigned int zeros = 0;
+       ssize_t sign_len;
+       const uint8_t *server_dh_params_ptr;
+
+       params = l_new(struct tls_dhe_params, 1);
+       prime_buf = tls->negotiated_ff_group->ff.prime;
+       params->prime_len = tls->negotiated_ff_group->ff.prime_len;
+
+       params->prime = l_key_new(L_KEY_RAW, prime_buf, params->prime_len);
+       params->generator = l_key_new(L_KEY_RAW, &generator_buf, 1);
+
+       if (!params->prime || !params->generator) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0, "l_key_new failed");
+               goto free_params;
+       }
+
+       params->private = l_key_generate_dh_private(prime_buf, params->prime_len);
+       if (!params->private) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "l_key_generate_dh_private failed");
+               goto free_params;
+       }
+
+       memset(public_buf, 0, sizeof(public_buf));
+       public_len = params->prime_len;
+
+       if (!l_key_compute_dh_public(params->generator, params->private,
+                                       params->prime, public_buf,
+                                       &public_len)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "l_key_compute_dh_public failed");
+               goto free_params;
+       }
+
+       while (zeros < public_len && public_buf[zeros] == 0x00)
+               zeros++;
+
+       server_dh_params_ptr = ptr;
+
+       /* RFC 5246, Section 7.4.3 */
+
+       l_put_be16(params->prime_len, ptr);
+       memcpy(ptr + 2, prime_buf, params->prime_len);
+       ptr += 2 + params->prime_len;
+
+       l_put_be16(1, ptr);
+       memcpy(ptr + 2, &generator_buf, 1);
+       ptr += 2 + 1;
+
+       l_put_be16(public_len - zeros, ptr);
+       memcpy(ptr + 2, public_buf + zeros, public_len - zeros);
+       ptr += 2 + public_len - zeros;
+
+       if (tls->pending.cipher_suite->signature) {
+               sign_len = tls->pending.cipher_suite->signature->sign(tls, ptr,
+                                               buf + sizeof(buf) - ptr,
+                                               tls_get_dh_params_hash,
+                                               server_dh_params_ptr,
+                                               ptr - server_dh_params_ptr);
+               if (sign_len < 0)
+                       goto free_params;
+
+               ptr += sign_len;
+       }
+
+       tls->pending.key_xchg_params = params;
+
+       tls_tx_handshake(tls, TLS_SERVER_KEY_EXCHANGE, buf, ptr - buf);
+       return true;
+
+free_params:
+       l_key_free(params->prime);
+       l_key_free(params->generator);
+       l_key_free(params->private);
+       l_free(params);
+       return false;
+}
+
+static void tls_handle_dhe_server_key_xchg(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       struct tls_dhe_params *params = NULL;
+       const uint8_t *prime_buf;
+       const uint8_t *generator_buf;
+       size_t generator_len;
+       const uint8_t *public_buf;
+       size_t public_len;
+       const uint8_t *server_dh_params_ptr = buf;
+
+       if (len < 2)
+               goto decode_error;
+
+       params = l_new(struct tls_dhe_params, 1);
+       params->prime_len = l_get_be16(buf);
+       if (len < 2 + params->prime_len + 2)
+               goto decode_error;
+
+       prime_buf = buf + 2;
+       buf += 2 + params->prime_len;
+       len -= 2 + params->prime_len;
+
+       /* Strip leading zeros for the length checks later */
+       while (params->prime_len && prime_buf[0] == 0x00) {
+               prime_buf++;
+               params->prime_len--;
+       }
+
+       generator_len = l_get_be16(buf);
+       if (len < 2 + generator_len + 2)
+               goto decode_error;
+
+       generator_buf = buf + 2;
+       buf += 2 + generator_len;
+       len -= 2 + generator_len;
+
+       public_len = l_get_be16(buf);
+       if (len < 2 + public_len)
+               goto decode_error;
+
+       public_buf = buf + 2;
+       buf += 2 + public_len;
+       len -= 2 + public_len;
+
+       /*
+        * Validate the values received.  Without requiring RFC 7919 from
+        * the server, and there are many servers that don't implement it
+        * yet, we basically have to blindly accept the provided prime value.
+        * We have no way to confirm that it's actually prime or that it's a
+        * "safe prime" or that it forms a group without small sub-groups.
+        * There's also no way to whitelist all valid values.  But we do a
+        * basic sanity check and require it to be 1536-bit or longer, the
+        * minimum length required by the Linux kernel for keyctl_dh_compute().
+        * The generator must also be at least within the min & max interval
+        * for the private/public values.
+        */
+
+       if (params->prime_len > TLS_DHE_MAX_SIZE || params->prime_len < 192 ||
+                       !(prime_buf[params->prime_len - 1] & 1)) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Server DH prime modulus invalid");
+               goto free_params;
+       }
+
+       if (!l_key_validate_dh_payload(generator_buf, generator_len,
+                                       prime_buf, params->prime_len)) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Server DH generator value invalid");
+               goto free_params;
+       }
+
+       /*
+        * Just output a warning if the server sent group parameters not
+        * offered in our RFC 7919 Supported Groups extension.
+        */
+       if (!tls_find_ff_group(prime_buf, params->prime_len,
+                               generator_buf, generator_len))
+               TLS_DEBUG("Warning: using server's custom %i-bit FF DH group",
+                               (int) (params->prime_len * 8));
+
+       /*
+        * RFC 7919 Section 3.0:
+        * "the client MUST verify that dh_Ys is in the range
+        * 1 < dh_Ys < dh_p - 1.  If dh_Ys is not in this range, the client
+        * MUST terminate the connection with a fatal handshake_failure(40)
+        * alert."
+        */
+       if (!l_key_validate_dh_payload(public_buf, public_len,
+                                       prime_buf, params->prime_len)) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Server DH public value invalid");
+               goto free_params;
+       }
+
+       params->prime = l_key_new(L_KEY_RAW, prime_buf, params->prime_len);
+       params->generator = l_key_new(L_KEY_RAW, generator_buf, generator_len);
+       params->public = l_key_new(L_KEY_RAW, public_buf, public_len);
+
+       if (!params->prime || !params->generator || !params->public) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0, "l_key_new failed");
+               goto free_params;
+       }
+
+       /* Do this now so we don't need prime_buf in send_client_key_xchg */
+       params->private = l_key_generate_dh_private(prime_buf, params->prime_len);
+       if (!params->private) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "l_key_generate_dh_private failed");
+               goto free_params;
+       }
+
+       tls->pending.key_xchg_params = params;
+
+       if (tls->pending.cipher_suite->signature) {
+               if (!tls->pending.cipher_suite->signature->verify(tls, buf, len,
+                                               tls_get_dh_params_hash,
+                                               server_dh_params_ptr,
+                                               buf - server_dh_params_ptr))
+                       return;
+       } else {
+               if (len)
+                       goto decode_error;
+       }
+
+       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_HELLO_DONE);
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "ServerKeyExchange decode error");
+
+free_params:
+       if (params) {
+               l_key_free(params->prime);
+               l_key_free(params->generator);
+               l_key_free(params->public);
+               l_free(params);
+       }
+}
+
+static bool tls_send_dhe_client_key_xchg(struct l_tls *tls)
+{
+       struct tls_dhe_params *params = tls->pending.key_xchg_params;
+       uint8_t buf[128 + params->prime_len];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       uint8_t public_buf[params->prime_len];
+       size_t public_len;
+       unsigned int zeros = 0;
+       uint8_t pre_master_secret[params->prime_len];
+       size_t pre_master_secret_len;
+
+       public_len = params->prime_len;
+       memset(public_buf, 0, sizeof(public_buf));
+
+       if (!l_key_compute_dh_public(params->generator, params->private,
+                                       params->prime, public_buf,
+                                       &public_len)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "l_key_compute_dh_public failed");
+               return false;
+       }
+
+       while (zeros < public_len && public_buf[zeros] == 0x00)
+               zeros++;
+
+       l_put_be16(public_len - zeros, ptr);
+       memcpy(ptr + 2, public_buf + zeros, public_len - zeros);
+       ptr += 2 + public_len - zeros;
+
+       pre_master_secret_len = params->prime_len;
+       zeros = 0;
+
+       if (!l_key_compute_dh_secret(params->public, params->private,
+                                       params->prime, pre_master_secret,
+                                       &pre_master_secret_len)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Generating DH shared-secret failed");
+               return false;
+       }
+
+       while (zeros < pre_master_secret_len &&
+                       pre_master_secret[zeros] == 0x00)
+               zeros++;
+
+       tls_tx_handshake(tls, TLS_CLIENT_KEY_EXCHANGE, buf, ptr - buf);
+
+       tls_free_dhe_params(tls);
+       tls_generate_master_secret(tls, pre_master_secret + zeros,
+                                       pre_master_secret_len - zeros);
+       explicit_bzero(pre_master_secret, pre_master_secret_len);
+       return true;
+}
+
+static void tls_handle_dhe_client_key_xchg(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       struct tls_dhe_params *params = tls->pending.key_xchg_params;
+       uint8_t pre_master_secret[params->prime_len];
+       size_t pre_master_secret_len;
+       size_t public_len;
+       unsigned int zeros = 0;
+
+       if (len < 2)
+               goto decode_error;
+
+       public_len = l_get_be16(buf);
+       buf += 2;
+       len -= 2;
+
+       if (public_len != len)
+               goto decode_error;
+
+       /*
+        * RFC 7919 Section 4:
+        * "the server MUST verify that 1 < dh_Yc < dh_p - 1.  If dh_Yc is
+        * out of range, the server MUST terminate the connection with
+        * a fatal handshake_failure(40) alert."
+        */
+       if (!l_key_validate_dh_payload(buf, public_len,
+                                       tls->negotiated_ff_group->ff.prime,
+                                       params->prime_len)) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Client DH public value invalid");
+               return;
+       }
+
+       params->public = l_key_new(L_KEY_RAW, buf, public_len);
+       if (!params->public) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0, "l_key_new failed");
+               return;
+       }
+
+       pre_master_secret_len = params->prime_len;
+
+       if (!l_key_compute_dh_secret(params->public, params->private,
+                                       params->prime, pre_master_secret,
+                                       &pre_master_secret_len)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Generating DH shared-secret failed");
+               return;
+       }
+
+       while (zeros < pre_master_secret_len &&
+                       pre_master_secret[zeros] == 0x00)
+               zeros++;
+
+       tls_free_dhe_params(tls);
+       tls_generate_master_secret(tls, pre_master_secret + zeros,
+                                       pre_master_secret_len - zeros);
+       explicit_bzero(pre_master_secret, pre_master_secret_len);
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "ClientKeyExchange decode error");
+}
+
+static struct tls_key_exchange_algorithm tls_dhe = {
+       .need_ecc = true,
+       .send_server_key_exchange = tls_send_dhe_server_key_xchg,
+       .handle_server_key_exchange = tls_handle_dhe_server_key_xchg,
+       .send_client_key_exchange = tls_send_dhe_client_key_xchg,
+       .handle_client_key_exchange = tls_handle_dhe_client_key_xchg,
+       .free_params = tls_free_dhe_params,
+};
+
+static struct tls_bulk_encryption_algorithm tls_rc4 = {
+       .cipher_type = TLS_CIPHER_STREAM,
+       .l_id = L_CIPHER_ARC4,
+       .key_length = 16,
+}, tls_aes128 = {
+       .cipher_type = TLS_CIPHER_BLOCK,
+       .l_id = L_CIPHER_AES_CBC,
+       .key_length = 16,
+       .iv_length = 16,
+       .block_length = 16,
+}, tls_aes256 = {
+       .cipher_type = TLS_CIPHER_BLOCK,
+       .l_id = L_CIPHER_AES_CBC,
+       .key_length = 32,
+       .iv_length = 16,
+       .block_length = 16,
+}, tls_3des_ede = {
+       .cipher_type = TLS_CIPHER_BLOCK,
+       .l_id = L_CIPHER_DES3_EDE_CBC,
+       .key_length = 24,
+       .iv_length = 8,
+       .block_length = 8,
+}, tls_aes128_gcm = {
+       .cipher_type = TLS_CIPHER_AEAD,
+       .l_aead_id = L_AEAD_CIPHER_AES_GCM,
+       .key_length = 16,
+       .iv_length = 12,
+       .fixed_iv_length = 4,
+       .auth_tag_length = 16,
+}, tls_aes256_gcm = {
+       .cipher_type = TLS_CIPHER_AEAD,
+       .l_aead_id = L_AEAD_CIPHER_AES_GCM,
+       .key_length = 32,
+       .iv_length = 12,
+       .fixed_iv_length = 4,
+       .auth_tag_length = 16,
+};
+
+static struct tls_mac_algorithm tls_md5 = {
+       .id = 1,
+       .hmac_type = L_CHECKSUM_MD5,
+       .mac_length = 16,
+}, tls_sha = {
+       .id = 2,
+       .hmac_type = L_CHECKSUM_SHA1,
+       .mac_length = 20,
+}, tls_sha256 = {
+       .id = 4,
+       .hmac_type = L_CHECKSUM_SHA256,
+       .mac_length = 32,
+}, tls_sha384 = {
+       .id = 5,
+       .hmac_type = L_CHECKSUM_SHA384,
+       .mac_length = 48,
+};
+
+static struct tls_cipher_suite tls_rsa_with_rc4_128_md5 = {
+       .id = { 0x00, 0x04 },
+       .name = "TLS_RSA_WITH_RC4_128_MD5",
+       .verify_data_length = 12,
+       .encryption = &tls_rc4,
+       .mac = &tls_md5,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_rsa_with_rc4_128_sha = {
+       .id = { 0x00, 0x05 },
+       .name = "TLS_RSA_WITH_RC4_128_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_rc4,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_rsa_with_3des_ede_cbc_sha = {
+       .id = { 0x00, 0x0a },
+       .name = "TLS_RSA_WITH_3DES_EDE_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_3des_ede,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_dhe_rsa_with_3des_ede_cbc_sha = {
+       .id = { 0x00, 0x16 },
+       .name = "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_3des_ede,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_rsa_with_aes_128_cbc_sha = {
+       .id = { 0x00, 0x2f },
+       .name = "TLS_RSA_WITH_AES_128_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_dhe_rsa_with_aes_128_cbc_sha = {
+       .id = { 0x00, 0x33 },
+       .name = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_rsa_with_aes_256_cbc_sha = {
+       .id = { 0x00, 0x35 },
+       .name = "TLS_RSA_WITH_AES_256_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_dhe_rsa_with_aes_256_cbc_sha = {
+       .id = { 0x00, 0x39 },
+       .name = "TLS_DHE_RSA_WITH_AES_256_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_rsa_with_aes_128_cbc_sha256 = {
+       .id = { 0x00, 0x3c },
+       .name = "TLS_RSA_WITH_AES_128_CBC_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128,
+       .mac = &tls_sha256,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_rsa_with_aes_256_cbc_sha256 = {
+       .id = { 0x00, 0x3d },
+       .name = "TLS_RSA_WITH_AES_256_CBC_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256,
+       .mac = &tls_sha256,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_dhe_rsa_with_aes_128_cbc_sha256 = {
+       .id = { 0x00, 0x67 },
+       .name = "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128,
+       .mac = &tls_sha256,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_dhe_rsa_with_aes_256_cbc_sha256 = {
+       .id = { 0x00, 0x6b },
+       .name = "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256,
+       .mac = &tls_sha256,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_rsa_with_aes_128_gcm_sha256 = {
+       .id = { 0x00, 0x9c },
+       .name = "TLS_RSA_WITH_AES_128_GCM_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128_gcm,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_rsa_with_aes_256_gcm_sha384 = {
+       .id = { 0x00, 0x9d },
+       .name = "TLS_RSA_WITH_AES_256_GCM_SHA384",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256_gcm,
+       .prf_hmac = L_CHECKSUM_SHA384,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_rsa_key_xchg,
+}, tls_dhe_rsa_with_aes_128_gcm_sha256 = {
+       .id = { 0x00, 0x9e },
+       .name = "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128_gcm,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_dhe_rsa_with_aes_256_gcm_sha384 = {
+       .id = { 0x00, 0x9f },
+       .name = "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256_gcm,
+       .prf_hmac = L_CHECKSUM_SHA384,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_dhe,
+}, tls_ecdhe_rsa_with_rc4_128_sha = {
+       .id = { 0xc0, 0x11 },
+       .name = "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_rc4,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_3des_ede_cbc_sha = {
+       .id = { 0xc0, 0x12 },
+       .name = "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_3des_ede,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_aes_128_cbc_sha = {
+       .id = { 0xc0, 0x13 },
+       .name = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_aes_256_cbc_sha = {
+       .id = { 0xc0, 0x14 },
+       .name = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256,
+       .mac = &tls_sha,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_aes_128_cbc_sha256 = {
+       .id = { 0xc0, 0x27 },
+       .name = "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128,
+       .mac = &tls_sha256,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_aes_256_cbc_sha384 = {
+       .id = { 0xc0, 0x28 },
+       .name = "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256,
+       .mac = &tls_sha384,
+       .prf_hmac = L_CHECKSUM_SHA384,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_aes_128_gcm_sha256 = {
+       .id = { 0xc0, 0x2f },
+       .name = "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+       .verify_data_length = 12,
+       .encryption = &tls_aes128_gcm,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+}, tls_ecdhe_rsa_with_aes_256_gcm_sha384 = {
+       .id = { 0xc0, 0x30 },
+       .name = "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+       .verify_data_length = 12,
+       .encryption = &tls_aes256_gcm,
+       .prf_hmac = L_CHECKSUM_SHA384,
+       .signature = &tls_rsa_signature,
+       .key_xchg = &tls_ecdhe,
+};
+
+struct tls_cipher_suite *tls_cipher_suite_pref[] = {
+       &tls_ecdhe_rsa_with_aes_256_cbc_sha,
+       &tls_ecdhe_rsa_with_aes_128_cbc_sha,
+       &tls_dhe_rsa_with_aes_256_cbc_sha,
+       &tls_dhe_rsa_with_aes_128_cbc_sha,
+       &tls_rsa_with_aes_256_cbc_sha,
+       &tls_rsa_with_aes_128_cbc_sha,
+       &tls_ecdhe_rsa_with_aes_256_cbc_sha384,
+       &tls_ecdhe_rsa_with_aes_128_cbc_sha256,
+       &tls_dhe_rsa_with_aes_256_cbc_sha256,
+       &tls_dhe_rsa_with_aes_128_cbc_sha256,
+       &tls_rsa_with_aes_256_cbc_sha256,
+       &tls_rsa_with_aes_128_cbc_sha256,
+       &tls_ecdhe_rsa_with_aes_256_gcm_sha384,
+       &tls_ecdhe_rsa_with_aes_128_gcm_sha256,
+       &tls_dhe_rsa_with_aes_256_gcm_sha384,
+       &tls_dhe_rsa_with_aes_128_gcm_sha256,
+       &tls_rsa_with_aes_256_gcm_sha384,
+       &tls_rsa_with_aes_128_gcm_sha256,
+       &tls_ecdhe_rsa_with_3des_ede_cbc_sha,
+       &tls_dhe_rsa_with_3des_ede_cbc_sha,
+       &tls_rsa_with_3des_ede_cbc_sha,
+       &tls_ecdhe_rsa_with_rc4_128_sha,
+       &tls_rsa_with_rc4_128_sha,
+       &tls_rsa_with_rc4_128_md5,
+       NULL,
+};
diff --git a/ell/tls.c b/ell/tls.c
new file mode 100644 (file)
index 0000000..52e7924
--- /dev/null
+++ b/ell/tls.c
@@ -0,0 +1,3078 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <time.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <strings.h>
+
+#include "util.h"
+#include "private.h"
+#include "tls.h"
+#include "checksum.h"
+#include "cipher.h"
+#include "random.h"
+#include "queue.h"
+#include "pem.h"
+#include "cert.h"
+#include "cert-private.h"
+#include "tls-private.h"
+#include "key.h"
+#include "asn1-private.h"
+#include "strv.h"
+#include "missing.h"
+#include "string.h"
+
+bool tls10_prf(const void *secret, size_t secret_len,
+               const char *label,
+               const void *seed, size_t seed_len,
+               uint8_t *out, size_t out_len)
+{
+       uint8_t p_hash2[out_len];
+       uint8_t l_s1 = (secret_len + 1) / 2;
+       unsigned int i;
+
+       /*
+        * RFC2246 section 5:
+        * S1 and S2 are the two halves of the secret, and each is the same
+        * length.  S1 is taken from the first half of the secret, S2 from the
+        * second half.  Their length is created by rounding up the length of
+        * the overall secret, divided by two; thus, if the original secret is
+        * an odd number of bytes long, the last byte of S1 will be the same as
+        * the first byte of S2.
+        */
+
+       if (!tls12_prf(L_CHECKSUM_MD5, secret, l_s1,
+                       label, seed, seed_len,
+                       out, out_len))
+               return false;
+
+       if (secret_len > 0)
+               secret += secret_len - l_s1;
+
+       if (!tls12_prf(L_CHECKSUM_SHA1, secret, l_s1,
+                       label, seed, seed_len,
+                       p_hash2, out_len))
+               return false;
+
+       for (i = 0; i < out_len; i++)
+               out[i] ^= p_hash2[i];
+
+       return true;
+}
+
+bool tls12_prf(enum l_checksum_type type,
+               const void *secret, size_t secret_len,
+               const char *label,
+               const void *seed, size_t seed_len,
+               uint8_t *out, size_t out_len)
+{
+       struct l_checksum *hmac = l_checksum_new_hmac(type, secret, secret_len);
+       size_t a_len, chunk_len, prfseed_len = strlen(label) + seed_len;
+       uint8_t a[64 + prfseed_len], prfseed[prfseed_len];
+
+       if (!hmac)
+               return false;
+
+       /* Generate the hash seed or A(0) as label + seed */
+       memcpy(prfseed, label, strlen(label));
+       memcpy(prfseed + strlen(label), seed, seed_len);
+
+       memcpy(a, prfseed, prfseed_len);
+       a_len = prfseed_len;
+
+       while (out_len) {
+               /* Generate A(i) */
+               l_checksum_reset(hmac);
+               l_checksum_update(hmac, a, a_len);
+               a_len = l_checksum_get_digest(hmac, a, sizeof(a));
+
+               /* Append seed & generate output */
+               memcpy(a + a_len, prfseed, prfseed_len);
+               l_checksum_reset(hmac);
+               l_checksum_update(hmac, a, a_len + prfseed_len);
+
+               chunk_len = l_checksum_get_digest(hmac, out, out_len);
+               out += chunk_len;
+               out_len -= chunk_len;
+       }
+
+       l_checksum_free(hmac);
+       return true;
+}
+
+static bool tls_prf_get_bytes(struct l_tls *tls,
+                               const void *secret, size_t secret_len,
+                               const char *label,
+                               const void *seed, size_t seed_len,
+                               uint8_t *buf, size_t len)
+{
+       if (tls->negotiated_version >= L_TLS_V12)
+               return tls12_prf(tls->prf_hmac->l_id,
+                                       secret, secret_len, label,
+                                       seed, seed_len, buf, len);
+       else
+               return tls10_prf(secret, secret_len, label, seed, seed_len,
+                                       buf, len);
+}
+
+LIB_EXPORT bool l_tls_prf_get_bytes(struct l_tls *tls, bool use_master_secret,
+                               const char *label, uint8_t *buf, size_t len)
+{
+       uint8_t seed[64];
+       bool r;
+
+       if (unlikely(!tls || !tls->prf_hmac))
+               return false;
+
+       memcpy(seed +  0, tls->pending.client_random, 32);
+       memcpy(seed + 32, tls->pending.server_random, 32);
+
+       if (use_master_secret)
+               r = tls_prf_get_bytes(tls, tls->pending.master_secret, 48,
+                                       label, seed, 64, buf, len);
+       else
+               r = tls_prf_get_bytes(tls, "", 0, label, seed, 64, buf, len);
+
+       explicit_bzero(seed, 64);
+
+       return r;
+}
+
+static void tls_write_random(uint8_t *buf)
+{
+       l_put_be32(time(NULL), buf);
+
+       l_getrandom(buf + 4, 28);
+}
+
+static void tls_drop_handshake_hash(struct l_tls *tls,
+                                       enum handshake_hash_type hash)
+{
+       if (tls->handshake_hash[hash]) {
+               l_checksum_free(tls->handshake_hash[hash]);
+
+               tls->handshake_hash[hash] = NULL;
+       }
+}
+
+static void tls_reset_handshake(struct l_tls *tls)
+{
+       enum handshake_hash_type hash;
+
+       explicit_bzero(tls->pending.key_block, sizeof(tls->pending.key_block));
+
+       if (tls->pending.cipher_suite &&
+                       tls->pending.cipher_suite->key_xchg->free_params)
+               tls->pending.cipher_suite->key_xchg->free_params(tls);
+
+       l_cert_free(tls->peer_cert);
+       l_key_free(tls->peer_pubkey);
+
+       tls->peer_cert = NULL;
+       tls->peer_pubkey = NULL;
+       tls->peer_pubkey_size = 0;
+       tls->negotiated_curve = NULL;
+       tls->negotiated_ff_group = NULL;
+
+       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+               tls_drop_handshake_hash(tls, hash);
+
+       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_START);
+       tls->cert_requested = 0;
+       tls->cert_sent = 0;
+}
+
+static void tls_cleanup_handshake(struct l_tls *tls)
+{
+       explicit_bzero(tls->pending.client_random, 32);
+       explicit_bzero(tls->pending.server_random, 32);
+       explicit_bzero(tls->pending.master_secret, 48);
+}
+
+static bool tls_change_cipher_spec(struct l_tls *tls, bool txrx,
+                                       const char **error)
+{
+       struct tls_bulk_encryption_algorithm *enc;
+       struct tls_mac_algorithm *mac;
+       int key_offset;
+       static char error_buf[200];
+
+       if (tls->cipher_type[txrx] == TLS_CIPHER_AEAD) {
+               if (tls->aead_cipher[txrx]) {
+                       l_aead_cipher_free(tls->aead_cipher[txrx]);
+                       tls->aead_cipher[txrx] = NULL;
+               }
+       } else {
+               if (tls->cipher[txrx]) {
+                       l_cipher_free(tls->cipher[txrx]);
+                       tls->cipher[txrx] = NULL;
+               }
+       }
+
+       tls->cipher_type[txrx] = TLS_CIPHER_STREAM;
+
+       if (tls->mac[txrx]) {
+               l_checksum_free(tls->mac[txrx]);
+               tls->mac[txrx] = NULL;
+       }
+
+       tls->mac_length[txrx] = 0;
+       tls->block_length[txrx] = 0;
+       tls->record_iv_length[txrx] = 0;
+
+       if (tls->fixed_iv_length[txrx]) {
+               explicit_bzero(tls->fixed_iv[txrx], tls->fixed_iv_length[txrx]);
+               tls->fixed_iv_length[txrx] = 0;
+       }
+
+       tls->auth_tag_length[txrx] = 0;
+       tls->seq_num[txrx] = 0;
+
+       tls->cipher_suite[txrx] = tls->pending.cipher_suite;
+       if (!tls->cipher_suite[txrx])
+               return true;
+
+       key_offset = 0;
+
+       if (tls->cipher_suite[txrx]->mac) {
+               mac = tls->cipher_suite[txrx]->mac;
+
+               /* Server write / client read is 2nd in the key block */
+               if ((tls->server && txrx) || (!tls->server && !txrx))
+                       key_offset += mac->mac_length;
+
+               tls->mac[txrx] = l_checksum_new_hmac(mac->hmac_type,
+                                               tls->pending.key_block +
+                                               key_offset, mac->mac_length);
+
+               /* Wipe out the now unneeded part of the key block */
+               explicit_bzero(tls->pending.key_block + key_offset,
+                               mac->mac_length);
+
+               if (!tls->mac[txrx]) {
+                       if (error) {
+                               *error = error_buf;
+                               snprintf(error_buf, sizeof(error_buf),
+                                               "Can't create %s's %s HMAC",
+                                               tls->cipher_suite[txrx]->name,
+                                               txrx ? "Tx" : "Rx");
+                       }
+
+                       return false;
+               }
+
+               tls->mac_length[txrx] = mac->mac_length;
+
+               key_offset = 2 * mac->mac_length;
+       }
+
+       if (tls->cipher_suite[txrx]->encryption) {
+               void *cipher;
+
+               enc = tls->cipher_suite[txrx]->encryption;
+
+               /* Server write / client read is 4th in the key block */
+               if ((tls->server && txrx) || (!tls->server && !txrx))
+                       key_offset += enc->key_length;
+
+               if (enc->cipher_type == TLS_CIPHER_AEAD) {
+                       cipher = l_aead_cipher_new(enc->l_aead_id,
+                                               tls->pending.key_block +
+                                               key_offset, enc->key_length,
+                                               enc->auth_tag_length);
+                       tls->aead_cipher[txrx] = cipher;
+               } else {
+                       cipher = l_cipher_new(enc->l_id,
+                                               tls->pending.key_block +
+                                               key_offset, enc->key_length);
+                       tls->cipher[txrx] = cipher;
+               }
+
+               /* Wipe out the now unneeded part of the key block */
+               explicit_bzero(tls->pending.key_block + key_offset,
+                               enc->key_length);
+
+               if (!cipher) {
+                       if (error) {
+                               *error = error_buf;
+                               snprintf(error_buf, sizeof(error_buf),
+                                               "Can't create %s's %s cipher",
+                                               tls->cipher_suite[txrx]->name,
+                                               txrx ? "Tx" : "Rx");
+                       }
+
+                       return false;
+               }
+
+               tls->cipher_type[txrx] = enc->cipher_type;
+               tls->record_iv_length[txrx] = enc->iv_length -
+                       enc->fixed_iv_length;
+               tls->block_length[txrx] = enc->block_length;
+               tls->auth_tag_length[txrx] = enc->auth_tag_length;
+
+               if ((tls->server && txrx) || (!tls->server && !txrx))
+                       key_offset += enc->key_length;
+               else
+                       key_offset += 2 * enc->key_length;
+       }
+
+       if (tls->negotiated_version <= L_TLS_V10 &&
+                       tls->cipher_suite[txrx]->encryption &&
+                       tls->cipher_suite[txrx]->encryption->cipher_type ==
+                       TLS_CIPHER_BLOCK) {
+               enc = tls->cipher_suite[txrx]->encryption;
+
+               /* Server write / client read is 6th in the key block */
+               if ((tls->server && txrx) || (!tls->server && !txrx))
+                       key_offset += enc->iv_length;
+
+               l_cipher_set_iv(tls->cipher[txrx], tls->pending.key_block +
+                               key_offset, enc->iv_length);
+
+               /* Wipe out the now unneeded part of the key block */
+               explicit_bzero(tls->pending.key_block + key_offset,
+                               enc->iv_length);
+       } else if (tls->cipher_suite[txrx]->encryption &&
+                       tls->cipher_suite[txrx]->encryption->fixed_iv_length) {
+               enc = tls->cipher_suite[txrx]->encryption;
+
+               /* Server write / client read is 6th in the key block */
+               if ((tls->server && txrx) || (!tls->server && !txrx))
+                       key_offset += enc->fixed_iv_length;
+
+               tls->fixed_iv_length[txrx] = enc->fixed_iv_length;
+               memcpy(tls->fixed_iv[txrx], tls->pending.key_block + key_offset,
+                       enc->fixed_iv_length);
+
+               /* Wipe out the now unneeded part of the key block */
+               explicit_bzero(tls->pending.key_block + key_offset,
+                               enc->fixed_iv_length);
+       }
+
+       return true;
+}
+
+static void tls_reset_cipher_spec(struct l_tls *tls, bool txrx)
+{
+       /* Reset everything to the TLS_NULL_WITH_NULL_NULL state */
+
+       tls->pending.cipher_suite = NULL;
+
+       tls_change_cipher_spec(tls, txrx, NULL);
+}
+
+bool tls_cipher_suite_is_compatible(struct l_tls *tls,
+                                       const struct tls_cipher_suite *suite,
+                                       const char **error)
+{
+       static char error_buf[200];
+       struct l_cert *leaf;
+       enum l_tls_version min_version =
+               tls->negotiated_version ?: tls->min_version;
+       enum l_tls_version max_version =
+               tls->negotiated_version ?: tls->max_version;
+
+       if (suite->encryption &&
+                       suite->encryption->cipher_type == TLS_CIPHER_AEAD) {
+               if (max_version < L_TLS_V12) {
+                       if (error) {
+                               *error = error_buf;
+                               snprintf(error_buf, sizeof(error_buf),
+                                               "Cipher suite %s uses an AEAD "
+                                               "cipher (TLS 1.2+) but "
+                                               TLS_VER_FMT
+                                               " was negotiated or is the max "
+                                               "version allowed", suite->name,
+                                               TLS_VER_ARGS(tls->max_version));
+                       }
+
+                       return false;
+               }
+
+               if (!l_aead_cipher_is_supported(suite->encryption->l_aead_id)) {
+                       if (error) {
+                               *error = error_buf;
+                               snprintf(error_buf, sizeof(error_buf),
+                                               "Cipher suite %s's AEAD cipher "
+                                               "algorithm not supported by "
+                                               "the kernel", suite->name);
+                       }
+
+                       return false;
+               }
+       } else if (suite->encryption) { /* Block or stream cipher */
+               if (!l_cipher_is_supported(suite->encryption->l_id)) {
+                       if (error) {
+                               *error = error_buf;
+                               snprintf(error_buf, sizeof(error_buf),
+                                               "Cipher suite %s's block/stream"
+                                               " cipher algorithm not "
+                                               "supported by the kernel",
+                                               suite->name);
+                       }
+
+                       return false;
+               }
+       }
+
+       if (suite->mac &&
+                       !l_checksum_is_supported(suite->mac->hmac_type, true)) {
+               if (error) {
+                       *error = error_buf;
+                       snprintf(error_buf, sizeof(error_buf),
+                                       "Cipher suite %s's HMAC algorithm not "
+                                       "supported by the kernel", suite->name);
+               }
+
+               return false;
+       }
+
+       if (
+                       (max_version < L_TLS_V12 &&
+                        (!l_checksum_is_supported(L_CHECKSUM_MD5, true) ||
+                         !l_checksum_is_supported(L_CHECKSUM_SHA1, true))) ||
+                       (min_version >= L_TLS_V12 &&
+                        !l_checksum_is_supported(
+                                       suite->prf_hmac != L_CHECKSUM_NONE ?
+                                       suite->prf_hmac : L_CHECKSUM_SHA256,
+                                       true))) {
+               if (error) {
+                       *error = error_buf;
+                       snprintf(error_buf, sizeof(error_buf),
+                                       "Cipher suite %s's PRF algorithm not "
+                                       "supported by the kernel", suite->name);
+               }
+
+               return false;
+       }
+
+       if (suite->key_xchg->need_ffdh &&
+                       !l_key_is_supported(L_KEY_FEATURE_DH)) {
+               if (error) {
+                       *error = error_buf;
+                       snprintf(error_buf, sizeof(error_buf),
+                                       "Cipher suite %s's key exchange "
+                                       "mechanism needs kernel DH support",
+                                       suite->name);
+               }
+
+               return false;
+       }
+
+       /*
+        * If the certificate is compatible with the signature algorithm it
+        * also must be compatible with the key exchange mechanism because
+        * the cipher suites are defined so that the same certificates can
+        * be used by both.
+        */
+       leaf = l_certchain_get_leaf(tls->cert);
+       if (leaf && suite->signature &&
+                       !suite->signature->validate_cert_key_type(leaf)) {
+               if (error) {
+                       *error = error_buf;
+                       snprintf(error_buf, sizeof(error_buf),
+                                       "Local certificate has key type "
+                                       "incompatible with cipher suite %s's "
+                                       "signature algorithm", suite->name);
+               }
+
+               return false;
+       }
+
+       /*
+        * On the server we know what elliptic curve we'll be using as soon
+        * as we've processed the ClientHello so for EC-based key exchange
+        * methods require that a curve has been selected.
+        */
+       if (suite->key_xchg->need_ecc && tls->server &&
+                       !tls->negotiated_curve) {
+               if (error) {
+                       *error = error_buf;
+                       snprintf(error_buf, sizeof(error_buf),
+                                       "No common supported elliptic curves "
+                                       "with the client, can't use %s",
+                                       suite->name);
+               }
+
+               return false;
+       }
+
+       /* Similarly for FF DH groups */
+       if (suite->key_xchg->need_ffdh && tls->server &&
+                       !tls->negotiated_ff_group) {
+               if (error) {
+                       *error = error_buf;
+                       snprintf(error_buf, sizeof(error_buf),
+                                       "No common supported finite-field "
+                                       "groups with the client, can't use %s",
+                                       suite->name);
+               }
+
+               return false;
+       }
+
+       return true;
+}
+
+static struct tls_cipher_suite *tls_find_cipher_suite(const uint8_t *id)
+{
+       struct tls_cipher_suite **suite;
+
+       for (suite = tls_cipher_suite_pref; *suite; suite++)
+               if ((*suite)->id[0] == id[0] && (*suite)->id[1] == id[1])
+                       return *suite;
+
+       return NULL;
+}
+
+static struct tls_compression_method tls_compression_pref[] = {
+       {
+               0,
+               "CompressionMethod.null",
+       },
+};
+
+static struct tls_compression_method *tls_find_compression_method(
+                                                       const uint8_t id)
+{
+       int i;
+
+       for (i = 0; i < (int) L_ARRAY_SIZE(tls_compression_pref); i++)
+               if (tls_compression_pref[i].id == id)
+                       return &tls_compression_pref[i];
+
+       return NULL;
+}
+
+const struct tls_hash_algorithm tls_handshake_hash_data[] = {
+       [HANDSHAKE_HASH_SHA384] = { 5, L_CHECKSUM_SHA384, "SHA384" },
+       [HANDSHAKE_HASH_SHA256] = { 4, L_CHECKSUM_SHA256, "SHA256" },
+       [HANDSHAKE_HASH_MD5]    = { 1, L_CHECKSUM_MD5, "MD5" },
+       [HANDSHAKE_HASH_SHA1]   = { 2, L_CHECKSUM_SHA1, "SHA1" },
+};
+
+static bool tls_init_handshake_hash(struct l_tls *tls)
+{
+       enum handshake_hash_type hash;
+       bool tls10 = tls->max_version < L_TLS_V12;
+
+       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++) {
+               /* Skip hash types we already know we won't need */
+               if (tls10 && hash != HANDSHAKE_HASH_SHA1 &&
+                               hash != HANDSHAKE_HASH_MD5)
+                       continue;
+
+               if (tls->handshake_hash[hash]) {
+                       TLS_DEBUG("Handshake hash %s already exists",
+                                       tls_handshake_hash_data[hash].name);
+                       goto err;
+               }
+
+               tls->handshake_hash[hash] = l_checksum_new(
+                                       tls_handshake_hash_data[hash].l_id);
+
+               if (!tls->handshake_hash[hash]) {
+                       TLS_DEBUG("Can't create %s hash",
+                                       tls_handshake_hash_data[hash].name);
+                       goto err;
+               }
+       }
+
+       return true;
+err:
+       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+               tls_drop_handshake_hash(tls, hash);
+
+       return false;
+}
+
+static const struct tls_hash_algorithm *tls_set_prf_hmac(struct l_tls *tls)
+{
+       enum handshake_hash_type hash;
+
+       if (tls->pending.cipher_suite->prf_hmac == L_CHECKSUM_NONE) {
+               tls->prf_hmac = &tls_handshake_hash_data[HANDSHAKE_HASH_SHA256];
+               return tls->prf_hmac;
+       }
+
+       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+               if (tls_handshake_hash_data[hash].l_id ==
+                               tls->pending.cipher_suite->prf_hmac) {
+                       tls->prf_hmac = &tls_handshake_hash_data[hash];
+                       return tls->prf_hmac;
+               }
+
+       return NULL;
+}
+
+static bool tls_domain_match_mask(const char *name, size_t name_len,
+                                       const char *mask, size_t mask_len)
+{
+       bool at_start = true;
+
+       while (1) {
+               const char *name_seg_end = memchr(name, '.', name_len);
+               const char *mask_seg_end = memchr(mask, '.', mask_len);
+               size_t name_seg_len = name_seg_end ?
+                       (size_t) (name_seg_end - name) : name_len;
+               size_t mask_seg_len = mask_seg_end ?
+                       (size_t) (mask_seg_end - mask) : mask_len;
+
+               if (mask_seg_len == 1 && mask[0] == '*') {
+                       /*
+                        * A * at the beginning of the mask matches any
+                        * number of labels.
+                        */
+                       if (at_start && name_seg_end &&
+                                       tls_domain_match_mask(name_seg_end + 1,
+                                               name_len - name_seg_len - 1,
+                                               mask, mask_len))
+                               return true;
+
+                       goto ok_next;
+               }
+
+               if (name_seg_len != mask_seg_len ||
+                               memcmp(name, mask, name_seg_len))
+                       return false;
+
+ok_next:
+               /* If either string ends here both must end here */
+               if (!name_seg_end || !mask_seg_end)
+                       return !name_seg_end && !mask_seg_end;
+
+               at_start = false;
+               name = name_seg_end + 1;
+               name_len -= name_seg_len + 1;
+               mask = mask_seg_end + 1;
+               mask_len -= mask_seg_len + 1;
+       }
+}
+
+static const struct asn1_oid subject_alt_name_oid =
+       { 3, { 0x55, 0x1d, 0x11 } };
+static const struct asn1_oid dn_common_name_oid =
+       { 3, { 0x55, 0x04, 0x03 } };
+
+#define SAN_DNS_NAME_ID ASN1_CONTEXT_IMPLICIT(2)
+
+static bool tls_cert_domains_match_mask(struct l_cert *cert, char **mask)
+{
+       const uint8_t *san, *dn, *end;
+       size_t san_len, dn_len;
+       uint8_t san_tag;
+       const char *cn = NULL;
+       size_t cn_len;
+       char **i;
+       bool dns_name_present = false;
+
+       /*
+        * Locate SubjectAltName (RFC5280 Section 4.2.1.6) and descend into
+        * the sole SEQUENCE element, check if any DNSName matches.
+        */
+       san = cert_get_extension(cert, &subject_alt_name_oid, NULL, &san_len);
+       if (san) {
+               san = asn1_der_find_elem(san, san_len, 0, &san_tag, &san_len);
+               if (unlikely(!san || san_tag != ASN1_ID_SEQUENCE))
+                       return false;
+
+               end = san + san_len;
+               while (san < end) {
+                       const uint8_t *value;
+                       uint8_t tag;
+                       size_t len;
+
+                       value = asn1_der_find_elem(san, end - san,
+                                                       SAN_DNS_NAME_ID,
+                                                       &tag, &len);
+                       if (!value)
+                               break;
+
+                       /* Type is implicitly IA5STRING */
+
+                       for (i = mask; *i; i++)
+                               if (tls_domain_match_mask((const char *) value,
+                                                       len, *i, strlen(*i)))
+                                       return true;
+
+                       san = value + len;
+                       dns_name_present = true;
+               }
+       }
+
+       /*
+        * Retrieve the Common Name from the Subject DN and check if it
+        * matches.
+        *
+        * We look at the Common Name only if no DNSNames were present in
+        * the certificate, following Wi-Fi Alliance's Hotspot 2.0
+        * Specification v3.1 section 7.3.3.2 step 2:
+        * "Verify in the AAA server certificate that the domain name from
+        * the FQDN [...] is a suffix match of the domain name in at least
+        * one of the DNSName SubjectAltName extensions. If a SubjectAltName
+        * of type DNSName is not present, then the domain name from the
+        * FQDN shall be a suffix match to the CommonName portion of the
+        * SubjectName. If neither of these conditions holds, then
+        * verification fails."
+        */
+       if (unlikely(dns_name_present))
+               return false;
+
+       dn = l_cert_get_dn(cert, &dn_len);
+       if (unlikely(!dn))
+               return false;
+
+       end = dn + dn_len;
+       while (dn < end) {
+               const uint8_t *set, *seq, *oid, *name;
+               uint8_t tag;
+               size_t len, oid_len, name_len;
+
+               set = asn1_der_find_elem(dn, end - dn, 0, &tag, &len);
+               if (unlikely(!set || tag != ASN1_ID_SET))
+                       return false;
+
+               dn = set + len;
+
+               seq = asn1_der_find_elem(set, len, 0, &tag, &len);
+               if (unlikely(!seq || tag != ASN1_ID_SEQUENCE))
+                       return false;
+
+               oid = asn1_der_find_elem(seq, len, 0, &tag, &oid_len);
+               if (unlikely(!oid || tag != ASN1_ID_OID))
+                       return false;
+
+               name = asn1_der_find_elem(seq, len, 1, &tag, &name_len);
+               if (unlikely(!name || (tag != ASN1_ID_PRINTABLESTRING &&
+                                       tag != ASN1_ID_UTF8STRING &&
+                                       tag != ASN1_ID_IA5STRING)))
+                       continue;
+
+               if (asn1_oid_eq(&dn_common_name_oid, oid_len, oid)) {
+                       cn = (const char *) name;
+                       cn_len = name_len;
+                       break;
+               }
+       }
+
+       if (unlikely(!cn))
+               return false;
+
+       for (i = mask; *i; i++)
+               if (tls_domain_match_mask(cn, cn_len, *i, strlen(*i)))
+                       return true;
+
+       return false;
+}
+
+#define SWITCH_ENUM_TO_STR(val) \
+       case (val):             \
+               return L_STRINGIFY(val);
+
+static const char *tls_handshake_type_to_str(enum tls_handshake_type type)
+{
+       static char buf[100];
+
+       switch (type) {
+       SWITCH_ENUM_TO_STR(TLS_HELLO_REQUEST)
+       SWITCH_ENUM_TO_STR(TLS_CLIENT_HELLO)
+       SWITCH_ENUM_TO_STR(TLS_SERVER_HELLO)
+       SWITCH_ENUM_TO_STR(TLS_CERTIFICATE)
+       SWITCH_ENUM_TO_STR(TLS_SERVER_KEY_EXCHANGE)
+       SWITCH_ENUM_TO_STR(TLS_CERTIFICATE_REQUEST)
+       SWITCH_ENUM_TO_STR(TLS_SERVER_HELLO_DONE)
+       SWITCH_ENUM_TO_STR(TLS_CERTIFICATE_VERIFY)
+       SWITCH_ENUM_TO_STR(TLS_CLIENT_KEY_EXCHANGE)
+       SWITCH_ENUM_TO_STR(TLS_FINISHED)
+       }
+
+       snprintf(buf, sizeof(buf), "tls_handshake_type(%i)", type);
+       return buf;
+}
+
+static void tls_send_alert(struct l_tls *tls, bool fatal,
+                               enum l_tls_alert_desc alert_desc)
+{
+       uint8_t buf[2];
+
+       TLS_DEBUG("Sending a %s Alert: %s", fatal ? "Fatal" : "Warning",
+                       l_tls_alert_to_str(alert_desc));
+
+       buf[0] = fatal ? 2 : 1;
+       buf[1] = alert_desc;
+
+       tls_tx_record(tls, TLS_CT_ALERT, buf, 2);
+}
+
+/*
+ * Callers make sure this is about the last function before returning
+ * from the stack frames up to the exported library call so that the
+ * user-supplied disconnected callback here is free to use l_tls_free
+ * for example.
+ */
+void tls_disconnect(struct l_tls *tls, enum l_tls_alert_desc desc,
+                       enum l_tls_alert_desc local_desc)
+{
+       tls_send_alert(tls, true, desc);
+
+       tls_reset_handshake(tls);
+       tls_cleanup_handshake(tls);
+
+       tls_reset_cipher_spec(tls, 0);
+       tls_reset_cipher_spec(tls, 1);
+
+       tls->negotiated_version = 0;
+       tls->ready = false;
+
+       tls->disconnected(local_desc ?: desc, local_desc && !desc,
+                               tls->user_data);
+}
+
+void tls_tx_handshake(struct l_tls *tls, int type, uint8_t *buf, size_t length)
+{
+       int i;
+
+       TLS_DEBUG("Sending a %s of %zi bytes",
+                       tls_handshake_type_to_str(type),
+                       length - TLS_HANDSHAKE_HEADER_SIZE);
+
+       /* Fill in the handshake header */
+
+       buf[0] = type;
+       buf[1] = (length - TLS_HANDSHAKE_HEADER_SIZE) >> 16;
+       buf[2] = (length - TLS_HANDSHAKE_HEADER_SIZE) >>  8;
+       buf[3] = (length - TLS_HANDSHAKE_HEADER_SIZE) >>  0;
+
+       for (i = 0; i < __HANDSHAKE_HASH_COUNT; i++)
+               if (tls->handshake_hash[i])
+                       l_checksum_update(tls->handshake_hash[i], buf, length);
+
+       tls_tx_record(tls, TLS_CT_HANDSHAKE, buf, length);
+}
+
+static ssize_t tls_append_hello_extensions(struct l_tls *tls,
+                                               struct l_queue *extensions,
+                                               uint8_t *buf, size_t len)
+{
+       uint8_t *ptr = buf;
+       uint8_t *extensions_len_ptr = ptr;
+       bool client_hello = !tls->server;
+       unsigned int i = 0;
+       const struct l_queue_entry *entry = l_queue_get_entries(extensions);
+
+       if (len < 2)
+               return -ENOSPC;
+
+       ptr += 2;
+       len -= 2;
+
+       while (1) {
+               const struct tls_hello_extension *extension;
+               ssize_t ext_len;
+               ssize_t (*ext_write)(struct l_tls *tls,
+                                       uint8_t *buf, size_t len);
+
+               if (client_hello) {
+                       extension = &tls_extensions[i++];
+                       if (!extension->name)
+                               break;
+
+                       ext_write = extension->client_write;
+               } else  {
+                       uint16_t ext_id;
+
+                       if (!entry)
+                               break;
+
+                       ext_id = L_PTR_TO_UINT(entry->data);
+                       entry = entry->next;
+
+                       for (i = 0; tls_extensions[i].name; i++)
+                               if (tls_extensions[i].id == ext_id)
+                                       break;
+
+                       extension = &tls_extensions[i];
+                       if (!extension->name)
+                               continue;
+
+                       ext_write = extension->server_write;
+               }
+
+               /*
+                * Note: could handle NULL client_write with non-NULL
+                * server_handle or server_handle_absent as "server-oriented"
+                * extension (7.4.1.4) and write empty extension_data and
+                * simliarly require empty extension_data in
+                * tls_handle_client_hello if client_handle NULL.
+                */
+               if (!ext_write)
+                       continue;
+
+               if (len < 4)
+                       return -ENOSPC;
+
+               ext_len = ext_write(tls, ptr + 4, len - 4);
+               if (ext_len == -ENOMSG)
+                       continue;
+
+               if (ext_len < 0) {
+                       TLS_DEBUG("%s extension's %s_write: %s",
+                                       extension->name,
+                                       client_hello ? "client" : "server",
+                                       strerror(-ext_len));
+                       return ext_len;
+               }
+
+               l_put_be16(extension->id, ptr + 0);
+               l_put_be16(ext_len, ptr + 2);
+               ptr += 4 + ext_len;
+               len -= 4 + ext_len;
+       }
+
+       if (ptr > extensions_len_ptr + 2)
+               l_put_be16(ptr - (extensions_len_ptr + 2), extensions_len_ptr);
+       else /* Skip the length if no extensions */
+               ptr = extensions_len_ptr;
+
+       return ptr - buf;
+}
+
+static bool tls_send_client_hello(struct l_tls *tls)
+{
+       uint8_t buf[1024 + L_ARRAY_SIZE(tls_compression_pref)];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       uint8_t *len_ptr;
+       unsigned int i;
+       ssize_t r;
+       struct tls_cipher_suite **suite;
+
+       /* Fill in the Client Hello body */
+
+       *ptr++ = (uint8_t) (tls->max_version >> 8);
+       *ptr++ = (uint8_t) (tls->max_version >> 0);
+
+       tls_write_random(tls->pending.client_random);
+       memcpy(ptr, tls->pending.client_random, 32);
+       ptr += 32;
+
+       *ptr++ = 0; /* No SessionID */
+
+       len_ptr = ptr;
+       ptr += 2;
+
+       for (suite = tls->cipher_suite_pref_list; *suite; suite++) {
+               const char *error;
+
+               if (!tls_cipher_suite_is_compatible(tls, *suite, &error)) {
+                       TLS_DEBUG("non-fatal: %s", error);
+                       continue;
+               }
+
+               *ptr++ = (*suite)->id[0];
+               *ptr++ = (*suite)->id[1];
+       }
+
+       if (ptr == len_ptr + 2) {
+               TLS_DEBUG("No compatible cipher suites, check kernel config, "
+                               "certificate's key type and TLS version range");
+               return false;
+       }
+
+       l_put_be16((ptr - len_ptr - 2), len_ptr);
+       *ptr++ = L_ARRAY_SIZE(tls_compression_pref);
+
+       for (i = 0; i < L_ARRAY_SIZE(tls_compression_pref); i++)
+               *ptr++ = tls_compression_pref[i].id;
+
+       r = tls_append_hello_extensions(tls, NULL,
+                                       ptr, buf + sizeof(buf) - ptr);
+       if (r < 0)
+               return false;
+
+       ptr += r;
+
+       tls_tx_handshake(tls, TLS_CLIENT_HELLO, buf, ptr - buf);
+       return true;
+}
+
+static bool tls_send_server_hello(struct l_tls *tls, struct l_queue *extensions)
+{
+       uint8_t buf[1024];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       ssize_t r;
+
+       /* Fill in the Server Hello body */
+
+       *ptr++ = tls->negotiated_version >> 8;
+       *ptr++ = tls->negotiated_version >> 0;
+
+       tls_write_random(tls->pending.server_random);
+       memcpy(ptr, tls->pending.server_random, 32);
+       ptr += 32;
+
+       *ptr++ = 0; /* Sessions are not cached */
+
+       *ptr++ = tls->pending.cipher_suite->id[0];
+       *ptr++ = tls->pending.cipher_suite->id[1];
+
+       *ptr++ = tls->pending.compression_method->id;
+
+       r = tls_append_hello_extensions(tls, extensions,
+                                       ptr, buf + sizeof(buf) - ptr);
+       if (r < 0) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Error appending extensions: %s",
+                               strerror(-r));
+               return false;
+       }
+
+       ptr += r;
+
+       tls_tx_handshake(tls, TLS_SERVER_HELLO, buf, ptr - buf);
+       return true;
+}
+
+static bool tls_cert_list_add_size(struct l_cert *cert, void *user_data)
+{
+       size_t *total = user_data;
+       size_t der_len;
+
+       l_cert_get_der_data(cert, &der_len);
+       *total += 3 + der_len;
+
+       return false;
+}
+
+static bool tls_cert_list_append(struct l_cert *cert, void *user_data)
+{
+       uint8_t **ptr = user_data;
+       const uint8_t *der;
+       size_t der_len;
+
+       der = l_cert_get_der_data(cert, &der_len);
+       *(*ptr)++ = der_len >> 16;
+       *(*ptr)++ = der_len >>  8;
+       *(*ptr)++ = der_len >>  0;
+       memcpy(*ptr, der, der_len);
+       *ptr += der_len;
+
+       return false;
+}
+
+static bool tls_send_certificate(struct l_tls *tls)
+{
+       uint8_t *buf, *ptr;
+       size_t total;
+
+       if (tls->server && !tls->cert) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, TLS_ALERT_BAD_CERT,
+                               "Certificate needed in server mode");
+               return false;
+       }
+
+       /*
+        * TODO: check that the certificate is compatible with hash and
+        * signature algorithms lists supplied to us in the Client Hello
+        * extensions (if we're a 1.2+ server) or in the Certificate Request
+        * (if we act as a 1.2+ client).
+        *
+        *  - for the hash and signature_algorithms list, check all
+        *    certs in the cert chain.
+        *
+        *  - also if !cipher_suite->key_xchg->key_exchange_msg, check that the
+        *    end entity certificate's key type matches and is usable with some
+        *    hash/signature pair.
+        *
+        *  - on client check if any of the supplied DNs (if any) match
+        *    anything in our cert chain.
+        */
+
+       total = 0;
+       l_certchain_walk_from_leaf(tls->cert, tls_cert_list_add_size, &total);
+
+       buf = l_malloc(128 + total);
+       ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+
+       /* Fill in the Certificate body */
+
+       *ptr++ = total >> 16;
+       *ptr++ = total >>  8;
+       *ptr++ = total >>  0;
+       l_certchain_walk_from_leaf(tls->cert, tls_cert_list_append, &ptr);
+
+       tls_tx_handshake(tls, TLS_CERTIFICATE, buf, ptr - buf);
+
+       l_free(buf);
+
+       if (tls->cert)
+               tls->cert_sent = true;
+
+       return true;
+}
+
+/*
+ * Note: ClientCertificateType.rsa_sign value coincides with the
+ * SignatureAlgorithm.rsa value but other values in those enum are
+ * different so we don't mix them, can't extract them from
+ * tls->pending.cipher_suite->signature.
+ */
+static uint8_t tls_cert_type_pref[] = {
+       1, /* RSA_sign */
+};
+
+static bool tls_send_certificate_request(struct l_tls *tls)
+{
+       uint8_t *buf, *ptr, *dn_ptr;
+       size_t len;
+       const struct l_queue_entry *entry;
+       unsigned int i;
+       size_t dn_total = 0;
+
+       for (entry = l_queue_get_entries(tls->ca_certs); entry;
+                       entry = entry->next) {
+               struct l_cert *ca_cert = entry->data;
+               size_t dn_size;
+
+               if (l_cert_get_dn(ca_cert, &dn_size))
+                       dn_total += 10 + dn_size;
+       }
+
+       len = 256 + L_ARRAY_SIZE(tls_cert_type_pref) + dn_total;
+       buf = l_malloc(len);
+       ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+
+       /* Fill in the Certificate Request body */
+
+       *ptr++ = L_ARRAY_SIZE(tls_cert_type_pref);
+       for (i = 0; i < L_ARRAY_SIZE(tls_cert_type_pref); i++)
+               *ptr++ = tls_cert_type_pref[i];
+
+       if (tls->negotiated_version >= L_TLS_V12) {
+               ssize_t ret = tls_write_signature_algorithms(tls, ptr,
+                                                       buf + len - ptr);
+
+               if (ret < 0) {
+                       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                       "tls_write_signature_algorithms: %s",
+                                       strerror(-ret));
+                       l_free(buf);
+                       return false;
+               }
+
+               ptr += ret;
+       }
+
+       dn_ptr = ptr;
+       ptr += 2;                       /* Leave space for the total DN size */
+
+       for (entry = l_queue_get_entries(tls->ca_certs); entry;
+                       entry = entry->next) {
+               struct l_cert *ca_cert = entry->data;
+               size_t dn_size;
+               const uint8_t *dn = l_cert_get_dn(ca_cert, &dn_size);
+               uint8_t *cur_dn_ptr = ptr;
+
+               if (!dn)
+                       continue;
+
+               ptr += 2;               /* Leave space for current DN size */
+               *ptr++ = ASN1_ID_SEQUENCE;      /* DER outer SEQUENCE tag */
+               asn1_write_definite_length(&ptr, dn_size); /* length */
+               memcpy(ptr, dn, dn_size);       /* value */
+               ptr += dn_size;
+               l_put_be16(ptr - cur_dn_ptr - 2, cur_dn_ptr);
+       }
+
+       l_put_be16(ptr - dn_ptr - 2, dn_ptr);   /* DistinguishedNames size */
+
+       tls_tx_handshake(tls, TLS_CERTIFICATE_REQUEST, buf, ptr - buf);
+
+       l_free(buf);
+
+       return true;
+}
+
+static void tls_send_server_hello_done(struct l_tls *tls)
+{
+       uint8_t buf[32];
+
+       /* No body */
+
+       tls_tx_handshake(tls, TLS_SERVER_HELLO_DONE, buf,
+                               TLS_HANDSHAKE_HEADER_SIZE);
+}
+
+void tls_generate_master_secret(struct l_tls *tls,
+                               const uint8_t *pre_master_secret,
+                               int pre_master_secret_len)
+{
+       uint8_t seed[64];
+       int key_block_size;
+
+       memcpy(seed +  0, tls->pending.client_random, 32);
+       memcpy(seed + 32, tls->pending.server_random, 32);
+
+       tls_prf_get_bytes(tls, pre_master_secret, pre_master_secret_len,
+                               "master secret", seed, 64,
+                               tls->pending.master_secret, 48);
+
+       /* Directly generate the key block while we're at it */
+       key_block_size = 0;
+
+       if (tls->pending.cipher_suite->encryption)
+               key_block_size += 2 *
+                       tls->pending.cipher_suite->encryption->key_length;
+
+       if (tls->pending.cipher_suite->mac)
+               key_block_size += 2 *
+                       tls->pending.cipher_suite->mac->mac_length;
+
+       if (tls->pending.cipher_suite->encryption &&
+                       tls->negotiated_version <= L_TLS_V10 &&
+                       tls->pending.cipher_suite->encryption->cipher_type ==
+                       TLS_CIPHER_BLOCK)
+               key_block_size += 2 *
+                       tls->pending.cipher_suite->encryption->iv_length;
+
+       if (tls->pending.cipher_suite->encryption)
+               key_block_size += 2 * tls->pending.cipher_suite->encryption->
+                       fixed_iv_length;
+
+       /* Reverse order from the master secret seed */
+       memcpy(seed +  0, tls->pending.server_random, 32);
+       memcpy(seed + 32, tls->pending.client_random, 32);
+
+       tls_prf_get_bytes(tls, tls->pending.master_secret, 48,
+                               "key expansion", seed, 64,
+                               tls->pending.key_block, key_block_size);
+
+       explicit_bzero(seed, 64);
+}
+
+static void tls_get_handshake_hash(struct l_tls *tls,
+                                       enum handshake_hash_type type,
+                                       uint8_t *out)
+{
+       struct l_checksum *hash = l_checksum_clone(tls->handshake_hash[type]);
+
+       if (!hash)
+               return;
+
+       l_checksum_get_digest(hash, out, l_checksum_digest_length(
+                                       tls_handshake_hash_data[type].l_id));
+       l_checksum_free(hash);
+}
+
+static bool tls_get_handshake_hash_by_type(struct l_tls *tls,
+                                       enum handshake_hash_type type,
+                                       const uint8_t *data, size_t data_len,
+                                       uint8_t *out, size_t *out_len)
+{
+       if (!tls->handshake_hash[type])
+               return false;
+
+       if (out_len)
+               *out_len = l_checksum_digest_length(
+                                       tls_handshake_hash_data[type].l_id);
+
+       tls_get_handshake_hash(tls, type, out);
+       return true;
+}
+
+static bool tls_send_certificate_verify(struct l_tls *tls)
+{
+       uint8_t buf[2048];
+       int i;
+       ssize_t sign_len;
+
+       /* Fill in the Certificate Verify body */
+
+       sign_len = tls->pending.cipher_suite->signature->sign(tls,
+                                       buf + TLS_HANDSHAKE_HEADER_SIZE,
+                                       2048 - TLS_HANDSHAKE_HEADER_SIZE,
+                                       tls_get_handshake_hash_by_type,
+                                       NULL, 0);
+
+       if (sign_len < 0)
+               return false;
+
+       /* Stop maintaining handshake message hashes other than the PRF hash */
+       if (tls->negotiated_version >= L_TLS_V12)
+               for (i = 0; i < __HANDSHAKE_HASH_COUNT; i++)
+                       if (&tls_handshake_hash_data[i] != tls->prf_hmac)
+                               tls_drop_handshake_hash(tls, i);
+
+       tls_tx_handshake(tls, TLS_CERTIFICATE_VERIFY, buf,
+                               sign_len + TLS_HANDSHAKE_HEADER_SIZE);
+
+       return true;
+}
+
+static void tls_send_change_cipher_spec(struct l_tls *tls)
+{
+       uint8_t buf = 1;
+
+       tls_tx_record(tls, TLS_CT_CHANGE_CIPHER_SPEC, &buf, 1);
+}
+
+static void tls_send_finished(struct l_tls *tls)
+{
+       uint8_t buf[512];
+       uint8_t *ptr = buf + TLS_HANDSHAKE_HEADER_SIZE;
+       uint8_t seed[HANDSHAKE_HASH_MAX_SIZE * 2];
+       size_t seed_len;
+
+       if (tls->negotiated_version >= L_TLS_V12) {
+               /* Same hash type as that used for the PRF (usually SHA256) */
+               enum handshake_hash_type hash;
+
+               for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+                       if (&tls_handshake_hash_data[hash] == tls->prf_hmac)
+                               break;
+
+               tls_get_handshake_hash(tls, hash, seed);
+               seed_len = l_checksum_digest_length(tls->prf_hmac->l_id);
+       } else {
+               tls_get_handshake_hash(tls, HANDSHAKE_HASH_MD5, seed + 0);
+               tls_get_handshake_hash(tls, HANDSHAKE_HASH_SHA1, seed + 16);
+               seed_len = 36;
+       }
+
+       tls_prf_get_bytes(tls, tls->pending.master_secret, 48,
+                               tls->server ? "server finished" :
+                               "client finished",
+                               seed, seed_len,
+                               ptr, tls->cipher_suite[1]->verify_data_length);
+       ptr += tls->cipher_suite[1]->verify_data_length;
+
+       tls_tx_handshake(tls, TLS_FINISHED, buf, ptr - buf);
+}
+
+static bool tls_verify_finished(struct l_tls *tls, const uint8_t *received,
+                               size_t len)
+{
+       uint8_t expected[tls->cipher_suite[0]->verify_data_length];
+       uint8_t *seed;
+       size_t seed_len;
+
+       if (len != (size_t) tls->cipher_suite[0]->verify_data_length) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "TLS_FINISHED length not %i",
+                               tls->cipher_suite[0]->verify_data_length);
+
+               return false;
+       }
+
+       if (tls->negotiated_version >= L_TLS_V12) {
+               enum handshake_hash_type hash;
+
+               for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+                       if (&tls_handshake_hash_data[hash] == tls->prf_hmac)
+                               break;
+
+               seed = tls->prev_digest[hash];
+               seed_len = l_checksum_digest_length(tls->prf_hmac->l_id);
+       } else {
+               seed = alloca(36);
+               memcpy(seed + 0, tls->prev_digest[HANDSHAKE_HASH_MD5], 16);
+               memcpy(seed + 16, tls->prev_digest[HANDSHAKE_HASH_SHA1], 20);
+               seed_len = 36;
+       }
+
+       tls_prf_get_bytes(tls, tls->pending.master_secret, 48,
+                               tls->server ? "client finished" :
+                               "server finished",
+                               seed, seed_len,
+                               expected,
+                               tls->cipher_suite[0]->verify_data_length);
+
+       if (memcmp(received, expected, len)) {
+               TLS_DISCONNECT(TLS_ALERT_DECRYPT_ERROR, 0,
+                               "TLS_FINISHED contents don't match");
+
+               return false;
+       }
+
+       return true;
+}
+
+static bool tls_ptr_match(const void *a, const void *b)
+{
+       return a == b;
+}
+
+static bool tls_handle_hello_extensions(struct l_tls *tls,
+                                       const uint8_t *buf, size_t len,
+                                       struct l_queue *seen)
+{
+       unsigned int i;
+       const struct tls_hello_extension *extension;
+       bool client_hello = tls->server;
+       uint16_t extensions_size;
+
+       if (!len)
+               return true;
+
+       if (len < 2 || len > 2 + 65535)
+               goto decode_error;
+
+       extensions_size = l_get_be16(buf);
+       len -= 2;
+       buf += 2;
+
+       if (len != extensions_size)
+               goto decode_error;
+
+       while (len) {
+               uint16_t ext_id;
+               size_t ext_len;
+               bool (*handler)(struct l_tls *tls,
+                               const uint8_t *buf, size_t len);
+
+               if (len < 4)
+                       goto decode_error;
+
+               ext_id = l_get_be16(buf + 0);
+               ext_len = l_get_be16(buf + 2);
+               buf += 4;
+               len -= 4;
+
+               if (ext_len > len)
+                       goto decode_error;
+
+               /*
+                * RFC 5246, Section 7.4.1.4: "There MUST NOT be more than
+                * one extension of the same type."
+                */
+               if (l_queue_find(seen, tls_ptr_match, L_UINT_TO_PTR(ext_id))) {
+                       TLS_DEBUG("Duplicate extension %u", ext_id);
+                       goto decode_error;
+               }
+
+               l_queue_push_tail(seen, L_UINT_TO_PTR(ext_id));
+
+               extension = NULL;
+
+               for (i = 0; tls_extensions[i].name; i++)
+                       if (tls_extensions[i].id == ext_id) {
+                               extension = &tls_extensions[i];
+                               break;
+                       }
+
+               if (!extension)
+                       goto next;
+
+               handler = client_hello ?
+                       extension->client_handle : extension->server_handle;
+
+               /*
+                * RFC 5246, Section 7.4.1.4: "If a client receives an
+                * extension type in ServerHello that it did not request in
+                * the associated ClientHello, it MUST abort the handshake
+                * with an unsupported_extension fatal alert."
+                * There are however servers that include an unsolicited
+                * Supported Point Format extension where the handshake
+                * still completes fine if the extension is ignored so we
+                * do this instead.
+                */
+               if (!client_hello && !handler) {
+                       TLS_DEBUG("non-fatal: %s extension not expected in "
+                                       "a ServerHello", extension->name);
+                       goto next;
+               }
+
+               if (!handler(tls, buf, ext_len)) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "Hello %s extension parse error",
+                                       extension->name);
+                       return false;
+               }
+
+next:
+               buf += ext_len;
+               len -= ext_len;
+       }
+
+       /*
+        * Trigger any actions needed when an extension is missing and its
+        * handler has not been called yet.
+        */
+       for (i = 0; tls_extensions[i].name; i++) {
+               bool (*handler)(struct l_tls *tls);
+
+               extension = &tls_extensions[i];
+               handler = client_hello ?
+                       extension->client_handle_absent :
+                       extension->server_handle_absent;
+
+               if (!handler)
+                       continue;
+
+               if (l_queue_find(seen, tls_ptr_match,
+                                       L_UINT_TO_PTR(extension->id)))
+                       continue;
+
+               if (!handler(tls)) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "Hello %s extension missing",
+                                       extension->name);
+                       return false;
+               }
+       }
+
+       return true;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "Hello extensions decode error");
+       return false;
+}
+
+static void tls_handle_client_hello(struct l_tls *tls,
+                                       const uint8_t *buf, size_t len)
+{
+       uint16_t cipher_suites_size;
+       uint8_t session_id_size, compression_methods_size;
+       const uint8_t *cipher_suites;
+       const uint8_t *compression_methods;
+       int i;
+       struct l_queue *extensions_offered = NULL;
+       enum l_tls_alert_desc alert_desc = TLS_ALERT_HANDSHAKE_FAIL;
+
+       /* Do we have enough for ProtocolVersion + Random + SessionID size? */
+       if (len < 2 + 32 + 1)
+               goto decode_error;
+
+       memcpy(tls->pending.client_random, buf + 2, 32);
+       session_id_size = buf[34];
+       len -= 35;
+
+       /*
+        * Do we have enough to hold the actual session ID + 2 byte field for
+        * cipher_suite len + minimum of a single cipher suite identifier
+        */
+       if (len < (size_t) session_id_size + 4)
+               goto decode_error;
+
+       len -= session_id_size + 2;
+
+       cipher_suites_size = l_get_be16(buf + 35 + session_id_size);
+       cipher_suites = buf + 37 + session_id_size;
+
+       /*
+        * Check that size is not odd, more than 0 and we have enough
+        * data in the packet for cipher_suites_size + 2 bytes for
+        * compression_methods_size + a single compression method
+        */
+       if (len < (size_t) cipher_suites_size + 2 ||
+                       (cipher_suites_size & 1) || cipher_suites_size == 0)
+               goto decode_error;
+
+       len -= cipher_suites_size + 1;
+
+       compression_methods_size = cipher_suites[cipher_suites_size];
+       compression_methods = cipher_suites + cipher_suites_size + 1;
+
+       if (len < (size_t) compression_methods_size ||
+                       compression_methods_size == 0)
+               goto decode_error;
+
+       len -= compression_methods_size;
+
+       extensions_offered = l_queue_new();
+
+       if (!tls_handle_hello_extensions(tls, compression_methods +
+                                       compression_methods_size,
+                                       len, extensions_offered))
+               goto cleanup;
+
+       /*
+        * Note: if the client is supplying a SessionID we know it is false
+        * because our server implementation never generates any SessionIDs
+        * yet so either the client is attempting something strange or was
+        * trying to connect somewhere else.  We might want to throw an error.
+        */
+
+       /* Save client_version for Premaster Secret verification */
+       tls->client_version = l_get_be16(buf);
+
+       if (tls->client_version < tls->min_version) {
+               TLS_DISCONNECT(TLS_ALERT_PROTOCOL_VERSION, 0,
+                               "Client version too low: %02x",
+                               tls->client_version);
+               goto cleanup;
+       }
+
+       tls->negotiated_version = tls->client_version > tls->max_version ?
+               tls->max_version : tls->client_version;
+
+       /* Stop maintaining handshake message hashes other than MD1 and SHA. */
+       if (tls->negotiated_version < L_TLS_V12)
+               for (i = 0; i < __HANDSHAKE_HASH_COUNT; i++)
+                       if (i != HANDSHAKE_HASH_SHA1 && i != HANDSHAKE_HASH_MD5)
+                               tls_drop_handshake_hash(tls, i);
+
+       TLS_DEBUG("Negotiated TLS " TLS_VER_FMT,
+                       TLS_VER_ARGS(tls->negotiated_version));
+
+       if (!tls->cipher_suite_pref_list) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "No usable cipher suites");
+               goto cleanup;
+       }
+
+       /* Select a cipher suite according to client's preference list */
+       while (cipher_suites_size) {
+               struct tls_cipher_suite *suite =
+                       tls_find_cipher_suite(cipher_suites);
+               struct tls_cipher_suite **iter;
+               const char *error;
+
+               for (iter = tls->cipher_suite_pref_list; *iter; iter++)
+                       if (*iter == suite)
+                               break;
+
+               if (!suite)
+                       TLS_DEBUG("non-fatal: Cipher suite %04x unknown",
+                                       l_get_be16(cipher_suites));
+               else if (!tls_cipher_suite_is_compatible(tls, suite, &error))
+                       TLS_DEBUG("non-fatal: %s", error);
+               else if (!*iter) {
+                       /*
+                        * We have at least one matching compatible suite but
+                        * it is not allowed in this security profile.  If the
+                        * handshake ends up failing then we blame the security
+                        * profile.
+                        */
+                       alert_desc = TLS_ALERT_INSUFFICIENT_SECURITY;
+                       TLS_DEBUG("non-fatal: Cipher suite %s disallowed "
+                                       "by config", suite->name);
+               } else {
+                       tls->pending.cipher_suite = suite;
+                       break;
+               }
+
+               cipher_suites += 2;
+               cipher_suites_size -= 2;
+       }
+
+       if (!cipher_suites_size) {
+               TLS_DISCONNECT(alert_desc, 0,
+                               "No common cipher suites matching negotiated "
+                               "TLS version and our certificate's key type");
+               goto cleanup;
+       }
+
+       if (!tls_set_prf_hmac(tls)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Error selecting the PRF HMAC");
+               goto cleanup;
+       }
+
+       TLS_DEBUG("Negotiated %s", tls->pending.cipher_suite->name);
+
+       /* Select a compression method */
+
+       /* CompressionMethod.null must be present in the vector */
+       if (!memchr(compression_methods, 0, compression_methods_size)) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "No common compression methods");
+               goto cleanup;
+       }
+
+       while (compression_methods_size) {
+               tls->pending.compression_method =
+                       tls_find_compression_method(*compression_methods);
+
+               if (tls->pending.compression_method)
+                       break;
+
+               compression_methods++;
+               compression_methods_size--;
+       }
+
+       TLS_DEBUG("Negotiated %s", tls->pending.compression_method->name);
+
+       if (!tls_send_server_hello(tls, extensions_offered))
+               goto cleanup;
+
+       l_queue_destroy(extensions_offered, NULL);
+
+       if (tls->pending.cipher_suite->signature && tls->cert)
+               if (!tls_send_certificate(tls))
+                       return;
+
+       if (tls->pending.cipher_suite->key_xchg->send_server_key_exchange)
+               if (!tls->pending.cipher_suite->key_xchg->
+                               send_server_key_exchange(tls))
+                       return;
+
+       /* TODO: don't bother if configured to not authenticate client */
+       if (tls->pending.cipher_suite->signature && tls->ca_certs)
+               if (!tls_send_certificate_request(tls))
+                       return;
+
+       tls_send_server_hello_done(tls);
+
+       if (tls->pending.cipher_suite->signature && tls->ca_certs)
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_CERTIFICATE);
+       else
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_KEY_EXCHANGE);
+
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "ClientHello decode error");
+
+cleanup:
+       l_queue_destroy(extensions_offered, NULL);
+}
+
+static void tls_handle_server_hello(struct l_tls *tls,
+                                       const uint8_t *buf, size_t len)
+{
+       uint8_t session_id_size, cipher_suite_id[2], compression_method_id;
+       const char *error;
+       struct tls_cipher_suite **iter;
+       int i;
+       struct l_queue *extensions_seen;
+       bool result;
+
+       /* Do we have enough for ProtocolVersion + Random + SessionID len ? */
+       if (len < 2 + 32 + 1)
+               goto decode_error;
+
+       memcpy(tls->pending.server_random, buf + 2, 32);
+       session_id_size = buf[34];
+       len -= 35;
+
+       /* Do we have enough for SessionID + CipherSuite ID + Compression ID */
+       if (len < (size_t) session_id_size + 2 + 1)
+               goto decode_error;
+
+       cipher_suite_id[0] = buf[35 + session_id_size + 0];
+       cipher_suite_id[1] = buf[35 + session_id_size + 1];
+       compression_method_id = buf[35 + session_id_size + 2];
+       len -= session_id_size + 2 + 1;
+
+       extensions_seen = l_queue_new();
+       result = tls_handle_hello_extensions(tls, buf + 38 + session_id_size,
+                                               len, extensions_seen);
+       l_queue_destroy(extensions_seen, NULL);
+
+       if (!result)
+               return;
+
+       tls->negotiated_version = l_get_be16(buf);
+
+       if (tls->negotiated_version < tls->min_version ||
+                       tls->negotiated_version > tls->max_version) {
+               TLS_DISCONNECT(tls->negotiated_version < tls->min_version ?
+                               TLS_ALERT_PROTOCOL_VERSION :
+                               TLS_ALERT_ILLEGAL_PARAM, 0,
+                               "Unsupported version %02x",
+                               tls->negotiated_version);
+               return;
+       }
+
+       /* Stop maintaining handshake message hashes other than MD1 and SHA. */
+       if (tls->negotiated_version < L_TLS_V12)
+               for (i = 0; i < __HANDSHAKE_HASH_COUNT; i++)
+                       if (i != HANDSHAKE_HASH_SHA1 && i != HANDSHAKE_HASH_MD5)
+                               tls_drop_handshake_hash(tls, i);
+
+       TLS_DEBUG("Negotiated TLS " TLS_VER_FMT,
+                       TLS_VER_ARGS(tls->negotiated_version));
+
+       /* Set the new cipher suite and compression method structs */
+       tls->pending.cipher_suite = tls_find_cipher_suite(cipher_suite_id);
+       if (!tls->pending.cipher_suite) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Unknown cipher suite %04x",
+                               l_get_be16(cipher_suite_id));
+               return;
+       }
+
+       for (iter = tls->cipher_suite_pref_list; *iter; iter++)
+               if (*iter == tls->pending.cipher_suite)
+                       break;
+       if (!*iter) {
+               TLS_DISCONNECT(TLS_ALERT_INSUFFICIENT_SECURITY, 0,
+                               "Selected cipher suite %s disallowed by config",
+                               tls->pending.cipher_suite->name);
+               return;
+       }
+
+       if (!tls_cipher_suite_is_compatible(tls, tls->pending.cipher_suite,
+                                               &error)) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Selected cipher suite not compatible: %s",
+                               error);
+               return;
+       }
+
+       if (!tls_set_prf_hmac(tls)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Error selecting the PRF HMAC");
+               return;
+       }
+
+       TLS_DEBUG("Negotiated %s", tls->pending.cipher_suite->name);
+
+       tls->pending.compression_method =
+               tls_find_compression_method(compression_method_id);
+       if (!tls->pending.compression_method) {
+               TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                               "Unknown compression method %i",
+                               compression_method_id);
+               return;
+       }
+
+       TLS_DEBUG("Negotiated %s", tls->pending.compression_method->name);
+
+       if (tls->pending.cipher_suite->signature)
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_CERTIFICATE);
+       else
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_KEY_EXCHANGE);
+
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "ServerHello decode error");
+}
+
+static void tls_handle_certificate(struct l_tls *tls,
+                                       const uint8_t *buf, size_t len)
+{
+       size_t total;
+       struct l_certchain *certchain = NULL;
+       struct l_cert *leaf;
+       size_t der_len;
+       const uint8_t *der;
+       bool dummy;
+       const char *error_str;
+
+       if (len < 3)
+               goto decode_error;
+
+       /* Length checks */
+       total = *buf++ << 16;
+       total |= *buf++ << 8;
+       total |= *buf++ << 0;
+       if (total + 3 != len)
+               goto decode_error;
+
+       if (tls_parse_certificate_list(buf, total, &certchain) < 0) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "Error decoding peer certificate chain");
+
+               goto done;
+       }
+
+       /*
+        * "Note that a client MAY send no certificates if it does not have any
+        * appropriate certificate to send in response to the server's
+        * authentication request." -- for now we unconditionally accept
+        * an empty certificate chain from the client.  Later on we need to
+        * make this configurable, if we don't want to authenticate the
+        * client then also don't bother sending a Certificate Request.
+        */
+       if (!certchain) {
+               if (!tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_HANDSHAKE_FAIL, 0,
+                                       "Server sent no certificate chain");
+
+                       goto done;
+               }
+
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_KEY_EXCHANGE);
+
+               goto done;
+       }
+
+       /*
+        * Validate the certificate chain's consistency and validate it
+        * against our CAs if we have any.
+        */
+       if (!l_certchain_verify(certchain, tls->ca_certs, &error_str)) {
+               TLS_DISCONNECT(TLS_ALERT_BAD_CERT, 0,
+                               "Peer certchain verification failed "
+                               "consistency check%s: %s", tls->ca_certs ?
+                               " or against local CA certs" : "", error_str);
+
+               goto done;
+       }
+
+       /*
+        * RFC5246 7.4.2:
+        * "The end entity certificate's public key (and associated
+        * restrictions) MUST be compatible with the selected key exchange
+        * algorithm."
+        */
+       leaf = l_certchain_get_leaf(certchain);
+       if (!tls->pending.cipher_suite->signature->
+                       validate_cert_key_type(leaf)) {
+               TLS_DISCONNECT(TLS_ALERT_UNSUPPORTED_CERT, 0,
+                               "Peer certificate key type incompatible with "
+                               "pending cipher suite %s",
+                               tls->pending.cipher_suite->name);
+
+               goto done;
+       }
+
+       if (tls->subject_mask && !tls_cert_domains_match_mask(leaf,
+                                                       tls->subject_mask)) {
+               char *mask = l_strjoinv(tls->subject_mask, '|');
+
+               TLS_DISCONNECT(TLS_ALERT_BAD_CERT, 0,
+                               "Peer certificate's subject domain "
+                               "doesn't match %s", mask);
+               l_free(mask);
+
+               goto done;
+       }
+
+       /* Save the end-entity certificate and free the chain */
+       der = l_cert_get_der_data(leaf, &der_len);
+       tls->peer_cert = l_cert_new_from_der(der, der_len);
+
+       tls->peer_pubkey = l_cert_get_pubkey(tls->peer_cert);
+       if (!tls->peer_pubkey) {
+               TLS_DISCONNECT(TLS_ALERT_UNSUPPORTED_CERT, 0,
+                               "Error loading peer public key to kernel");
+
+               goto done;
+       }
+
+       if (!l_key_get_info(tls->peer_pubkey, L_KEY_RSA_PKCS1_V1_5,
+                                       L_CHECKSUM_NONE, &tls->peer_pubkey_size,
+                                       &dummy)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "Can't l_key_get_info for peer public key");
+
+               goto done;
+       }
+
+       tls->peer_pubkey_size /= 8;
+
+       if (tls->server || tls->pending.cipher_suite->key_xchg->
+                       handle_server_key_exchange)
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_KEY_EXCHANGE);
+       else
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_HELLO_DONE);
+
+       goto done;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "TLS_CERTIFICATE decode error");
+
+done:
+       l_certchain_free(certchain);
+}
+
+static void tls_handle_certificate_request(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       unsigned int cert_type_len, dn_len, i;
+
+       tls->cert_requested = 1;
+
+       cert_type_len = *buf++;
+       if (len < 1 + cert_type_len + 2)
+               goto decode_error;
+
+       for (i = 0; i < sizeof(tls_cert_type_pref); i++)
+               if (memchr(buf, tls_cert_type_pref[i], cert_type_len))
+                       break;
+
+       if (i == sizeof(tls_cert_type_pref)) {
+               TLS_DISCONNECT(TLS_ALERT_UNSUPPORTED_CERT, 0,
+                               "Requested certificate types not supported");
+               return;
+       }
+
+       buf += cert_type_len;
+       len -= 1 + cert_type_len;
+
+       /*
+        * TODO: parse and save certificate_types,
+        * supported_signature_algorithms and certificate_authorities
+        * lists for use in tls_send_certificate.
+        */
+
+       if (tls->negotiated_version >= L_TLS_V12) {
+               enum handshake_hash_type hash;
+               ssize_t ret = tls_parse_signature_algorithms(tls, buf, len);
+
+               if (ret == -ENOTSUP) {
+                       TLS_DISCONNECT(TLS_ALERT_UNSUPPORTED_CERT, 0,
+                                       "No supported signature hash type");
+                       return;
+               }
+
+               if (ret < 0)
+                       goto decode_error;
+
+               len -= ret;
+               buf += ret;
+
+               /*
+                * We can now safely stop maintaining handshake message
+                * hashes other than the PRF hash and the one selected for
+                * signing.
+                */
+               for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+                       if (&tls_handshake_hash_data[hash] != tls->prf_hmac &&
+                                       hash != tls->signature_hash)
+                               tls_drop_handshake_hash(tls, hash);
+       }
+
+       dn_len = l_get_be16(buf);
+       if (2 + dn_len != len)
+               goto decode_error;
+
+       return;
+
+decode_error:
+       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                       "CertificateRequest decode error");
+}
+
+static void tls_handle_server_hello_done(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       const char *error;
+
+       if (len) {
+               TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                               "ServerHello not empty");
+               return;
+       }
+
+       if (tls->cert_requested)
+               if (!tls_send_certificate(tls))
+                       return;
+
+       if (!tls->pending.cipher_suite->key_xchg->send_client_key_exchange(tls))
+               return;
+
+       if (tls->cert_sent)
+               if (!tls_send_certificate_verify(tls))
+                       return;
+
+       tls_send_change_cipher_spec(tls);
+
+       if (!tls_change_cipher_spec(tls, 1, &error)) {
+               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                               "change_cipher_spec: %s", error);
+               return;
+       }
+
+       tls_send_finished(tls);
+
+       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_CHANGE_CIPHER_SPEC);
+}
+
+static bool tls_get_prev_digest_by_type(struct l_tls *tls,
+                                       enum handshake_hash_type type,
+                                       const uint8_t *data, size_t data_len,
+                                       uint8_t *out, size_t *out_len)
+{
+       size_t len;
+
+       if (!tls->handshake_hash[type])
+               return false;
+
+       len = l_checksum_digest_length(tls_handshake_hash_data[type].l_id);
+       memcpy(out, tls->prev_digest[type], len);
+
+       if (out_len)
+               *out_len = len;
+
+       return 0;
+}
+
+static void tls_handle_certificate_verify(struct l_tls *tls,
+                                               const uint8_t *buf, size_t len)
+{
+       int i;
+
+       if (!tls->pending.cipher_suite->signature->verify(tls, buf, len,
+                                               tls_get_prev_digest_by_type,
+                                               NULL, 0))
+               return;
+
+       /* Stop maintaining handshake message hashes other than the PRF hash */
+       if (tls->negotiated_version >= L_TLS_V12)
+               for (i = 0; i < __HANDSHAKE_HASH_COUNT; i++)
+                       if (&tls_handshake_hash_data[i] != tls->prf_hmac)
+                               tls_drop_handshake_hash(tls, i);
+
+       /*
+        * The client's certificate is now verified based on the following
+        * logic:
+        *   - If we received an (expected) Certificate Verify, we must have
+        *     sent a Certificate Request.
+        *   - If we sent a Certificate Request that's because
+        *     tls->ca_certs is non-NULL.
+        *   - If tls->ca_certs is non-NULL then tls_handle_certificate
+        *     will have checked the whole certificate chain to be valid and
+        *     additionally trusted by our CAs if known.
+        *   - Additionally cipher_suite->signature->verify has just confirmed
+        *     that the peer owns the end-entity certificate because it was
+        *     able to sign the contents of the handshake messages and that
+        *     signature could be verified with the public key from that
+        *     certificate.
+        */
+       tls->peer_authenticated = true;
+
+       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_CHANGE_CIPHER_SPEC);
+}
+
+struct dn_element_info {
+       const char *str;
+       const struct asn1_oid oid;
+};
+
+static const struct dn_element_info dn_elements[] = {
+       { "CN", { 3, { 0x55, 0x04, 0x03 } } },
+       { "SN", { 3, { 0x55, 0x04, 0x04 } } },
+       { "serialNumber", { 3, { 0x55, 0x04, 0x05 } } },
+       { "C", { 3, { 0x55, 0x04, 0x06 } } },
+       { "ST", { 3, { 0x55, 0x04, 0x07 } } },
+       { "L", { 3, { 0x55, 0x04, 0x08 } } },
+       { "street", { 3, { 0x55, 0x04, 0x09 } } },
+       { "O", { 3, { 0x55, 0x04, 0x0a } } },
+       { "OU", { 3, { 0x55, 0x04, 0x0b } } },
+       { "title", { 3, { 0x55, 0x04, 0x0c } } },
+       { "telephoneNumber", { 3, { 0x55, 0x04, 0x14 } } },
+       { "givenName", { 3, { 0x55, 0x04, 0x2a } } },
+       { "initials", { 3, { 0x55, 0x04, 0x2b } } },
+       { "emailAddress", {
+               9,
+               { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x01 }
+       } },
+       { "domainComponent", {
+               10,
+               { 0x09, 0x92, 0x26, 0x89, 0x93, 0xf2, 0x2c, 0x64, 0x01, 0x19 }
+       } },
+       {}
+};
+
+static void tls_str_escape_append(struct l_string *out, char *str, size_t len)
+{
+       while (len--) {
+               switch (*str) {
+               case '\\':
+               case '/':
+               case '=':
+                       l_string_append_c(out, '\\');
+                       l_string_append_c(out, *str);
+                       break;
+               default:
+                       l_string_append_c(out, *str);
+                       break;
+               }
+
+               str++;
+       }
+}
+
+static char *tls_get_peer_identity_str(struct l_cert *cert)
+{
+       const uint8_t *dn, *end;
+       size_t dn_size;
+       struct l_string *id_str;
+
+       if (!cert)
+               return NULL;
+
+       dn = l_cert_get_dn(cert, &dn_size);
+       if (!dn)
+               return NULL;
+
+       id_str = l_string_new(200);
+
+       end = dn + dn_size;
+       while (dn < end) {
+               const uint8_t *set, *seq, *oid, *name;
+               uint8_t tag;
+               size_t len, oid_len, name_len;
+               const struct dn_element_info *info;
+
+               set = asn1_der_find_elem(dn, end - dn, 0, &tag, &len);
+               if (!set || tag != ASN1_ID_SET)
+                       goto error;
+
+               dn = set + len;
+
+               seq = asn1_der_find_elem(set, len, 0, &tag, &len);
+               if (!seq || tag != ASN1_ID_SEQUENCE)
+                       goto error;
+
+               oid = asn1_der_find_elem(seq, len, 0, &tag, &oid_len);
+               if (!oid || tag != ASN1_ID_OID)
+                       goto error;
+
+               name = asn1_der_find_elem(seq, len, 1, &tag, &name_len);
+               if (!name || (tag != ASN1_ID_PRINTABLESTRING &&
+                                       tag != ASN1_ID_UTF8STRING &&
+                                       tag != ASN1_ID_IA5STRING))
+                       continue;
+
+               for (info = dn_elements; info->str; info++)
+                       if (asn1_oid_eq(&info->oid, oid_len, oid))
+                               break;
+               if (!info->str)
+                       continue;
+
+               l_string_append_c(id_str, '/');
+               l_string_append(id_str, info->str);
+               l_string_append_c(id_str, '=');
+               tls_str_escape_append(id_str, (char *) name, name_len);
+       }
+
+       return l_string_unwrap(id_str);
+
+error:
+       l_string_free(id_str);
+       return NULL;
+}
+
+static void tls_finished(struct l_tls *tls)
+{
+       char *peer_identity = NULL;
+
+       if (tls->peer_authenticated) {
+               peer_identity = tls_get_peer_identity_str(tls->peer_cert);
+               if (!peer_identity) {
+                       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                       "tls_get_peer_identity_str failed");
+                       return;
+               }
+       }
+
+       /* Free up the resources used in the handshake */
+       tls_reset_handshake(tls);
+
+       TLS_SET_STATE(TLS_HANDSHAKE_DONE);
+       tls->ready = true;
+
+       tls->in_callback = true;
+       tls->ready_handle(peer_identity, tls->user_data);
+       tls->in_callback = false;
+       l_free(peer_identity);
+
+       tls_cleanup_handshake(tls);
+}
+
+static void tls_handle_handshake(struct l_tls *tls, int type,
+                                       const uint8_t *buf, size_t len)
+{
+       TLS_DEBUG("Handling a %s of %zi bytes",
+                       tls_handshake_type_to_str(type), len);
+
+       switch (type) {
+       case TLS_HELLO_REQUEST:
+               if (tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in server mode");
+                       break;
+               }
+
+               if (len != 0) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "HelloRequest not empty");
+                       break;
+               }
+
+               /*
+                * May be sent by the server at any time but "SHOULD be ignored
+                * by the client if it arrives in the middle of a handshake"
+                * and "MAY be ignored by the client if it does not wish to
+                * renegotiate a session".
+                */
+
+               break;
+
+       case TLS_CLIENT_HELLO:
+               if (!tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in client mode");
+                       break;
+               }
+
+               if (tls->state != TLS_HANDSHAKE_WAIT_HELLO &&
+                               tls->state != TLS_HANDSHAKE_DONE) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               tls_handle_client_hello(tls, buf, len);
+
+               break;
+
+       case TLS_SERVER_HELLO:
+               if (tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in server mode");
+                       break;
+               }
+
+               if (tls->state != TLS_HANDSHAKE_WAIT_HELLO) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               tls_handle_server_hello(tls, buf, len);
+
+               break;
+
+       case TLS_CERTIFICATE:
+               if (tls->state != TLS_HANDSHAKE_WAIT_CERTIFICATE) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               tls_handle_certificate(tls, buf, len);
+
+               break;
+
+       case TLS_SERVER_KEY_EXCHANGE:
+               if (tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in server mode");
+                       break;
+               }
+
+               if (tls->state != TLS_HANDSHAKE_WAIT_KEY_EXCHANGE) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_HELLO_DONE);
+
+               tls->pending.cipher_suite->key_xchg->handle_server_key_exchange(
+                                                               tls, buf, len);
+
+               break;
+
+       case TLS_CERTIFICATE_REQUEST:
+               if (tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in server mode");
+                       break;
+               }
+
+               /*
+                * Server sends this optionally so in the WAIT_HELLO_DONE
+                * state we accept either this or a Server Hello Done (below).
+                */
+               if (tls->state != TLS_HANDSHAKE_WAIT_HELLO_DONE ||
+                               tls->cert_requested ||
+                               !tls->pending.cipher_suite->signature) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in current state "
+                                       "or certificate check not supported "
+                                       "in pending cipher suite");
+                       break;
+               }
+
+               tls_handle_certificate_request(tls, buf, len);
+
+               break;
+
+       case TLS_SERVER_HELLO_DONE:
+               if (tls->state != TLS_HANDSHAKE_WAIT_HELLO_DONE) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               tls_handle_server_hello_done(tls, buf, len);
+
+               break;
+
+       case TLS_CERTIFICATE_VERIFY:
+               if (tls->state != TLS_HANDSHAKE_WAIT_CERTIFICATE_VERIFY) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               tls_handle_certificate_verify(tls, buf, len);
+
+               break;
+
+       case TLS_CLIENT_KEY_EXCHANGE:
+               if (!tls->server) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in client mode");
+                       break;
+               }
+
+               if (tls->state != TLS_HANDSHAKE_WAIT_KEY_EXCHANGE) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               /*
+                * If we accepted a client Certificate message with a
+                * certificate that has signing capability (TODO: check
+                * usage bitmask), Certificate Verify is received next.  It
+                * sounds as if this is mandatory for the client although
+                * this isn't 100% clear.
+                */
+               if (tls->peer_pubkey)
+                       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_CERTIFICATE_VERIFY);
+               else
+                       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_CHANGE_CIPHER_SPEC);
+
+               tls->pending.cipher_suite->key_xchg->handle_client_key_exchange(
+                                                               tls, buf, len);
+
+               break;
+
+       case TLS_FINISHED:
+               if (tls->state != TLS_HANDSHAKE_WAIT_FINISHED) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Message invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+                       break;
+               }
+
+               if (!tls_verify_finished(tls, buf, len))
+                       break;
+
+               if (tls->server) {
+                       const char *error;
+
+                       tls_send_change_cipher_spec(tls);
+                       if (!tls_change_cipher_spec(tls, 1, &error)) {
+                               TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                               "change_cipher_spec: %s",
+                                               error);
+                               break;
+                       }
+                       tls_send_finished(tls);
+               }
+
+               /*
+                * On the client, the server's certificate is now verified
+                * regardless of the key exchange method, based on the
+                * following logic:
+                *
+                *  - tls->ca_certs is non-NULL so tls_handle_certificate
+                *    (always called on the client) must have veritifed the
+                *    server's certificate chain to be valid and additionally
+                *    trusted by our CA.
+                *
+                *  - the peer owns the end-entity certificate because:
+                *    either:
+                *
+                *    * (RSA key exchange algorithm case) the correct
+                *      receival of this Finished message confirms the
+                *      posession of the master secret, it is verified by
+                *      both the successful decryption and the MAC of this
+                *      message (either should be enough) because we entered
+                *      the TLS_HANDSHAKE_WAIT_FINISHED state only after
+                *      encryption and MAC were enabled in ChangeCipherSpec.
+                *      To obtain the master secret the server must have been
+                *      able to decrypt the pre_master_secret which we had
+                *      encrypted with the public key from that certificate.
+                *
+                *    * (ECDHE and DHE key exchange algorithms) server was
+                *      able to sign the client random together with the
+                *      ServerKeyExchange parameters using its certified key
+                *      pair.
+                */
+               if (!tls->server && tls->cipher_suite[0]->signature &&
+                               tls->ca_certs)
+                       tls->peer_authenticated = true;
+
+               tls_finished(tls);
+
+               break;
+
+       default:
+               TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                               "Invalid message");
+       }
+}
+
+LIB_EXPORT struct l_tls *l_tls_new(bool server,
+                               l_tls_write_cb_t app_data_handler,
+                               l_tls_write_cb_t tx_handler,
+                               l_tls_ready_cb_t ready_handler,
+                               l_tls_disconnect_cb_t disconnect_handler,
+                               void *user_data)
+{
+       struct l_tls *tls;
+
+       if (!l_key_is_supported(L_KEY_FEATURE_CRYPTO))
+               return NULL;
+
+       tls = l_new(struct l_tls, 1);
+       tls->server = server;
+       tls->rx = app_data_handler;
+       tls->tx = tx_handler;
+       tls->ready_handle = ready_handler;
+       tls->disconnected = disconnect_handler;
+       tls->user_data = user_data;
+       tls->cipher_suite_pref_list = tls_cipher_suite_pref;
+       tls->min_version = TLS_MIN_VERSION;
+       tls->max_version = TLS_MAX_VERSION;
+
+       /* If we're the server wait for the Client Hello already */
+       if (tls->server)
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_HELLO);
+       else
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_START);
+
+       return tls;
+}
+
+LIB_EXPORT void l_tls_free(struct l_tls *tls)
+{
+       enum handshake_hash_type hash;
+
+       if (unlikely(!tls))
+               return;
+
+       if (tls->in_callback) {
+               tls->pending_destroy = true;
+               return;
+       }
+
+       l_tls_set_cacert(tls, NULL);
+       l_tls_set_auth_data(tls, NULL, NULL);
+       l_tls_set_domain_mask(tls, NULL);
+
+       tls_reset_handshake(tls);
+       tls_cleanup_handshake(tls);
+
+       tls_reset_cipher_spec(tls, 0);
+       tls_reset_cipher_spec(tls, 1);
+
+       if (tls->record_buf)
+               l_free(tls->record_buf);
+
+       if (tls->message_buf)
+               l_free(tls->message_buf);
+
+       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++)
+               tls_drop_handshake_hash(tls, hash);
+
+       if (tls->debug_destroy)
+               tls->debug_destroy(tls->debug_data);
+
+       if (tls->cipher_suite_pref_list != tls_cipher_suite_pref)
+               l_free(tls->cipher_suite_pref_list);
+
+       l_free(tls);
+}
+
+LIB_EXPORT void l_tls_write(struct l_tls *tls, const uint8_t *data, size_t len)
+{
+       if (unlikely(!tls->ready)) {
+               return;
+       }
+
+       tls_tx_record(tls, TLS_CT_APPLICATION_DATA, data, len);
+}
+
+bool tls_handle_message(struct l_tls *tls, const uint8_t *message,
+                       int len, enum tls_content_type type, uint16_t version)
+{
+       enum handshake_hash_type hash;
+       const char *error;
+
+       switch (type) {
+       case TLS_CT_CHANGE_CIPHER_SPEC:
+               if (len != 1 || message[0] != 0x01) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "ChangeCipherSpec msg decode error");
+
+                       return false;
+               }
+
+               if (tls->state != TLS_HANDSHAKE_WAIT_CHANGE_CIPHER_SPEC) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "ChangeCipherSpec invalid in state %s",
+                                       tls_handshake_state_to_str(tls->state));
+
+                       return false;
+               }
+
+               if (!tls_change_cipher_spec(tls, 0, &error)) {
+                       TLS_DISCONNECT(TLS_ALERT_INTERNAL_ERROR, 0,
+                                       "change_cipher_spec: %s", error);
+
+                       return false;
+               }
+
+               TLS_SET_STATE(TLS_HANDSHAKE_WAIT_FINISHED);
+
+               return true;
+
+       case TLS_CT_ALERT:
+               /* Verify AlertLevel */
+               if (message[0] != 0x01 && message[0] != 0x02) {
+                       TLS_DISCONNECT(TLS_ALERT_DECODE_ERROR, 0,
+                                       "Received bad AlertLevel %i",
+                                       message[0]);
+
+                       return false;
+               }
+
+               /*
+                * On a fatal alert we are obligated to respond with a
+                * fatal alert and disconnect but also not complain if
+                * the connection has been torn down by the peer before
+                * we were able to send our alert.  However on a non-fatal
+                * alert (warning) we're also allowed to panic and send
+                * a fatal alert, then disconnect, so we do that
+                * regardless of the alert level.
+                */
+               TLS_DISCONNECT(TLS_ALERT_CLOSE_NOTIFY, message[1],
+                               "Peer sent a %s Alert: %s",
+                               message[0] == 0x02 ? "Fatal" : "Warning",
+                               l_tls_alert_to_str(message[1]));
+
+               return false;
+
+       case TLS_CT_HANDSHAKE:
+               /* Start hashing the handshake contents on first message */
+               if (tls->server && message[0] == TLS_CLIENT_HELLO &&
+                               (tls->state == TLS_HANDSHAKE_WAIT_HELLO ||
+                                tls->state != TLS_HANDSHAKE_DONE))
+                       if (!tls_init_handshake_hash(tls))
+                               return false;
+
+               /*
+                * Corner case: When handling a Certificate Verify or a
+                * Finished message we need access to the messages hash from
+                * before this message was transmitted on the Tx side so we
+                * can verify it matches the hash the sender included in the
+                * message.  We save it here for that purpose.  Everywhere
+                * else we need to update the hash before handling the new
+                * message because 1. we may need the new hash to build our
+                * own Certificate Verify or Finished messages, and 2. we
+                * update the message hash with newly transmitted messages
+                * inside tls_tx_handshake which may be called as part of
+                * handling incoming message, and if we didn't call
+                * l_checksum_update before, the calls would end up being
+                * out of order.
+                */
+               if (message[0] == TLS_CERTIFICATE_VERIFY ||
+                               message[0] == TLS_FINISHED)
+                       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++) {
+                               if (!tls->handshake_hash[hash])
+                                       continue;
+
+                               tls_get_handshake_hash(tls, hash,
+                                                       tls->prev_digest[hash]);
+                       }
+
+               /*
+                * RFC 5246, Section 7.4.1.1:
+                * This message MUST NOT be included in the message hashes
+                * that are maintained throughout the handshake and used in
+                * the Finished messages and the certificate verify message.
+                */
+               if (message[0] != TLS_HELLO_REQUEST)
+                       for (hash = 0; hash < __HANDSHAKE_HASH_COUNT; hash++) {
+                               if (!tls->handshake_hash[hash])
+                                       continue;
+
+                               l_checksum_update(tls->handshake_hash[hash],
+                                                       message, len);
+                       }
+
+               tls_handle_handshake(tls, message[0],
+                                       message + TLS_HANDSHAKE_HEADER_SIZE,
+                                       len - TLS_HANDSHAKE_HEADER_SIZE);
+
+               if (tls->pending_destroy) {
+                       l_tls_free(tls);
+                       return false;
+               }
+
+               return true;
+
+       case TLS_CT_APPLICATION_DATA:
+               if (!tls->ready) {
+                       TLS_DISCONNECT(TLS_ALERT_UNEXPECTED_MESSAGE, 0,
+                                       "Application data message before "
+                                       "handshake finished");
+
+                       return false;
+               }
+
+               if (!len)
+                       return true;
+
+               tls->in_callback = true;
+               tls->rx(message, len, tls->user_data);
+               tls->in_callback = false;
+
+               if (tls->pending_destroy) {
+                       l_tls_free(tls);
+                       return false;
+               }
+
+               return true;
+       }
+
+       return false;
+}
+
+LIB_EXPORT bool l_tls_start(struct l_tls *tls)
+{
+       if (tls->max_version < tls->min_version)
+               return false;
+
+       if (!tls->cipher_suite_pref_list)
+               return false;
+
+       /* This is a nop in server mode */
+       if (tls->server)
+               return true;
+
+       if (tls->state != TLS_HANDSHAKE_WAIT_START) {
+               TLS_DEBUG("Call invalid in state %s",
+                               tls_handshake_state_to_str(tls->state));
+               return false;
+       }
+
+       if (!tls_init_handshake_hash(tls))
+               return false;
+
+       if (!tls_send_client_hello(tls))
+               return false;
+
+       TLS_SET_STATE(TLS_HANDSHAKE_WAIT_HELLO);
+       return true;
+}
+
+LIB_EXPORT void l_tls_close(struct l_tls *tls)
+{
+       TLS_DISCONNECT(TLS_ALERT_CLOSE_NOTIFY, 0, "Closing session");
+}
+
+LIB_EXPORT bool l_tls_set_cacert(struct l_tls *tls, struct l_queue *ca_certs)
+{
+       if (tls->ca_certs) {
+               l_queue_destroy(tls->ca_certs,
+                               (l_queue_destroy_func_t) l_cert_free);
+               tls->ca_certs = NULL;
+       }
+
+       if (ca_certs) {
+               if (!l_key_is_supported(L_KEY_FEATURE_RESTRICT)) {
+                       TLS_DEBUG("keyctl restrict support missing, "
+                                       "check kernel configuration");
+                       return false;
+               }
+
+               tls->ca_certs = ca_certs;
+       }
+
+       return true;
+}
+
+LIB_EXPORT bool l_tls_set_auth_data(struct l_tls *tls,
+                                       struct l_certchain *certchain,
+                                       struct l_key *priv_key)
+{
+       if (tls->cert) {
+               l_certchain_free(tls->cert);
+               tls->cert = NULL;
+       }
+
+       if (tls->priv_key) {
+               l_key_free(tls->priv_key);
+               tls->priv_key = NULL;
+               tls->priv_key_size = 0;
+       }
+
+       if (certchain)
+               tls->cert = certchain;
+
+       if (priv_key) {
+               bool is_public = true;
+
+               tls->priv_key = priv_key;
+
+               if (!l_key_get_info(tls->priv_key, L_KEY_RSA_PKCS1_V1_5,
+                                       L_CHECKSUM_NONE, &tls->priv_key_size,
+                                       &is_public) || is_public) {
+                       TLS_DEBUG("Not a private key or l_key_get_info failed");
+                       tls->cert = NULL;
+                       tls->priv_key = NULL;
+                       tls->priv_key_size = 0;
+                       return false;
+               }
+
+               tls->priv_key_size /= 8;
+       }
+
+       return true;
+}
+
+bool tls_set_cipher_suites(struct l_tls *tls, const char **suite_list)
+{
+       struct tls_cipher_suite **suite;
+
+       if (tls->cipher_suite_pref_list != tls_cipher_suite_pref)
+               l_free(tls->cipher_suite_pref_list);
+
+       if (!suite_list) {
+               /* Use our default cipher suite preference list */
+               tls->cipher_suite_pref_list = tls_cipher_suite_pref;
+               return true;
+       }
+
+       tls->cipher_suite_pref_list = l_new(struct tls_cipher_suite *,
+                               l_strv_length((char **) suite_list) + 1);
+       suite = tls->cipher_suite_pref_list;
+
+       for (; *suite_list; suite_list++) {
+               unsigned int i;
+
+               for (i = 0; tls_cipher_suite_pref[i]; i++)
+                       if (!strcmp(tls_cipher_suite_pref[i]->name,
+                                               *suite_list))
+                               break;
+
+               if (tls_cipher_suite_pref[i])
+                       *suite++ = tls_cipher_suite_pref[i];
+               else
+                       TLS_DEBUG("Cipher suite %s is not supported",
+                                       *suite_list);
+       }
+
+       if (suite > tls->cipher_suite_pref_list)
+               return true;
+
+       TLS_DEBUG("None of the supplied suite names is supported");
+       l_free(suite);
+       tls->cipher_suite_pref_list = NULL;
+       return false;
+}
+
+LIB_EXPORT void l_tls_set_version_range(struct l_tls *tls,
+                                       enum l_tls_version min_version,
+                                       enum l_tls_version max_version)
+{
+       tls->min_version =
+               (min_version && min_version > TLS_MIN_VERSION) ?
+               min_version : TLS_MIN_VERSION;
+       tls->max_version =
+               (max_version && max_version < TLS_MAX_VERSION) ?
+               max_version : TLS_MAX_VERSION;
+}
+
+/**
+ * l_tls_set_domain_mask:
+ * @tls: TLS object being configured
+ * @mask: NULL-terminated array of domain masks
+ *
+ * Sets a mask for domain names contained in the peer certificate
+ * (eg. the subject Common Name) to be matched against.  If none of the
+ * domains match the any mask, authentication will fail.  At least one
+ * domain has to match at least one mask from the list.
+ *
+ * The masks are each split into segments at the dot characters and each
+ * segment must match the corresponding label of the domain name --
+ * a domain name is a sequence of labels joined by dots.  An asterisk
+ * segment in the mask matches any label.  An asterisk segment at the
+ * beginning of the mask matches one or more consecutive labels from
+ * the beginning of the domain string.
+ */
+LIB_EXPORT void l_tls_set_domain_mask(struct l_tls *tls, char **mask)
+{
+       l_strv_free(tls->subject_mask);
+
+       tls->subject_mask = l_strv_copy(mask);
+}
+
+LIB_EXPORT const char *l_tls_alert_to_str(enum l_tls_alert_desc desc)
+{
+       switch (desc) {
+       case TLS_ALERT_CLOSE_NOTIFY:
+               return "close_notify";
+       case TLS_ALERT_UNEXPECTED_MESSAGE:
+               return "unexpected_message";
+       case TLS_ALERT_BAD_RECORD_MAC:
+               return "bad_record_mac";
+       case TLS_ALERT_DECRYPT_FAIL_RESERVED:
+               return "decryption_failure_RESERVED";
+       case TLS_ALERT_RECORD_OVERFLOW:
+               return "record_overflow";
+       case TLS_ALERT_DECOMPRESS_FAIL:
+               return "decompression_failure";
+       case TLS_ALERT_HANDSHAKE_FAIL:
+               return "handshake_failure";
+       case TLS_ALERT_NO_CERT_RESERVED:
+               return "no_certificate_RESERVED";
+       case TLS_ALERT_BAD_CERT:
+               return "bad_certificate";
+       case TLS_ALERT_UNSUPPORTED_CERT:
+               return "unsupported_certificate";
+       case TLS_ALERT_CERT_REVOKED:
+               return "certificate_revoked";
+       case TLS_ALERT_CERT_EXPIRED:
+               return "certificate_expired";
+       case TLS_ALERT_CERT_UNKNOWN:
+               return "certificate_unknown";
+       case TLS_ALERT_ILLEGAL_PARAM:
+               return "illegal_parameter";
+       case TLS_ALERT_UNKNOWN_CA:
+               return "unknown_ca";
+       case TLS_ALERT_ACCESS_DENIED:
+               return "access_denied";
+       case TLS_ALERT_DECODE_ERROR:
+               return "decode_error";
+       case TLS_ALERT_DECRYPT_ERROR:
+               return "decrypt_error";
+       case TLS_ALERT_EXPORT_RES_RESERVED:
+               return "export_restriction_RESERVED";
+       case TLS_ALERT_PROTOCOL_VERSION:
+               return "protocol_version";
+       case TLS_ALERT_INSUFFICIENT_SECURITY:
+               return "insufficient_security";
+       case TLS_ALERT_INTERNAL_ERROR:
+               return "internal_error";
+       case TLS_ALERT_USER_CANCELED:
+               return "user_canceled";
+       case TLS_ALERT_NO_RENEGOTIATION:
+               return "no_renegotiation";
+       case TLS_ALERT_UNSUPPORTED_EXTENSION:
+               return "unsupported_extension";
+       }
+
+       return NULL;
+}
+
+const char *tls_handshake_state_to_str(enum tls_handshake_state state)
+{
+       static char buf[100];
+
+       switch (state) {
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_START)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_HELLO)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_CERTIFICATE)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_KEY_EXCHANGE)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_HELLO_DONE)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_CERTIFICATE_VERIFY)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_CHANGE_CIPHER_SPEC)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_WAIT_FINISHED)
+       SWITCH_ENUM_TO_STR(TLS_HANDSHAKE_DONE)
+       }
+
+       snprintf(buf, sizeof(buf), "tls_handshake_state(%i)", state);
+       return buf;
+}
+
+int tls_parse_certificate_list(const void *data, size_t len,
+                               struct l_certchain **out_certchain)
+{
+       const uint8_t *buf = data;
+       struct l_certchain *chain = NULL;
+
+       while (len) {
+               struct l_cert *cert;
+               size_t cert_len;
+
+               if (len < 3)
+                       goto decode_error;
+
+               cert_len = *buf++ << 16;
+               cert_len |= *buf++ << 8;
+               cert_len |= *buf++ << 0;
+
+               if (cert_len + 3 > len)
+                       goto decode_error;
+
+               cert = l_cert_new_from_der(buf, cert_len);
+               if (!cert)
+                       goto decode_error;
+
+               if (!chain) {
+                       chain = certchain_new_from_leaf(cert);
+                       if (!chain)
+                               goto decode_error;
+               } else
+                       certchain_link_issuer(chain, cert);
+
+               buf += cert_len;
+               len -= cert_len + 3;
+       }
+
+       if (out_certchain)
+               *out_certchain = chain;
+       else
+               l_certchain_free(chain);
+
+       return 0;
+
+decode_error:
+       l_certchain_free(chain);
+       return -EBADMSG;
+}
+
+LIB_EXPORT bool l_tls_set_debug(struct l_tls *tls, l_tls_debug_cb_t function,
+                               void *user_data, l_tls_destroy_cb_t destroy)
+{
+       if (unlikely(!tls))
+               return false;
+
+       if (tls->debug_destroy)
+               tls->debug_destroy(tls->debug_data);
+
+       tls->debug_handler = function;
+       tls->debug_destroy = destroy;
+       tls->debug_data = user_data;
+
+       return true;
+}
diff --git a/ell/tls.h b/ell/tls.h
new file mode 100644 (file)
index 0000000..b67492b
--- /dev/null
+++ b/ell/tls.h
@@ -0,0 +1,141 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __ELL_TLS_H
+#define __ELL_TLS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum l_tls_version {
+       L_TLS_V10 = ((3 << 8) | 1),
+       L_TLS_V11 = ((3 << 8) | 2),
+       L_TLS_V12 = ((3 << 8) | 3),
+       L_TLS_V13 = ((3 << 8) | 4),     /* Not supported */
+};
+
+struct l_tls;
+struct l_key;
+struct l_certchain;
+struct l_queue;
+
+enum l_tls_alert_desc {
+       TLS_ALERT_CLOSE_NOTIFY          = 0,
+       TLS_ALERT_UNEXPECTED_MESSAGE    = 10,
+       TLS_ALERT_BAD_RECORD_MAC        = 20,
+       TLS_ALERT_DECRYPT_FAIL_RESERVED = 21,
+       TLS_ALERT_RECORD_OVERFLOW       = 22,
+       TLS_ALERT_DECOMPRESS_FAIL       = 30,
+       TLS_ALERT_HANDSHAKE_FAIL        = 40,
+       TLS_ALERT_NO_CERT_RESERVED      = 41,
+       TLS_ALERT_BAD_CERT              = 42,
+       TLS_ALERT_UNSUPPORTED_CERT      = 43,
+       TLS_ALERT_CERT_REVOKED          = 44,
+       TLS_ALERT_CERT_EXPIRED          = 45,
+       TLS_ALERT_CERT_UNKNOWN          = 46,
+       TLS_ALERT_ILLEGAL_PARAM         = 47,
+       TLS_ALERT_UNKNOWN_CA            = 48,
+       TLS_ALERT_ACCESS_DENIED         = 49,
+       TLS_ALERT_DECODE_ERROR          = 50,
+       TLS_ALERT_DECRYPT_ERROR         = 51,
+       TLS_ALERT_EXPORT_RES_RESERVED   = 60,
+       TLS_ALERT_PROTOCOL_VERSION      = 70,
+       TLS_ALERT_INSUFFICIENT_SECURITY = 71,
+       TLS_ALERT_INTERNAL_ERROR        = 80,
+       TLS_ALERT_USER_CANCELED         = 90,
+       TLS_ALERT_NO_RENEGOTIATION      = 100,
+       TLS_ALERT_UNSUPPORTED_EXTENSION = 110,
+};
+
+typedef void (*l_tls_write_cb_t)(const uint8_t *data, size_t len,
+                                       void *user_data);
+typedef void (*l_tls_ready_cb_t)(const char *peer_identity, void *user_data);
+typedef void (*l_tls_disconnect_cb_t)(enum l_tls_alert_desc reason,
+                                       bool remote, void *user_data);
+typedef void (*l_tls_debug_cb_t)(const char *str, void *user_data);
+typedef void (*l_tls_destroy_cb_t)(void *user_data);
+
+/*
+ * app_data_handler gets called with newly received decrypted data.
+ * tx_handler gets called to send TLS payloads off to remote end.
+ * ready_handler gets called when l_tls_write calls are first accepted.
+ */
+struct l_tls *l_tls_new(bool server, l_tls_write_cb_t app_data_handler,
+                       l_tls_write_cb_t tx_handler,
+                       l_tls_ready_cb_t ready_handler,
+                       l_tls_disconnect_cb_t disconnect_handler,
+                       void *user_data);
+
+void l_tls_free(struct l_tls *tls);
+
+/* Begin sending connection setup messages to the server */
+bool l_tls_start(struct l_tls *tls);
+
+/* Properly disconnect a connected session */
+void l_tls_close(struct l_tls *tls);
+
+/* Submit plaintext data to be encrypted and transmitted */
+void l_tls_write(struct l_tls *tls, const uint8_t *data, size_t len);
+
+/* Submit TLS payload from underlying transport to be decrypted */
+void l_tls_handle_rx(struct l_tls *tls, const uint8_t *data, size_t len);
+
+/*
+ * If peer is to be authenticated, supply the CA certificates.  On success
+ * the l_tls object takes ownership of the queue and the individual l_cert
+ * objects and they should not be freed by the caller afterwards.
+ */
+bool l_tls_set_cacert(struct l_tls *tls, struct l_queue *ca_certs);
+
+/*
+ * If we are to be authenticated, supply our certificate and private key.
+ * On the client this is optional.  On success, the l_tls object takes
+ * ownership of the certchain and the key objects and they should not be
+ * freed by the caller afterwards.
+ * TODO: it may also be useful for the caller to be able to supply one
+ * certificate of each type so they can be used depending on which is compatible
+ * with the negotiated parameters.
+ */
+bool l_tls_set_auth_data(struct l_tls *tls,
+                               struct l_certchain *certchain,
+                               struct l_key *priv_key);
+
+void l_tls_set_version_range(struct l_tls *tls,
+                               enum l_tls_version min_version,
+                               enum l_tls_version max_version);
+
+void l_tls_set_domain_mask(struct l_tls *tls, char **mask);
+
+const char *l_tls_alert_to_str(enum l_tls_alert_desc desc);
+
+enum l_checksum_type;
+
+bool l_tls_prf_get_bytes(struct l_tls *tls, bool use_master_secret,
+                               const char *label, uint8_t *buf, size_t len);
+
+bool l_tls_set_debug(struct l_tls *tls, l_tls_debug_cb_t function,
+                       void *user_data, l_tls_destroy_cb_t destroy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_TLS_H */
diff --git a/ell/uintset.c b/ell/uintset.c
new file mode 100644 (file)
index 0000000..b88e28e
--- /dev/null
@@ -0,0 +1,532 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015-2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <limits.h>
+
+#include "uintset.h"
+#include "private.h"
+
+#define BITS_PER_LONG (sizeof(unsigned long) * 8)
+
+static inline int __ffz(unsigned long word)
+{
+       return __builtin_ctzl(~word);
+}
+
+static inline int __fls(unsigned long word)
+{
+       return word ? sizeof(word) * 8 - __builtin_clzl(word) : 0;
+}
+
+static inline int __ffs(unsigned long word)
+{
+       return __builtin_ctzl(word);
+}
+
+static unsigned long find_first_zero_bit(const unsigned long *addr,
+                                                       unsigned long size,
+                                                       unsigned long start)
+{
+       unsigned long i;
+       unsigned long mask = ~0UL << (start & (BITS_PER_LONG - 1));
+       unsigned long p;
+
+       for (i = start / BITS_PER_LONG; i * BITS_PER_LONG < size; i++) {
+               p = addr[i];
+
+               if (mask) {
+                       p |= ~mask;
+                       mask = 0;
+               }
+
+               if (p == ~0UL)
+                       continue;
+
+               return i * BITS_PER_LONG + __ffz(p);
+       }
+
+       return size;
+}
+
+static unsigned long find_first_bit(const unsigned long *addr,
+                                                       unsigned long size)
+{
+       unsigned long result = 0;
+       unsigned long tmp;
+
+       while (size >= BITS_PER_LONG) {
+               tmp = *addr;
+               addr += 1;
+
+               if (tmp)
+                       goto found;
+
+               result += BITS_PER_LONG;
+               size -= BITS_PER_LONG;
+       }
+
+       if (!size)
+               return result;
+
+       tmp = *addr;
+       if (!tmp)
+               return result + size;
+
+found:
+       return result + __ffs(tmp);
+}
+
+static unsigned long find_last_bit(const unsigned long *addr, unsigned int size)
+{
+       unsigned long words;
+       unsigned long tmp;
+       long i;
+
+       /* Bits out of bounds are always zero, start at last word */
+       words = (size + BITS_PER_LONG - 1) / BITS_PER_LONG;
+
+       for (i = words - 1; i >= 0; i -= 1) {
+               tmp = addr[i];
+
+               if (!tmp)
+                       continue;
+
+               return i * BITS_PER_LONG + __fls(tmp) - 1;
+       }
+
+       /* Not found */
+       return size;
+}
+
+static unsigned long find_next_bit(const unsigned long *addr,
+                                                       unsigned long size,
+                                                       unsigned long bit)
+{
+       unsigned long mask;
+       unsigned long offset;
+
+       if (bit >= size)
+               return size;
+
+       addr += bit / BITS_PER_LONG;
+       offset = bit % BITS_PER_LONG;
+       bit -= offset;
+
+       if (offset) {
+               mask = *addr & ~(~0UL >> (BITS_PER_LONG - offset));
+               if (mask)
+                       return bit + __ffs(mask);
+
+               bit += BITS_PER_LONG;
+               addr++;
+       }
+
+       for (size -= bit; size >= BITS_PER_LONG;
+                       size -= BITS_PER_LONG, bit += BITS_PER_LONG, addr++) {
+               if (!*addr)
+                       continue;
+
+               return bit + __ffs(*addr);
+       }
+
+       if (!size)
+               return bit;
+
+       mask = *addr & (~0UL >> (BITS_PER_LONG - size));
+       if (mask)
+               bit += __ffs(mask);
+       else
+               bit += size;
+
+       return bit;
+}
+
+struct l_uintset {
+       unsigned long *bits;
+       uint16_t size;
+       uint32_t min;
+       uint32_t max;
+};
+
+/**
+ * l_uintset_new_from_range:
+ * @min: The minimum value of the set of numbers contained in the set
+ * @max: The maximum value of the set of numbers contained
+ *
+ * Creates a new empty collection of unsigned integers.  The size of the set
+ * is limited to roughly 2^16 entries.  @min and @max give the minimum and
+ * maximum elements of the set.
+ *
+ * Returns: A newly allocated l_uintset object, and NULL otherwise.
+ **/
+LIB_EXPORT struct l_uintset *l_uintset_new_from_range(uint32_t min,
+                                                               uint32_t max)
+{
+       struct l_uintset *ret;
+       unsigned int size = max - min + 1;
+
+       if (size > USHRT_MAX)
+               return NULL;
+
+       ret = l_new(struct l_uintset, 1);
+       ret->bits = l_new(unsigned long,
+                               (size + BITS_PER_LONG - 1) / BITS_PER_LONG);
+       ret->size = size;
+       ret->min = min;
+       ret->max = max;
+
+       return ret;
+}
+
+/**
+ * l_uintset_new:
+ * @size: The maximum size of the set
+ *
+ * Creates a new empty collection of unsigned integers.  The size of the set
+ * is limited to roughly 2^16 entries.  The set is created with minimum value
+ * of 1 and maximum value equal to size.
+ *
+ * Returns: A newly allocated l_uintset object, and NULL otherwise.
+ **/
+LIB_EXPORT struct l_uintset *l_uintset_new(unsigned int size)
+{
+       return l_uintset_new_from_range(1, size);
+}
+
+/**
+ * l_uintset_free:
+ * @set: The set to destroy
+ *
+ * De-allocated the set object.
+ **/
+LIB_EXPORT void l_uintset_free(struct l_uintset *set)
+{
+       if (unlikely(!set))
+               return;
+
+       l_free(set->bits);
+       l_free(set);
+}
+
+/**
+ * l_uintset_take:
+ * @set: The set of numbers
+ * @number: The number to remove from the set
+ *
+ * Removes the @number from the @set.  No checking is performed whether the
+ * number is actually contained in the set.  However, basic bounds checking
+ * is performed to make sure the number taken can actually exist in the set.
+ *
+ * Returns: true if the number was removed, and false otherwise.
+ **/
+LIB_EXPORT bool l_uintset_take(struct l_uintset *set, uint32_t number)
+{
+       uint32_t offset;
+
+       if (unlikely(!set))
+               return false;
+
+       offset = (number - set->min) / BITS_PER_LONG;
+
+       number -= set->min;
+
+       if (number > set->size)
+               return false;
+
+       number %= BITS_PER_LONG;
+
+       set->bits[offset] &= ~(1UL << number);
+
+       return true;
+}
+
+/**
+ * l_uintset_put:
+ * @set: The set of numbers
+ * @number: The number to add to the set
+ *
+ * Adds the @number to the @set.  No checking is performed whether the
+ * number is already contained in the set.  However, basic bounds checking
+ * is performed to make sure the number being added can actually exist in
+ * the set.
+ *
+ * Returns: true if the number was added, and false otherwise.
+ **/
+LIB_EXPORT bool l_uintset_put(struct l_uintset *set, uint32_t number)
+{
+       uint32_t bit;
+       uint32_t offset;
+
+       if (unlikely(!set))
+               return false;
+
+       bit = number - set->min;
+       if (bit >= set->size)
+               return false;
+
+       offset = bit / BITS_PER_LONG;
+       set->bits[offset] |= 1UL << (bit % BITS_PER_LONG);
+
+       return true;
+}
+
+/**
+ * l_uintset_contains:
+ * @set: The set of numbers
+ * @number: The number to search for
+ *
+ * Returns: true if the number is in the set, and false otherwise.
+ **/
+LIB_EXPORT bool l_uintset_contains(struct l_uintset *set, uint32_t number)
+{
+       uint32_t bit;
+       uint32_t offset;
+
+       if (unlikely(!set))
+               return false;
+
+       bit = number - set->min;
+       if (bit >= set->size)
+               return false;
+
+       offset = bit / BITS_PER_LONG;
+       if (set->bits[offset] & (1UL << (bit % BITS_PER_LONG)))
+               return true;
+
+       return false;
+}
+
+/**
+ * l_uintset_get_min:
+ * @set: The set of numbers
+ *
+ * Returns: the minimum possible value of the set.  If @set is NULL returns
+ * UINT_MAX.
+ **/
+LIB_EXPORT uint32_t l_uintset_get_min(struct l_uintset *set)
+{
+       if (unlikely(!set))
+               return UINT_MAX;
+
+       return set->min;
+}
+
+/**
+ * l_uintset_get_max:
+ * @set: The set of numbers
+ *
+ * Returns: the maximum possible value of the set.  If @set is NULL returns
+ * UINT_MAX.
+ **/
+LIB_EXPORT uint32_t l_uintset_get_max(struct l_uintset *set)
+{
+       if (unlikely(!set))
+               return UINT_MAX;
+
+       return set->max;
+}
+
+/**
+ * l_uintset_find_unused_min:
+ * @set: The set of numbers
+ *
+ * Returns: The minimum number that is not preset in the set.  If the set of
+ * numbers is fully populated, returns l_uintset_get_max(set) + 1. If @set is
+ * NULL returns UINT_MAX.
+ **/
+LIB_EXPORT uint32_t l_uintset_find_unused_min(struct l_uintset *set)
+{
+       unsigned int bit;
+
+       if (unlikely(!set))
+               return UINT_MAX;
+
+       bit = find_first_zero_bit(set->bits, set->size, 0);
+
+       if (bit >= set->size)
+               return set->max + 1;
+
+       return bit + set->min;
+}
+
+/**
+ * l_uintset_find_unused:
+ * @set: The set of numbers
+ * @start: The starting point
+ *
+ * Returns: First number not in the set starting at position @start (inclusive).
+ * If all numbers in the set starting at @start until l_uintset_get_max(set)
+ * are taken, the starting position is set to the minimum and the search starts
+ * again.  If the set of numbers is fully populated, this function returns
+ * l_uintset_get_max(set) + 1. If @set is NULL returns UINT_MAX.
+ **/
+LIB_EXPORT uint32_t l_uintset_find_unused(struct l_uintset *set, uint32_t start)
+{
+       unsigned int bit;
+
+       if (unlikely(!set))
+               return UINT_MAX;
+
+       if (start < set->min || start > set->max)
+               return set->max + 1;
+
+       bit = find_first_zero_bit(set->bits, set->size, start - set->min);
+       if (bit >= set->size)
+               bit = find_first_zero_bit(set->bits, set->size, 0);
+
+       if (bit >= set->size)
+               return set->max + 1;
+
+       return bit + set->min;
+}
+
+/**
+ * l_uintset_find_max:
+ * @set: The set of numbers
+ *
+ * Returns: The maximum number preset in the set.  If the set of numbers is
+ * empty returns l_uintset_get_max(set) + 1. If @set is NULL returns UINT_MAX.
+ **/
+LIB_EXPORT uint32_t l_uintset_find_max(struct l_uintset *set)
+{
+       unsigned int bit;
+
+       if (unlikely(!set))
+               return UINT_MAX;
+
+       bit = find_last_bit(set->bits, set->size);
+
+       if (bit >= set->size)
+               return set->max + 1;
+
+       return bit + set->min;
+}
+
+/**
+ * l_uintset_find_min:
+ * @set: The set of numbers
+ *
+ * Returns: The minimum number preset in the set.  If the set of numbers is
+ * empty returns l_uintset_get_max(set) + 1. If @set is NULL returns UINT_MAX.
+ **/
+LIB_EXPORT uint32_t l_uintset_find_min(struct l_uintset *set)
+{
+       unsigned int bit;
+
+       if (unlikely(!set))
+               return UINT_MAX;
+
+       bit = find_first_bit(set->bits, set->size);
+
+       if (bit >= set->size)
+               return set->max + 1;
+
+       return bit + set->min;
+}
+
+/**
+ * l_uintset_foreach:
+ * @set: The set of numbers
+ * @function: callback function
+ * @user_data: user data given to callback function
+ *
+ * Call @function for every given number in @set.
+ **/
+LIB_EXPORT void l_uintset_foreach(struct l_uintset *set,
+                                       l_uintset_foreach_func_t function,
+                                       void *user_data)
+{
+       unsigned int bit;
+
+       if (unlikely(!set || !function))
+               return;
+
+       for (bit = find_first_bit(set->bits, set->size); bit < set->size;
+                       bit = find_next_bit(set->bits, set->size, bit + 1))
+               function(set->min + bit, user_data);
+}
+
+/**
+ * l_uintset_intersect:
+ * @set_a: The set of numbers
+ * @set_b: The set of numbers
+ *
+ * Intersects the two sets of numbers of an equal base, e.g.:
+ * l_uintset_get_min(set_a) must be equal to l_uintset_get_min(set_b) and
+ * l_uintset_get_max(set_a) must be equal to l_uintset_get_max(set_b)
+ *
+ * Returns: A newly allocated l_uintset object containing the intersection of
+ * @set_a and @set_b. If the bases are not equal returns NULL. If either @set_a
+ * or @set_b is NULL returns NULL.
+ **/
+LIB_EXPORT struct l_uintset *l_uintset_intersect(const struct l_uintset *set_a,
+                                               const struct l_uintset *set_b)
+{
+       struct l_uintset *intersection;
+       uint32_t offset;
+       uint32_t offset_max;
+
+       if (unlikely(!set_a || !set_b))
+               return NULL;
+
+       if (unlikely(set_a->min != set_b->min || set_a->max != set_b->max))
+               return NULL;
+
+       intersection = l_uintset_new_from_range(set_a->min, set_a->max);
+
+       offset_max = (set_a->size + BITS_PER_LONG - 1) / BITS_PER_LONG;
+
+       for (offset = 0; offset < offset_max; offset++)
+               intersection->bits[offset] =
+                               set_a->bits[offset] & set_b->bits[offset];
+
+       return intersection;
+}
+
+/**
+ * l_uintset_isempty
+ * @set: The set of numbers
+ *
+ * Returns true if the uintset has no entries, or if set is NULL.
+ */
+LIB_EXPORT bool l_uintset_isempty(const struct l_uintset *set)
+{
+       uint16_t i;
+       uint32_t offset_max;
+
+       if (unlikely(!set))
+               return true;
+
+       offset_max = (set->size + BITS_PER_LONG - 1) / BITS_PER_LONG;
+
+       for (i = 0; i < offset_max; i++) {
+               if (set->bits[i])
+                       return false;
+       }
+
+       return true;
+}
diff --git a/ell/uintset.h b/ell/uintset.h
new file mode 100644 (file)
index 0000000..8215def
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015-2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_UINTSET_H
+#define __ELL_UINTSET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+typedef void (*l_uintset_foreach_func_t) (uint32_t number, void *user_data);
+
+struct l_uintset;
+
+struct l_uintset *l_uintset_new_from_range(uint32_t min, uint32_t max);
+struct l_uintset *l_uintset_new(unsigned int size);
+void l_uintset_free(struct l_uintset *set);
+
+bool l_uintset_contains(struct l_uintset *set, uint32_t number);
+bool l_uintset_take(struct l_uintset *set, uint32_t number);
+bool l_uintset_put(struct l_uintset *set, uint32_t number);
+
+uint32_t l_uintset_get_min(struct l_uintset *set);
+uint32_t l_uintset_get_max(struct l_uintset *set);
+
+uint32_t l_uintset_find_max(struct l_uintset *set);
+uint32_t l_uintset_find_min(struct l_uintset *set);
+
+uint32_t l_uintset_find_unused_min(struct l_uintset *set);
+uint32_t l_uintset_find_unused(struct l_uintset *set, uint32_t start);
+
+void l_uintset_foreach(struct l_uintset *set,
+                       l_uintset_foreach_func_t function, void *user_data);
+
+struct l_uintset *l_uintset_intersect(const struct l_uintset *set_a,
+                                               const struct l_uintset *set_b);
+bool l_uintset_isempty(const struct l_uintset *set);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_UINTSET_H */
diff --git a/ell/utf8.c b/ell/utf8.c
new file mode 100644 (file)
index 0000000..44601dc
--- /dev/null
@@ -0,0 +1,497 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <wchar.h>
+
+#include "util.h"
+#include "strv.h"
+#include "utf8.h"
+#include "private.h"
+
+/**
+ * SECTION:utf8
+ * @short_description: UTF-8 utility function
+ *
+ * UTF-8 string handling support
+ */
+
+LIB_EXPORT unsigned char l_ascii_table[256] = {
+       [0x00 ... 0x08] = L_ASCII_CNTRL,
+       [0x09 ... 0x0D] = L_ASCII_CNTRL | L_ASCII_SPACE,
+       [0x0E ... 0x1F] = L_ASCII_CNTRL,
+       [0x20]          = L_ASCII_PRINT | L_ASCII_SPACE,
+       [0x21 ... 0x2F] = L_ASCII_PRINT | L_ASCII_PUNCT,
+       [0x30 ... 0x39] = L_ASCII_DIGIT | L_ASCII_XDIGIT | L_ASCII_PRINT,
+       [0x3A ... 0x40] = L_ASCII_PRINT | L_ASCII_PUNCT,
+       [0x41 ... 0x46] = L_ASCII_PRINT | L_ASCII_XDIGIT | L_ASCII_UPPER,
+       [0x47 ... 0x5A] = L_ASCII_PRINT | L_ASCII_UPPER,
+       [0x5B ... 0x60] = L_ASCII_PRINT | L_ASCII_PUNCT,
+       [0x61 ... 0x66] = L_ASCII_PRINT | L_ASCII_XDIGIT | L_ASCII_LOWER,
+       [0x67 ... 0x7A] = L_ASCII_PRINT | L_ASCII_LOWER,
+       [0x7B ... 0x7E] = L_ASCII_PRINT | L_ASCII_PUNCT,
+       [0x7F]          = L_ASCII_CNTRL,
+       [0x80 ... 0xFF] = 0,
+};
+
+static inline bool __attribute__ ((always_inline))
+                       valid_unicode(wchar_t c)
+{
+       if (c <= 0xd7ff)
+               return true;
+
+       if (c < 0xe000 || c > 0x10ffff)
+               return false;
+
+       if (c >= 0xfdd0 && c <= 0xfdef)
+               return false;
+
+       if ((c & 0xfffe) == 0xfffe)
+               return false;
+
+       return true;
+}
+
+/**
+ * l_utf8_get_codepoint
+ * @str: a pointer to codepoint data
+ * @len: maximum bytes to read
+ * @cp: destination for codepoint
+ *
+ * Returns: number of bytes read, or -1 for invalid coddepoint
+ **/
+LIB_EXPORT int l_utf8_get_codepoint(const char *str, size_t len, wchar_t *cp)
+{
+       static const wchar_t mins[3] = { 1 << 7, 1 << 11, 1 << 16 };
+       unsigned int expect_bytes;
+       wchar_t val;
+       size_t i;
+
+       if (len == 0)
+               return 0;
+
+       if ((signed char) str[0] > 0) {
+               *cp = str[0];
+               return 1;
+       }
+
+       expect_bytes = __builtin_clz(~((unsigned char)str[0] << 24));
+
+       if (expect_bytes < 2 || expect_bytes > 4)
+               goto error;
+
+       if (expect_bytes > len)
+               goto error;
+
+       val = str[0] & (0xff >> (expect_bytes + 1));
+
+       for (i = 1; i < expect_bytes; i++) {
+               if ((str[i] & 0xc0) != 0x80)
+                       goto error;
+
+               val <<= 6;
+               val |= str[i] & 0x3f;
+       }
+
+       if (val < mins[expect_bytes - 2])
+               goto error;
+
+       if (valid_unicode(val) == false)
+               goto error;
+
+       *cp = val;
+       return expect_bytes;
+
+error:
+       return -1;
+}
+
+/**
+ * l_utf8_validate:
+ * @str: a pointer to character data
+ * @len: max bytes to validate
+ * @end: return location for end of valid data
+ *
+ * Validates UTF-8 encoded text. If @end is non-NULL, then the end of
+ * the valid range will be stored there (i.e. the start of the first
+ * invalid character if some bytes were invalid, or the end of the text
+ * being validated otherwise).
+ *
+ * Returns: Whether the text was valid UTF-8
+ **/
+LIB_EXPORT bool l_utf8_validate(const char *str, size_t len, const char **end)
+{
+       size_t pos = 0;
+       int ret;
+       wchar_t val;
+
+       while (pos < len && str[pos]) {
+               ret = l_utf8_get_codepoint(str + pos, len - pos, &val);
+
+               if (ret < 0)
+                       goto error;
+
+               pos += ret;
+       }
+
+error:
+       if (end)
+               *end = str + pos;
+
+       if (pos != len)
+               return false;
+
+       return true;
+}
+
+/**
+ * l_utf8_strlen:
+ * @str: a pointer to character data
+ *
+ * Computes the number of UTF-8 characters (not bytes) in the string given
+ * by @str.
+ *
+ * Returns: The number of UTF-8 characters in the string
+ **/
+LIB_EXPORT size_t l_utf8_strlen(const char *str)
+{
+       size_t l = 0;
+       size_t i;
+       unsigned char b;
+
+       for (i = 0; str[i]; i++) {
+               b = str[i];
+
+               if ((b >> 6) == 2)
+                       l += 1;
+       }
+
+       return i - l;
+}
+
+static inline int __attribute__ ((always_inline))
+                       utf8_length(wchar_t c)
+{
+       if (c <= 0x7f)
+               return 1;
+
+       if (c <= 0x7ff)
+               return 2;
+
+       if (c <= 0xffff)
+               return 3;
+
+       return 4;
+}
+
+static inline uint16_t __attribute__ ((always_inline))
+                       surrogate_value(uint16_t h, uint16_t l)
+{
+       return 0x10000 + (h - 0xd800) * 0x400 + l - 0xdc00;
+}
+
+/*
+ * l_utf8_from_wchar:
+ * @c: a wide-character to convert
+ * @out_buf: Buffer to write out to
+ *
+ * Assumes c is valid unicode and out_buf contains enough space for a single
+ * utf8 character (maximum 4 bytes)
+ * Returns: number of characters written
+ */
+LIB_EXPORT size_t l_utf8_from_wchar(wchar_t c, char *out_buf)
+{
+       int len = utf8_length(c);
+       int i;
+
+       if (len == 1) {
+               out_buf[0] = c;
+               return 1;
+       }
+
+       for (i = len - 1; i; i--) {
+               out_buf[i] = (c & 0x3f) | 0x80;
+               c >>= 6;
+       }
+
+       out_buf[0] = (0xff << (8 - len)) | c;
+       return len;
+}
+
+/**
+ * l_utf8_from_utf16:
+ * @utf16: Array of UTF16 characters
+ * @utf16_size: The size of the @utf16 array in bytes.  Must be a multiple of 2.
+ *
+ * Returns: A newly-allocated buffer containing UTF16 encoded string converted
+ * to UTF8.  The UTF8 string will always be null terminated, even if the
+ * original UTF16 string was not.
+ **/
+LIB_EXPORT char *l_utf8_from_utf16(const void *utf16, ssize_t utf16_size)
+{
+       char *utf8;
+       size_t utf8_len = 0;
+       wchar_t high_surrogate = 0;
+       ssize_t i = 0;
+       uint16_t in;
+       wchar_t c;
+
+       if (unlikely(utf16_size % 2))
+               return NULL;
+
+       while (utf16_size < 0 || i < utf16_size) {
+               in = l_get_u16(utf16 + i);
+
+               if (!in)
+                       break;
+
+               if (in >= 0xdc00 && in < 0xe000) {
+                       if (high_surrogate)
+                               c = surrogate_value(high_surrogate, in);
+                       else
+                               return NULL;
+
+                       high_surrogate = 0;
+               } else {
+                       if (high_surrogate)
+                               return NULL;
+
+                       if (in >= 0xd800 && in < 0xdc00) {
+                               high_surrogate = in;
+                               goto next;
+                       }
+
+                       c = in;
+               }
+
+               if (!valid_unicode(c))
+                       return NULL;
+
+               utf8_len += utf8_length(c);
+next:
+               i += 2;
+       }
+
+       if (high_surrogate)
+               return NULL;
+
+       utf8 = l_malloc(utf8_len + 1);
+       utf8_len = 0;
+       i = 0;
+
+       while (utf16_size < 0 || i < utf16_size) {
+               in = l_get_u16(utf16 + i);
+
+               if (!in)
+                       break;
+
+               if (in >= 0xd800 && in < 0xdc00) {
+                       high_surrogate = in;
+                       i += 2;
+                       in = l_get_u16(utf16 + i);
+                       c = surrogate_value(high_surrogate, in);
+               } else
+                       c = in;
+
+               utf8_len += l_utf8_from_wchar(c, utf8 + utf8_len);
+               i += 2;
+       }
+
+       utf8[utf8_len] = '\0';
+
+       return utf8;
+}
+
+/**
+ * l_utf8_to_utf16:
+ * @utf8: UTF8 formatted string
+ * @out_size: The size in bytes of the converted utf16 string
+ *
+ * Converts a UTF8 formatted string to UTF16.  It is assumed that the string
+ * is valid UTF8 and no sanity checking is performed.
+ *
+ * Returns: A newly-allocated buffer containing UTF8 encoded string converted
+ * to UTF16.  The UTF16 string will always be null terminated.
+ **/
+LIB_EXPORT void *l_utf8_to_utf16(const char *utf8, size_t *out_size)
+{
+       const char *c;
+       wchar_t wc;
+       int len;
+       uint16_t *utf16;
+       size_t n_utf16;
+
+       if (unlikely(!utf8))
+               return NULL;
+
+       c = utf8;
+       n_utf16 = 0;
+
+       while (*c) {
+               len = l_utf8_get_codepoint(c, 4, &wc);
+               if (len < 0)
+                       return NULL;
+
+               if (wc < 0x10000)
+                       n_utf16 += 1;
+               else
+                       n_utf16 += 2;
+
+               c += len;
+       }
+
+       utf16 = l_malloc((n_utf16 + 1) * 2);
+       c = utf8;
+       n_utf16 = 0;
+
+       while (*c) {
+               len = l_utf8_get_codepoint(c, 4, &wc);
+
+               if (wc >= 0x10000) {
+                       utf16[n_utf16++] = (wc - 0x1000) / 0x400 + 0xd800;
+                       utf16[n_utf16++] = (wc - 0x1000) % 0x400 + 0xdc00;
+               } else
+                       utf16[n_utf16++] = wc;
+
+               c += len;
+       }
+
+       utf16[n_utf16] = 0;
+
+       if (out_size)
+               *out_size = (n_utf16 + 1) * 2;
+
+       return utf16;
+}
+
+/**
+ * l_utf8_from_ucs2be:
+ * @ucs2be: Array of UCS2 characters in big-endian format
+ * @ucs2be_size: The size of the @ucs2 array in bytes.  Must be a multiple of 2.
+ *
+ * Returns: A newly-allocated buffer containing UCS2BE encoded string converted
+ * to UTF8.  The UTF8 string will always be null terminated, even if the
+ * original UCS2BE string was not.
+ **/
+LIB_EXPORT char *l_utf8_from_ucs2be(const void *ucs2be, ssize_t ucs2be_size)
+{
+       char *utf8;
+       size_t utf8_len = 0;
+       ssize_t i = 0;
+       uint16_t in;
+
+       if (unlikely(ucs2be_size % 2))
+               return NULL;
+
+       while (ucs2be_size < 0 || i < ucs2be_size) {
+               in = l_get_be16(ucs2be + i);
+
+               if (!in)
+                       break;
+
+               if (in >= 0xd800 && in < 0xe000)
+                       return NULL;
+
+               if (!valid_unicode(in))
+                       return NULL;
+
+               utf8_len += utf8_length(in);
+               i += 2;
+       }
+
+       utf8 = l_malloc(utf8_len + 1);
+       utf8_len = 0;
+       i = 0;
+
+       while (ucs2be_size < 0 || i < ucs2be_size) {
+               in = l_get_be16(ucs2be + i);
+
+               if (!in)
+                       break;
+
+               utf8_len += l_utf8_from_wchar(in, utf8 + utf8_len);
+               i += 2;
+       }
+
+       utf8[utf8_len] = '\0';
+
+       return utf8;
+}
+
+/**
+ * l_utf8_to_ucs2be:
+ * @utf8: UTF8 formatted string
+ * @out_size: The size in bytes of the converted ucs2be string
+ *
+ * Converts a UTF8 formatted string to UCS2BE.  It is assumed that the string
+ * is valid UTF8 and no sanity checking is performed.
+ *
+ * Returns: A newly-allocated buffer containing UTF8 encoded string converted
+ * to UCS2BE.  The UCS2BE string will always be null terminated.
+ **/
+LIB_EXPORT void *l_utf8_to_ucs2be(const char *utf8, size_t *out_size)
+{
+       const char *c;
+       wchar_t wc;
+       int len;
+       uint16_t *ucs2be;
+       size_t n_ucs2be;
+
+       if (unlikely(!utf8))
+               return NULL;
+
+       c = utf8;
+       n_ucs2be = 0;
+
+       while (*c) {
+               len = l_utf8_get_codepoint(c, 4, &wc);
+               if (len < 0)
+                       return NULL;
+
+               if (wc >= 0x10000)
+                       return NULL;
+
+               n_ucs2be += 1;
+               c += len;
+       }
+
+       ucs2be = l_malloc((n_ucs2be + 1) * 2);
+       c = utf8;
+       n_ucs2be = 0;
+
+       while (*c) {
+               len = l_utf8_get_codepoint(c, 4, &wc);
+               ucs2be[n_ucs2be++] = L_CPU_TO_BE16(wc);
+               c += len;
+       }
+
+       ucs2be[n_ucs2be] = 0;
+
+       if (out_size)
+               *out_size = (n_ucs2be + 1) * 2;
+
+       return ucs2be;
+}
diff --git a/ell/utf8.h b/ell/utf8.h
new file mode 100644 (file)
index 0000000..c92da60
--- /dev/null
@@ -0,0 +1,120 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_UTF8_H
+#define __ELL_UTF8_H
+
+#include <stdbool.h>
+#include <wchar.h>
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern unsigned char l_ascii_table[];
+
+enum l_ascii {
+       L_ASCII_CNTRL   = 0x80,
+       L_ASCII_PRINT   = 0x40,
+       L_ASCII_PUNCT   = 0x20,
+       L_ASCII_SPACE   = 0x10,
+       L_ASCII_XDIGIT  = 0x08,
+       L_ASCII_UPPER   = 0x04,
+       L_ASCII_LOWER   = 0x02,
+       L_ASCII_DIGIT   = 0x01,
+       L_ASCII_ALPHA   = L_ASCII_LOWER | L_ASCII_UPPER,
+       L_ASCII_ALNUM   = L_ASCII_ALPHA | L_ASCII_DIGIT,
+       L_ASCII_GRAPH   = L_ASCII_ALNUM | L_ASCII_PUNCT,
+};
+
+#define l_ascii_isalnum(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_ALNUM) != 0)
+
+#define l_ascii_isalpha(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_ALPHA) != 0)
+
+#define l_ascii_iscntrl(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_CNTRL) != 0)
+
+#define l_ascii_isdigit(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_DIGIT) != 0)
+
+#define l_ascii_isgraph(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_GRAPH) != 0)
+
+#define l_ascii_islower(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_LOWER) != 0)
+
+#define l_ascii_isprint(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_PRINT) != 0)
+
+#define l_ascii_ispunct(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_PUNCT) != 0)
+
+#define l_ascii_isspace(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_SPACE) != 0)
+
+#define l_ascii_isupper(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_UPPER) != 0)
+
+#define l_ascii_isxdigit(c) \
+       ((l_ascii_table[(unsigned char) (c)] & L_ASCII_XDIGIT) != 0)
+
+#if __STDC_VERSION__ <= 199409L
+#define inline __inline__
+#endif
+
+static inline __attribute__ ((always_inline))
+                                       bool l_ascii_isblank(unsigned char c)
+{
+       if (c == ' ' || c == '\t')
+               return true;
+
+       return false;
+}
+
+static inline __attribute__ ((always_inline)) bool l_ascii_isascii(int c)
+{
+       if (c <= 127)
+               return true;
+
+       return false;
+}
+
+bool l_utf8_validate(const char *src, size_t len, const char **end);
+size_t l_utf8_strlen(const char *src);
+
+int l_utf8_get_codepoint(const char *str, size_t len, wchar_t *cp);
+size_t l_utf8_from_wchar(wchar_t c, char *out_buf);
+
+char *l_utf8_from_utf16(const void *utf16, ssize_t utf16_size);
+void *l_utf8_to_utf16(const char *utf8, size_t *out_size);
+
+char *l_utf8_from_ucs2be(const void *ucs2be, ssize_t ucs2be_size);
+void *l_utf8_to_ucs2be(const char *utf8, size_t *out_size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_UTF8_H */
diff --git a/ell/util.c b/ell/util.c
new file mode 100644 (file)
index 0000000..26cea8a
--- /dev/null
@@ -0,0 +1,636 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include "util.h"
+#include "private.h"
+
+/**
+ * SECTION:util
+ * @short_description: Utility functions
+ *
+ * Utility functions
+ */
+
+#define STRLOC __FILE__ ":" L_STRINGIFY(__LINE__)
+
+/**
+ * l_malloc:
+ * @size: memory size to allocate
+ *
+ * If for any reason the memory allocation fails, then execution will be
+ * halted via abort().
+ *
+ * In case @size is 0 then #NULL will be returned.
+ *
+ * Returns: pointer to allocated memory
+ **/
+LIB_EXPORT void *l_malloc(size_t size)
+{
+       if (likely(size)) {
+               void *ptr;
+
+               ptr = malloc(size);
+               if (ptr)
+                       return ptr;
+
+               fprintf(stderr, "%s:%s(): failed to allocate %zd bytes\n",
+                                       STRLOC, __func__, size);
+               abort();
+       }
+
+       return NULL;
+}
+
+/**
+ * l_realloc:
+ * @mem: previously allocated memory, or NULL
+ * @size: memory size to allocate
+ *
+ * If for any reason the memory allocation fails, then execution will be
+ * halted via abort().
+ *
+ * In case @mem is NULL, this function acts like l_malloc.
+ * In case @size is 0 then #NULL will be returned.
+ *
+ * Returns: pointer to allocated memory
+ **/
+LIB_EXPORT void *l_realloc(void *mem, size_t size)
+{
+       if (likely(size)) {
+               void *ptr;
+
+               ptr = realloc(mem, size);
+               if (ptr)
+                       return ptr;
+
+               fprintf(stderr, "%s:%s(): failed to re-allocate %zd bytes\n",
+                                       STRLOC, __func__, size);
+               abort();
+       } else
+               l_free(mem);
+
+       return NULL;
+}
+
+/**
+ * l_memdup:
+ * @mem: pointer to memory you want to duplicate
+ * @size: memory size
+ *
+ * If for any reason the memory allocation fails, then execution will be
+ * halted via abort().
+ *
+ * In case @size is 0 then #NULL will be returned.
+ *
+ * Returns: pointer to duplicated memory buffer
+ **/
+LIB_EXPORT void *l_memdup(const void *mem, size_t size)
+{
+       void *ptr;
+
+       ptr = l_malloc(size);
+
+       memcpy(ptr, mem, size);
+
+       return ptr;
+}
+
+/**
+ * l_free:
+ * @ptr: memory pointer
+ *
+ * Free the allocated memory area.
+ **/
+LIB_EXPORT void l_free(void *ptr)
+{
+       free(ptr);
+}
+
+/**
+ * l_strdup:
+ * @str: string pointer
+ *
+ * Allocates and duplicates sring
+ *
+ * Returns: a newly allocated string
+ **/
+LIB_EXPORT char *l_strdup(const char *str)
+{
+       if (likely(str)) {
+               char *tmp;
+
+               tmp = strdup(str);
+               if (tmp)
+                       return tmp;
+
+               fprintf(stderr, "%s:%s(): failed to allocate string\n",
+                                               STRLOC, __func__);
+               abort();
+       }
+
+       return NULL;
+}
+
+/**
+ * l_strndup:
+ * @str: string pointer
+ * @max: Maximum number of characters to copy
+ *
+ * Allocates and duplicates sring.  If the string is longer than @max
+ * characters, only @max are copied and a null terminating character
+ * is added.
+ *
+ * Returns: a newly allocated string
+ **/
+LIB_EXPORT char *l_strndup(const char *str, size_t max)
+{
+       if (likely(str)) {
+               char *tmp;
+
+               tmp = strndup(str, max);
+               if (tmp)
+                       return tmp;
+
+               fprintf(stderr, "%s:%s(): failed to allocate string\n",
+                                               STRLOC, __func__);
+               abort();
+       }
+
+       return NULL;
+}
+
+/**
+ * l_strdup_printf:
+ * @format: string format
+ * @...: parameters to insert into format string
+ *
+ * Returns: a newly allocated string
+ **/
+LIB_EXPORT char *l_strdup_printf(const char *format, ...)
+{
+       va_list args;
+       char *str;
+       int len;
+
+       va_start(args, format);
+       len = vasprintf(&str, format, args);
+       va_end(args);
+
+       if (len < 0) {
+               fprintf(stderr, "%s:%s(): failed to allocate string\n",
+                                       STRLOC, __func__);
+               abort();
+
+               return NULL;
+       }
+
+       return str;
+}
+
+/**
+ * l_strdup_vprintf:
+ * @format: string format
+ * @args: parameters to insert into format string
+ *
+ * Returns: a newly allocated string
+ **/
+LIB_EXPORT char *l_strdup_vprintf(const char *format, va_list args)
+{
+       char *str;
+       int len;
+
+       len = vasprintf(&str, format, args);
+
+       if (len < 0) {
+               fprintf(stderr, "%s:%s(): failed to allocate string\n",
+                                       STRLOC, __func__);
+               abort();
+
+               return NULL;
+       }
+
+       return str;
+}
+
+/**
+ * l_strlcpy:
+ * @dst: Destination buffer for string
+ * @src: Source buffer containing null-terminated string to copy
+ * @len: Maximum destination buffer space to use
+ *
+ * Copies a string from the @src buffer to the @dst buffer, using no
+ * more than @len bytes in @dst. @dst is guaranteed to be
+ * null-terminated. The caller can determine if the copy was truncated by
+ * checking if the return value is greater than or equal to @len.
+ *
+ * NOTE: Passing in a NULL string results in a no-op
+ *
+ * Returns: The length of the @src string, not including the null
+ * terminator.
+ */
+LIB_EXPORT size_t l_strlcpy(char *dst, const char *src, size_t len)
+{
+       size_t src_len = src ? strlen(src) : 0;
+
+       if (!src)
+               goto done;
+
+       if (len) {
+               if (src_len < len) {
+                       len = src_len + 1;
+               } else {
+                       len -= 1;
+                       dst[len] = '\0';
+               }
+
+               memcpy(dst, src, len);
+       }
+
+done:
+       return src_len;
+}
+
+/**
+ * l_str_has_prefix:
+ * @str: A string to be examined
+ * @delim: Prefix string
+ *
+ * Determines if the string given by @str is prefixed by string given by
+ * @prefix.
+ *
+ * Returns: True if @str was prefixed by @prefix.  False otherwise.
+ */
+LIB_EXPORT bool l_str_has_prefix(const char *str, const char *prefix)
+{
+       size_t str_len;
+       size_t prefix_len;
+
+       if (unlikely(!str))
+               return false;
+
+       if (unlikely(!prefix))
+               return false;
+
+       str_len = strlen(str);
+       prefix_len = strlen(prefix);
+
+       if (str_len < prefix_len)
+               return false;
+
+       return !strncmp(str, prefix, prefix_len);
+}
+
+/**
+ * l_str_has_suffix:
+ * @str: A string to be examined
+ * @suffix: Suffix string
+ *
+ * Determines if the string given by @str ends with the specified @suffix.
+ *
+ * Returns: True if @str ends with the specified @suffix.  False otherwise.
+ */
+LIB_EXPORT bool l_str_has_suffix(const char *str, const char *suffix)
+{
+       size_t str_len;
+       size_t suffix_len;
+       size_t len_diff;
+
+       if (unlikely(!str))
+               return false;
+
+       if (unlikely(!suffix))
+               return false;
+
+       str_len = strlen(str);
+       suffix_len = strlen(suffix);
+
+       if (str_len < suffix_len)
+               return false;
+
+       len_diff = str_len - suffix_len;
+
+       return !strcmp(&str[len_diff], suffix);
+}
+
+static char *hexstring_common(const unsigned char *buf, size_t len,
+                               const char hexdigits[static 16])
+{
+       char *str;
+       size_t i;
+
+       if (unlikely(!buf) || unlikely(!len))
+               return NULL;
+
+       str = l_malloc(len * 2 + 1);
+
+       for (i = 0; i < len; i++) {
+               str[(i * 2) + 0] = hexdigits[buf[i] >> 4];
+               str[(i * 2) + 1] = hexdigits[buf[i] & 0xf];
+       }
+
+       str[len * 2] = '\0';
+
+       return str;
+}
+
+/**
+ * l_util_hexstring:
+ * @buf: buffer pointer
+ * @len: length of buffer
+ *
+ * Returns: a newly allocated hex string.  Note that the string will contain
+ * lower case hex digits a-f.  If you require upper case hex digits, use
+ * @l_util_hexstring_upper
+ **/
+LIB_EXPORT char *l_util_hexstring(const unsigned char *buf, size_t len)
+{
+       static const char hexdigits[] = "0123456789abcdef";
+       return hexstring_common(buf, len, hexdigits);
+}
+
+/**
+ * l_util_hexstring_upper:
+ * @buf: buffer pointer
+ * @len: length of buffer
+ *
+ * Returns: a newly allocated hex string.  Note that the string will contain
+ * upper case hex digits a-f.  If you require lower case hex digits, use
+ * @l_util_hexstring
+ **/
+LIB_EXPORT char *l_util_hexstring_upper(const unsigned char *buf, size_t len)
+{
+       static const char hexdigits[] = "0123456789ABCDEF";
+       return hexstring_common(buf, len, hexdigits);
+}
+
+/**
+ * l_util_from_hexstring:
+ * @str: Null-terminated string containing the hex-encoded bytes
+ * @out_len: Number of bytes decoded
+ *
+ * Returns: a newly allocated byte array.  Empty strings are treated as
+ * an error condition.
+ **/
+LIB_EXPORT unsigned char *l_util_from_hexstring(const char *str,
+                                                       size_t *out_len)
+{
+       size_t i, j;
+       size_t len;
+       char c;
+       unsigned char *buf;
+
+       if (unlikely(!str))
+               return NULL;
+
+       for (i = 0; str[i]; i++) {
+               c = toupper(str[i]);
+
+               if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F'))
+                       continue;
+
+               return NULL;
+       }
+
+       if (!i)
+               return NULL;
+
+       if ((i % 2) != 0)
+               return NULL;
+
+       len = i;
+       buf = l_malloc(i >> 1);
+
+       for (i = 0, j = 0; i < len; i++, j++) {
+               c = toupper(str[i]);
+
+               if (c >= '0' && c <= '9')
+                       buf[j] = c - '0';
+               else if (c >= 'A' && c <= 'F')
+                       buf[j] = 10 + c - 'A';
+
+               i += 1;
+
+               c = toupper(str[i]);
+
+               if (c >= '0' && c <= '9')
+                       buf[j] = buf[j] * 16 + c - '0';
+               else if (c >= 'A' && c <= 'F')
+                       buf[j] = buf[j] * 16 + 10 + c - 'A';
+       }
+
+       if (out_len)
+               *out_len = j;
+
+       return buf;
+}
+
+static void hexdump(const char dir, const unsigned char *buf, size_t len,
+                       l_util_hexdump_func_t function, void *user_data)
+{
+       static const char hexdigits[] = "0123456789abcdef";
+       char str[68];
+       size_t i;
+
+       if (unlikely(!len))
+               return;
+
+       str[0] = dir;
+
+       for (i = 0; i < len; i++) {
+               str[((i % 16) * 3) + 1] = ' ';
+               str[((i % 16) * 3) + 2] = hexdigits[buf[i] >> 4];
+               str[((i % 16) * 3) + 3] = hexdigits[buf[i] & 0xf];
+               str[(i % 16) + 51] = isprint(buf[i]) ? buf[i] : '.';
+
+               if ((i + 1) % 16 == 0) {
+                       str[49] = ' ';
+                       str[50] = ' ';
+                       str[67] = '\0';
+                       function(str, user_data);
+                       str[0] = ' ';
+               }
+       }
+
+       if (i % 16 > 0) {
+               size_t j;
+               for (j = (i % 16); j < 16; j++) {
+                       str[(j * 3) + 1] = ' ';
+                       str[(j * 3) + 2] = ' ';
+                       str[(j * 3) + 3] = ' ';
+                       str[j + 51] = ' ';
+               }
+               str[49] = ' ';
+               str[50] = ' ';
+               str[67] = '\0';
+               function(str, user_data);
+       }
+}
+
+LIB_EXPORT void l_util_hexdump(bool in, const void *buf, size_t len,
+                       l_util_hexdump_func_t function, void *user_data)
+{
+       if (likely(!function))
+               return;
+
+       hexdump(in ? '<' : '>', buf, len, function, user_data);
+}
+
+LIB_EXPORT void l_util_hexdump_two(bool in, const void *buf1, size_t len1,
+                       const void *buf2, size_t len2,
+                       l_util_hexdump_func_t function, void *user_data)
+{
+       if (likely(!function))
+               return;
+
+       hexdump(in ? '<' : '>', buf1, len1, function, user_data);
+       hexdump(' ', buf2, len2, function, user_data);
+}
+
+LIB_EXPORT void l_util_hexdumpv(bool in, const struct iovec *iov,
+                                       size_t n_iov,
+                                       l_util_hexdump_func_t function,
+                                       void *user_data)
+{
+       static const char hexdigits[] = "0123456789abcdef";
+       char str[68];
+       size_t i;
+       size_t len;
+       size_t c;
+       const uint8_t *buf;
+
+       if (unlikely(!iov || !n_iov))
+               return;
+
+       str[0] = in ? '<' : '>';
+
+       for (i = 0, len = 0; i < n_iov; i++)
+               len += iov[i].iov_len;
+
+       c = 0;
+       buf = iov[0].iov_base;
+
+       for (i = 0; i < len; i++, c++) {
+               if (c == iov[0].iov_len) {
+                       c = 0;
+                       iov += 1;
+                       buf = iov[0].iov_base;
+               }
+
+               str[((i % 16) * 3) + 1] = ' ';
+               str[((i % 16) * 3) + 2] = hexdigits[buf[c] >> 4];
+               str[((i % 16) * 3) + 3] = hexdigits[buf[c] & 0xf];
+               str[(i % 16) + 51] = isprint(buf[c]) ? buf[c] : '.';
+
+               if ((i + 1) % 16 == 0) {
+                       str[49] = ' ';
+                       str[50] = ' ';
+                       str[67] = '\0';
+                       function(str, user_data);
+                       str[0] = ' ';
+               }
+       }
+
+       if (i % 16 > 0) {
+               size_t j;
+               for (j = (i % 16); j < 16; j++) {
+                       str[(j * 3) + 1] = ' ';
+                       str[(j * 3) + 2] = ' ';
+                       str[(j * 3) + 3] = ' ';
+                       str[j + 51] = ' ';
+               }
+               str[49] = ' ';
+               str[50] = ' ';
+               str[67] = '\0';
+               function(str, user_data);
+       }
+}
+
+LIB_EXPORT void l_util_debug(l_util_hexdump_func_t function, void *user_data,
+                                               const char *format, ...)
+{
+       va_list args;
+       char *str;
+       int len;
+
+       if (likely(!function))
+               return;
+
+       if (unlikely(!format))
+               return;
+
+       va_start(args, format);
+       len = vasprintf(&str, format, args);
+       va_end(args);
+
+       if (unlikely(len < 0))
+               return;
+
+       function(str, user_data);
+
+       free(str);
+}
+
+/**
+ * l_util_get_debugfs_path:
+ *
+ * Returns: a pointer to mount point of debugfs
+ **/
+LIB_EXPORT const char *l_util_get_debugfs_path(void)
+{
+       static char path[PATH_MAX + 1];
+       static bool found = false;
+       char type[100];
+       FILE *fp;
+
+       if (found)
+               return path;
+
+       fp = fopen("/proc/mounts", "r");
+       if (!fp)
+               return NULL;
+
+       while (fscanf(fp, "%*s %" L_STRINGIFY(PATH_MAX) "s %99s %*s %*d %*d\n",
+                                                       path, type) == 2) {
+               if (!strcmp(type, "debugfs")) {
+                       found = true;
+                       break;
+               }
+       }
+
+       fclose(fp);
+
+       if (!found)
+               return NULL;
+
+       return path;
+}
diff --git a/ell/util.h b/ell/util.h
new file mode 100644 (file)
index 0000000..3b56d5d
--- /dev/null
@@ -0,0 +1,321 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_UTIL_H
+#define __ELL_UTIL_H
+
+#include <string.h>
+#include <stdbool.h>
+#include <stdarg.h>
+#include <inttypes.h>
+#include <endian.h>
+#include <byteswap.h>
+#include <sys/uio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define l_container_of(ptr, type, member) ({                           \
+_Pragma("GCC diagnostic push")                                         \
+_Pragma("GCC diagnostic ignored \"-Wcast-align\"")                     \
+               const __typeof__(((type *) 0)->member) *__mptr = (ptr); \
+               (type *)((char *) __mptr - offsetof(type, member));     \
+_Pragma("GCC diagnostic pop")                                          \
+       })
+
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+
+#define L_STRINGIFY(val) L_STRINGIFY_ARG(val)
+#define L_STRINGIFY_ARG(contents) #contents
+
+#define L_WARN_ON(condition) __extension__ ({                          \
+               bool r = !!(condition);                                 \
+               if (unlikely(r))                                        \
+                       l_warn("WARNING: %s:%s() condition %s failed",  \
+                               __FILE__, __func__,                     \
+                               #condition);                            \
+               unlikely(r);                                            \
+       })
+
+#define L_PTR_TO_UINT(p) ((unsigned int) ((uintptr_t) (p)))
+#define L_UINT_TO_PTR(u) ((void *) ((uintptr_t) (u)))
+
+#define L_PTR_TO_INT(p) ((int) ((intptr_t) (p)))
+#define L_INT_TO_PTR(u) ((void *) ((intptr_t) (u)))
+
+#define L_GET_UNALIGNED(ptr) __extension__     \
+({                                             \
+       struct __attribute__((packed)) {        \
+            __typeof__(*(ptr)) __v;            \
+       } *__p = (__typeof__(__p)) (ptr);       \
+       __p->__v;                               \
+})
+
+#define L_PUT_UNALIGNED(val, ptr)              \
+do {                                           \
+       struct __attribute__((packed)) {        \
+               __typeof__(*(ptr)) __v;         \
+       } *__p = (__typeof__(__p)) (ptr);       \
+       __p->__v = (val);                       \
+} while(0)
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define L_LE16_TO_CPU(val) (val)
+#define L_LE32_TO_CPU(val) (val)
+#define L_LE64_TO_CPU(val) (val)
+#define L_CPU_TO_LE16(val) (val)
+#define L_CPU_TO_LE32(val) (val)
+#define L_CPU_TO_LE64(val) (val)
+#define L_BE16_TO_CPU(val) bswap_16(val)
+#define L_BE32_TO_CPU(val) bswap_32(val)
+#define L_BE64_TO_CPU(val) bswap_64(val)
+#define L_CPU_TO_BE16(val) bswap_16(val)
+#define L_CPU_TO_BE32(val) bswap_32(val)
+#define L_CPU_TO_BE64(val) bswap_64(val)
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define L_LE16_TO_CPU(val) bswap_16(val)
+#define L_LE32_TO_CPU(val) bswap_32(val)
+#define L_LE64_TO_CPU(val) bswap_64(val)
+#define L_CPU_TO_LE16(val) bswap_16(val)
+#define L_CPU_TO_LE32(val) bswap_32(val)
+#define L_CPU_TO_LE64(val) bswap_64(val)
+#define L_BE16_TO_CPU(val) (val)
+#define L_BE32_TO_CPU(val) (val)
+#define L_BE64_TO_CPU(val) (val)
+#define L_CPU_TO_BE16(val) (val)
+#define L_CPU_TO_BE32(val) (val)
+#define L_CPU_TO_BE64(val) (val)
+#else
+#error "Unknown byte order"
+#endif
+
+#if __STDC_VERSION__ <= 199409L
+#define inline __inline__
+#endif
+
+static inline uint8_t l_get_u8(const void *ptr)
+{
+       return *((const uint8_t *) ptr);
+}
+
+static inline void l_put_u8(uint8_t val, void *ptr)
+{
+       *((uint8_t *) ptr) = val;
+}
+
+static inline uint16_t l_get_u16(const void *ptr)
+{
+       return L_GET_UNALIGNED((const uint16_t *) ptr);
+}
+
+static inline void l_put_u16(uint16_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(val, (uint16_t *) ptr);
+}
+
+static inline uint32_t l_get_u32(const void *ptr)
+{
+       return L_GET_UNALIGNED((const uint32_t *) ptr);
+}
+
+static inline void l_put_u32(uint32_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(val, (uint32_t *) ptr);
+}
+
+static inline uint64_t l_get_u64(const void *ptr)
+{
+       return L_GET_UNALIGNED((const uint64_t *) ptr);
+}
+
+static inline void l_put_u64(uint64_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(val, (uint64_t *) ptr);
+}
+
+static inline int16_t l_get_s16(const void *ptr)
+{
+       return L_GET_UNALIGNED((const int16_t *) ptr);
+}
+
+static inline int32_t l_get_s32(const void *ptr)
+{
+       return L_GET_UNALIGNED((const int32_t *) ptr);
+}
+
+static inline int64_t l_get_s64(const void *ptr)
+{
+       return L_GET_UNALIGNED((const int64_t *) ptr);
+}
+
+static inline uint16_t l_get_le16(const void *ptr)
+{
+       return L_LE16_TO_CPU(L_GET_UNALIGNED((const uint16_t *) ptr));
+}
+
+static inline uint16_t l_get_be16(const void *ptr)
+{
+       return L_BE16_TO_CPU(L_GET_UNALIGNED((const uint16_t *) ptr));
+}
+
+static inline uint32_t l_get_le32(const void *ptr)
+{
+       return L_LE32_TO_CPU(L_GET_UNALIGNED((const uint32_t *) ptr));
+}
+
+static inline uint32_t l_get_be32(const void *ptr)
+{
+       return L_BE32_TO_CPU(L_GET_UNALIGNED((const uint32_t *) ptr));
+}
+
+static inline uint64_t l_get_le64(const void *ptr)
+{
+       return L_LE64_TO_CPU(L_GET_UNALIGNED((const uint64_t *) ptr));
+}
+
+static inline uint64_t l_get_be64(const void *ptr)
+{
+       return L_BE64_TO_CPU(L_GET_UNALIGNED((const uint64_t *) ptr));
+}
+
+static inline void l_put_le16(uint16_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(L_CPU_TO_LE16(val), (uint16_t *) ptr);
+}
+
+static inline void l_put_be16(uint16_t val, const void *ptr)
+{
+       L_PUT_UNALIGNED(L_CPU_TO_BE16(val), (uint16_t *) ptr);
+}
+
+static inline void l_put_le32(uint32_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(L_CPU_TO_LE32(val), (uint32_t *) ptr);
+}
+
+static inline void l_put_be32(uint32_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(L_CPU_TO_BE32(val), (uint32_t *) ptr);
+}
+
+static inline void l_put_le64(uint64_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(L_CPU_TO_LE64(val), (uint64_t *) ptr);
+}
+
+static inline void l_put_be64(uint64_t val, void *ptr)
+{
+       L_PUT_UNALIGNED(L_CPU_TO_BE64(val), (uint64_t *) ptr);
+}
+
+#define L_AUTO_CLEANUP_VAR(vartype,varname,destroy) \
+       vartype varname __attribute__((cleanup(destroy)))
+
+#define L_AUTO_FREE_VAR(vartype,varname) \
+       vartype varname __attribute__((cleanup(auto_free)))
+
+#define L_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+void *l_malloc(size_t size) __attribute__ ((warn_unused_result, malloc));
+void *l_memdup(const void *mem, size_t size)
+                       __attribute__ ((warn_unused_result, malloc));
+void l_free(void *ptr);
+
+void *l_realloc(void *mem, size_t size)
+                       __attribute__ ((warn_unused_result, malloc));
+
+static inline void auto_free(void *a)
+{
+       void **p = (void **)a;
+       l_free(*p);
+}
+
+static inline size_t minsize(size_t a, size_t b)
+{
+       if (a <= b)
+               return a;
+
+       return b;
+}
+
+/**
+ * l_new:
+ * @type: type of structure
+ * @count: amount of structures
+ *
+ * Returns: pointer to allocated memory
+ **/
+#define l_new(type, count)                     \
+       (type *) (__extension__ ({              \
+               size_t __n = (size_t) (count);  \
+               size_t __s = sizeof(type);      \
+               void *__p;                      \
+               __p = l_malloc(__n * __s);      \
+               memset(__p, 0, __n * __s);      \
+               __p;                            \
+       }))
+
+char *l_strdup(const char *str);
+char *l_strndup(const char *str, size_t max);
+char *l_strdup_printf(const char *format, ...)
+                       __attribute__((format(printf, 1, 2)));
+char *l_strdup_vprintf(const char *format, va_list args);
+
+size_t l_strlcpy(char* dst, const char *src, size_t len);
+
+bool l_str_has_prefix(const char *str, const char *prefix);
+bool l_str_has_suffix(const char *str, const char *suffix);
+
+char *l_util_hexstring(const unsigned char *buf, size_t len);
+char *l_util_hexstring_upper(const unsigned char *buf, size_t len);
+unsigned char *l_util_from_hexstring(const char *str, size_t *out_len);
+
+typedef void (*l_util_hexdump_func_t) (const char *str, void *user_data);
+
+void l_util_hexdump(bool in, const void *buf, size_t len,
+                       l_util_hexdump_func_t function, void *user_data);
+void l_util_hexdump_two(bool in, const void *buf1, size_t len1,
+                       const void *buf2, size_t len2,
+                       l_util_hexdump_func_t function, void *user_data);
+void l_util_hexdumpv(bool in, const struct iovec *iov, size_t n_iov,
+                                       l_util_hexdump_func_t function,
+                                       void *user_data);
+void l_util_debug(l_util_hexdump_func_t function, void *user_data,
+                                               const char *format, ...)
+                       __attribute__((format(printf, 3, 4)));
+
+const char *l_util_get_debugfs_path(void);
+
+#define L_TFR(expression)                          \
+  (__extension__                                   \
+    ({ long int __result;                          \
+       do __result = (long int) (expression);      \
+       while (__result == -1L && errno == EINTR);  \
+       __result; }))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_UTIL_H */
diff --git a/ell/uuid.c b/ell/uuid.c
new file mode 100644 (file)
index 0000000..de54015
--- /dev/null
@@ -0,0 +1,260 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+
+#include "checksum.h"
+#include "random.h"
+#include "private.h"
+#include "uuid.h"
+
+const uint8_t L_UUID_NAMESPACE_DNS[16] = {
+       0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1,
+       0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8,
+};
+
+const uint8_t L_UUID_NAMESPACE_URL[16] = {
+       0x6b, 0xa7, 0xb8, 0x11, 0x9d, 0xad, 0x11, 0xd1,
+       0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8,
+};
+
+const uint8_t L_UUID_NAMESPACE_OID[16] = {
+       0x6b, 0xa7, 0xb8, 0x12, 0x9d, 0xad, 0x11, 0xd1,
+       0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8,
+};
+
+const uint8_t L_UUID_NAMESPACE_X500[16] = {
+       0x6b, 0xa7, 0xb8, 0x14, 0x9d, 0xad, 0x11, 0xd1,
+       0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8,
+};
+
+/* RFC 4122, Section 4.3 */
+static bool name_from_namespace(int version, const uint8_t nsid[16],
+                               const void *name,
+                               size_t name_size, uint8_t out_uuid[16])
+{
+       enum l_checksum_type type;
+       struct l_checksum *hash;
+       struct iovec iov[2];
+
+       if (unlikely(!out_uuid))
+               return false;
+
+       switch (version) {
+       case 3:
+               type = L_CHECKSUM_MD5;
+               break;
+       case 5:
+               type = L_CHECKSUM_SHA1;
+               break;
+       default:
+               return false;
+       }
+
+       hash = l_checksum_new(type);
+       if (!hash)
+               return false;
+
+       iov[0].iov_base = (void *) nsid;
+       iov[0].iov_len = 16;
+       iov[1].iov_base = (void *) name;
+       iov[1].iov_len = name_size;
+
+       /* Compute the hash of the name space ID concatenated with the name. */
+       l_checksum_updatev(hash, iov, 2);
+
+       /* o Set octets zero through 3 of the time_low field to octets zero
+        * through 3 of the hash.
+        *
+        * o Set octets zero and one of the time_mid field to octets 4 and 5 of
+        * the hash.
+        *
+        * o Set octets zero and one of the time_hi_and_version field to octets
+        * 6 and 7 of the hash.
+        * o Set the four most significant bits (bits 12 through 15) of the
+        * time_hi_and_version field to the appropriate 4-bit version number
+        * from Section 4.1.3.
+        *
+        * o Set the clock_seq_hi_and_reserved field to octet 8 of the hash.
+        * o Set the two most significant bits (bits 6 and 7) of the
+        * clock_seq_hi_and_reserved to zero and one, respectively.
+        *
+        * o  Set the clock_seq_low field to octet 9 of the hash.
+        *
+        * o  Set octets zero through five of the node field to octets 10
+        * through 15 of the hash.
+        */
+
+       l_checksum_get_digest(hash, out_uuid, 16);
+
+       /* Set 4 MSB bits of time_hi_and_version field */
+       out_uuid[6] &= 0x0f;
+       out_uuid[6] |= version << 4;
+
+       /* Set 2 MSB of clock_seq_hi_and_reserved to 10 */
+       out_uuid[8] &= 0x3f;
+       out_uuid[8] |= 0x80;
+
+       l_checksum_free(hash);
+
+       return true;
+}
+
+LIB_EXPORT bool l_uuid_v3(const uint8_t nsid[16], const void *name,
+                               size_t name_size, uint8_t out_uuid[16])
+{
+       return name_from_namespace(3, nsid, name, name_size, out_uuid);
+}
+
+LIB_EXPORT bool l_uuid_v5(const uint8_t nsid[16], const void *name,
+                               size_t name_size, uint8_t out_uuid[16])
+{
+       return name_from_namespace(5, nsid, name, name_size, out_uuid);
+}
+
+/* RFC 4122, Section 4.4 */
+LIB_EXPORT bool l_uuid_v4(uint8_t out_uuid[16])
+{
+       if (unlikely(!out_uuid))
+               return false;
+
+       if (!l_getrandom(out_uuid, 16))
+               return false;
+
+       /*
+        * o Set the two most significant bits (bits 6 and 7) of the
+        * clock_seq_hi_and_reserved to zero and one, respectively.
+        *
+        * o Set the four most significant bits (bits 12 through 15) of the
+        * time_hi_and_version field to the 4-bit version number from
+        * Section 4.1.3.
+        *
+        * o Set all the other bits to randomly (or pseudo-randomly) chosen
+        * values.
+        */
+
+       /* Set 4 MSB bits of time_hi_and_version field */
+       out_uuid[6] &= 0x0f;
+       out_uuid[6] |= 4 << 4;
+
+       /* Set 2 MSB of clock_seq_hi_and_reserved to 10 */
+       out_uuid[8] &= 0x3f;
+       out_uuid[8] |= 0x80;
+
+       return true;
+}
+
+/**
+ * l_uuid_is_valid:
+ * @uuid: UUID to check.
+ *
+ * Checks whether the given UUID is valid according to RFC 4122.  This function
+ * checks that the version field is set properly and the variant of the UUID
+ * is set to RFC 4122.
+ *
+ * Returns: Whether the UUID is valid
+ **/
+LIB_EXPORT bool l_uuid_is_valid(const uint8_t uuid[16])
+{
+       unsigned int version;
+       unsigned int variant;
+
+       if (!uuid)
+               return false;
+
+       variant = uuid[8] >> 6;
+       if (variant != 2)
+               return false;
+
+       version = uuid[6] >> 4;
+       if (version < 1 || version > 5)
+               return false;
+
+       return true;
+}
+
+LIB_EXPORT enum l_uuid_version l_uuid_get_version(const uint8_t uuid[16])
+{
+       unsigned int version;
+
+       version = uuid[6] >> 4;
+       return version;
+}
+
+LIB_EXPORT bool l_uuid_to_string(const uint8_t uuid[16],
+                                               char *dest, size_t dest_size)
+{
+       int n;
+
+       n = snprintf(dest, dest_size, "%02x%02x%02x%02x-%02x%02x-%02x%02x-"
+                                       "%02x%02x-%02x%02x%02x%02x%02x%02x",
+                                       uuid[0], uuid[1], uuid[2], uuid[3],
+                                       uuid[4], uuid[5],
+                                       uuid[6], uuid[7],
+                                       uuid[8], uuid[9],
+                                       uuid[10], uuid[11], uuid[12],
+                                       uuid[13], uuid[14], uuid[15]);
+
+       if (n < 0 || (size_t) n >= dest_size)
+               return false;
+
+       return true;
+}
+
+LIB_EXPORT bool l_uuid_from_string(const char *src, uint8_t uuid[16])
+{
+       uint8_t buf[16];
+       int n;
+
+       /*
+        * textual representation: 32 hex digits + 4 group separators
+        */
+       if (strlen(src) < 16 * 2 + 4)
+               return false;
+
+       n = sscanf(src,
+                       "%02hhx%02hhx%02hhx%02hhx-"
+                       "%02hhx%02hhx-"
+                       "%02hhx%02hhx-"
+                       "%02hhx%02hhx-"
+                       "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
+                       &buf[0], &buf[1], &buf[2], &buf[3],
+                       &buf[4], &buf[5],
+                       &buf[6], &buf[7],
+                       &buf[8], &buf[9],
+                       &buf[10], &buf[11], &buf[12],
+                       &buf[13], &buf[14], &buf[15]);
+
+       if (n != 16)
+               return false;
+
+       if (!l_uuid_is_valid(buf))
+               return false;
+
+       memcpy(uuid, buf, sizeof(buf));
+       return true;
+}
diff --git a/ell/uuid.h b/ell/uuid.h
new file mode 100644 (file)
index 0000000..cb59b78
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef __ELL_UUID_H
+#define __ELL_UUID_H
+
+#include <stdbool.h>
+#include <inttypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum l_uuid_version {
+       L_UUID_VERSION_1_TIME = 1,
+       L_UUID_VERSION_2_DCE = 2,
+       L_UUID_VERSION_3_MD5 = 3,
+       L_UUID_VERSION_4_RANDOM = 4,
+       L_UUID_VERSION_5_SHA1 = 5,
+};
+
+extern const uint8_t L_UUID_NAMESPACE_DNS[];
+extern const uint8_t L_UUID_NAMESPACE_URL[];
+extern const uint8_t L_UUID_NAMESPACE_OID[];
+extern const uint8_t L_UUID_NAMESPACE_X500[];
+
+bool l_uuid_v3(const uint8_t nsid[16], const void *name, size_t name_size,
+                       uint8_t out_uuid[16]);
+bool l_uuid_v4(uint8_t out_uuid[16]);
+bool l_uuid_v5(const uint8_t nsid[16], const void *name, size_t name_size,
+                       uint8_t out_uuid[16]);
+
+bool l_uuid_is_valid(const uint8_t uuid[16]);
+enum l_uuid_version l_uuid_get_version(const uint8_t uuid[16]);
+
+bool l_uuid_to_string(const uint8_t uuid[16], char *dest, size_t dest_size);
+bool l_uuid_from_string(const char *src, uint8_t uuid[16]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ELL_UTIL_H */
diff --git a/examples/dbus-client.c b/examples/dbus-client.c
new file mode 100644 (file)
index 0000000..11b9b50
--- /dev/null
@@ -0,0 +1,179 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <signal.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void ready_callback(void *user_data)
+{
+       l_info("ready");
+}
+
+static void disconnect_callback(void *user_data)
+{
+       l_main_quit();
+}
+
+static void iwd_service_appeared(struct l_dbus *dbus, void *user_data)
+{
+       l_info("Service appeared");
+}
+
+static void iwd_service_disappeared(struct l_dbus *dbus, void *user_data)
+{
+       l_info("Service disappeared");
+}
+
+static void bluez_client_connected(struct l_dbus *dbus, void *user_data)
+{
+       l_info("client connected");
+}
+
+static void bluez_client_disconnected(struct l_dbus *dbus, void *user_data)
+{
+       l_info("client disconnected");
+}
+
+static void bluez_client_ready(struct l_dbus_client *client, void *user_data)
+{
+       l_info("client ready");
+}
+
+static void proxy_added(struct l_dbus_proxy *proxy, void *user_data)
+{
+       const char *interface = l_dbus_proxy_get_interface(proxy);
+       const char *path = l_dbus_proxy_get_path(proxy);
+
+       l_info("proxy added: %s %s", path, interface);
+
+       if (!strcmp(interface, "org.bluez.Adapter1") ||
+                               !strcmp(interface, "org.bluez.Device1")) {
+               char *str;
+
+               if (!l_dbus_proxy_get_property(proxy, "Address", "s", &str))
+                       return;
+
+               l_info("   Address: %s", str);
+       }
+}
+
+static void proxy_removed(struct l_dbus_proxy *proxy, void *user_data)
+{
+       l_info("proxy removed: %s %s", l_dbus_proxy_get_path(proxy),
+                                       l_dbus_proxy_get_interface(proxy));
+}
+
+static void property_changed(struct l_dbus_proxy *proxy, const char *name,
+                               struct l_dbus_message *msg, void *user_data)
+{
+       l_info("property changed: %s (%s %s)", name,
+                                       l_dbus_proxy_get_path(proxy),
+                                       l_dbus_proxy_get_interface(proxy));
+
+       if (!strcmp(name, "Address")) {
+               char *str;
+
+               if (!l_dbus_message_get_arguments(msg, "s", &str)) {
+                       return;
+               }
+
+               l_info("   Address: %s", str);
+       }
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_dbus_client *client;
+       struct l_dbus *dbus;
+       uint32_t iwd_watch_id;
+
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS);
+       l_dbus_set_debug(dbus, do_debug, "[DBUS] ", NULL);
+       l_dbus_set_ready_handler(dbus, ready_callback, dbus, NULL);
+       l_dbus_set_disconnect_handler(dbus, disconnect_callback, NULL, NULL);
+
+       /* service basic watch */
+       iwd_watch_id = l_dbus_add_service_watch(dbus, "net.connman.iwd",
+                                               iwd_service_appeared,
+                                               iwd_service_disappeared,
+                                               NULL, NULL);
+
+       /* proxy example */
+       client = l_dbus_client_new(dbus, "org.bluez", "/org/bluez");
+
+       l_dbus_client_set_connect_handler(client, bluez_client_connected, NULL,
+                                                                       NULL);
+       l_dbus_client_set_disconnect_handler(client, bluez_client_disconnected,
+                                                               NULL, NULL);
+
+       l_dbus_client_set_proxy_handlers(client, proxy_added, proxy_removed,
+                                                       property_changed, NULL, NULL);
+
+       l_dbus_client_set_ready_handler(client, bluez_client_ready, NULL, NULL);
+
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+       l_dbus_remove_watch(dbus, iwd_watch_id);
+
+       l_dbus_client_destroy(client);
+
+       l_dbus_destroy(dbus);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/examples/dbus-service.c b/examples/dbus-service.c
new file mode 100644 (file)
index 0000000..b3d9509
--- /dev/null
@@ -0,0 +1,235 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <signal.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void request_name_callback(struct l_dbus *dbus, bool success,
+                                       bool queued, void *user_data)
+{
+       l_info("request name result=%s",
+               success ? (queued ? "queued" : "success") : "failed");
+}
+
+static void ready_callback(void *user_data)
+{
+       l_info("ready");
+}
+
+static void disconnect_callback(void *user_data)
+{
+       l_main_quit();
+}
+
+struct test_data {
+       char *string;
+       uint32_t integer;
+};
+
+static void test_data_destroy(void *data)
+{
+       struct test_data *test = data;
+
+       l_free(test->string);
+       l_free(test);
+}
+
+static struct l_dbus_message *test_method_call(struct l_dbus *dbus,
+                                               struct l_dbus_message *message,
+                                               void *user_data)
+{
+       struct l_dbus_message *reply;
+
+       l_info("Method Call");
+
+       reply = l_dbus_message_new_method_return(message);
+       l_dbus_message_set_arguments(reply, "");
+
+       return reply;
+}
+
+static bool test_string_getter(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               void *user_data)
+{
+       struct test_data *test = user_data;
+
+       l_dbus_message_builder_append_basic(builder, 's', test->string);
+
+       return true;
+}
+
+static struct l_dbus_message *test_string_setter(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_iter *new_value,
+                                       l_dbus_property_complete_cb_t complete,
+                                       void *user_data)
+{
+       const char *strvalue;
+       struct test_data *test = user_data;
+
+       if (!l_dbus_message_iter_get_variant(new_value, "s", &strvalue))
+               return l_dbus_message_new_error(message,
+                                               "org.test.InvalidArguments",
+                                               "String value expected");
+
+       l_info("New String value: %s", strvalue);
+       l_free(test->string);
+       test->string = l_strdup(strvalue);
+
+       complete(dbus, message, NULL);
+
+       return NULL;
+}
+
+static bool test_int_getter(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               void *user_data)
+{
+       struct test_data *test = user_data;
+
+       l_dbus_message_builder_append_basic(builder, 'u', &test->integer);
+
+       return true;
+}
+
+static struct l_dbus_message *test_int_setter(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_iter *new_value,
+                               l_dbus_property_complete_cb_t complete,
+                               void *user_data)
+{
+       uint32_t u;
+       struct test_data *test = user_data;
+
+       if (!l_dbus_message_iter_get_variant(new_value, "u", &u))
+               return l_dbus_message_new_error(message,
+                                               "org.test.InvalidArguments",
+                                               "Integer value expected");
+
+       l_info("New Integer value: %u", u);
+       test->integer = u;
+
+       complete(dbus, message, NULL);
+
+       return NULL;
+}
+
+static void setup_test_interface(struct l_dbus_interface *interface)
+{
+       l_dbus_interface_method(interface, "MethodCall", 0,
+                               test_method_call, "", "");
+
+       l_dbus_interface_property(interface, "String", 0, "s",
+                                       test_string_getter, test_string_setter);
+       l_dbus_interface_property(interface, "Integer", 0, "u",
+                                       test_int_getter, test_int_setter);
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_dbus *dbus;
+       struct test_data *test;
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       dbus = l_dbus_new_default(L_DBUS_SESSION_BUS);
+       l_dbus_set_debug(dbus, do_debug, "[DBUS] ", NULL);
+       l_dbus_set_ready_handler(dbus, ready_callback, dbus, NULL);
+       l_dbus_set_disconnect_handler(dbus, disconnect_callback, NULL, NULL);
+
+       l_dbus_name_acquire(dbus, "org.test", false, false, false,
+                               request_name_callback, NULL);
+
+       if (!l_dbus_object_manager_enable(dbus, "/")) {
+               l_info("Unable to enable Object Manager");
+               goto cleanup;
+       }
+
+       test = l_new(struct test_data, 1);
+       test->string = l_strdup("Default");
+       test->integer = 42;
+
+       if (!l_dbus_register_interface(dbus, "org.test", setup_test_interface,
+                                       test_data_destroy, true)) {
+               l_info("Unable to register interface");
+               test_data_destroy(test);
+               goto cleanup;
+       }
+
+       if (!l_dbus_object_add_interface(dbus, "/test", "org.test", test)) {
+               l_info("Unable to instantiate interface");
+               test_data_destroy(test);
+               goto cleanup;
+       }
+
+       if (!l_dbus_object_add_interface(dbus, "/test",
+                                       L_DBUS_INTERFACE_PROPERTIES, NULL)) {
+               l_info("Unable to instantiate the properties interface");
+               test_data_destroy(test);
+               goto cleanup;
+       }
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+       l_dbus_unregister_object(dbus, "/test");
+
+cleanup:
+       l_dbus_destroy(dbus);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/examples/dhcp-client.c b/examples/dhcp-client.c
new file mode 100644 (file)
index 0000000..0a16ce4
--- /dev/null
@@ -0,0 +1,119 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <signal.h>
+#include <sys/socket.h>
+#include <linux/if_arp.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void event_handler(struct l_dhcp_client *client,
+                                       enum l_dhcp_client_event event,
+                                       void *userdata)
+{
+       const struct l_dhcp_lease *lease = l_dhcp_client_get_lease(client);
+       char *ip = l_dhcp_lease_get_address(lease);
+       char *netmask = l_dhcp_lease_get_netmask(lease);
+       char *gw = l_dhcp_lease_get_gateway(lease);
+       uint32_t lifetime = l_dhcp_lease_get_lifetime(lease);
+       char **dns = l_dhcp_lease_get_dns(lease);
+
+       l_info("Lease Obtained:");
+       l_info("\tIP: %s, Netmask: %s, Gateway: %s", ip, netmask, gw);
+       l_info("Lifetime: %u seconds", lifetime);
+       if (dns) {
+               char *dns_concat = l_strjoinv(dns, ',');
+               l_info("DNS List: %s", dns_concat);
+               l_free(dns_concat);
+               l_strfreev(dns);
+       } else
+               l_info("No DNS information obtained");
+
+       l_free(ip);
+       l_free(netmask);
+       l_free(gw);
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_dhcp_client *client;
+       int ifindex;
+       uint8_t mac[6];
+
+       if (argc < 2) {
+                printf("Usage: %s <interface index>\n", argv[0]);
+                exit(0);
+        }
+
+       ifindex = atoi(argv[1]);
+
+       if (!l_net_get_mac_address(ifindex, mac)) {
+               printf("Unable to get address from interface %d\n", ifindex);
+               exit(0);
+       }
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+       l_debug_enable("*");
+
+       client = l_dhcp_client_new(ifindex);
+       l_dhcp_client_set_address(client, ARPHRD_ETHER, mac, 6);
+       l_dhcp_client_set_event_handler(client, event_handler, NULL, NULL);
+       l_dhcp_client_set_debug(client, do_debug, "[DHCP] ", NULL);
+       l_dhcp_client_start(client);
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+       l_dhcp_client_destroy(client);
+       l_main_exit();
+
+       return 0;
+}
diff --git a/examples/glib-eventloop.c b/examples/glib-eventloop.c
new file mode 100644 (file)
index 0000000..a77a70b
--- /dev/null
@@ -0,0 +1,157 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
+#include <glib.h>
+#include <ell/ell.h>
+
+static GMainLoop *event_loop;
+
+struct ell_event_source {
+       GSource source;
+       GPollFD pollfd;
+};
+
+static gboolean event_prepare(GSource *source, gint *timeout)
+{
+       int r = l_main_prepare();
+       *timeout = r;
+
+       return FALSE;
+}
+
+static gboolean event_check(GSource *source)
+{
+       l_main_iterate(0);
+       return FALSE;
+}
+
+static GSourceFuncs event_funcs = {
+       .prepare = event_prepare,
+       .check = event_check,
+};
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void oneshot_handler(void *user_data)
+{
+       l_info("One-shot");
+}
+
+static bool write_handler(struct l_io *io, void *user_data)
+{
+       int fd = l_io_get_fd(io);
+       char *str = "Hello";
+       ssize_t written;
+
+       written = write(fd, str, strlen(str));
+
+       l_info("%zd bytes written", written);
+
+       return false;
+}
+
+static bool read_handler(struct l_io *io, void *user_data)
+{
+       int fd = l_io_get_fd(io);
+       char str[32];
+       ssize_t result;
+
+       result = read(fd, str, sizeof(str));
+
+       l_info("%zd bytes read", result);
+
+       g_main_loop_quit(event_loop);
+
+       return false;
+}
+
+static void disconnect_handler(struct l_io *io, void *user_data)
+{
+       l_info("disconnect");
+}
+
+int main(int argc, char **argv)
+{
+       struct l_io *io1, *io2;
+       int fd[2];
+       struct ell_event_source *source;
+
+       l_log_set_stderr();
+       l_debug_enable("*");
+       l_debug("hello");
+
+       l_main_init();
+       event_loop = g_main_loop_new(NULL, FALSE);
+
+       source = (struct ell_event_source *) g_source_new(&event_funcs,
+                                       sizeof(struct ell_event_source));
+
+       source->pollfd.fd = l_main_get_epoll_fd();
+       source->pollfd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+
+       g_source_add_poll((GSource *)source, &source->pollfd);
+       g_source_attach((GSource *) source,
+                                       g_main_loop_get_context(event_loop));
+
+       l_idle_oneshot(oneshot_handler, NULL, NULL);
+
+       if (socketpair(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, fd) < 0) {
+               l_error("Failed to create socket pair");
+               goto done;
+       }
+
+       io1 = l_io_new(fd[0]);
+       l_io_set_close_on_destroy(io1, true);
+       l_io_set_debug(io1, do_debug, "[IO-1] ", NULL);
+       l_io_set_read_handler(io1, read_handler, NULL, NULL);
+       l_io_set_disconnect_handler(io1, disconnect_handler, NULL, NULL);
+
+       io2 = l_io_new(fd[1]);
+       l_io_set_close_on_destroy(io2, true);
+       l_io_set_debug(io2, do_debug, "[IO-2] ", NULL);
+       l_io_set_write_handler(io2, write_handler, NULL, NULL);
+       l_io_set_disconnect_handler(io2, disconnect_handler, NULL, NULL);
+
+       g_main_loop_run(event_loop);
+
+       l_io_destroy(io2);
+       l_io_destroy(io1);
+
+done:
+       g_source_destroy((GSource *) source);
+       g_main_loop_unref(event_loop);
+       l_main_exit();
+
+       return 0;
+}
diff --git a/examples/https-client-test.c b/examples/https-client-test.c
new file mode 100644 (file)
index 0000000..eaa7900
--- /dev/null
@@ -0,0 +1,224 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include <ell/ell.h>
+
+static struct l_io *io;
+static struct l_tls *tls;
+static const char *hostname;
+static bool ready;
+
+static void https_io_disconnect(struct l_io *io, void *user_data)
+{
+       if (!ready)
+               printf("socket disconnected\n");
+       l_main_quit();
+}
+
+static bool https_io_read(struct l_io *io, void *user_data)
+{
+       uint8_t buf[2048];
+       int l;
+
+       l = read(l_io_get_fd(io), buf, sizeof(buf));
+       if (l == 0) {
+               if (!ready)
+                       printf("socket EOF\n");
+               l_main_quit();
+       } else if (l > 0)
+               l_tls_handle_rx(tls, buf, l);
+
+       return true;
+}
+
+static void https_tls_disconnected(enum l_tls_alert_desc reason, bool remote,
+                                       void *user_data)
+{
+       if (reason)
+               printf("TLS error: %s\n", l_tls_alert_to_str(reason));
+       l_main_quit();
+}
+
+static void https_new_data(const uint8_t *data, size_t len, void *user_data)
+{
+       int r;
+
+       while (len) {
+               r = write(1, data, len);
+               if (r < 0) {
+                       printf("socket EOF\n");
+                       l_main_quit();
+                       break;
+               }
+               len -= r;
+               data += r;
+       }
+}
+
+static void https_tls_write(const uint8_t *data, size_t len, void *user_data)
+{
+       int r;
+
+       while (len) {
+               r = send(l_io_get_fd(io), data, len, MSG_NOSIGNAL);
+               if (r < 0) {
+                       printf("socket send: %s\n", strerror(errno));
+                       l_main_quit();
+                       break;
+               }
+               len -= r;
+               data += r;
+       }
+}
+
+static void https_tls_ready(const char *peer_identity, void *user_data)
+{
+       uint8_t buf[2048];
+       int l;
+
+       ready = true;
+
+       if (peer_identity)
+               printf("Server authenticated as %s\n", peer_identity);
+       else
+               printf("Server not authenticated\n");
+
+       l = snprintf((char *) buf, sizeof(buf),
+                       "HEAD / HTTP/1.1\r\n"
+                       "Connection: close\r\n"
+                       "Host: %s\r\n\r\n", hostname);
+       l_tls_write(tls, buf, l);
+}
+
+static void https_tls_debug_cb(const char *str, void *user_data)
+{
+       printf("%s\n", str);
+}
+
+int main(int argc, char *argv[])
+{
+       struct hostent *he;
+       struct in_addr **addr_list;
+       struct sockaddr_in addr;
+       int fd;
+       bool auth_ok;
+       struct l_certchain *cert = NULL;
+       struct l_key *priv_key = NULL;
+       struct l_queue *ca_cert = NULL;
+
+       if (argc != 2 && argc != 3 && argc != 6) {
+               printf("Usage: %s <https-host-name> [<ca-cert-path> "
+                               "[<client-cert-path> <client-key-path> "
+                               "<client-key-passphrase>]]\n"
+                               "Note: The passphrase will be ignored if the "
+                               "key is not encrypted.\n",
+                               argv[0]);
+               return -1;
+       }
+
+       l_log_set_stderr();
+
+       hostname = argv[1];
+       he = gethostbyname(hostname);
+       if (!he) {
+               printf("gethostbyname: %s\n", strerror(errno));
+               return -1;
+       }
+
+       addr_list = (struct in_addr **) he->h_addr_list;
+       if (!addr_list) {
+               printf("No host addresses found\n");
+               return -1;
+       }
+
+       fd = socket(AF_INET, SOCK_STREAM, 0);
+       if (fd < 0) {
+               printf("socket: %s\n", strerror(errno));
+               return -1;
+       }
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_port = htons(443);
+       memcpy(&addr.sin_addr, addr_list[0], sizeof(addr.sin_addr));
+       if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+               printf("connect: %s\n", strerror(errno));
+               return -1;
+       }
+
+       if (!l_main_init())
+               return -1;
+
+       io = l_io_new(fd);
+       l_io_set_close_on_destroy(io, true);
+       l_io_set_read_handler(io, https_io_read, tls, NULL);
+       l_io_set_disconnect_handler(io, https_io_disconnect, tls, NULL);
+
+       tls = l_tls_new(false, https_new_data, https_tls_write,
+                       https_tls_ready, https_tls_disconnected, NULL);
+
+       if (getenv("TLS_DEBUG"))
+               l_tls_set_debug(tls, https_tls_debug_cb, NULL, NULL);
+
+       if (argc >= 3)
+               ca_cert = l_pem_load_certificate_list(argv[2]);
+
+       if (argc >= 4)
+               cert = l_pem_load_certificate_chain(argv[3]);
+
+       if (argc >= 6)
+               priv_key = l_pem_load_private_key(argv[4], argv[5], NULL);
+
+       auth_ok = (argc <= 2 || l_tls_set_cacert(tls, ca_cert)) &&
+               (argc <= 5 ||
+                l_tls_set_auth_data(tls, cert, priv_key)) &&
+               l_tls_start(tls);
+
+       if (tls && auth_ok)
+               l_main_run();
+       else {
+               printf("TLS setup failed\n");
+               l_queue_destroy(ca_cert, (l_queue_destroy_func_t) l_cert_free);
+               l_certchain_free(cert);
+               l_key_free(priv_key);
+       }
+
+       l_io_destroy(io);
+       l_tls_free(tls);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/examples/https-server-test.c b/examples/https-server-test.c
new file mode 100644 (file)
index 0000000..2512601
--- /dev/null
@@ -0,0 +1,205 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+
+#include <ell/ell.h>
+
+static struct l_io *io;
+static struct l_tls *tls;
+bool served;
+
+static void https_io_disconnect(struct l_io *io, void *user_data)
+{
+       if (!served)
+               printf("Disconnected before serving a page\n");
+       l_main_quit();
+}
+
+static bool https_io_read(struct l_io *io, void *user_data)
+{
+       uint8_t buf[2048];
+       int l;
+
+       l = read(l_io_get_fd(io), buf, sizeof(buf));
+       if (l == 0) {
+               if (!served)
+                       printf("EOF before serving a page\n");
+               l_main_quit();
+       } else if (l > 0)
+               l_tls_handle_rx(tls, buf, l);
+
+       return true;
+}
+
+static void https_tls_disconnected(enum l_tls_alert_desc reason, bool remote,
+                                       void *user_data)
+{
+       if (reason)
+               printf("TLS error: %s\n", l_tls_alert_to_str(reason));
+       l_main_quit();
+}
+
+static void https_new_data(const uint8_t *data, size_t len, void *user_data)
+{
+       char *reply = "HTTP/1.1 200 OK\r\n"
+               "Content-Type: text/plain\r\n"
+               "Connection: close\r\n"
+               "\r\n"
+               "Hello, world!\n";
+
+       if (len >= 4 && !memcmp(data + len - 4, "\r\n\r\n", 4)) {
+               l_tls_write(tls, (void *) reply, strlen(reply));
+               served = true;
+               printf("Hello world page served\n");
+               l_tls_close(tls);
+       }
+}
+
+static void https_tls_write(const uint8_t *data, size_t len, void *user_data)
+{
+       int r;
+
+       while (len) {
+               r = send(l_io_get_fd(io), data, len, MSG_NOSIGNAL);
+               if (r < 0) {
+                       printf("send: %s\n", strerror(errno));
+                       l_main_quit();
+                       break;
+               }
+               len -= r;
+               data += r;
+       }
+}
+
+static void https_tls_ready(const char *peer_identity, void *user_data)
+{
+       if (peer_identity)
+               printf("Client authenticated as %s\n", peer_identity);
+       else
+               printf("Client not authenticated\n");
+}
+
+static void https_tls_debug_cb(const char *str, void *user_data)
+{
+       printf("%s\n", str);
+}
+
+int main(int argc, char *argv[])
+{
+       struct sockaddr_in addr;
+       int fd, listenfd;
+       bool auth_ok;
+       struct l_certchain *cert;
+       struct l_key *priv_key;
+       struct l_queue *ca_cert = NULL;
+
+       if (argc != 4 && argc != 5) {
+               printf("Usage: %s <server-cert-path> <server-key-path> "
+                               "<server-key-passphrase> [<ca-cert-path>]\n"
+                               "Note: The passphrase will be ignored if the "
+                               "key is not encrypted.\n",
+                               argv[0]);
+
+               return -1;
+       }
+
+       l_log_set_stderr();
+
+       listenfd = socket(AF_INET, SOCK_STREAM, 0);
+       setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &(int) { 1 },
+                       sizeof(int));
+
+       memset(&addr, 0, sizeof(addr));
+       addr.sin_family = AF_INET;
+       addr.sin_addr.s_addr = htonl(INADDR_ANY);
+       addr.sin_port = htons(1234);
+
+       if (bind(listenfd, (struct sockaddr *) &addr, sizeof(addr)) == -1) {
+               printf("bind: %s\n", strerror(errno));
+               return -1;
+       }
+       if (listen(listenfd, 1) == -1) {
+               printf("listen: %s\n", strerror(errno));
+               return -1;
+       }
+
+       printf("Try https://localhost:1234/ now\n");
+
+       fd = accept(listenfd, NULL, NULL);
+       close(listenfd);
+       if (fd == -1) {
+               printf("accept: %s\n", strerror(errno));
+               return -1;
+       }
+
+       if (!l_main_init())
+               return -1;
+
+       io = l_io_new(fd);
+       l_io_set_close_on_destroy(io, true);
+       l_io_set_read_handler(io, https_io_read, tls, NULL);
+       l_io_set_disconnect_handler(io, https_io_disconnect, tls, NULL);
+
+       tls = l_tls_new(true, https_new_data, https_tls_write,
+                       https_tls_ready, https_tls_disconnected, NULL);
+
+       if (getenv("TLS_DEBUG"))
+               l_tls_set_debug(tls, https_tls_debug_cb, NULL, NULL);
+
+       cert = l_pem_load_certificate_chain(argv[1]);
+       priv_key = l_pem_load_private_key(argv[2], argv[3], NULL);
+
+       if (argc >= 5)
+               ca_cert = l_pem_load_certificate_list(argv[4]);
+
+       auth_ok = l_tls_set_auth_data(tls, cert, priv_key) &&
+               (argc <= 4 || l_tls_set_cacert(tls, ca_cert)) &&
+               l_tls_start(tls);
+
+       if (tls && auth_ok)
+               l_main_run();
+       else {
+               printf("TLS setup failed\n");
+               l_queue_destroy(ca_cert, (l_queue_destroy_func_t) l_cert_free);
+               l_certchain_free(cert);
+               l_key_free(priv_key);
+       }
+
+       l_io_destroy(io);
+       l_tls_free(tls);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/linux/gpio.h b/linux/gpio.h
new file mode 100644 (file)
index 0000000..778ebc3
--- /dev/null
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * <linux/gpio.h> - userspace ABI for the GPIO character devices
+ *
+ * Copyright (C) 2016 Linus Walleij
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef _GPIO_H_
+#define _GPIO_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * struct gpiochip_info - Information about a certain GPIO chip
+ * @name: the Linux kernel name of this GPIO chip
+ * @label: a functional name for this GPIO chip, such as a product
+ * number, may be NULL
+ * @lines: number of GPIO lines on this chip
+ */
+struct gpiochip_info {
+       char name[32];
+       char label[32];
+       __u32 lines;
+};
+
+/* Informational flags */
+#define GPIOLINE_FLAG_KERNEL           (1UL << 0) /* Line used by the kernel */
+#define GPIOLINE_FLAG_IS_OUT           (1UL << 1)
+#define GPIOLINE_FLAG_ACTIVE_LOW       (1UL << 2)
+#define GPIOLINE_FLAG_OPEN_DRAIN       (1UL << 3)
+#define GPIOLINE_FLAG_OPEN_SOURCE      (1UL << 4)
+
+/**
+ * struct gpioline_info - Information about a certain GPIO line
+ * @line_offset: the local offset on this GPIO device, fill this in when
+ * requesting the line information from the kernel
+ * @flags: various flags for this line
+ * @name: the name of this GPIO line, such as the output pin of the line on the
+ * chip, a rail or a pin header name on a board, as specified by the gpio
+ * chip, may be NULL
+ * @consumer: a functional name for the consumer of this GPIO line as set by
+ * whatever is using it, will be NULL if there is no current user but may
+ * also be NULL if the consumer doesn't set this up
+ */
+struct gpioline_info {
+       __u32 line_offset;
+       __u32 flags;
+       char name[32];
+       char consumer[32];
+};
+
+/* Maximum number of requested handles */
+#define GPIOHANDLES_MAX 64
+
+/* Linerequest flags */
+#define GPIOHANDLE_REQUEST_INPUT       (1UL << 0)
+#define GPIOHANDLE_REQUEST_OUTPUT      (1UL << 1)
+#define GPIOHANDLE_REQUEST_ACTIVE_LOW  (1UL << 2)
+#define GPIOHANDLE_REQUEST_OPEN_DRAIN  (1UL << 3)
+#define GPIOHANDLE_REQUEST_OPEN_SOURCE (1UL << 4)
+
+/**
+ * struct gpiohandle_request - Information about a GPIO handle request
+ * @lineoffsets: an array of desired lines, specified by offset index for the
+ * associated GPIO device
+ * @flags: desired flags for the desired GPIO lines, such as
+ * GPIOHANDLE_REQUEST_OUTPUT, GPIOHANDLE_REQUEST_ACTIVE_LOW etc, OR:ed
+ * together. Note that even if multiple lines are requested, the same flags
+ * must be applicable to all of them, if you want lines with individual
+ * flags set, request them one by one. It is possible to select
+ * a batch of input or output lines, but they must all have the same
+ * characteristics, i.e. all inputs or all outputs, all active low etc
+ * @default_values: if the GPIOHANDLE_REQUEST_OUTPUT is set for a requested
+ * line, this specifies the default output value, should be 0 (low) or
+ * 1 (high), anything else than 0 or 1 will be interpreted as 1 (high)
+ * @consumer_label: a desired consumer label for the selected GPIO line(s)
+ * such as "my-bitbanged-relay"
+ * @lines: number of lines requested in this request, i.e. the number of
+ * valid fields in the above arrays, set to 1 to request a single line
+ * @fd: if successful this field will contain a valid anonymous file handle
+ * after a GPIO_GET_LINEHANDLE_IOCTL operation, zero or negative value
+ * means error
+ */
+struct gpiohandle_request {
+       __u32 lineoffsets[GPIOHANDLES_MAX];
+       __u32 flags;
+       __u8 default_values[GPIOHANDLES_MAX];
+       char consumer_label[32];
+       __u32 lines;
+       int fd;
+};
+
+/**
+ * struct gpiohandle_data - Information of values on a GPIO handle
+ * @values: when getting the state of lines this contains the current
+ * state of a line, when setting the state of lines these should contain
+ * the desired target state
+ */
+struct gpiohandle_data {
+       __u8 values[GPIOHANDLES_MAX];
+};
+
+#define GPIOHANDLE_GET_LINE_VALUES_IOCTL _IOWR(0xB4, 0x08, struct gpiohandle_data)
+#define GPIOHANDLE_SET_LINE_VALUES_IOCTL _IOWR(0xB4, 0x09, struct gpiohandle_data)
+
+/* Eventrequest flags */
+#define GPIOEVENT_REQUEST_RISING_EDGE  (1UL << 0)
+#define GPIOEVENT_REQUEST_FALLING_EDGE (1UL << 1)
+#define GPIOEVENT_REQUEST_BOTH_EDGES   ((1UL << 0) | (1UL << 1))
+
+/**
+ * struct gpioevent_request - Information about a GPIO event request
+ * @lineoffset: the desired line to subscribe to events from, specified by
+ * offset index for the associated GPIO device
+ * @handleflags: desired handle flags for the desired GPIO line, such as
+ * GPIOHANDLE_REQUEST_ACTIVE_LOW or GPIOHANDLE_REQUEST_OPEN_DRAIN
+ * @eventflags: desired flags for the desired GPIO event line, such as
+ * GPIOEVENT_REQUEST_RISING_EDGE or GPIOEVENT_REQUEST_FALLING_EDGE
+ * @consumer_label: a desired consumer label for the selected GPIO line(s)
+ * such as "my-listener"
+ * @fd: if successful this field will contain a valid anonymous file handle
+ * after a GPIO_GET_LINEEVENT_IOCTL operation, zero or negative value
+ * means error
+ */
+struct gpioevent_request {
+       __u32 lineoffset;
+       __u32 handleflags;
+       __u32 eventflags;
+       char consumer_label[32];
+       int fd;
+};
+
+/**
+ * GPIO event types
+ */
+#define GPIOEVENT_EVENT_RISING_EDGE 0x01
+#define GPIOEVENT_EVENT_FALLING_EDGE 0x02
+
+/**
+ * struct gpioevent_data - The actual event being pushed to userspace
+ * @timestamp: best estimate of time of event occurrence, in nanoseconds
+ * @id: event identifier
+ */
+struct gpioevent_data {
+       __u64 timestamp;
+       __u32 id;
+};
+
+#define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)
+#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info)
+#define GPIO_GET_LINEHANDLE_IOCTL _IOWR(0xB4, 0x03, struct gpiohandle_request)
+#define GPIO_GET_LINEEVENT_IOCTL _IOWR(0xB4, 0x04, struct gpioevent_request)
+
+#endif /* _GPIO_H_ */
diff --git a/tools/certchain-verify.c b/tools/certchain-verify.c
new file mode 100644 (file)
index 0000000..1a1dab1
--- /dev/null
@@ -0,0 +1,140 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+#include <ell/ell.h>
+#include "ell/tls-private.h"
+
+static int load_cert_chain(const char *file, struct l_certchain **certchain)
+{
+       int fd;
+       struct stat st;
+       char *data;
+       int err;
+
+       fd = open(file, O_RDONLY);
+       if (fd < 0) {
+               fprintf(stderr, "Could not open %s: %s\n",
+                                               file, strerror(errno));
+               return -errno;
+       }
+
+       if (fstat(fd, &st) < 0) {
+               err = -errno;
+               fprintf(stderr, "Could not stat %s: %s\n",
+                                               file, strerror(errno));
+               goto close_file;
+       }
+
+       if (st.st_size == 0) {
+               err = -EINVAL;
+               fprintf(stderr, "Certificate file %s is empty!\n", file);
+               goto close_file;
+       }
+
+       data = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+       if (data == MAP_FAILED) {
+               err = -errno;
+               fprintf(stderr, "Could not mmap %s: %s\n",
+                                               file, strerror(errno));
+               goto close_file;
+       }
+
+       err = tls_parse_certificate_list(data, st.st_size, certchain);
+       if (err < 0)
+               fprintf(stderr, "Could not parse certificate list: %s\n",
+                                               strerror(-err));
+
+       munmap(data, st.st_size);
+
+close_file:
+       close(fd);
+       return err;
+}
+
+static void usage(const char *bin)
+{
+       printf("%s - TLS certificate chain verification utility\n\n", bin);
+
+       printf("Usage: %s [options] <ca_cert file> <raw certificates file>\n"
+               "  <ca_cert file> - local CA Certificate to validate against\n"
+               "  <raw certificates file> - Certificates obtained from PCAP\n"
+               "  --help\n\n", bin);
+}
+
+int main(int argc, char *argv[])
+{
+       int status = EXIT_FAILURE;
+       struct l_certchain *certchain;
+       struct l_queue *ca_certs;
+       int err;
+       const char *error_str;
+
+       if (argc != 3) {
+               usage(argv[0]);
+               return -1;
+       }
+
+       l_log_set_stderr();
+
+       err = load_cert_chain(argv[2], &certchain);
+       if (err < 0)
+               goto done;
+
+       if (!certchain) {
+               status = EXIT_SUCCESS;
+               fprintf(stdout, "Certchain is empty, nothing to do\n");
+               goto done;
+       }
+
+       ca_certs = l_pem_load_certificate_list(argv[1]);
+       if (!ca_certs) {
+               fprintf(stderr, "Unable to load CA certifiates\n");
+               goto free_certchain;
+       }
+
+       if (!l_certchain_verify(certchain, ca_certs, &error_str)) {
+               fprintf(stderr, "Verification failed: %s\n", error_str);
+               goto free_cacert;
+       }
+
+       fprintf(stdout, "Verification succeeded\n");
+       status = EXIT_SUCCESS;
+
+free_cacert:
+       l_queue_destroy(ca_certs, (l_queue_destroy_func_t) l_cert_free);
+free_certchain:
+       l_certchain_free(certchain);
+done:
+       return status;
+}
diff --git a/tools/genl-discover.c b/tools/genl-discover.c
new file mode 100644 (file)
index 0000000..5b030d5
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void family_discovered(const struct l_genl_family_info *info,
+                                                       void *user_data)
+{
+       char **groups;
+       char *groupstr;
+
+       l_info("Family: %s(%u) Version: %u",
+                       l_genl_family_info_get_name(info),
+                       l_genl_family_info_get_id(info),
+                       l_genl_family_info_get_version(info));
+
+       groups = l_genl_family_info_get_groups(info);
+       groupstr = l_strjoinv(groups, ',');
+       l_strfreev(groups);
+
+       l_info("\tMulticast Groups: %s", groupstr);
+       l_free(groupstr);
+}
+
+static void discovery_done(void *user_data)
+{
+       l_main_quit();
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_genl *genl;
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       genl = l_genl_new();
+
+       if (getenv("GENL_DEBUG"))
+               l_genl_set_debug(genl, do_debug, "[GENL] ", NULL);
+
+       if (!l_genl_discover_families(genl, family_discovered, NULL,
+                                               discovery_done)) {
+               l_info("Unable to start family discovery");
+               goto done;
+       }
+
+       l_main_run();
+
+done:
+       l_genl_unref(genl);
+       l_main_exit();
+
+       return 0;
+}
diff --git a/tools/genl-request.c b/tools/genl-request.c
new file mode 100644 (file)
index 0000000..c0a2b43
--- /dev/null
@@ -0,0 +1,117 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <signal.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_main_quit();
+               break;
+       }
+}
+
+static void family_requested(const struct l_genl_family_info *info,
+                                                       void *user_data)
+{
+       char **groups;
+       char *groupstr;
+
+       if (info == NULL) {
+               l_info("Family request failed");
+               goto done;
+       }
+
+       l_info("Appeared: Family: %s(%u) Version: %u",
+                       l_genl_family_info_get_name(info),
+                       l_genl_family_info_get_id(info),
+                       l_genl_family_info_get_version(info));
+
+       groups = l_genl_family_info_get_groups(info);
+       groupstr = l_strjoinv(groups, ',');
+       l_strfreev(groups);
+
+       l_info("\tMulticast Groups: %s", groupstr);
+       l_free(groupstr);
+
+done:
+       l_main_quit();
+}
+
+static void usage(const char *bin)
+{
+       printf("%s - genl family autoload utility\n\n", bin);
+       printf("Usage: %s <family_name>\n"
+               "  <family_name> - Name of the family to request\n",
+               bin);
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_genl *genl;
+
+       if (argc != 2) {
+               usage(argv[0]);
+               return -1;
+       }
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       genl = l_genl_new();
+
+       if (getenv("GENL_DEBUG"))
+               l_genl_set_debug(genl, do_debug, "[GENL] ", NULL);
+
+       if (!l_genl_request_family(genl, argv[1],
+                                       family_requested, NULL, NULL)) {
+               l_info("Unable to request family: %s", argv[1]);
+               goto done;
+       }
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+done:
+       l_genl_unref(genl);
+       l_main_exit();
+
+       return 0;
+}
diff --git a/tools/genl-watch.c b/tools/genl-watch.c
new file mode 100644 (file)
index 0000000..5d8c303
--- /dev/null
@@ -0,0 +1,102 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <signal.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_main_quit();
+               break;
+       }
+}
+
+static void family_appeared(const struct l_genl_family_info *info,
+                                                       void *user_data)
+{
+       char **groups;
+       char *groupstr;
+
+       l_info("Appeared: Family: %s(%u) Version: %u",
+                       l_genl_family_info_get_name(info),
+                       l_genl_family_info_get_id(info),
+                       l_genl_family_info_get_version(info));
+
+       groups = l_genl_family_info_get_groups(info);
+       groupstr = l_strjoinv(groups, ',');
+       l_strfreev(groups);
+
+       l_info("\tMulticast Groups: %s", groupstr);
+       l_free(groupstr);
+}
+
+static void family_vanished(const char *name, void *user_data)
+{
+       l_info("Vanished: Family: %s", name);
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_genl *genl;
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       genl = l_genl_new();
+
+       if (getenv("GENL_DEBUG"))
+               l_genl_set_debug(genl, do_debug, "[GENL] ", NULL);
+
+       if (!l_genl_add_family_watch(genl, NULL,
+                                       family_appeared, family_vanished,
+                                       NULL, NULL)) {
+               l_info("Unable to create family watch");
+               goto done;
+       }
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+done:
+       l_genl_unref(genl);
+       l_main_exit();
+
+       return 0;
+}
diff --git a/tools/gpio.c b/tools/gpio.c
new file mode 100644 (file)
index 0000000..0fdb31e
--- /dev/null
@@ -0,0 +1,265 @@
+/*
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019 Geanix. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <ell/ell.h>
+
+static int print_usage(void)
+{
+       fprintf(stderr,
+               "usage: %1$s find <name>\n"
+               "       %1$s get (<chip> <line>|<label>)\n"
+               "       %1$s set (<chip> <line>|<label>) <value>\n"
+               "       %1$s chip <chip>\n"
+               "       %1$s line (<chip> <line>|<label>)\n",
+               program_invocation_short_name);
+
+       return -1;
+}
+
+static bool find_line(const char *line_label, struct l_gpio_chip **chip,
+                       uint32_t *offset)
+{
+       struct l_gpio_chip *c;
+       char **chip_names = NULL;
+       uint32_t o;
+
+       if (!unlikely(line_label))
+               return false;
+
+       chip_names = l_gpio_chips_with_line_label(line_label);
+       if (l_strv_length(chip_names) != 1) {
+               l_strfreev(chip_names);
+               return false;
+       }
+
+       c = l_gpio_chip_new(chip_names[0]);
+       l_strfreev(chip_names);
+
+       if (!c)
+               return false;
+
+       if (!l_gpio_chip_find_line_offset(c, line_label, &o)) {
+               l_gpio_chip_free(c);
+               return false;
+       }
+
+       if (chip)
+               *chip = c;
+
+       if (offset)
+               *offset = o;
+
+       return true;
+}
+
+static int find(int argc, char **argv)
+{
+       struct l_gpio_chip *chip;
+       uint32_t offset;
+
+       if (argc != 2)
+               return print_usage();
+
+       if (!find_line(argv[1], &chip, &offset))
+               return -1;
+
+       printf("chip: %s\n", l_gpio_chip_get_name(chip));
+       printf("line: %u\n", offset);
+
+       l_gpio_chip_free(chip);
+
+       return 0;
+}
+
+static int get(int argc, char **argv)
+{
+       struct l_gpio_chip *chip;
+       struct l_gpio_reader *reader;
+       uint32_t offset;
+       uint32_t value;
+       bool res;
+
+       if (argc == 2) {
+               if (!find_line(argv[1], &chip, &offset))
+                       return -1;
+       } else if (argc == 3) {
+               chip = l_gpio_chip_new(argv[1]);
+               if (!chip)
+                       return -1;
+
+               offset = strtoul(argv[2], NULL, 0);
+       } else {
+               return print_usage();
+       }
+
+       printf("chip: %s\n", l_gpio_chip_get_name(chip));
+       printf("line: %u\n", offset);
+
+       reader = l_gpio_reader_new(chip, "gpio-test", 1, &offset);
+       if (!reader) {
+               l_gpio_chip_free(chip);
+               return -1;
+       }
+
+       res = l_gpio_reader_get(reader, 1, &value);
+       l_gpio_reader_free(reader);
+       l_gpio_chip_free(chip);
+
+       if (!res)
+               return -1;
+
+       printf("val:  %u\n", value);
+
+       return 0;
+}
+
+static int set(int argc, char **argv)
+{
+       struct l_gpio_chip *chip;
+       struct l_gpio_writer *writer;
+       uint32_t offset;
+       uint32_t value;
+       bool res;
+
+       if (argc == 3) {
+               if (!find_line(argv[1], &chip, &offset))
+                       return -1;
+
+               value = strtol(argv[2], NULL, 0);
+       } else if (argc == 4) {
+               chip = l_gpio_chip_new(argv[1]);
+               if (!chip)
+                       return -1;
+
+               offset = strtoul(argv[2], NULL, 0);
+               value = strtol(argv[3], NULL, 0);
+       } else {
+               return print_usage();
+       }
+
+       printf("chip: %s\n", l_gpio_chip_get_name(chip));
+       printf("line: %u\n", offset);
+
+       writer = l_gpio_writer_new(chip, "gpio-test", 1, &offset, &value);
+       l_gpio_chip_free(chip);
+
+       if (!writer)
+               return -1;
+
+       res = l_gpio_writer_set(writer, 1, &value);
+       l_gpio_writer_free(writer);
+
+       if (!res)
+               return -1;
+
+       printf("val:  %u\n", value);
+
+       return 0;
+}
+
+static int chip(int argc, char **argv)
+{
+       struct l_gpio_chip *chip;
+
+       if (argc != 2)
+               return print_usage();
+
+       chip = l_gpio_chip_new(argv[1]);
+       if (!chip)
+               return -1;
+
+       printf("chip:  %s\n", l_gpio_chip_get_name(chip));
+       printf("label: %s\n", l_gpio_chip_get_label(chip));
+       printf("lines: %u\n", l_gpio_chip_get_num_lines(chip));
+
+       l_gpio_chip_free(chip);
+
+       return 0;
+}
+
+static int line(int argc, char **argv)
+{
+       struct l_gpio_chip *chip;
+       uint32_t offset;
+       char *consumer;
+       char *label;
+
+       if (argc == 2) {
+               if (!find_line(argv[1], &chip, &offset))
+                       return -1;
+       } else if (argc == 3) {
+               chip = l_gpio_chip_new(argv[1]);
+               if (!chip)
+                       return -1;
+
+               offset = strtoul(argv[2], NULL, 0);
+       } else {
+               return print_usage();
+       }
+
+       label = l_gpio_chip_get_line_label(chip, offset);
+       consumer = l_gpio_chip_get_line_consumer(chip, offset);
+
+       printf("chip:     %s\n", l_gpio_chip_get_name(chip));
+       printf("line:     %u\n", offset);
+       printf("label:    %s\n", label);
+       printf("consumer: %s\n", consumer);
+
+       l_free(consumer);
+       l_free(label);
+       l_gpio_chip_free(chip);
+
+       return 0;
+}
+
+int main(int argc, char **argv)
+{
+       const char *cmd;
+
+       if (argc < 2)
+               return print_usage();
+
+       cmd = argv[1];
+       argc--;
+       argv++;
+
+       if (strcmp(cmd, "get") == 0)
+               return get(argc, argv);
+       else if (strcmp(cmd, "set") == 0)
+               return set(argc, argv);
+       else if (strcmp(cmd, "find") == 0)
+               return find(argc, argv);
+       else if (strcmp(cmd, "chip") == 0)
+               return chip(argc, argv);
+       else if (strcmp(cmd, "line") == 0)
+               return line(argc, argv);
+       else
+               return print_usage();
+}
diff --git a/unit/dbus.conf b/unit/dbus.conf
new file mode 100644 (file)
index 0000000..97e1bb5
--- /dev/null
@@ -0,0 +1,19 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <auth>EXTERNAL</auth>
+  <auth>ANONYMOUS</auth>
+  <allow_anonymous />
+
+  <listen>unix:path=/tmp/ell-test-bus</listen>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+</busconfig>
diff --git a/unit/example-plugin.c b/unit/example-plugin.c
new file mode 100644 (file)
index 0000000..644c9d0
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ell/ell.h>
+
+static int demo_init(void)
+{
+       l_info("External demo plugin init");
+       l_debug("some debug info");
+
+       return 0;
+}
+
+static void demo_exit(void)
+{
+       l_info("External demo plugin exit");
+       l_debug("some more debug info");
+}
+
+L_PLUGIN_DEFINE_DEBUG(demo_plugin_desc, demo, "External demo plugin",
+                                       VERSION, L_PLUGIN_PRIORITY_DEFAULT,
+                                       demo_init, demo_exit, __ell_debug)
diff --git a/unit/gencerts.cnf b/unit/gencerts.cnf
new file mode 100644 (file)
index 0000000..dc469e8
--- /dev/null
@@ -0,0 +1,25 @@
+[ req ]
+distinguished_name = req_distinguished_name
+
+[ req_distinguished_name ]
+
+[ ca_ext ]
+basicConstraints = CA:TRUE,pathlen:0
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+
+[ int_ext ]
+basicConstraints = CA:TRUE
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+
+[ cert_ext ]
+basicConstraints = CA:FALSE
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+
+[ server_ext ]
+basicConstraints = CA:FALSE
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer:always
+subjectAltName = DNS:foo.int.example,DNS:foo.int.com
diff --git a/unit/plaintext.txt b/unit/plaintext.txt
new file mode 100644 (file)
index 0000000..e8337d7
--- /dev/null
@@ -0,0 +1 @@
+The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!
diff --git a/unit/settings.test b/unit/settings.test
new file mode 100644 (file)
index 0000000..5f2d4f8
--- /dev/null
@@ -0,0 +1,50 @@
+[Foobar]
+#Comment
+#Comment2
+Key=Value
+IntegerA=2147483647
+IntegerB=-2147483648
+IntegerC=4294967295
+IntegerD=9223372036854775807
+IntegerE=-9223372036854775808
+IntegerF=18446744073709551615
+IntegerG=2247483647
+IntegerH=4294967296
+IntegerI=9223372036854775808
+IntegerJ=18446744073709551616
+String=\tFoobar\s
+StringEmpty=
+StringBad1=Foobar\
+StringBad2=Foobar\b123
+StringList=Foo,Bar,Baz
+StringListEmpty=
+StringListOne=FooBarBaz
+StringWithSpaces=Bar B Q
+
+[@pem@certificate]
+-----BEGIN CERTIFICATE-----
+MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL
+BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y
+Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc
+BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00
+NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg
+RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1
+ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet
+1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0
+v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H
+ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO
+A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq
+wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw
+gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX
+jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz
+BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp
+b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN
+AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG
+SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53
+4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d
+tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS
+SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th
+MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P
+DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK
+-----END CERTIFICATE-----
diff --git a/unit/test-base64.c b/unit/test-base64.c
new file mode 100644 (file)
index 0000000..2c2a57d
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+struct base64_decode_test {
+       const char *input;
+       const uint8_t *output;
+       size_t output_size;
+};
+
+static const uint8_t decode_output_1[] = {
+       'p', 'l', 'e', 'a', 's', 'u', 'r', 'e', '.'
+};
+
+static const struct base64_decode_test decode_1 = {
+       .input = "cGxlYXN1cmUu",
+       .output = decode_output_1,
+       .output_size = 9,
+};
+
+static const struct base64_decode_test decode_2 = {
+       .input = "bGVhc3VyZS4=",
+       .output = decode_output_1 + 1,
+       .output_size = 8,
+};
+
+static const struct base64_decode_test decode_3 = {
+       .input = "ZWFzdXJlLg==",
+       .output = decode_output_1 + 2,
+       .output_size = 7,
+};
+
+static const uint8_t decode_output_2[] = {
+       'S', 'o', '?', '<', 'p', '>',
+};
+
+static const struct base64_decode_test decode_4 = {
+       .input = "U28/PHA+",
+       .output = decode_output_2,
+       .output_size = 6,
+};
+
+static void test_base64_decode(const void *data)
+{
+       const struct base64_decode_test *test = data;
+       uint8_t *decoded;
+       size_t decoded_size;
+
+       decoded = l_base64_decode(test->input, strlen(test->input),
+                                                               &decoded_size);
+       assert(decoded);
+       assert(decoded_size == test->output_size);
+       assert(!memcmp(decoded, test->output, decoded_size));
+
+       l_free(decoded);
+}
+
+struct base64_encode_test {
+       const char *input;
+       const char *output;
+       int columns;
+};
+
+static const struct base64_encode_test encode_1 = {
+       .input = "So?<p>",
+       .columns = 4,
+       .output = "U28/\nPHA+",
+};
+
+static const struct base64_encode_test encode_2 = {
+       .input = "pleasure.",
+       .columns = 0,
+       .output = "cGxlYXN1cmUu",
+};
+
+static const struct base64_encode_test encode_3 = {
+       .input = "leasure.",
+       .columns = 0,
+       .output = "bGVhc3VyZS4=",
+};
+
+static const struct base64_encode_test encode_4 = {
+       .input = "easure.",
+       .columns = 0,
+       .output = "ZWFzdXJlLg==",
+};
+
+static void test_base64_encode(const void *data)
+{
+       const struct base64_encode_test *test = data;
+       char *encoded;
+       size_t encoded_size;
+
+       encoded = l_base64_encode((uint8_t *)test->input, strlen(test->input),
+                                       test->columns, &encoded_size);
+       assert(encoded);
+       assert(encoded_size == strlen(test->output));
+       assert(!memcmp(encoded, test->output, encoded_size));
+
+       l_free(encoded);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("base64/decode/test1", test_base64_decode, &decode_1);
+       l_test_add("base64/decode/test2", test_base64_decode, &decode_2);
+       l_test_add("base64/decode/test3", test_base64_decode, &decode_3);
+       l_test_add("base64/decode/test4", test_base64_decode, &decode_4);
+
+       l_test_add("base64/encode/test1", test_base64_encode, &encode_1);
+       l_test_add("base64/encode/test2", test_base64_encode, &encode_2);
+       l_test_add("base64/encode/test3", test_base64_encode, &encode_3);
+       l_test_add("base64/encode/test4", test_base64_encode, &encode_4);
+
+       return l_test_run();
+}
diff --git a/unit/test-checksum.c b/unit/test-checksum.c
new file mode 100644 (file)
index 0000000..1a2ffd5
--- /dev/null
@@ -0,0 +1,279 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <alloca.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static char FIXED_STR[] =
+       "The quick brown fox jumps over the lazy dog. "
+       "Jackdaws love my big sphinx of quartz. "
+       "Pack my box with five dozen liquor jugs. "
+       "How razorback-jumping frogs can level six piqued gymnasts!";
+
+#define FIXED_LEN  (strlen (FIXED_STR))
+
+static void test_unsupported(const void *data)
+{
+       struct l_checksum *checksum;
+
+       checksum = l_checksum_new(42);
+       assert(!checksum);
+}
+
+static void test_md4(const void *data)
+{
+       struct l_checksum *checksum;
+       unsigned char digest[16];
+       unsigned char *expected;
+       size_t expectlen;
+
+       checksum = l_checksum_new(L_CHECKSUM_MD4);
+       assert(checksum);
+
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+
+       l_checksum_get_digest(checksum, digest, sizeof(digest));
+
+       expected = l_util_from_hexstring("be3de05811bec433af48270014a8df0e",
+                                               &expectlen);
+       assert(expectlen == sizeof(digest));
+       assert(!memcmp(digest, expected, expectlen));
+
+       l_free(expected);
+       l_checksum_free(checksum);
+}
+
+static void test_md5(const void *data)
+{
+       struct l_checksum *checksum;
+       unsigned char digest[16];
+       unsigned char *expected;
+       size_t expectlen;
+
+       checksum = l_checksum_new(L_CHECKSUM_MD5);
+       assert(checksum);
+
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+
+       l_checksum_get_digest(checksum, digest, sizeof(digest));
+
+       expected = l_util_from_hexstring("407b72260377f77f8e63e13dc09bda2c",
+                                               &expectlen);
+       assert(expectlen == sizeof(digest));
+       assert(!memcmp(digest, expected, expectlen));
+
+       l_free(expected);
+       l_checksum_free(checksum);
+}
+
+static void test_sha1(const void *data)
+{
+       struct l_checksum *checksum;
+       unsigned char digest[20];
+       unsigned char *expected;
+       size_t expectlen;
+
+       checksum = l_checksum_new(L_CHECKSUM_SHA1);
+       assert(checksum);
+
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+
+       l_checksum_get_digest(checksum, digest, sizeof(digest));
+
+       expected = l_util_from_hexstring(
+               "8802f1d217906250585b75187b1ebfbb5c6cbcae", &expectlen);
+       assert(expectlen == sizeof(digest));
+       assert(!memcmp(digest, expected, expectlen));
+
+       l_free(expected);
+       l_checksum_free(checksum);
+}
+
+static void test_sha256(const void *data)
+{
+       struct l_checksum *checksum;
+       unsigned char digest[32];
+       unsigned char *expected;
+       size_t expectlen;
+
+       checksum = l_checksum_new(L_CHECKSUM_SHA256);
+       assert(checksum);
+
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+
+       l_checksum_get_digest(checksum, digest, sizeof(digest));
+
+       expected = l_util_from_hexstring(
+               "df3a0c35d5345d6d792415c1310bd458"
+               "9cdf68bac96ed599d6bb0c1545ffc86c", &expectlen);
+       assert(expectlen == sizeof(digest));
+       assert(!memcmp(digest, expected, expectlen));
+
+       l_free(expected);
+       l_checksum_free(checksum);
+}
+
+static void test_reset(const void *data)
+{
+       struct l_checksum *checksum;
+       unsigned char digest[16];
+
+       checksum = l_checksum_new(L_CHECKSUM_MD5);
+       assert(checksum);
+
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+       l_checksum_reset(checksum);
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+       l_checksum_get_digest(checksum, digest, sizeof(digest));
+
+       l_checksum_free(checksum);
+}
+
+static void test_updatev(const void *data)
+{
+       struct l_checksum *checksum;
+       unsigned char digest1[20];
+       unsigned char digest2[20];
+       struct iovec iov[2];
+
+       checksum = l_checksum_new(L_CHECKSUM_SHA1);
+       assert(checksum);
+
+       l_checksum_update(checksum, FIXED_STR, FIXED_LEN);
+       l_checksum_get_digest(checksum, digest1, sizeof(digest1));
+
+       iov[0].iov_base = FIXED_STR;
+       iov[0].iov_len = FIXED_LEN / 2;
+
+       iov[1].iov_base = FIXED_STR + FIXED_LEN / 2;
+       iov[1].iov_len = FIXED_LEN - FIXED_LEN / 2;
+
+       l_checksum_updatev(checksum, iov, 2);
+       l_checksum_get_digest(checksum, digest2, sizeof(digest2));
+
+       assert(!memcmp(digest1, digest2, sizeof(digest1)));
+
+       l_checksum_free(checksum);
+}
+
+struct aes_cmac_test_vector {
+       char *plaintext;
+       char *key;
+       char *ciphertext;
+};
+
+/* Hash AES_CMAC tests based on Bluetooth Mesh published sample data */
+static const struct aes_cmac_test_vector aes_cmac_test1 = {
+       .plaintext = "74657374",
+       .key = "00000000000000000000000000000000",
+       .ciphertext = "b73cefbd641ef2ea598c2b6efb62f79c",
+};
+
+static const struct aes_cmac_test_vector aes_cmac_test2 = {
+       .plaintext = "f7a2a44f8e8a8029064f173ddc1e2b00",
+       .key = "4f90480c1871bfbffd16971f4d8d10b1",
+       .ciphertext = "2ea6467aa3378c4c545eda62935b9b86",
+};
+
+static void test_aes_cmac(const void *data)
+{
+       struct l_checksum *checksum;
+       char *encbuf;
+       size_t encbuflen;
+       char *decbuf;
+       size_t decbuflen;
+       int r;
+       bool success;
+       const struct aes_cmac_test_vector *tv = data;
+
+       size_t ptlen;
+       uint8_t *pt = l_util_from_hexstring(tv->plaintext, &ptlen);
+       size_t keylen;
+       uint8_t *key = l_util_from_hexstring(tv->key, &keylen);
+       size_t ctlen;
+       uint8_t *ct = l_util_from_hexstring(tv->ciphertext, &ctlen);
+
+       assert(pt);
+       assert(ct);
+       assert(key);
+
+       encbuflen = ctlen;
+       encbuf = alloca(encbuflen);
+       memset(encbuf, 0, encbuflen);
+       decbuflen = ptlen;
+       decbuf = alloca(decbuflen);
+       memset(decbuf, 0, decbuflen);
+
+       checksum = l_checksum_new_cmac_aes(key, keylen);
+       assert(checksum);
+
+       success = l_checksum_update(checksum, pt, ptlen);
+       assert(success);
+
+       ctlen = l_checksum_get_digest(checksum, encbuf, encbuflen);
+       assert(ctlen == encbuflen);
+
+       r = memcmp(encbuf, ct, ctlen);
+       assert(!r);
+
+       l_checksum_free(checksum);
+
+       l_free(pt);
+       l_free(key);
+       l_free(ct);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("unsupported", test_unsupported, NULL);
+
+       if (l_checksum_is_supported(L_CHECKSUM_MD4, false))
+               l_test_add("md4-1", test_md4, NULL);
+
+       if (l_checksum_is_supported(L_CHECKSUM_MD5, false))
+               l_test_add("md5-1", test_md5, NULL);
+
+       if (l_checksum_is_supported(L_CHECKSUM_SHA1, false)) {
+               l_test_add("sha1-1", test_sha1, NULL);
+
+               l_test_add("checksum reset", test_reset, NULL);
+               l_test_add("checksum updatev", test_updatev, NULL);
+       }
+
+       if (l_checksum_is_supported(L_CHECKSUM_SHA256, false))
+               l_test_add("sha256-1", test_sha256, NULL);
+
+       if (l_checksum_cmac_aes_supported()) {
+               l_test_add("aes-cmac-1", test_aes_cmac, &aes_cmac_test1);
+               l_test_add("aes-cmac-2", test_aes_cmac, &aes_cmac_test2);
+       }
+
+       return l_test_run();
+}
diff --git a/unit/test-cipher.c b/unit/test-cipher.c
new file mode 100644 (file)
index 0000000..9469e0e
--- /dev/null
@@ -0,0 +1,407 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <alloca.h>
+#include <stdio.h>
+
+#include <ell/ell.h>
+
+#define FIXED_STR  "The quick brown fox jumps over the lazy dog. " \
+                  "Jackdaws love my big sphinx of quartz. "       \
+                  "Pack my box with five dozen liquor jugs. "     \
+                  "How razorback-jumping frogs can level six piqued gymnasts!"
+#define FIXED_LEN  (strlen(FIXED_STR))
+
+#define KEY_STR "This key has exactly _32_ bytes!"
+#define KEY_LEN (strlen(KEY_STR))
+
+static void test_unsupported(const void *data)
+{
+       struct l_cipher *cipher;
+
+       cipher = l_cipher_new(42, KEY_STR, KEY_LEN);
+       assert(!cipher);
+}
+
+static void test_aes(const void *data)
+{
+       struct l_cipher *cipher;
+       char buf[256];
+       int r;
+
+       cipher = l_cipher_new(L_CIPHER_AES, KEY_STR, KEY_LEN);
+       assert(cipher);
+
+       memcpy(buf, FIXED_STR, FIXED_LEN);
+
+       l_cipher_encrypt(cipher, buf, buf, FIXED_LEN);
+
+       r = memcmp(buf, FIXED_STR, FIXED_LEN);
+       assert(r);
+
+       l_cipher_decrypt(cipher, buf, buf, FIXED_LEN);
+
+       r = memcmp(buf, FIXED_STR, FIXED_LEN);
+       assert(!r);
+
+       l_cipher_free(cipher);
+}
+
+static void test_aes_ctr(const void *data)
+{
+       struct l_cipher *cipher;
+       uint8_t iv[8] = { 0 };
+       char buf[256];
+       int r;
+
+       cipher = l_cipher_new(L_CIPHER_AES_CTR, KEY_STR, KEY_LEN);
+       assert(cipher);
+
+       l_cipher_set_iv(cipher, iv, sizeof(iv));
+
+       memcpy(buf, FIXED_STR, FIXED_LEN);
+
+       l_cipher_encrypt(cipher, buf, buf, FIXED_LEN);
+
+       r = memcmp(buf, FIXED_STR, FIXED_LEN);
+       assert(r);
+
+       l_cipher_decrypt(cipher, buf, buf, FIXED_LEN);
+
+       r = memcmp(buf, FIXED_STR, FIXED_LEN);
+       assert(!r);
+
+       l_cipher_free(cipher);
+}
+
+static void test_arc4(const void *data)
+{
+       struct l_cipher *cipher;
+       char buf[256];
+       int r;
+
+       static const unsigned char expect_plaintext[] = {
+               0xbb, 0xf3, 0x16, 0xe8, 0xd9, 0x40, 0xaf, 0x0a, 0xd3,
+       };
+       static const unsigned char expect_pedia[] = {
+               0x10, 0x21, 0xbf, 0x04, 0x20,
+       };
+       static const unsigned char expect_attack[] = {
+               0x45, 0xa0, 0x1f, 0x64, 0x5f, 0xc3, 0x5b, 0x38, 0x35, 0x52,
+               0x54, 0x4b, 0x9b, 0xf5,
+       };
+
+       cipher = l_cipher_new(L_CIPHER_ARC4, "Key", 3);
+       assert(cipher);
+       l_cipher_encrypt(cipher, "Plaintext", buf, 9);
+       assert(!memcmp(buf, expect_plaintext, 9));
+       l_cipher_free(cipher);
+
+       cipher = l_cipher_new(L_CIPHER_ARC4, "Wiki", 4);
+       assert(cipher);
+       l_cipher_encrypt(cipher, "pedia", buf, 5);
+       assert(!memcmp(buf, expect_pedia, 5));
+       l_cipher_free(cipher);
+
+       cipher = l_cipher_new(L_CIPHER_ARC4, "Secret", 6);
+       assert(cipher);
+       l_cipher_encrypt(cipher, "Attack at dawn", buf, 14);
+       assert(!memcmp(buf, expect_attack, 14));
+       l_cipher_free(cipher);
+
+       cipher = l_cipher_new(L_CIPHER_ARC4, KEY_STR, KEY_LEN);
+       assert(cipher);
+
+       memcpy(buf, FIXED_STR, FIXED_LEN);
+
+       l_cipher_encrypt(cipher, buf, buf, FIXED_LEN);
+
+       r = memcmp(buf, FIXED_STR, FIXED_LEN);
+       assert(r);
+
+       l_cipher_decrypt(cipher, buf, buf, FIXED_LEN);
+
+       r = memcmp(buf, FIXED_STR, FIXED_LEN);
+       assert(!r);
+
+       l_cipher_free(cipher);
+}
+
+struct aead_test_vector {
+       enum l_aead_cipher_type type;
+       char *aad;
+       char *plaintext;
+       char *key;
+       char *nonce;
+       char *ciphertext;
+       char *tag;
+};
+
+static const struct aead_test_vector ccm_long_nonce = {
+       .type = L_AEAD_CIPHER_AES_CCM,
+       .aad =
+       "333b6b8fda49c6e671bad05c7e2cafa88bd47f9b0aef1a358bc87d04f26f6c82",
+       .plaintext =
+       "1293201eb30ddd693b2eb23c1e6c20d5add2202afc71679ca2eba14f73b77bcd",
+       .key = "fa536cf6c309d45c1baaa658f674758d",
+       .nonce = "e0c5241bf0014ca88511d73a30",
+       .ciphertext =
+       "2e54ebaa38da9a2b03a1147495565c31d07e793b01fd28b2adeacac6f76ae84e",
+       .tag = "e0a03b982c5afc8a937373d7d2b0e7a3"
+};
+
+static const struct aead_test_vector ccm_short_nonce = {
+       .type = L_AEAD_CIPHER_AES_CCM,
+       .plaintext =
+       "a3b3fdf26d213f83c5f656b00f77253b68959c188767d584914887602c787595",
+       .aad =
+       "fcc20524894b4603fefb8029eff485a513ce4753d0d3a27c3a2c69088fa7fab7",
+       .key = "7d84efac51291e868c7b7702181a3936",
+       .nonce = "1bb3e62620462a",
+       .ciphertext =
+       "3222192ee773cef4a87175b73b3875320f18b7e016d17d52fb01f0f6ca10bb5f",
+       .tag = "ee007aafe91135c39855ebf3db96d7ff"
+};
+
+static const struct aead_test_vector ccm_no_aad = {
+       .type = L_AEAD_CIPHER_AES_CCM,
+       .plaintext =
+       "90795fffab99cffdeee5cadafe448ea4df74c480f9d7e1e481ee49adeee2732a",
+       .key = "7b3da7d5ef41b5eef19cf8fb4ca19519",
+       .nonce = "96722de7516afb",
+       .ciphertext =
+       "9160dd0e0a8ddd13bf4acb0c6f3cf4794c5459d36a378cfb4a31e6b00840d78a",
+       .tag = "efd1dc938802cd845a16f32a60eabd0f"
+};
+
+/* https://tools.ietf.org/html/draft-mcgrew-gcm-test-01 */
+
+static const struct aead_test_vector gcm_test1 = {
+       .type = L_AEAD_CIPHER_AES_GCM,
+       .aad = "000043218765432100000000",
+       .plaintext =
+       "45000048699a000080114db7c0a80102c0a801010a9bf15638d3010000010000"
+       "00000000045f736970045f756470037369700963796265726369747902646b00"
+       "0021000101020201",
+       /* 128-bit key */
+       .key = "4c80cdefbb5d10da906ac73c3613a634",
+       .nonce = "2e443b684956ed7e3b244cfe",
+       .ciphertext =
+       "fecf537e729d5b07dc30df528dd22b768d1b98736696a6fd348509fa13ceac34"
+       "cfa2436f14a3f3cf65925bf1f4a13c5d15b21e1884f5ff6247aeabb786b93bce"
+       "61bc17d768fd9732",
+       .tag = "459018148f6cbe722fd04796562dfdb4",
+};
+
+static const struct aead_test_vector gcm_test2 = {
+       .type = L_AEAD_CIPHER_AES_GCM,
+       .aad = "0000a5f80000000a",
+       .plaintext =
+       "45000028a4ad4000400678800a01038f0a010612802306b8cb712602dd6bb03e"
+       "501016d075680001",
+       /* 192-bit key */
+       .key = "feffe9928665731c6d6a8f9467308308feffe9928665731c",
+       .nonce = "cafebabefacedbaddecaf888",
+       .ciphertext =
+       "a5b1f8066029aea40e598b8122de02420938b3ab33f828e687b8858b5bfbdbd0"
+       "315b27452144cc77",
+       .tag = "95457b9652037f5318027b5b4cd7a636",
+};
+
+static const struct aead_test_vector gcm_test3 = {
+       .type = L_AEAD_CIPHER_AES_GCM,
+       .aad = "4a2cbfe300000002",
+       .plaintext =
+       "4500003069a6400080062690c0a801029389155e0a9e008b2dc57ee000000000"
+       "7002400020bf0000020405b40101040201020201",
+       /* 256-bit key */
+       .key =
+       "abbccddef00112233445566778899aababbccddef00112233445566778899aab",
+       .nonce = "112233440102030405060708",
+       .ciphertext =
+       "ff425c9b724599df7a3bcd510194e00d6a78107f1b0b1cbf06efae9d65a5d763"
+       "748a637985771d347f0545659f14e99def842d8e",
+       .tag = "b335f4eecfdbf831824b4c4915956c96",
+};
+
+static const struct aead_test_vector gcm_test4 = {
+       .type = L_AEAD_CIPHER_AES_GCM,
+       .aad = "0000000000000001",
+       .plaintext =
+       "4500003c99c500008001cb7a40679318010101010800075c0200440061626364"
+       "65666768696a6b6c6d6e6f707172737475767761626364656667686901020201",
+       .key = "00000000000000000000000000000000",
+       .nonce = "000000000000000000000000",
+       .ciphertext =
+       "4688daf2f973a392732909c331d56d60f694abaa414b5e7ff5fdcdfff5e9a284"
+       "456476492719ffb64de7d9dca1e1d894bc3bd57873ed4d181d19d4d5c8c18af3",
+       .tag = "f821d496eeb096e98ad2b69e4799c71d",
+};
+
+static const struct aead_test_vector gcm_test5 = {
+       .type = L_AEAD_CIPHER_AES_GCM,
+       .aad = "335467aeffffffff",
+       .plaintext = "01020201",
+       .key = "7d773d00c144c525ac619d18c84a3f47",
+       .nonce = "d966426743457e9182443bc6",
+       .ciphertext = "437f866b",
+       .tag = "cb3f699fe9b0822bac961c4504bef270",
+};
+
+static const struct aead_test_vector gcm_test6 = {
+       .type = L_AEAD_CIPHER_AES_GCM,
+       .aad =
+       "0000432100000007000000000000000045000030da3a00008001df3bc0a80005"
+       "c0a800010800c6cd020007006162636465666768696a6b6c6d6e6f7071727374"
+       "01020201",
+       .key = "4c80cdefbb5d10da906ac73c3613a634",
+       .nonce = "22433c640000000000000000",
+       .tag = "f2a9a836e155106aa8dcd618e4099aaa",
+};
+
+static void test_aead(const void *data)
+{
+       static uint8_t empty[] = { };
+       struct l_aead_cipher *cipher;
+       char *encbuf;
+       size_t encbuflen;
+       char *decbuf;
+       size_t decbuflen;
+       int r;
+       bool success;
+       const struct aead_test_vector *tv = data;
+
+       size_t ptlen = 0;
+       uint8_t *pt = empty;
+       size_t aadlen = 0;
+       uint8_t *aad = NULL;
+       size_t keylen;
+       uint8_t *key = l_util_from_hexstring(tv->key, &keylen);
+       size_t noncelen;
+       uint8_t *nonce = l_util_from_hexstring(tv->nonce, &noncelen);
+       size_t ctlen = 0;
+       uint8_t *ct = empty;
+       size_t taglen;
+       uint8_t *tag = l_util_from_hexstring(tv->tag, &taglen);
+
+       if (tv->plaintext) {
+               pt = l_util_from_hexstring(tv->plaintext, &ptlen);
+               assert(pt);
+       }
+
+       if (tv->ciphertext) {
+               ct = l_util_from_hexstring(tv->ciphertext, &ctlen);
+               assert(ct);
+       }
+
+       if (tv->aad) {
+               aad = l_util_from_hexstring(tv->aad, &aadlen);
+               assert(aad);
+       }
+
+       assert(key);
+       assert(nonce);
+       assert(tag);
+
+       decbuflen = ptlen;
+       decbuf = alloca(decbuflen);
+       memset(decbuf, 0, decbuflen);
+
+       encbuflen = ctlen + taglen;
+       encbuf = alloca(encbuflen);
+       memset(encbuf, 0, encbuflen);
+
+       cipher = l_aead_cipher_new(tv->type, key, keylen, taglen);
+       assert(cipher);
+
+       success = l_aead_cipher_encrypt(cipher, pt, ptlen, aad, aadlen,
+                                       nonce, noncelen, encbuf, encbuflen);
+       if (!success) {
+               printf("* Some kernel versions before v4.9 have a known AEAD\n"
+                       "* bug. If the system running this test is using a\n"
+                       "* v4.8 or earlier kernel, a failure here is likely\n"
+                       "* due to that kernel bug.\n");
+       }
+       assert(success);
+
+       assert(memcmp(encbuf, ct, ctlen) == 0);
+       assert(memcmp(encbuf + ctlen, tag, taglen) == 0);
+
+       success = l_aead_cipher_decrypt(cipher, encbuf, encbuflen, aad, aadlen,
+                                       nonce, noncelen, decbuf, decbuflen);
+       assert (success);
+
+       r = memcmp(decbuf, pt, ptlen);
+       assert(!r);
+
+       l_aead_cipher_free(cipher);
+
+       if (tv->plaintext)
+               l_free(pt);
+
+       l_free(key);
+       l_free(aad);
+       l_free(nonce);
+
+       if (tv->ciphertext)
+               l_free(ct);
+
+       l_free(tag);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("unsupported", test_unsupported, NULL);
+
+       if (l_cipher_is_supported(L_CIPHER_AES))
+               l_test_add("aes", test_aes, NULL);
+
+       if (l_cipher_is_supported(L_CIPHER_AES_CTR))
+               l_test_add("aes_ctr", test_aes_ctr, NULL);
+
+       if (l_cipher_is_supported(L_CIPHER_ARC4))
+               l_test_add("arc4", test_arc4, NULL);
+
+       if (l_aead_cipher_is_supported(L_AEAD_CIPHER_AES_CCM)) {
+               l_test_add("aes_ccm long nonce", test_aead, &ccm_long_nonce);
+               l_test_add("aes_ccm short nonce", test_aead, &ccm_short_nonce);
+               l_test_add("aes_ccm no AAD", test_aead, &ccm_no_aad);
+       }
+
+       if (l_aead_cipher_is_supported(L_AEAD_CIPHER_AES_GCM)) {
+               l_test_add("aes_gcm test 1", test_aead, &gcm_test1);
+               l_test_add("aes_gcm test 2", test_aead, &gcm_test2);
+               l_test_add("aes_gcm test 3", test_aead, &gcm_test3);
+               l_test_add("aes_gcm test 4", test_aead, &gcm_test4);
+               l_test_add("aes_gcm test 5", test_aead, &gcm_test5);
+               l_test_add("aes_gcm test 6", test_aead, &gcm_test6);
+       }
+
+       return l_test_run();
+}
diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
new file mode 100644 (file)
index 0000000..6f68bae
--- /dev/null
@@ -0,0 +1,370 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+
+#include <ell/ell.h>
+#include "ell/dbus-private.h"
+
+#ifndef WAIT_ANY
+#define WAIT_ANY (-1) /* Any process */
+#endif
+
+#define TEST_BUS_ADDRESS "unix:path=/tmp/ell-test-bus"
+
+static pid_t dbus_daemon_pid = -1;
+
+static bool start_dbus_daemon(void)
+{
+       char *prg_argv[5];
+       char *prg_envp[1];
+       pid_t pid;
+
+       prg_argv[0] = "/usr/bin/dbus-daemon";
+       prg_argv[1] = "--nopidfile";
+       prg_argv[2] = "--nofork";
+       prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
+       prg_argv[4] = NULL;
+
+       prg_envp[0] = NULL;
+
+       l_info("launching dbus-daemon");
+
+       pid = fork();
+       if (pid < 0) {
+               l_error("failed to fork new process");
+               return false;
+       }
+
+       if (pid == 0) {
+               execve(prg_argv[0], prg_argv, prg_envp);
+               exit(EXIT_SUCCESS);
+       }
+
+       l_info("dbus-daemon process %d created", pid);
+
+       dbus_daemon_pid = pid;
+
+       return true;
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void sigchld_handler(void *user_data)
+{
+       while (1) {
+               pid_t pid;
+               int status;
+
+               pid = waitpid(WAIT_ANY, &status, WNOHANG);
+               if (pid < 0 || pid == 0)
+                       break;
+
+               l_info("process %d terminated with status=%d\n", pid, status);
+
+               if (pid == dbus_daemon_pid) {
+                       dbus_daemon_pid = -1;
+                       l_main_quit();
+               }
+       }
+}
+
+static struct l_dbus *dbus;
+
+struct dbus_test {
+       const char *name;
+       void (*start)(struct l_dbus *dbus, void *);
+       void *data;
+};
+
+static bool success;
+static struct l_queue *tests;
+static const struct l_queue_entry *current;
+
+static void test_add(const char *name,
+                       void (*start)(struct l_dbus *dbus, void *),
+                       void *test_data)
+{
+       struct dbus_test *test = l_new(struct dbus_test, 1);
+
+       test->name = name;
+       test->start = start;
+       test->data = test_data;
+
+       if (!tests)
+               tests = l_queue_new();
+
+       l_queue_push_tail(tests, test);
+}
+
+static void test_next()
+{
+       struct dbus_test *test;
+
+       if (current)
+               current = current->next;
+       else
+               current = l_queue_get_entries(tests);
+
+       if (!current) {
+               success = true;
+               l_main_quit();
+               return;
+       }
+
+       test = current->data;
+
+       l_info("TEST: %s", test->name);
+
+       test->start(dbus, test->data);
+}
+
+#define test_assert(cond)      \
+       do {    \
+               if (!(cond)) {  \
+                       l_info("TEST FAILED in %s at %s:%i: %s",        \
+                               __func__, __FILE__, __LINE__,   \
+                               L_STRINGIFY(cond));     \
+                       l_main_quit();  \
+                       return; \
+               }       \
+       } while (0)
+
+static void request_name_callback(struct l_dbus *dbus, bool success,
+                                       bool queued, void *user_data)
+{
+       l_info("request name result=%s",
+               success ? (queued ? "queued" : "success") : "failed");
+
+       test_next();
+}
+
+static void ready_callback(void *user_data)
+{
+       l_info("ready");
+
+       l_dbus_name_acquire(dbus, "org.test", false, false, false,
+                               request_name_callback, NULL);
+}
+
+static void disconnect_callback(void *user_data)
+{
+       l_info("Disconnected from DBus");
+       l_main_quit();
+}
+
+static struct l_dbus_message *get_random_callback(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *reply;
+       int fd;
+
+       reply = l_dbus_message_new_method_return(message);
+
+       fd = open("/dev/random", O_RDONLY);
+       l_dbus_message_set_arguments(reply, "h", fd);
+       close(fd);
+
+       return reply;
+}
+
+static void setup_test_interface(struct l_dbus_interface *interface)
+{
+       l_dbus_interface_method(interface, "GetRandom", 0, get_random_callback,
+                               "h", "", "randomfd");
+}
+
+static int count_fds(void)
+{
+       int fd;
+       int count = 0;
+       int flags;
+
+       for (fd = 0; fd < FD_SETSIZE; fd++) {
+               flags = fcntl(fd, F_GETFL);
+               if (flags < 0) /* ignore any files we can't operate on */
+                       continue;
+
+               /*
+                * Only count files that are read-only or write-only.  This is
+                * to work around the issue that fakeroot opens a TCP socket
+                * in RDWR mode in a separate thread
+                *
+                * Note: This means that files used for file-descriptor passing
+                * tests should be opened RDONLY or WRONLY
+                */
+               if (flags & O_RDWR)
+                       continue;
+
+               count++;
+       }
+
+       return count;
+}
+
+static bool compare_failed;
+
+static void compare_files(int a, int b)
+{
+       struct stat sa, sb;
+
+       compare_failed = true;
+
+       test_assert(fstat(a, &sa) == 0);
+       test_assert(fstat(b, &sb) == 0);
+
+       test_assert(sa.st_dev == sb.st_dev);
+       test_assert(sa.st_ino == sb.st_ino);
+       test_assert(sa.st_rdev == sb.st_rdev);
+
+       compare_failed = false;
+}
+
+static int open_fds;
+
+static void get_random_idle_callback(void *user_data)
+{
+       test_assert(count_fds() == open_fds);
+
+       test_next();
+}
+
+static void get_random_return_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       int fd0, fd1;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+
+       test_assert(l_dbus_message_get_arguments(message, "h", &fd1));
+
+       fd0 = open("/dev/random", O_RDONLY);
+       test_assert(fd0 != -1);
+
+       compare_files(fd0, fd1);
+
+       close(fd0);
+       close(fd1);
+
+       if (compare_failed)
+               return;
+
+       test_assert(l_idle_oneshot(get_random_idle_callback, NULL, NULL));
+}
+
+static void test_fd_passing_1(struct l_dbus *dbus, void *test_data)
+{
+       open_fds = count_fds();
+
+       l_dbus_method_call(dbus, "org.test", "/test", "org.test", "GetRandom",
+                               NULL, get_random_return_callback, NULL, NULL);
+}
+
+static void test_run(void)
+{
+       success = false;
+
+       l_dbus_set_ready_handler(dbus, ready_callback, dbus, NULL);
+       l_dbus_set_disconnect_handler(dbus, disconnect_callback, NULL, NULL);
+
+       if (!l_dbus_register_interface(dbus, "org.test", setup_test_interface,
+                                       NULL, true)) {
+               l_info("Unable to register interface");
+               return;
+       }
+
+       if (!l_dbus_object_add_interface(dbus, "/test", "org.test", NULL)) {
+               l_info("Unable to instantiate interface");
+               return;
+       }
+
+       l_main_run_with_signal(signal_handler, NULL);
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_signal *sigchld;
+       int i;
+
+       if (!l_main_init())
+               return -1;
+
+       test_add("FD passing 1", test_fd_passing_1, NULL);
+
+       sigchld = l_signal_create(SIGCHLD, sigchld_handler, NULL, NULL);
+
+       l_log_set_stderr();
+
+       if (!start_dbus_daemon())
+               return -1;
+
+       for (i = 0; i < 10; i++) {
+               usleep(200 * 1000);
+
+               dbus = l_dbus_new(TEST_BUS_ADDRESS);
+               if (dbus)
+                       break;
+       }
+
+       if (!dbus)
+               goto done;
+
+       test_run();
+
+       l_dbus_destroy(dbus);
+
+done:
+       if (dbus_daemon_pid > 0)
+               kill(dbus_daemon_pid, SIGKILL);
+
+       l_signal_remove(sigchld);
+       l_queue_destroy(tests, l_free);
+
+       l_main_exit();
+
+       if (!success)
+               abort();
+
+       return 0;
+}
diff --git a/unit/test-dbus-message.c b/unit/test-dbus-message.c
new file mode 100644 (file)
index 0000000..b809f0a
--- /dev/null
@@ -0,0 +1,2974 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <assert.h>
+#include <math.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <ell/ell.h>
+
+#include "ell/dbus-private.h"
+
+static bool do_print = true;
+
+struct message_data {
+       const char *type;
+       const char *sender;
+       const char *path;
+       const char *interface;
+       const char *member;
+       const char *destination;
+       const char *signature;
+       uint32_t serial;
+       uint32_t reply_serial;
+       bool no_reply;
+       bool auto_start;
+       uint32_t unix_fds;
+       const unsigned char *binary;
+       size_t binary_len;
+       int *fds;
+};
+
+static const unsigned char message_binary_basic_1[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x13, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x73, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00,
+};
+
+static const struct message_data message_data_basic_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "s",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_1,
+       .binary_len     = 147,
+};
+
+static const unsigned char message_binary_basic_2[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x19, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x02, 0x73, 0x73, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00,
+};
+
+static const struct message_data message_data_basic_2 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "ss",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_2,
+       .binary_len     = 153,
+};
+
+static const unsigned char message_binary_basic_3[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x18, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x02, 0x73, 0x62, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_basic_3 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "sb",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_3,
+       .binary_len     = 152,
+};
+
+static const unsigned char message_binary_basic_4[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x79, 0x00, 0x00,
+                       0x17,
+};
+
+static const struct message_data message_data_basic_4 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "y",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_4,
+       .binary_len     = 129,
+};
+
+static const unsigned char message_binary_basic_5[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x71, 0x00, 0x00,
+                       0x2a, 0x00,
+};
+
+static const struct message_data message_data_basic_5 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "q",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_5,
+       .binary_len     = 130,
+};
+
+static const unsigned char message_binary_basic_6[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x75, 0x00, 0x00,
+                       0x67, 0x12, 0x00, 0x00,
+};
+
+static const struct message_data message_data_basic_6 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "u",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_6,
+       .binary_len     = 132,
+};
+
+static const unsigned char message_binary_basic_7[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x74, 0x00, 0x00,
+                       0x10, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_basic_7 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "t",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_7,
+       .binary_len     = 136,
+};
+
+static const unsigned char message_binary_basic_8[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x6e, 0x00, 0x00,
+                       0xd6, 0xff,
+};
+
+static const struct message_data message_data_basic_8 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "n",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_8,
+       .binary_len     = 130,
+};
+
+static const unsigned char message_binary_basic_9[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x69, 0x00, 0x00,
+                       0x99, 0xed, 0xff, 0xff,
+};
+
+static const struct message_data message_data_basic_9 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "i",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_9,
+       .binary_len     = 132,
+};
+
+static const unsigned char message_binary_basic_10[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x78, 0x00, 0x00,
+                       0xf0, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+};
+
+static const struct message_data message_data_basic_10 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "x",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_10,
+       .binary_len     = 136,
+};
+
+static const unsigned char message_binary_basic_11[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x64, 0x00, 0x00,
+                       0x18, 0x2d, 0x44, 0x54, 0xfb, 0x21, 0x09, 0x40,
+};
+
+static const struct message_data message_data_basic_11 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "d",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_basic_11,
+       .binary_len     = 136,
+};
+
+static const unsigned char message_binary_struct_1[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x19, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x04, 0x28, 0x73, 0x73,
+                       0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00,
+};
+
+static const struct message_data message_data_struct_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "(ss)",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_struct_1,
+       .binary_len     = 161,
+};
+
+static const unsigned char message_binary_struct_2[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x31, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x07, 0x28, 0x73, 0x28,
+                       0x73, 0x73, 0x29, 0x29, 0x00, 0x00, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00,
+};
+
+static const struct message_data message_data_struct_2 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "(s(ss))",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_struct_2,
+       .binary_len     = 185,
+};
+
+static const unsigned char message_binary_struct_3[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0xfc, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0xce, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x60, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x28, 0x69, 0x28,
+                       0x69, 0x28, 0x69, 0x28, 0x69, 0x29, 0x29, 0x29,
+                       0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,
+                       0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,
+                       0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29,
+                       0x29, 0x29, 0x29, 0x29, 0x29, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x1a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x1f, 0x00, 0x00, 0x00};
+
+#define MESSAGE_SIGNATURE_STRUCT_3                                     \
+       "(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i" \
+       "))))))))))))))))))))))))))))))))"
+
+static const struct message_data message_data_struct_3 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = MESSAGE_SIGNATURE_STRUCT_3,
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_struct_3,
+       .binary_len     = 476,
+};
+
+#define MESSAGE_SIGNATURE_STRUCT_4                                     \
+       "(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i(i" \
+       ")))))))))))))))))))))))))))))))))"
+
+static const struct message_data message_data_struct_4 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = MESSAGE_SIGNATURE_STRUCT_4,
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+};
+
+static const unsigned char message_binary_array_1[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x1d, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x02, 0x61, 0x73, 0x00,
+                       0x19, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+                       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x00, 0x00, 0x00,
+                       0x08, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x72, 0x76,
+                       0x61, 0x6c, 0x64, 0x73, 0x00,
+};
+
+static const struct message_data message_data_array_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "as",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_array_1,
+       .binary_len     = 157,
+};
+
+static const unsigned char message_binary_array_2[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x02, 0x61, 0x62, 0x00,
+                       0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_array_2 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "ab",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_array_2,
+       .binary_len     = 144,
+};
+
+static const unsigned char message_binary_array_3[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x03, 0x61, 0x61, 0x73,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x3c, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_array_3 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "aas",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_array_3,
+       .binary_len     = 200,
+};
+
+static const unsigned char message_binary_array_4[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x41, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x05, 0x61, 0x28, 0x73,
+                       0x73, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x00, 0x00, 0x00, 0x4d, 0x61, 0x72, 0x63,
+                       0x65, 0x6c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x48, 0x6f, 0x6c, 0x74, 0x6d, 0x61, 0x6e, 0x6e,
+                       0x00,
+};
+
+static const struct message_data message_data_array_4 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "a(ss)",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_array_4,
+       .binary_len     = 201,
+};
+
+static const unsigned char message_binary_array_5[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x3d, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x04, 0x61, 0x73, 0x61,
+                       0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x19, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+                       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x00, 0x00, 0x00,
+                       0x08, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x72, 0x76,
+                       0x61, 0x6c, 0x64, 0x73, 0x00, 0x00, 0x00, 0x00,
+                       0x19, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x4d, 0x61, 0x72, 0x63, 0x65, 0x6c, 0x00, 0x00,
+                       0x08, 0x00, 0x00, 0x00, 0x48, 0x6f, 0x6c, 0x74,
+                       0x6d, 0x61, 0x6e, 0x6e, 0x00,
+};
+
+static const struct message_data message_data_array_5 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "asas",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_array_5,
+       .binary_len     = 197,
+};
+
+static const unsigned char message_binary_array_6[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x24, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x02, 0x61, 0x76, 0x00,
+                       0x20, 0x00, 0x00, 0x00, 0x01, 0x73, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00, 0x01, 0x62, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_array_6 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "av",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_array_6,
+       .binary_len     = 164,
+};
+
+static const unsigned char message_binary_dict_1[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x08, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x05, 0x61, 0x7b, 0x73,
+                       0x76, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_dict_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "a{sv}",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_dict_1,
+       .binary_len     = 144,
+};
+
+static const unsigned char message_binary_dict_2[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x05, 0x61, 0x7b, 0x73,
+                       0x76, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x4e, 0x61, 0x6d, 0x65,
+                       0x00, 0x01, 0x73, 0x00, 0x0e, 0x00, 0x00, 0x00,
+                       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x20, 0x54, 0x6f,
+                       0x72, 0x76, 0x61, 0x6c, 0x64, 0x73, 0x00, 0x00,
+                       0x09, 0x00, 0x00, 0x00, 0x44, 0x65, 0x76, 0x65,
+                       0x6c, 0x6f, 0x70, 0x65, 0x72, 0x00, 0x01, 0x62,
+                       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_dict_2 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "a{sv}",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_dict_2,
+       .binary_len     = 200,
+};
+
+static const unsigned char message_binary_dict_3[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x41, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x05, 0x61, 0x7b, 0x73,
+                       0x73, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x00, 0x00, 0x00, 0x4d, 0x61, 0x72, 0x63,
+                       0x65, 0x6c, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x48, 0x6f, 0x6c, 0x74, 0x6d, 0x61, 0x6e, 0x6e,
+                       0x00,
+};
+
+static const struct message_data message_data_dict_3 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "a{ss}",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_dict_3,
+       .binary_len     = 201,
+};
+
+static const unsigned char message_binary_variant_1[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x17, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x76, 0x00, 0x00,
+                       0x01, 0x73, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
+                       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x20, 0x54, 0x6f,
+                       0x72, 0x76, 0x61, 0x6c, 0x64, 0x73, 0x00,
+};
+
+static const struct message_data message_data_variant_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "v",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_variant_1,
+       .binary_len     = 151,
+};
+
+static const unsigned char message_binary_variant_2[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x21, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x76, 0x00, 0x00,
+                       0x02, 0x61, 0x73, 0x00, 0x19, 0x00, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00,
+};
+
+static const struct message_data message_data_variant_2 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "v",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_variant_2,
+       .binary_len     = 161,
+};
+
+static const unsigned char message_binary_variant_3[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x28, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x76, 0x00, 0x00,
+                       0x05, 0x28, 0x73, 0x73, 0x62, 0x29, 0x00, 0x00,
+                       0x05, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+                       0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c, 0x64, 0x73,
+                       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_variant_3 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "v",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_variant_3,
+       .binary_len     = 168,
+};
+
+static const unsigned char message_binary_variant_4[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x1b, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x76, 0x00, 0x00,
+                       0x01, 0x76, 0x00, 0x01, 0x73, 0x00, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00,
+};
+
+static const struct message_data message_data_variant_4 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "v",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_variant_4,
+       .binary_len     = 155,
+};
+
+static const unsigned char message_binary_variant_5[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x24, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x01, 0x76, 0x00, 0x00,
+                       0x04, 0x28, 0x73, 0x76, 0x29, 0x00, 0x00, 0x00,
+                       0x0e, 0x00, 0x00, 0x00, 0x4c, 0x69, 0x6e, 0x75,
+                       0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+                       0x64, 0x73, 0x00, 0x01, 0x62, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_variant_5 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "v",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_variant_5,
+       .binary_len     = 164,
+};
+
+static const unsigned char message_binary_complex_1[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x58, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x06, 0x6f, 0x61, 0x7b,
+                       0x73, 0x76, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x13, 0x00, 0x00, 0x00, 0x2f, 0x63, 0x6f, 0x6d,
+                       0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+                       0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x00,
+                       0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x4e, 0x61, 0x6d, 0x65,
+                       0x00, 0x01, 0x73, 0x00, 0x0e, 0x00, 0x00, 0x00,
+                       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x20, 0x54, 0x6f,
+                       0x72, 0x76, 0x61, 0x6c, 0x64, 0x73, 0x00, 0x00,
+                       0x09, 0x00, 0x00, 0x00, 0x44, 0x65, 0x76, 0x65,
+                       0x6c, 0x6f, 0x70, 0x65, 0x72, 0x00, 0x01, 0x62,
+                       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_complex_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "oa{sv}",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_complex_1,
+       .binary_len     = 224,
+};
+
+static const unsigned char message_binary_complex_2[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x88, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+                       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+                       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+                       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+                       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+                       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+                       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+                       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x09, 0x61, 0x28, 0x6f,
+                       0x61, 0x7b, 0x73, 0x76, 0x7d, 0x29, 0x00, 0x00,
+                       0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x14, 0x00, 0x00, 0x00, 0x2f, 0x63, 0x6f, 0x6d,
+                       0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+                       0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x31,
+                       0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x4e, 0x61, 0x6d, 0x65,
+                       0x00, 0x01, 0x73, 0x00, 0x0e, 0x00, 0x00, 0x00,
+                       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x20, 0x54, 0x6f,
+                       0x72, 0x76, 0x61, 0x6c, 0x64, 0x73, 0x00, 0x00,
+                       0x14, 0x00, 0x00, 0x00, 0x2f, 0x63, 0x6f, 0x6d,
+                       0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+                       0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x32,
+                       0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x4e, 0x61, 0x6d, 0x65,
+                       0x00, 0x01, 0x73, 0x00, 0x0f, 0x00, 0x00, 0x00,
+                       0x4d, 0x61, 0x72, 0x63, 0x65, 0x6c, 0x20, 0x48,
+                       0x6f, 0x6c, 0x74, 0x6d, 0x61, 0x6e, 0x6e, 0x00,
+};
+
+static const struct message_data message_data_complex_2 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "a(oa{sv})",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_complex_2,
+       .binary_len     = 272,
+};
+
+static const unsigned char message_binary_complex_3[] = {
+                       0x6c, 0x01, 0x00, 0x01, 0x61, 0x00, 0x00, 0x00,
+                       0x02, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00,
+                       0x01, 0x01, 0x6f, 0x00, 0x25, 0x00, 0x00, 0x00,
+                       0x2f, 0x6f, 0x72, 0x67, 0x2f, 0x66, 0x72, 0x65,
+                       0x65, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70,
+                       0x2f, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4b,
+                       0x69, 0x74, 0x31, 0x2f, 0x41, 0x75, 0x74, 0x68,
+                       0x6f, 0x72, 0x69, 0x74, 0x79, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x1a, 0x00, 0x00, 0x00,
+                       0x6f, 0x72, 0x67, 0x2e, 0x66, 0x72, 0x65, 0x65,
+                       0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e,
+                       0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4b, 0x69,
+                       0x74, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x02, 0x01, 0x73, 0x00, 0x24, 0x00, 0x00, 0x00,
+                       0x6f, 0x72, 0x67, 0x2e, 0x66, 0x72, 0x65, 0x65,
+                       0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x2e,
+                       0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x4b, 0x69,
+                       0x74, 0x31, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x6f,
+                       0x72, 0x69, 0x74, 0x79, 0x00, 0x00, 0x00, 0x00,
+                       0x03, 0x01, 0x73, 0x00, 0x12, 0x00, 0x00, 0x00,
+                       0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x75, 0x74,
+                       0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69,
+                       0x6f, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x10, 0x28, 0x73, 0x61,
+                       0x7b, 0x73, 0x76, 0x7d, 0x29, 0x73, 0x61, 0x7b,
+                       0x73, 0x73, 0x7d, 0x75, 0x73, 0x00, 0x00, 0x00,
+                       0x0f, 0x00, 0x00, 0x00, 0x73, 0x79, 0x73, 0x74,
+                       0x65, 0x6d, 0x2d, 0x62, 0x75, 0x73, 0x2d, 0x6e,
+                       0x61, 0x6d, 0x65, 0x00, 0x18, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x6e, 0x61, 0x6d, 0x65,
+                       0x00, 0x01, 0x73, 0x00, 0x07, 0x00, 0x00, 0x00,
+                       0x3a, 0x31, 0x2e, 0x33, 0x33, 0x30, 0x37, 0x00,
+                       0x1e, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2e,
+                       0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b,
+                       0x74, 0x6f, 0x70, 0x2e, 0x70, 0x6f, 0x6c, 0x69,
+                       0x63, 0x79, 0x6b, 0x69, 0x74, 0x2e, 0x65, 0x78,
+                       0x65, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00,
+};
+
+static const struct message_data message_data_complex_3 = {
+       .type           = "method_call",
+       .path           = "/org/freedesktop/PolicyKit1/Authority",
+       .interface      = "org.freedesktop.PolicyKit1.Authority",
+       .member         = "CheckAuthorization",
+       .destination    = "org.freedesktop.PolicyKit1",
+       .signature      = "(sa{sv})sa{ss}us",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 0,
+       .binary         = message_binary_complex_3,
+       .binary_len     = 305,
+};
+
+static const unsigned char message_binary_complex_4[] = {
+                       0x6c, 0x02, 0x01, 0x01, 0x31, 0x00, 0x00, 0x00,
+                       0x45, 0x2e, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x09, 0x28, 0x62, 0x62,
+                       0x61, 0x7b, 0x73, 0x73, 0x7d, 0x29, 0x00, 0x00,
+                       0x05, 0x01, 0x75, 0x00, 0x02, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x07, 0x00, 0x00, 0x00,
+                       0x3a, 0x31, 0x2e, 0x33, 0x33, 0x30, 0x37, 0x00,
+                       0x07, 0x01, 0x73, 0x00, 0x04, 0x00, 0x00, 0x00,
+                       0x3a, 0x31, 0x2e, 0x38, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x10, 0x00, 0x00, 0x00, 0x70, 0x6f, 0x6c, 0x6b,
+                       0x69, 0x74, 0x2e, 0x64, 0x69, 0x73, 0x6d, 0x69,
+                       0x73, 0x73, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00,
+                       0x04, 0x00, 0x00, 0x00, 0x74, 0x72, 0x75, 0x65,
+                       0x00,
+};
+
+static const struct message_data message_data_complex_4 = {
+       .binary         = message_binary_complex_4,
+       .binary_len     = 121,
+};
+
+static const unsigned char message_binary_complex_5[] = {
+                       0x6c, 0x02, 0x01, 0x01, 0x10, 0x00, 0x00, 0x00,
+                       0x64, 0x2e, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00,
+                       0x08, 0x01, 0x67, 0x00, 0x09, 0x28, 0x62, 0x62,
+                       0x61, 0x7b, 0x73, 0x73, 0x7d, 0x29, 0x00, 0x00,
+                       0x05, 0x01, 0x75, 0x00, 0x02, 0x00, 0x00, 0x00,
+                       0x06, 0x01, 0x73, 0x00, 0x07, 0x00, 0x00, 0x00,
+                       0x3a, 0x31, 0x2e, 0x33, 0x33, 0x30, 0x39, 0x00,
+                       0x07, 0x01, 0x73, 0x00, 0x04, 0x00, 0x00, 0x00,
+                       0x3a, 0x31, 0x2e, 0x38, 0x00, 0x00, 0x00, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_complex_5 = {
+       .binary         = message_binary_complex_5,
+       .binary_len     = 88,
+};
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static struct l_dbus_message *check_message(const struct message_data *msg_data)
+{
+       struct l_dbus_message *msg;
+
+       msg = dbus_message_from_blob(msg_data->binary, msg_data->binary_len,
+                                       msg_data->fds, msg_data->unix_fds);
+       assert(msg);
+
+       if (do_print)
+               l_util_hexdump(false, msg_data->binary, msg_data->binary_len,
+                                                       do_debug, "[MSG] ");
+
+       if (msg_data->sender) {
+               const char *sender;
+
+               sender = l_dbus_message_get_sender(msg);
+               assert(sender);
+               assert(!strcmp(msg_data->sender, sender));
+
+               if (do_print)
+                       l_info("sender=%s", sender);
+        }
+
+       if (msg_data->destination) {
+               const char *destination;
+
+               destination = l_dbus_message_get_destination(msg);
+               assert(destination);
+               assert(!strcmp(msg_data->destination, destination));
+
+               if (do_print)
+                       l_info("destination=%s", destination);
+       }
+
+       return msg;
+}
+
+static struct l_dbus_message *build_message(const struct message_data *msg_data)
+{
+       struct l_dbus_message *msg;
+
+       msg = _dbus_message_new_method_call(1, msg_data->destination,
+                       msg_data->path, msg_data->interface, msg_data->member);
+       assert(msg);
+
+       return msg;
+}
+
+static void compare_message(struct l_dbus_message *msg,
+                                       const struct message_data *msg_data)
+{
+       bool result;
+
+       /* Shut valgrind up */
+       _dbus_message_set_serial(msg, 0);
+
+       if (do_print) {
+               void *blob;
+               void *header, *body;
+               size_t header_size, body_size;
+
+               header = _dbus_message_get_header(msg, &header_size);
+               body = _dbus_message_get_body(msg, &body_size);
+               blob = l_malloc(header_size + body_size);
+               memcpy(blob, header, header_size);
+               memcpy(blob + header_size, body, body_size);
+
+               l_util_hexdump(true, blob, header_size + body_size,
+                               do_debug, "[MSG] ");
+
+               l_free(blob);
+
+               l_util_hexdump(true, msg_data->binary, msg_data->binary_len,
+                                                       do_debug, "[MSG] ");
+       }
+
+       result = dbus_message_compare(msg, msg_data->binary,
+                                               msg_data->binary_len);
+       assert(result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void parse_basic_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str = "Linus Torvalds";
+
+       l_dbus_message_set_arguments(msg, "s", str);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       const char *str1, *str2;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "ss", &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "Linus"));
+       assert(!strcmp(str2, "Torvalds"));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_2(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str1 = "Linus";
+       const char *str2 = "Torvalds";
+
+       l_dbus_message_set_arguments(msg, "ss", str1, str2);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_3(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       const char *str;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "sb", &str, &val);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+       assert(val);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str = "Linus Torvalds";
+
+       l_dbus_message_set_arguments(msg, "sb", str, true);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_4(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       uint8_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "y", &val);
+       assert(result);
+       assert(val == 23);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_4(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       uint8_t val = 23;
+
+       l_dbus_message_set_arguments(msg, "y", val);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_5(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       uint16_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "q", &val);
+       assert(result);
+       assert(val == 42);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_5(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       uint16_t val = 42;
+
+       l_dbus_message_set_arguments(msg, "q", val);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_6(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       uint32_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "u", &val);
+       assert(result);
+       assert(val == 4711);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_6(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+
+       l_dbus_message_set_arguments(msg, "u", 4711);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_7(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       uint64_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "t", &val);
+       assert(result);
+       assert(val == 10000);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_7(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+
+       l_dbus_message_set_arguments(msg, "t", (uint64_t) 10000);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_8(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       int16_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "n", &val);
+       assert(result);
+       assert(val == -42);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_8(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       int16_t val = -42;
+
+       l_dbus_message_set_arguments(msg, "n", val);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_9(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       int32_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "i", &val);
+       assert(result);
+       assert(val == -4711);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_9(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       int32_t val = -4711;
+
+       l_dbus_message_set_arguments(msg, "i", val);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_10(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       int64_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "x", &val);
+       assert(result);
+       assert(val == -10000);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_10(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       int64_t val = -10000;
+
+       l_dbus_message_set_arguments(msg, "x", val);
+
+       compare_message(msg, data);
+}
+
+static void parse_basic_11(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       double val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "d", &val);
+       assert(result);
+       assert(val == M_PI);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_11(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       double val = M_PI;
+
+       l_dbus_message_set_arguments(msg, "d", val);
+
+       compare_message(msg, data);
+}
+
+static void parse_struct_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       const char *str1, *str2;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "(ss)", &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "Linus"));
+       assert(!strcmp(str2, "Torvalds"));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_struct_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str1 = "Linus";
+       const char *str2 = "Torvalds";
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "(ss)", str1, str2);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void parse_struct_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       const char *str, *str1, *str2;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "(s(ss))",
+                                                       &str, &str1, &str2);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+       assert(!strcmp(str1, "Linus"));
+       assert(!strcmp(str2, "Torvalds"));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_struct_2(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str = "Linus Torvalds";
+       const char *str1 = "Linus";
+       const char *str2 = "Torvalds";
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "(s(ss))",
+                                                       str, str1, str2);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void parse_struct_3(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       int num[32] = { 0 };
+       bool result;
+       int i;
+
+       result = l_dbus_message_get_arguments(msg, MESSAGE_SIGNATURE_STRUCT_3,
+                     &num[0], &num[1], &num[2], &num[3],
+                     &num[4], &num[5], &num[6], &num[7],
+                     &num[8], &num[9], &num[10], &num[11],
+                     &num[12], &num[13], &num[14], &num[15],
+                     &num[16], &num[17], &num[18], &num[19],
+                     &num[20], &num[21], &num[22], &num[23],
+                     &num[24], &num[25], &num[26], &num[27],
+                     &num[28], &num[29], &num[30], &num[31]);
+
+       assert(result);
+
+       for (i = 0; i < 32; i++) {
+               assert(i == num[i]);
+       }
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_struct_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, MESSAGE_SIGNATURE_STRUCT_3,
+               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+               18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31);
+
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void build_struct_4(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, MESSAGE_SIGNATURE_STRUCT_4,
+               0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+               18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32);
+
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void check_array_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter iter;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "as", &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(result);
+       assert(!strcmp(str, "Linus"));
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(result);
+       assert(!strcmp(str, "Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_array_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str1 = "Linus";
+       const char *str2 = "Torvalds";
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "as", 2, str1, str2);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_array_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter iter;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "ab", &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&iter, &val);
+       assert(result);
+       assert(val);
+
+       result = l_dbus_message_iter_next_entry(&iter, &val);
+       assert(result);
+       assert(val);
+
+       result = l_dbus_message_iter_next_entry(&iter, &val);
+       assert(result);
+       assert(!val);
+
+       result = l_dbus_message_iter_next_entry(&iter, &val);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void check_fixed_array_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter iter;
+       const uint32_t *array = NULL;
+       uint32_t n_elem;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "ab", &iter);
+       assert(result);
+
+       /* Bools are represented by 4 bytes in dbus, so use a uint32_t array */
+       result = l_dbus_message_iter_get_fixed_array(&iter, &array, &n_elem);
+       assert(result);
+       assert(array);
+       assert(n_elem == 3);
+
+       assert(array[0] == 0x1);
+       assert(array[1] == 0x1);
+       assert(array[2] == 0x0);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_array_2(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "ab", 3, true, true, false);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_array_3(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter array, iter;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "aas", &array);
+       assert(result);
+
+       /* Top-level array's first element */
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(!result);
+
+       /* Top-level array's second element */
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(result);
+       assert(!strcmp(str, "Linus"));
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(result);
+       assert(!strcmp(str, "Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(!result);
+
+       /* Top-level array's third element */
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&iter, &str);
+       assert(!result);
+
+       /* Top-level array's end element */
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_array_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "aas", 3,
+                                               1, "Linus Torvalds",
+                                               2, "Linus", "Torvalds",
+                                               0);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_array_4(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter array;
+       const char *str1, *str2;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "a(ss)", &array);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&array, &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "Linus"));
+       assert(!strcmp(str2, "Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&array, &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "Marcel"));
+       assert(!strcmp(str2, "Holtmann"));
+
+       result = l_dbus_message_iter_next_entry(&array, &str1, &str2);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_array_4(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "a(ss)", 2,
+                                               "Linus", "Torvalds",
+                                               "Marcel", "Holtmann");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_array_5(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter array1, array2;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "asas", &array1, &array2);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&array1, &str);
+       assert(result);
+       assert(!strcmp(str, "Linus"));
+
+       result = l_dbus_message_iter_next_entry(&array1, &str);
+       assert(result);
+       assert(!strcmp(str, "Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&array1, &str);
+       assert(!result);
+
+       result = l_dbus_message_iter_next_entry(&array2, &str);
+       assert(result);
+       assert(!strcmp(str, "Marcel"));
+
+       result = l_dbus_message_iter_next_entry(&array2, &str);
+       assert(result);
+       assert(!strcmp(str, "Holtmann"));
+
+       result = l_dbus_message_iter_next_entry(&array2, &str);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_array_5(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "asas",
+                                               2, "Linus", "Torvalds",
+                                               2, "Marcel", "Holtmann");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_array_6(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter array, iter;
+       const char *str;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "av", &array);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&iter, "b", &val);
+       assert(result);
+       assert(val);
+
+       result = l_dbus_message_iter_next_entry(&array, &iter);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_array_6(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "av", 2,
+                                               "s", "Linus Torvalds",
+                                               "b", true);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_dict_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict, iter;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "a{sv}", &dict);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_dict_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "a{sv}", 0);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_dict_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict, iter;
+       const char *str;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "a{sv}", &dict);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Name"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Developer"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "b", &val);
+       assert(result);
+       assert(val);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_dict_2(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "a{sv}", 2,
+                                               "Name", "s", "Linus Torvalds",
+                                               "Developer", "b", true);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_dict_3(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict;
+       const char *str1, *str2;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "a{ss}", &dict);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "Linus"));
+       assert(!strcmp(str2, "Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "Marcel"));
+       assert(!strcmp(str2, "Holtmann"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str1, &str2);
+       assert(!result);
+
+        l_dbus_message_unref(msg);
+}
+
+static void build_dict_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "a{ss}", 2,
+                                               "Linus", "Torvalds",
+                                               "Marcel", "Holtmann");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_variant_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter iter;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "v", &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_variant_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str = "Linus Torvalds";
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "v", "s", str);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_variant_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter iter, array;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "v", &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&iter, "as", &array);
+       assert(result);
+
+       result = l_dbus_message_iter_next_entry(&array, &str);
+       assert(result);
+       assert(!strcmp(str, "Linus"));
+
+       result = l_dbus_message_iter_next_entry(&array, &str);
+       assert(result);
+       assert(!strcmp(str, "Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&array, &str);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_variant_2(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "v", "as", 2,
+                                               "Linus", "Torvalds");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_variant_3(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter iter;
+       const char *str1, *str2;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "v", &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&iter, "(ssb)",
+                                                       &str1, &str2, &val);
+       assert(result);
+       assert(!strcmp(str1, "Linus"));
+       assert(!strcmp(str2, "Torvalds"));
+       assert(val);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_variant_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       const char *str1 = "Linus";
+       const char *str2 = "Torvalds";
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "v", "(ssb)",
+                                               str1, str2, true);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_variant_4(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter entry, iter;
+       const char *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "v", &entry);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&entry, "v", &iter);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_variant_4(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "v", "v", "s",
+                                               "Linus Torvalds");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_variant_5(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter entry, iter;
+       const char *str;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "v", &entry);
+       assert(result);
+
+       result = l_dbus_message_iter_get_variant(&entry, "(sv)", &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "b", &val);
+       assert(result);
+       assert(val);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_variant_5(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "v", "(sv)",
+                                               "Linus Torvalds",
+                                               "b", true);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_complex_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict, iter;
+       const char *path, *str;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "oa{sv}", &path, &dict);
+       assert(result);
+       assert(!strcmp(path, "/com/example/object"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Name"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Developer"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "b", &val);
+       assert(result);
+       assert(val);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_complex_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "oa{sv}",
+                                               "/com/example/object", 2,
+                                               "Name", "s", "Linus Torvalds",
+                                               "Developer", "b", true);
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_complex_2(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter array, dict, iter;
+       const char *path, *str;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "a(oa{sv})", &array);
+       assert(result);
+
+       /* First object path + properties */
+       result = l_dbus_message_iter_next_entry(&array, &path, &dict);
+       assert(result);
+       assert(!strcmp(path, "/com/example/object1"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Name"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(!result);
+
+       /* Second object path + properties */
+       result = l_dbus_message_iter_next_entry(&array, &path, &dict);
+       assert(result);
+       assert(!strcmp(path, "/com/example/object2"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Name"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Marcel Holtmann"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(!result);
+
+       /* End element */
+       result = l_dbus_message_iter_next_entry(&array, &path, &dict);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_complex_2(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "a(oa{sv})", 2,
+                                               "/com/example/object1", 1,
+                                               "Name", "s", "Linus Torvalds",
+                                               "/com/example/object2", 1,
+                                               "Name", "s", "Marcel Holtmann");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void check_complex_3(const void *data)
+{
+        struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict1, dict2, iter;
+       const char *str1, *str2, *str3;
+       uint32_t val;
+       bool result;
+
+       result = l_dbus_message_get_arguments(msg, "(sa{sv})sa{ss}us",
+                               &str1, &dict1, &str2, &dict2, &val, &str3);
+       assert(result);
+       assert(!strcmp(str1, "system-bus-name"));
+       assert(!strcmp(str2, "org.freedesktop.policykit.exec"));
+       assert(val == 1);
+       assert(!strcmp(str3, ""));
+
+       result = l_dbus_message_iter_next_entry(&dict1, &str1, &iter);
+       assert(result);
+       assert(!strcmp(str1, "name"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str2);
+       assert(result);
+       assert(!strcmp(str2, ":1.3307"));
+
+       result = l_dbus_message_iter_next_entry(&dict1, &str1, &iter);
+       assert(!result);
+
+       result = l_dbus_message_iter_next_entry(&dict2, &str1, &str2);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_complex_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "(sa{sv})sa{ss}us",
+                                       "system-bus-name", 1,
+                                       "name", "s", ":1.3307",
+                                       "org.freedesktop.policykit.exec", 0,
+                                       1, "");
+       assert(result);
+
+       compare_message(msg, data);
+}
+
+static void builder_complex_3(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       struct l_dbus_message_builder *builder;
+       uint32_t u = 1;
+
+       builder = l_dbus_message_builder_new(msg);
+       assert(builder);
+
+       assert(l_dbus_message_builder_enter_struct(builder, "sa{sv}"));
+       assert(l_dbus_message_builder_append_basic(builder, 's',
+                                                       "system-bus-name"));
+       assert(l_dbus_message_builder_enter_array(builder, "{sv}"));
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "name"));
+       assert(l_dbus_message_builder_enter_variant(builder, "s"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', ":1.3307"));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+       assert(l_dbus_message_builder_leave_array(builder));
+       assert(l_dbus_message_builder_leave_struct(builder));
+
+       assert(l_dbus_message_builder_append_basic(builder, 's',
+                                       "org.freedesktop.policykit.exec"));
+
+       assert(l_dbus_message_builder_enter_array(builder, "{ss}"));
+       assert(l_dbus_message_builder_leave_array(builder));
+
+       assert(l_dbus_message_builder_append_basic(builder, 'u', &u));
+
+       assert(l_dbus_message_builder_append_basic(builder, 's', ""));
+
+       assert(l_dbus_message_builder_finalize(builder));
+
+       l_dbus_message_builder_destroy(builder);
+
+       compare_message(msg, data);
+}
+
+static void check_complex_4(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict;
+       const char *str1, *str2;
+       bool result, val1, val2;
+
+       result = l_dbus_message_get_arguments(msg, "(bba{ss})",
+                                               &val1, &val2, &dict);
+       assert(result);
+       assert(!val1);
+       assert(!val2);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str1, &str2);
+       assert(result);
+       assert(!strcmp(str1, "polkit.dismissed"));
+       assert(!strcmp(str2, "true"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str1, &str2);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void check_complex_5(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict;
+       const char *str1, *str2;
+       bool result, val1, val2;
+
+       result = l_dbus_message_get_arguments(msg, "(bba{ss})",
+                                               &val1, &val2, &dict);
+       assert(result);
+       assert(val1);
+       assert(!val2);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str1, &str2);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void builder_rewind(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       struct l_dbus_message_builder *builder;
+       bool b = true;
+
+       builder = l_dbus_message_builder_new(msg);
+       assert(builder);
+
+       assert(l_dbus_message_builder_append_basic(builder, 'o',
+                                                       "/com/example/object"));
+
+       assert(l_dbus_message_builder_enter_array(builder, "{sv}"));
+
+       assert(_dbus_message_builder_mark(builder));
+
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "Name"));
+       assert(l_dbus_message_builder_enter_variant(builder, "s"));
+       assert(l_dbus_message_builder_append_basic(builder, 's',
+                                                       "Invalid"));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+
+       assert(_dbus_message_builder_rewind(builder));
+
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "Name"));
+       assert(l_dbus_message_builder_enter_variant(builder, "s"));
+       assert(l_dbus_message_builder_append_basic(builder, 's',
+                                                       "Linus Torvalds"));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "Developer"));
+       assert(l_dbus_message_builder_enter_variant(builder, "b"));
+       assert(l_dbus_message_builder_append_basic(builder, 'b', &b));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+
+       assert(l_dbus_message_builder_leave_array(builder));
+
+       assert(l_dbus_message_builder_finalize(builder));
+       l_dbus_message_builder_destroy(builder);
+
+       compare_message(msg, data);
+}
+
+static int count_fds(void)
+{
+       int fd;
+       int count = 0;
+       int flags;
+
+       for (fd = 0; fd < FD_SETSIZE; fd++) {
+               flags = fcntl(fd, F_GETFL);
+               if (flags < 0) /* ignore any files we can't operate on */
+                       continue;
+
+               /*
+                * Only count files that are read-only or write-only.  This is
+                * to work around the issue that fakeroot opens a TCP socket
+                * in RDWR mode in a separate thread
+                *
+                * Note: This means that files used for file-descriptor passing
+                * tests should be opened RDONLY or WRONLY
+                */
+               if (flags & O_RDWR)
+                       continue;
+
+               count++;
+       }
+
+       return count;
+}
+
+static void compare_files(int a, int b)
+{
+       struct stat sa, sb;
+
+       assert(fstat(a, &sa) == 0);
+       assert(fstat(b, &sb) == 0);
+
+       assert(sa.st_dev == sb.st_dev);
+       assert(sa.st_ino == sb.st_ino);
+       assert(sa.st_rdev == sb.st_rdev);
+}
+
+static const unsigned char message_binary_basic_h[] = {
+       0x6c, 0x01, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00,
+       0x01, 0x01, 0x6f, 0x00, 0x13, 0x00, 0x00, 0x00,
+       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a,
+       0x65, 0x63, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x03, 0x01, 0x73, 0x00, 0x06, 0x00, 0x00, 0x00,
+       0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x00, 0x00,
+       0x02, 0x01, 0x73, 0x00, 0x15, 0x00, 0x00, 0x00,
+       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+       0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x00,
+       0x06, 0x01, 0x73, 0x00, 0x0b, 0x00, 0x00, 0x00,
+       0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+       0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x08, 0x01, 0x67, 0x00, 0x01, 0x68, 0x00, 0x00,
+       0x09, 0x01, 0x75, 0x00, 0x01, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const struct message_data message_data_basic_h = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "h",
+       .serial         = 0,
+       .reply_serial   = 0,
+       .no_reply       = 0,
+       .auto_start     = 1,
+       .unix_fds       = 1,
+       .binary         = message_binary_basic_h,
+       .binary_len     = sizeof(message_binary_basic_h),
+};
+
+static void message_fds_parse(const void *data)
+{
+       struct message_data message_data = message_data_basic_h;
+       struct l_dbus_message *msg;
+       int fd0, fd1;
+       int open_fds;
+       bool result;
+
+       open_fds = count_fds();
+
+       fd0 = open("/dev/random", O_RDONLY);
+       assert(fd0 != -1);
+
+       message_data.fds = &fd0;
+       msg = check_message(&message_data);
+
+       result = l_dbus_message_get_arguments(msg, "h", &fd1);
+       assert(result);
+       assert(fd1 != -1 && fd0 != fd1);
+
+       compare_files(fd0, fd1);
+
+       assert(count_fds() != open_fds);
+
+       close(fd1);
+
+       assert(count_fds() != open_fds);
+
+       l_dbus_message_unref(msg);
+
+       assert(count_fds() == open_fds);
+}
+
+static void message_fds_build(const void *data)
+{
+       struct message_data message_data = message_data_basic_h;
+       struct l_dbus_message *msg;
+       int fd;
+       int open_fds;
+
+       open_fds = count_fds();
+
+       fd = open("/dev/random", O_RDONLY);
+       assert(fd != -1);
+
+       msg = build_message(&message_data);
+
+       l_dbus_message_set_arguments(msg, "h", fd);
+
+       close(fd);
+
+       assert(count_fds() != open_fds);
+
+       compare_message(msg, &message_data);
+
+       assert(count_fds() == open_fds);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Basic 1 (parse)", parse_basic_1, &message_data_basic_1);
+       l_test_add("Basic 1 (build)", build_basic_1, &message_data_basic_1);
+       l_test_add("Basic 2 (parse)", parse_basic_2, &message_data_basic_2);
+       l_test_add("Basic 3 (build)", build_basic_2, &message_data_basic_2);
+       l_test_add("Basic 3 (parse)", parse_basic_3, &message_data_basic_3);
+       l_test_add("Basic 3 (build)", build_basic_3, &message_data_basic_3);
+       l_test_add("Basic 4 (parse)", parse_basic_4, &message_data_basic_4);
+       l_test_add("Basic 4 (build)", build_basic_4, &message_data_basic_4);
+       l_test_add("Basic 5 (parse)", parse_basic_5, &message_data_basic_5);
+       l_test_add("Basic 5 (build)", build_basic_5, &message_data_basic_5);
+       l_test_add("Basic 6 (parse)", parse_basic_6, &message_data_basic_6);
+       l_test_add("Basic 6 (build)", build_basic_6, &message_data_basic_6);
+       l_test_add("Basic 7 (parse)", parse_basic_7, &message_data_basic_7);
+       l_test_add("Basic 7 (build)", build_basic_7, &message_data_basic_7);
+       l_test_add("Basic 8 (parse)", parse_basic_8, &message_data_basic_8);
+       l_test_add("Basic 8 (build)", build_basic_8, &message_data_basic_8);
+       l_test_add("Basic 9 (parse)", parse_basic_9, &message_data_basic_9);
+       l_test_add("Basic 9 (build)", build_basic_9, &message_data_basic_9);
+       l_test_add("Basic 10 (parse)", parse_basic_10, &message_data_basic_10);
+       l_test_add("Basic 10 (build)", build_basic_10, &message_data_basic_10);
+       l_test_add("Basic 11 (parse)", parse_basic_11, &message_data_basic_11);
+       l_test_add("Basic 11 (build)", build_basic_11, &message_data_basic_11);
+
+       l_test_add("Struct 1 (parse)", parse_struct_1, &message_data_struct_1);
+       l_test_add("Struct 1 (build)", build_struct_1, &message_data_struct_1);
+       l_test_add("Struct 2 (parse)", parse_struct_2, &message_data_struct_2);
+       l_test_add("Struct 2 (build)", build_struct_2, &message_data_struct_2);
+       l_test_add("Struct 3 (parse)", parse_struct_3, &message_data_struct_3);
+       l_test_add("Struct 3 (build)", build_struct_3, &message_data_struct_3);
+       l_test_add("Struct 4 (build)", build_struct_4, &message_data_struct_4);
+
+       l_test_add("Array 1 (parse)", check_array_1, &message_data_array_1);
+       l_test_add("Array 1 (build)", build_array_1, &message_data_array_1);
+       l_test_add("Array 2 (parse)", check_array_2, &message_data_array_2);
+       l_test_add("Array 2 (checkfixed)", check_fixed_array_2,
+                                                       &message_data_array_2);
+       l_test_add("Array 2 (build)", build_array_2, &message_data_array_2);
+       l_test_add("Array 3 (parse)", check_array_3, &message_data_array_3);
+       l_test_add("Array 3 (build)", build_array_3, &message_data_array_3);
+       l_test_add("Array 4 (parse)", check_array_4, &message_data_array_4);
+       l_test_add("Array 4 (build)", build_array_4, &message_data_array_4);
+       l_test_add("Array 5 (parse)", check_array_5, &message_data_array_5);
+       l_test_add("Array 5 (build)", build_array_5, &message_data_array_5);
+       l_test_add("Array 6 (parse)", check_array_6, &message_data_array_6);
+       l_test_add("Array 6 (build)", build_array_6, &message_data_array_6);
+
+       l_test_add("Dict 1 (parse)", check_dict_1, &message_data_dict_1);
+       l_test_add("Dict 1 (build)", build_dict_1, &message_data_dict_1);
+       l_test_add("Dict 2 (parse)", check_dict_2, &message_data_dict_2);
+       l_test_add("Dict 2 (build)", build_dict_2, &message_data_dict_2);
+       l_test_add("Dict 3 (parse)", check_dict_3, &message_data_dict_3);
+       l_test_add("Dict 3 (build)", build_dict_3, &message_data_dict_3);
+
+       l_test_add("Variant 1 (parse)", check_variant_1,
+                                               &message_data_variant_1);
+       l_test_add("Variant 1 (build)", build_variant_1,
+                                               &message_data_variant_1);
+       l_test_add("Variant 2 (parse)", check_variant_2,
+                                               &message_data_variant_2);
+       l_test_add("Variant 2 (build)", build_variant_2,
+                                               &message_data_variant_2);
+       l_test_add("Variant 3 (parse)", check_variant_3,
+                                               &message_data_variant_3);
+       l_test_add("Variant 3 (build)", build_variant_3,
+                                               &message_data_variant_3);
+       l_test_add("Variant 4 (parse)", check_variant_4,
+                                               &message_data_variant_4);
+       l_test_add("Variant 4 (build)", build_variant_4,
+                                               &message_data_variant_4);
+       l_test_add("Variant 5 (parse)", check_variant_5,
+                                               &message_data_variant_5);
+       l_test_add("Variant 5 (build)", build_variant_5,
+                                               &message_data_variant_5);
+
+       l_test_add("Complex 1 (parse)", check_complex_1,
+                                               &message_data_complex_1);
+       l_test_add("Complex 1 (build)", build_complex_1,
+                                               &message_data_complex_1);
+       l_test_add("Complex 2 (parse)", check_complex_2,
+                                               &message_data_complex_2);
+       l_test_add("Complex 2 (build)", build_complex_2,
+                                               &message_data_complex_2);
+       l_test_add("Complex 3 (parse)", check_complex_3,
+                                               &message_data_complex_3);
+       l_test_add("Complex 3 (build)", build_complex_3,
+                                               &message_data_complex_3);
+       l_test_add("Complex 4", check_complex_4, &message_data_complex_4);
+       l_test_add("Complex 5", check_complex_5, &message_data_complex_5);
+
+       l_test_add("Message Builder Complex 3", builder_complex_3,
+                                               &message_data_complex_3);
+
+       l_test_add("Message Builder Rewind Complex 1", builder_rewind,
+                                               &message_data_complex_1);
+
+       l_test_add("FDs (parse)", message_fds_parse, NULL);
+       l_test_add("FDs (build)", message_fds_build, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
new file mode 100644 (file)
index 0000000..b435062
--- /dev/null
@@ -0,0 +1,1043 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/wait.h>
+
+#include <ell/ell.h>
+#include "ell/dbus-private.h"
+
+#ifndef WAIT_ANY
+#define WAIT_ANY (-1) /* Any process */
+#endif
+
+#define TEST_BUS_ADDRESS "unix:path=/tmp/ell-test-bus"
+#define ROOT_PATH "/ell/test"
+
+static pid_t dbus_daemon_pid = -1;
+
+static bool start_dbus_daemon(void)
+{
+       char *prg_argv[5];
+       char *prg_envp[1];
+       pid_t pid;
+
+       prg_argv[0] = "/usr/bin/dbus-daemon";
+       prg_argv[1] = "--nopidfile";
+       prg_argv[2] = "--nofork";
+       prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
+       prg_argv[4] = NULL;
+
+       prg_envp[0] = NULL;
+
+       l_info("launching dbus-daemon");
+
+       pid = fork();
+       if (pid < 0) {
+               l_error("failed to fork new process");
+               return false;
+       }
+
+       if (pid == 0) {
+               execve(prg_argv[0], prg_argv, prg_envp);
+               exit(EXIT_SUCCESS);
+       }
+
+       l_info("dbus-daemon process %d created", pid);
+
+       dbus_daemon_pid = pid;
+
+       return true;
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void sigchld_handler(void *user_data)
+{
+       while (1) {
+               pid_t pid;
+               int status;
+
+               pid = waitpid(WAIT_ANY, &status, WNOHANG);
+               if (pid < 0 || pid == 0)
+                       break;
+
+               l_info("process %d terminated with status=%d\n", pid, status);
+
+               if (pid == dbus_daemon_pid) {
+                       dbus_daemon_pid = -1;
+                       l_main_quit();
+               }
+       }
+}
+
+static struct l_dbus *dbus;
+
+struct dbus_test {
+       const char *name;
+       void (*start)(struct l_dbus *dbus, void *);
+       void *data;
+};
+
+static bool success;
+static struct l_queue *tests;
+static const struct l_queue_entry *current;
+
+static void test_add(const char *name,
+                       void (*start)(struct l_dbus *dbus, void *),
+                       void *test_data)
+{
+       struct dbus_test *test = l_new(struct dbus_test, 1);
+
+       test->name = name;
+       test->start = start;
+       test->data = test_data;
+
+       if (!tests)
+               tests = l_queue_new();
+
+       l_queue_push_tail(tests, test);
+}
+
+static void test_next()
+{
+       struct dbus_test *test;
+
+       if (current)
+               current = current->next;
+       else
+               current = l_queue_get_entries(tests);
+
+       if (!current) {
+               success = true;
+               l_main_quit();
+               return;
+       }
+
+       test = current->data;
+
+       l_info("TEST: %s", test->name);
+
+       test->start(dbus, test->data);
+}
+
+#define test_assert(cond)      \
+       do {    \
+               if (!(cond)) {  \
+                       l_info("TEST FAILED in %s at %s:%i: %s",        \
+                               __func__, __FILE__, __LINE__,   \
+                               L_STRINGIFY(cond));     \
+                       l_main_quit();  \
+                       return; \
+               }       \
+       } while (0)
+
+static void request_name_callback(struct l_dbus *dbus, bool success,
+                                       bool queued, void *user_data)
+{
+       l_info("request name result=%s",
+               success ? (queued ? "queued" : "success") : "failed");
+
+       test_next();
+}
+
+static void ready_callback(void *user_data)
+{
+       l_info("ready");
+
+       l_dbus_name_acquire(dbus, "org.test", false, false, false,
+                               request_name_callback, NULL);
+}
+
+static void disconnect_callback(void *user_data)
+{
+       l_info("Disconnected from DBus");
+       l_main_quit();
+}
+
+static bool test_string_getter(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               void *user_data)
+{
+       return l_dbus_message_builder_append_basic(builder, 's', "foo");
+}
+
+static bool setter_called;
+static bool int_optional;
+
+static struct l_dbus_message *test_string_setter(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_iter *new_value,
+                                       l_dbus_property_complete_cb_t complete,
+                                       void *user_data)
+{
+       const char *strvalue;
+
+       if (!l_dbus_message_iter_get_variant(new_value, "s", &strvalue))
+               goto done;
+
+       if (strcmp(strvalue, "bar"))
+               goto done;
+
+       setter_called = true;
+
+done:
+       complete(dbus, message, NULL);
+
+       return NULL;
+}
+
+static bool test_int_getter(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               void *user_data)
+{
+       uint32_t u;
+
+       if (int_optional)
+               return false;
+
+       u = 5;
+
+       return l_dbus_message_builder_append_basic(builder, 'u', &u);
+}
+
+static struct l_dbus_message *test_int_setter(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_iter *new_value,
+                                       l_dbus_property_complete_cb_t complete,
+                                       void *user_data)
+{
+       uint32_t u;
+
+       if (!l_dbus_message_iter_get_variant(new_value, "u", &u))
+               goto done;
+
+       if (u != 42)
+               goto done;
+
+       setter_called = true;
+
+done:
+       return l_dbus_message_new_method_return(message);
+}
+
+static struct l_dbus_message *test_error_setter(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_iter *new_value,
+                                       l_dbus_property_complete_cb_t complete,
+                                       void *user_data)
+{
+       setter_called = true;
+
+       return l_dbus_message_new_error(message, "org.test.Error", "Error");
+}
+
+static bool test_path_getter(struct l_dbus *dbus,
+                               struct l_dbus_message *message,
+                               struct l_dbus_message_builder *builder,
+                               void *user_data)
+{
+       return l_dbus_message_builder_append_basic(builder, 'o', "/foo/bar");
+}
+
+static void setup_test_interface(struct l_dbus_interface *interface)
+{
+       l_dbus_interface_property(interface, "String",
+                                       L_DBUS_PROPERTY_FLAG_AUTO_EMIT, "s",
+                                       test_string_getter, test_string_setter);
+       l_dbus_interface_property(interface, "Integer",
+                                       L_DBUS_PROPERTY_FLAG_AUTO_EMIT, "u",
+                                       test_int_getter, test_int_setter);
+       l_dbus_interface_property(interface, "Readonly", 0, "s",
+                                       test_string_getter, NULL);
+       l_dbus_interface_property(interface, "SetError", 0, "s",
+                                       test_string_getter, test_error_setter);
+       l_dbus_interface_property(interface, "Path", 0, "o",
+                                       test_path_getter, NULL);
+}
+
+static void validate_properties(struct l_dbus_message_iter *dict)
+{
+       struct l_dbus_message_iter variant;
+       const char *name, *strval;
+       uint32_t intval;
+
+       test_assert(l_dbus_message_iter_next_entry(dict, &name, &variant));
+       test_assert(!strcmp(name, "String"));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "s", &strval));
+       test_assert(!strcmp(strval, "foo"));
+
+       if (!int_optional) {
+               test_assert(l_dbus_message_iter_next_entry(dict, &name,
+                                                               &variant));
+               test_assert(!strcmp(name, "Integer"));
+               test_assert(l_dbus_message_iter_get_variant(&variant, "u",
+                                                               &intval));
+               test_assert(intval == 5);
+       }
+
+       test_assert(l_dbus_message_iter_next_entry(dict, &name, &variant));
+       test_assert(!strcmp(name, "Readonly"));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "s", &strval));
+       test_assert(!strcmp(strval, "foo"));
+
+       test_assert(l_dbus_message_iter_next_entry(dict, &name, &variant));
+       test_assert(!strcmp(name, "SetError"));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "s", &strval));
+       test_assert(!strcmp(strval, "foo"));
+
+       test_assert(l_dbus_message_iter_next_entry(dict, &name, &variant));
+       test_assert(!strcmp(name, "Path"));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "o", &strval));
+       test_assert(!strcmp(strval, "/foo/bar"));
+
+       test_assert(!l_dbus_message_iter_next_entry(dict, &name, &variant));
+}
+
+static void get_properties_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message_iter dict;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, "a{sv}", &dict));
+
+       validate_properties(&dict);
+
+       test_next();
+}
+
+static void test_old_get(struct l_dbus *dbus, void *test_data)
+{
+       struct l_dbus_message *call =
+               l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "GetProperties");
+
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, ""));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, get_properties_callback,
+                                               NULL, NULL));
+}
+
+static void test_old_optional_get(struct l_dbus *dbus, void *test_data)
+{
+       struct l_dbus_message *call =
+               l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "GetProperties");
+
+       int_optional = true;
+
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, ""));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, get_properties_callback,
+                                               NULL, NULL));
+}
+static void set_invalid_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(!setter_called);
+
+       test_next();
+}
+
+static void old_set_error_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(setter_called);
+       setter_called = false;
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "SetProperty");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "sv", "Invalid",
+                                                       "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, set_invalid_callback,
+                                               NULL, NULL));
+}
+
+static void old_set_ro_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(!setter_called);
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "SetProperty");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "sv", "SetError",
+                                                       "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, old_set_error_callback,
+                                               NULL, NULL));
+}
+
+static void old_set_int_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, ""));
+       test_assert(setter_called);
+       setter_called = false;
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "SetProperty");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "sv", "Readonly",
+                                                       "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, old_set_ro_callback,
+                                               NULL, NULL));
+}
+
+static void old_set_string_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, ""));
+       test_assert(setter_called);
+       setter_called = false;
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "SetProperty");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "sv", "Integer",
+                                                       "u", 42));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, old_set_int_callback,
+                                               NULL, NULL));
+}
+
+static void test_old_set(struct l_dbus *dbus, void *test_data)
+{
+       struct l_dbus_message *call =
+               l_dbus_message_new_method_call(dbus, "org.test",
+                                               ROOT_PATH"/test",
+                                               "org.test", "SetProperty");
+
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "sv", "String",
+                                                       "s", "bar"));
+
+       test_assert(!setter_called);
+       test_assert(l_dbus_send_with_reply(dbus, call, old_set_string_callback,
+                                               NULL, NULL));
+}
+
+static void new_get_invalid_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "GetAll");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "s", "org.test"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, get_properties_callback,
+                                               NULL, NULL));
+}
+
+static void new_get_bad_if_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Get");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ss",
+                                                       "org.test", "Invalid"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_get_invalid_callback,
+                                               NULL, NULL));
+}
+
+static void new_get_callback(struct l_dbus_message *message, void *user_data)
+{
+       struct l_dbus_message_iter variant;
+       const char *strval;
+       struct l_dbus_message *call;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, "v", &variant));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "s", &strval));
+       test_assert(!strcmp(strval, "foo"));
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Get");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ss", "org.invalid",
+                                                       "String"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_get_bad_if_callback,
+                                               NULL, NULL));
+}
+
+static void test_new_get(struct l_dbus *dbus, void *test_data)
+{
+       struct l_dbus_message *call =
+               l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Get");
+
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ss",
+                                                       "org.test", "String"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_get_callback,
+                                               NULL, NULL));
+}
+
+static void new_set_bad_if_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(!setter_called);
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ssv", "org.test",
+                                                       "Invalid", "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, set_invalid_callback,
+                                               NULL, NULL));
+}
+
+static void new_set_error_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(setter_called);
+       setter_called = false;
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ssv", "org.invalid",
+                                                       "String", "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_set_bad_if_callback,
+                                               NULL, NULL));
+}
+
+static void new_set_ro_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(!setter_called);
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ssv", "org.test",
+                                                       "SetError",
+                                                       "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_set_error_callback,
+                                               NULL, NULL));
+}
+
+static void new_set_int_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, ""));
+       test_assert(setter_called);
+       setter_called = false;
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ssv", "org.test",
+                                                       "Readonly",
+                                                       "s", "bar"));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_set_ro_callback,
+                                               NULL, NULL));
+}
+
+static void new_set_string_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message *call;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, ""));
+       test_assert(setter_called);
+       setter_called = false;
+
+       call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ssv", "org.test",
+                                                       "Integer", "u", 42));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, new_set_int_callback,
+                                               NULL, NULL));
+}
+
+static void test_new_set(struct l_dbus *dbus, void *test_data)
+{
+       struct l_dbus_message *call =
+               l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, "ssv", "org.test",
+                                                       "String", "s", "bar"));
+
+       test_assert(!setter_called);
+       test_assert(l_dbus_send_with_reply(dbus, call, new_set_string_callback,
+                                               NULL, NULL));
+}
+
+static struct l_timeout *signal_timeout;
+
+static void signal_timeout_callback(struct l_timeout *timeout, void *user_data)
+{
+       signal_timeout = NULL;
+       test_assert(false);
+}
+
+static bool old_signal_received, new_signal_received;
+static bool signal_success;
+
+static void test_check_signal_success(void)
+{
+       struct l_dbus_message *call;
+
+       if (!old_signal_received || !new_signal_received)
+               return;
+
+       l_timeout_remove(signal_timeout);
+       signal_timeout = NULL;
+
+       if (!signal_success) {
+               signal_success = true;
+
+               /* Now repeat the test for the signal triggered by Set */
+
+               old_signal_received = false;
+               new_signal_received = false;
+
+               signal_timeout = l_timeout_create(1, signal_timeout_callback,
+                                                       NULL, NULL);
+               test_assert(signal_timeout);
+
+               call = l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH"/test",
+                                       "org.freedesktop.DBus.Properties",
+                                       "Set");
+               test_assert(call);
+               test_assert(l_dbus_message_set_arguments(call, "ssv",
+                                                       "org.test", "String",
+                                                       "s", "bar"));
+
+               test_assert(!setter_called);
+               test_assert(l_dbus_send(dbus, call));
+       } else {
+               test_assert(setter_called);
+               setter_called = false;
+
+               test_next();
+       }
+}
+
+static void test_old_signal_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       const char *property, *value;
+       struct l_dbus_message_iter variant;
+
+       if (!signal_timeout)
+               return;
+
+       test_assert(l_dbus_message_get_arguments(message, "sv",
+                                                       &property, &variant));
+       test_assert(!strcmp(property, "String"));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "s", &value));
+       test_assert(!strcmp(value, "foo"));
+
+       test_assert(!old_signal_received);
+       old_signal_received = true;
+
+       test_check_signal_success();
+}
+
+static void test_new_signal_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       const char *interface, *property, *value;
+       struct l_dbus_message_iter variant, changed, invalidated;
+
+       if (!signal_timeout)
+               return;
+
+       test_assert(l_dbus_message_get_arguments(message, "sa{sv}as",
+                                                       &interface, &changed,
+                                                       &invalidated));
+
+       test_assert(l_dbus_message_iter_next_entry(&changed, &property,
+                                                       &variant));
+       test_assert(!strcmp(property, "String"));
+       test_assert(l_dbus_message_iter_get_variant(&variant, "s", &value));
+       test_assert(!strcmp(value, "foo"));
+
+       test_assert(!l_dbus_message_iter_next_entry(&changed, &property,
+                                                       &variant));
+       test_assert(!l_dbus_message_iter_next_entry(&invalidated,
+                                                       &property));
+
+       test_assert(!new_signal_received);
+       new_signal_received = true;
+
+       test_check_signal_success();
+}
+
+static void test_property_signals(struct l_dbus *dbus, void *test_data)
+{
+       old_signal_received = false;
+       new_signal_received = false;
+
+       signal_timeout = l_timeout_create(1, signal_timeout_callback,
+                                               NULL, NULL);
+       test_assert(signal_timeout);
+
+       test_assert(l_dbus_property_changed(dbus, ROOT_PATH"/test",
+                                               "org.test", "String"));
+}
+
+static void object_manager_callback(struct l_dbus_message *message,
+                                       void *user_data)
+{
+       struct l_dbus_message_iter objects, interfaces, properties, variant;
+       const char *path, *interface, *name;
+       bool object_manager_found = false;
+       bool test_found = false;
+       bool properties_found = false;
+
+       test_assert(!l_dbus_message_get_error(message, NULL, NULL));
+       test_assert(l_dbus_message_get_arguments(message, "a{oa{sa{sv}}}",
+                                                       &objects));
+
+       while (l_dbus_message_iter_next_entry(&objects, &path, &interfaces)) {
+               while (l_dbus_message_iter_next_entry(&interfaces, &interface,
+                                                       &properties)) {
+                       if (!strcmp(path, ROOT_PATH) && !strcmp(interface,
+                                       "org.freedesktop.DBus.ObjectManager")) {
+                               test_assert(!object_manager_found);
+                               object_manager_found = true;
+                               test_assert(!l_dbus_message_iter_next_entry(
+                                                       &properties, &name,
+                                                       &variant));
+                       }
+
+                       if (!strcmp(path, ROOT_PATH"/test") &&
+                                       !strcmp(interface,
+                                       "org.freedesktop.DBus.Properties")) {
+                               test_assert(!properties_found);
+                               properties_found = true;
+                               test_assert(!l_dbus_message_iter_next_entry(
+                                                       &properties, &name,
+                                                       &variant));
+                       }
+
+                       if (!strcmp(path, ROOT_PATH"/test") &&
+                                       !strcmp(interface, "org.test")) {
+                               test_assert(!test_found);
+                               test_found = true;
+                               validate_properties(&properties);
+                       }
+               }
+       }
+
+       test_assert(object_manager_found && test_found && properties_found);
+
+       test_next();
+}
+
+static void test_object_manager_get(struct l_dbus *dbus, void *test_data)
+{
+       struct l_dbus_message *call =
+               l_dbus_message_new_method_call(dbus, "org.test",
+                                       ROOT_PATH,
+                                       "org.freedesktop.DBus.ObjectManager",
+                                       "GetManagedObjects");
+
+       test_assert(call);
+       test_assert(l_dbus_message_set_arguments(call, ""));
+
+       test_assert(l_dbus_send_with_reply(dbus, call, object_manager_callback,
+                                               NULL, NULL));
+}
+
+static struct l_timeout *om_signal_timeout;
+
+static void om_signal_timeout_callback(struct l_timeout *timeout,
+                                       void *user_data)
+{
+       om_signal_timeout = NULL;
+       test_assert(false);
+}
+
+static bool expect_interfaces_added;
+
+static void om_signal_callback(struct l_dbus_message *message, void *user_data)
+{
+       const char *path, *interface, *member;
+       struct l_dbus_message_iter interfaces, properties;
+
+       if (!om_signal_timeout)
+               return;
+
+       member = l_dbus_message_get_member(message);
+
+       if (!strcmp(member, "InterfacesAdded"))
+               test_assert(expect_interfaces_added);
+       else if (!strcmp(member, "InterfacesRemoved"))
+               test_assert(!expect_interfaces_added);
+       else
+               return;
+
+       if (!strcmp(member, "InterfacesAdded")) {
+               test_assert(l_dbus_message_get_arguments(message, "oa{sa{sv}}",
+                                                               &path,
+                                                               &interfaces));
+               test_assert(!strcmp(path, ROOT_PATH"/test2"));
+
+               test_assert(l_dbus_message_iter_next_entry(&interfaces,
+                                                               &interface,
+                                                               &properties));
+               test_assert(!strcmp(interface, "org.test"));
+               validate_properties(&properties);
+
+               test_assert(!l_dbus_message_iter_next_entry(&interfaces,
+                                                               &interface,
+                                                               &properties));
+
+               /* Now repeat the test for the InterfacesRemoved signal */
+
+               expect_interfaces_added = false;
+               test_assert(l_dbus_unregister_object(dbus, ROOT_PATH"/test2"));
+       } else {
+               test_assert(l_dbus_message_get_arguments(message, "oas",
+                                                               &path,
+                                                               &interfaces));
+               test_assert(!strcmp(path, ROOT_PATH"/test2"));
+
+               test_assert(l_dbus_message_iter_next_entry(&interfaces,
+                                                               &interface));
+               test_assert(!strcmp(interface, "org.test"));
+
+               test_assert(!l_dbus_message_iter_next_entry(&interfaces,
+                                                               &interface));
+
+               l_timeout_remove(om_signal_timeout);
+               om_signal_timeout = NULL;
+
+               test_next();
+       }
+}
+
+static void test_object_manager_signals(struct l_dbus *dbus, void *test_data)
+{
+       om_signal_timeout = l_timeout_create(1, om_signal_timeout_callback,
+                                               NULL, NULL);
+       test_assert(om_signal_timeout);
+
+       expect_interfaces_added = true;
+       test_assert(l_dbus_object_add_interface(dbus, ROOT_PATH"/test2",
+                                               "org.test", NULL));
+}
+
+static void test_run(void)
+{
+       success = false;
+
+       l_dbus_set_ready_handler(dbus, ready_callback, dbus, NULL);
+       l_dbus_set_disconnect_handler(dbus, disconnect_callback, NULL, NULL);
+
+       if (!l_dbus_register_interface(dbus, "org.test", setup_test_interface,
+                                       NULL, true)) {
+               l_info("Unable to register interface");
+               return;
+       }
+
+       if (!l_dbus_object_add_interface(dbus, ROOT_PATH"/test",
+                                               "org.test", NULL)) {
+               l_info("Unable to instantiate interface");
+               return;
+       }
+
+       if (!l_dbus_object_add_interface(dbus, ROOT_PATH"/test",
+                               "org.freedesktop.DBus.Properties", NULL)) {
+               l_info("Unable to instantiate the properties interface");
+               return;
+       }
+
+       l_dbus_add_signal_watch(dbus, "org.test", ROOT_PATH"/test", "org.test",
+                               "PropertyChanged", L_DBUS_MATCH_NONE,
+                               test_old_signal_callback, NULL);
+       l_dbus_add_signal_watch(dbus, "org.test", ROOT_PATH"/test",
+                               "org.freedesktop.DBus.Properties",
+                               "PropertiesChanged", L_DBUS_MATCH_ARGUMENT(0),
+                               "org.test", L_DBUS_MATCH_NONE,
+                               test_new_signal_callback, NULL);
+
+       if (!l_dbus_object_manager_enable(dbus, ROOT_PATH)) {
+               l_info("Unable to enable Object Manager");
+               return;
+       }
+
+       l_dbus_add_signal_watch(dbus, "org.test", ROOT_PATH,
+                               "org.freedesktop.DBus.ObjectManager",
+                               NULL, L_DBUS_MATCH_NONE,
+                               om_signal_callback, NULL);
+
+       l_main_run_with_signal(signal_handler, NULL);
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_signal *sigchld;
+       int i;
+
+       if (!l_main_init())
+               return -1;
+
+       test_add("Legacy properties get", test_old_get, NULL);
+       test_add("Legacy properties set", test_old_set, NULL);
+       test_add("Legacy optional property", test_old_optional_get, NULL);
+       test_add("org.freedesktop.DBus.Properties get", test_new_get, NULL);
+       test_add("org.freedesktop.DBus.Properties set", test_new_set, NULL);
+       test_add("Property changed signals", test_property_signals, NULL);
+       test_add("org.freedesktop.DBus.ObjectManager get",
+                       test_object_manager_get, NULL);
+       test_add("org.freedesktop.DBus.ObjectManager signals",
+                       test_object_manager_signals, NULL);
+
+       sigchld = l_signal_create(SIGCHLD, sigchld_handler, NULL, NULL);
+
+       l_log_set_stderr();
+
+       if (!start_dbus_daemon())
+               return -1;
+
+       for (i = 0; i < 10; i++) {
+               usleep(200 * 1000);
+
+               dbus = l_dbus_new(TEST_BUS_ADDRESS);
+               if (dbus)
+                       break;
+       }
+
+       if (!dbus)
+               goto done;
+
+       test_run();
+
+       l_dbus_destroy(dbus);
+
+done:
+       if (dbus_daemon_pid > 0)
+               kill(dbus_daemon_pid, SIGKILL);
+
+       l_signal_remove(sigchld);
+       l_queue_destroy(tests, l_free);
+
+       l_main_exit();
+
+       if (!success)
+               abort();
+
+       return 0;
+}
diff --git a/unit/test-dbus-service.c b/unit/test-dbus-service.c
new file mode 100644 (file)
index 0000000..85d7abb
--- /dev/null
@@ -0,0 +1,568 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <assert.h>
+#include <stdbool.h>
+
+#include <ell/ell.h>
+#include "ell/dbus-private.h"
+
+struct l_dbus_interface *interface;
+static bool callback_called = false;
+static char *dummy_data = "Foobar";
+
+struct introspect_test {
+       const char *name;
+       const char *expected_xml;
+};
+
+static const struct introspect_test frobate_test = {
+       .name = "Frobate",
+       .expected_xml = "\t\t<method name=\"Frobate\">\n"
+               "\t\t\t<arg name=\"foo\" type=\"i\" direction=\"in\"/>\n"
+               "\t\t\t<arg name=\"bar\" type=\"s\" direction=\"out\"/>\n"
+               "\t\t\t<arg name=\"baz\" type=\"a{us}\" direction=\"out\"/>\n"
+               "\t\t\t<annotation name=\"org.freedesktop.DBus.Deprecated\" "
+               "value=\"true\"/>\n"
+               "\t\t</method>\n",
+};
+
+static const struct introspect_test bazify_test = {
+       .name = "Bazify",
+       .expected_xml = "\t\t<method name=\"Bazify\">\n"
+               "\t\t\t<arg name=\"bar\" type=\"(iiu)\" direction=\"in\"/>\n"
+               "\t\t\t<arg name=\"bar\" type=\"v\" direction=\"out\"/>\n"
+               "\t\t</method>\n",
+};
+
+static const struct introspect_test mogrify_test = {
+       .name = "Mogrify",
+       .expected_xml = "\t\t<method name=\"Mogrify\">\n"
+               "\t\t\t<arg name=\"bar\" type=\"(iiav)\" direction=\"in\"/>\n"
+               "\t\t</method>\n",
+};
+
+static const struct introspect_test changed_test = {
+       .name = "Changed",
+       .expected_xml = "\t\t<signal name=\"Changed\">\n"
+               "\t\t\t<arg name=\"new_value\" type=\"b\"/>\n"
+               "\t\t</signal>\n",
+};
+
+static const struct introspect_test bar_test = {
+       .name = "Bar",
+       .expected_xml = "\t\t<property name=\"Bar\" type=\"y\" "
+               "access=\"readwrite\"/>\n",
+};
+
+static const struct introspect_test interface_test = {
+       .name = "",
+       .expected_xml =
+               "\t<interface name=\"org.freedesktop.SampleInterface\">\n"
+               "\t\t<method name=\"Frobate\">\n"
+               "\t\t\t<arg name=\"foo\" type=\"i\" direction=\"in\"/>\n"
+               "\t\t\t<arg name=\"bar\" type=\"s\" direction=\"out\"/>\n"
+               "\t\t\t<arg name=\"baz\" type=\"a{us}\" direction=\"out\"/>\n"
+               "\t\t\t<annotation name=\"org.freedesktop.DBus.Deprecated\" "
+               "value=\"true\"/>\n"
+               "\t\t</method>\n"
+               "\t\t<method name=\"Bazify\">\n"
+               "\t\t\t<arg name=\"bar\" type=\"(iiu)\" direction=\"in\"/>\n"
+               "\t\t\t<arg name=\"bar\" type=\"v\" direction=\"out\"/>\n"
+               "\t\t</method>\n"
+               "\t\t<method name=\"Mogrify\">\n"
+               "\t\t\t<arg name=\"bar\" type=\"(iiav)\" direction=\"in\"/>\n"
+               "\t\t</method>\n"
+               "\t\t<signal name=\"Changed\">\n"
+               "\t\t\t<arg name=\"new_value\" type=\"b\"/>\n"
+               "\t\t</signal>\n"
+               "\t\t<property name=\"Bar\" type=\"y\" "
+               "access=\"readwrite\"/>\n"
+               "\t</interface>\n",
+};
+
+static void test_introspect_method(const void *test_data)
+{
+       const struct introspect_test *test = test_data;
+       struct _dbus_method *method;
+       struct l_string *buf;
+       char *xml;
+
+       method = _dbus_interface_find_method(interface, test->name);
+       assert(method);
+
+       buf = l_string_new(0);
+       _dbus_method_introspection(method, buf);
+       xml = l_string_unwrap(buf);
+
+       assert(!strcmp(test->expected_xml, xml));
+       l_free(xml);
+}
+
+static void test_introspect_signal(const void *test_data)
+{
+       const struct introspect_test *test = test_data;
+       struct _dbus_signal *signal;
+       struct l_string *buf;
+       char *xml;
+
+       signal = _dbus_interface_find_signal(interface, test->name);
+       assert(signal);
+
+       buf = l_string_new(0);
+       _dbus_signal_introspection(signal, buf);
+       xml = l_string_unwrap(buf);
+
+       assert(!strcmp(test->expected_xml, xml));
+       l_free(xml);
+}
+
+static void test_introspect_property(const void *test_data)
+{
+       const struct introspect_test *test = test_data;
+       struct _dbus_property *property;
+       struct l_string *buf;
+       char *xml;
+
+       property = _dbus_interface_find_property(interface, test->name);
+       assert(property);
+
+       buf = l_string_new(0);
+       _dbus_property_introspection(property, buf);
+       xml = l_string_unwrap(buf);
+
+       assert(!strcmp(test->expected_xml, xml));
+       l_free(xml);
+}
+
+static void test_introspect_interface(const void *test_data)
+{
+       const struct introspect_test *test = test_data;
+       struct l_string *buf;
+       char *xml;
+
+       buf = l_string_new(0);
+       _dbus_interface_introspection(interface, buf);
+       xml = l_string_unwrap(buf);
+
+       assert(!strcmp(test->expected_xml, xml));
+       l_free(xml);
+}
+
+static void test_dbus_object_tree_1(const void *test_data)
+{
+       struct _dbus_object_tree *tree;
+       struct object_node *leaf1, *leaf2, *leaf3;
+       struct object_node *tmp;
+
+       tree = _dbus_object_tree_new();
+       assert(tree);
+
+       leaf1 = _dbus_object_tree_makepath(tree, "/foo/bar/baz");
+       leaf2 = _dbus_object_tree_makepath(tree, "/foo/bar/ble");
+       leaf3 = _dbus_object_tree_makepath(tree, "/foo/bee/boo");
+
+       tmp = _dbus_object_tree_lookup(tree, "/foo");
+       assert(tmp);
+
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bar/baz");
+       assert(tmp);
+       assert(tmp == leaf1);
+
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bar/ble");
+       assert(tmp);
+       assert(tmp == leaf2);
+
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bee/boo");
+       assert(tmp);
+       assert(tmp == leaf3);
+
+       tmp = _dbus_object_tree_lookup(tree, "/foobar");
+       assert(!tmp);
+
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bee");
+       assert(tmp);
+       _dbus_object_tree_prune_node(leaf3);
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bee");
+       assert(!tmp);
+
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bar");
+       assert(tmp);
+       _dbus_object_tree_prune_node(leaf2);
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bar");
+       assert(tmp);
+       _dbus_object_tree_prune_node(leaf1);
+       tmp = _dbus_object_tree_lookup(tree, "/foo/bar");
+       assert(!tmp);
+       tmp = _dbus_object_tree_lookup(tree, "/foo");
+       assert(!tmp);
+
+       tmp = _dbus_object_tree_lookup(tree, "/");
+       assert(tmp);
+
+       _dbus_object_tree_free(tree);
+}
+
+static void setup_dummy_interface(struct l_dbus_interface *iface)
+{
+}
+
+static void interface_destroy(void *data)
+{
+       bool *destroyed = data;
+
+       *destroyed = true;
+}
+
+static void test_dbus_object_tree_2(const void *test_data)
+{
+       struct _dbus_object_tree *tree;
+       bool destroyed[2] = { false, false };
+
+       tree = _dbus_object_tree_new();
+       assert(tree);
+
+       assert(_dbus_object_tree_new_object(tree, "/foo", NULL, NULL));
+       assert(_dbus_object_tree_new_object(tree, "/foo/bar/baz", NULL, NULL));
+
+       assert(_dbus_object_tree_lookup(tree, "/foo"));
+       assert(_dbus_object_tree_lookup(tree, "/foo/bar"));
+       assert(_dbus_object_tree_lookup(tree, "/foo/bar/baz"));
+
+       assert(_dbus_object_tree_register_interface(tree, "org.example",
+                                               setup_dummy_interface,
+                                               interface_destroy, false));
+
+       assert(_dbus_object_tree_add_interface(tree, "/foo",
+                                               "org.example", &destroyed[0]));
+       assert(!_dbus_object_tree_add_interface(tree, "/foo",
+                                               "org.other", NULL));
+       assert(_dbus_object_tree_add_interface(tree, "/foo/bar/baz",
+                                               "org.example", &destroyed[1]));
+
+       assert(!_dbus_object_tree_remove_interface(tree, "/foo", "org.other"));
+       assert(_dbus_object_tree_remove_interface(tree, "/foo", "org.example"));
+       assert(destroyed[0]);
+
+       assert(_dbus_object_tree_object_destroy(tree, "/foo"));
+       assert(!_dbus_object_tree_object_destroy(tree, "/foo/bar"));
+
+       assert(_dbus_object_tree_lookup(tree, "/foo"));
+       assert(_dbus_object_tree_lookup(tree, "/foo/bar"));
+       assert(_dbus_object_tree_lookup(tree, "/foo/bar/baz"));
+
+       destroyed[0] = false;
+       assert(_dbus_object_tree_add_interface(tree, "/foo",
+                                               "org.example", &destroyed[0]));
+
+       assert(_dbus_object_tree_object_destroy(tree, "/foo/bar/baz"));
+
+       assert(_dbus_object_tree_lookup(tree, "/foo"));
+       assert(!_dbus_object_tree_lookup(tree, "/foo/bar"));
+       assert(!_dbus_object_tree_lookup(tree, "/foo/bar/baz"));
+
+       assert(_dbus_object_tree_object_destroy(tree, "/foo"));
+       assert(destroyed[0] && destroyed[1]);
+       assert(!_dbus_object_tree_lookup(tree, "/foo"));
+
+       destroyed[0] = false;
+       assert(_dbus_object_tree_add_interface(tree, "/foo",
+                                               "org.example", &destroyed[0]));
+
+       assert(!_dbus_object_tree_unregister_interface(tree, "org.other"));
+       assert(_dbus_object_tree_unregister_interface(tree, "org.example"));
+       assert(destroyed[0]);
+
+       _dbus_object_tree_free(tree);
+}
+
+#define TEST_3_OBJ_COUNT 20000
+static void test_dbus_object_tree_3(const void *test_data)
+{
+       struct _dbus_object_tree *tree;
+       char path[50];
+       struct l_hashmap *paths;
+       unsigned int count = 0;
+       struct l_dbus_message *message, *reply;
+       struct l_dbus_message_iter objects, interfaces;
+       const char *obj_path;
+
+       tree = _dbus_object_tree_new();
+       assert(tree);
+
+       assert(_dbus_object_tree_register_interface(tree, "org.example",
+                                               setup_dummy_interface,
+                                               NULL, false));
+
+       srand48(50);
+       paths = l_hashmap_string_new();
+       while (count < TEST_3_OBJ_COUNT) {
+               unsigned int len = 0;
+               unsigned int subpath_len = 0;
+               bool repeat;
+
+               /* Generate a random legal path composed of a, b and / chars */
+               path[len++] = '/';
+
+               while (len < sizeof(path) - 1) {
+                       const char *allowed;
+                       char ch;
+
+                       if (subpath_len)
+                               allowed = "aabb/E";
+                       else /* At least one letter required after a / */
+                               allowed = "ab";
+
+                       ch = allowed[lrand48() % strlen(allowed)];
+
+                       if (ch == 'E')
+                               break;
+                       else if (ch == '/')
+                               subpath_len = 0;
+                       else
+                               subpath_len++;
+
+                       path[len++] = ch;
+               }
+
+               /* Last character can't be a / */
+               if (path[len - 1] == '/')
+                       len--;
+               path[len] = '\0';
+
+               repeat = l_hashmap_lookup(paths, path) != NULL;
+
+               assert(_dbus_object_tree_add_interface(tree, path,
+                                       "org.example", NULL) == !repeat);
+
+               if (!repeat) {
+                       l_hashmap_insert(paths, path, path);
+                       count++;
+               }
+       }
+
+       assert(_dbus_object_tree_add_interface(tree, "/",
+                                       L_DBUS_INTERFACE_OBJECT_MANAGER, NULL));
+       l_hashmap_insert(paths, "/", path);
+
+       message = _dbus_message_new_method_call(1, "org.example", "/",
+                                               L_DBUS_INTERFACE_OBJECT_MANAGER,
+                                               "GetManagedObjects");
+       l_dbus_message_set_arguments(message, "");
+       _dbus_message_set_serial(message, 0);
+
+       reply = _dbus_object_tree_get_objects(tree, NULL, "/", message);
+       assert(reply);
+       assert(!l_dbus_message_get_error(reply, NULL, NULL));
+       assert(l_dbus_message_get_arguments(reply, "a{oa{sa{sv}}}", &objects));
+
+       while (l_dbus_message_iter_next_entry(&objects, &obj_path, &interfaces))
+               assert(l_hashmap_remove(paths, obj_path));
+
+       l_dbus_message_unref(message);
+       l_dbus_message_unref(reply);
+
+       assert(l_hashmap_isempty(paths));
+       l_hashmap_destroy(paths, NULL);
+
+       assert(_dbus_object_tree_remove_interface(tree, "/",
+                                       L_DBUS_INTERFACE_OBJECT_MANAGER));
+
+       assert(_dbus_object_tree_unregister_interface(tree, "org.example"));
+       _dbus_object_tree_free(tree);
+}
+
+static struct l_dbus_message *get_modems_callback(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       void *user_data)
+{
+       assert(user_data == dummy_data);
+       callback_called = true;
+
+       return NULL;
+}
+
+static void build_manager_interface(struct l_dbus_interface *iface)
+{
+       l_dbus_interface_method(iface, "GetModems", 0, get_modems_callback,
+                               "a(oa{sv})", "", "modems");
+       l_dbus_interface_signal(iface, "ModemAdded", 0,
+                               "oa{sv}", "path", "properties");
+       l_dbus_interface_signal(iface, "ModemRemoved", 0,
+                               "o", "path");
+}
+
+static const char *ofono_manager_introspection =
+       "<!DOCTYPE node PUBLIC \""
+       "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
+       "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
+       "<node>\n"
+       "\t<interface name=\"org.freedesktop.DBus.Introspectable\">\n"
+       "\t\t<method name=\"Introspect\">\n"
+       "\t\t\t<arg name=\"xml\" type=\"s\" direction=\"out\"/>\n"
+       "\t\t</method>\n\t</interface>\n"
+       "\t<interface name=\"org.ofono.Manager\">\n"
+       "\t\t<method name=\"GetModems\">\n"
+       "\t\t\t<arg name=\"modems\" type=\"a(oa{sv})\" direction=\"out\"/>\n"
+       "\t\t</method>\n"
+       "\t\t<signal name=\"ModemAdded\">\n"
+       "\t\t\t<arg name=\"path\" type=\"o\"/>\n"
+       "\t\t\t<arg name=\"properties\" type=\"a{sv}\"/>\n"
+       "\t\t</signal>\n"
+       "\t\t<signal name=\"ModemRemoved\">\n"                                          "\t\t\t<arg name=\"path\" type=\"o\"/>\n"
+       "\t\t</signal>\n\t</interface>\n"
+       "\t<node name=\"phonesim\"/>\n"
+       "</node>\n";
+
+static void test_dbus_object_tree_introspection(const void *test_data)
+{
+       struct _dbus_object_tree *tree;
+       struct l_string *buf;
+       char *xml;
+
+       tree = _dbus_object_tree_new();
+
+       _dbus_object_tree_register_interface(tree, "org.ofono.Manager",
+                                               build_manager_interface,
+                                               NULL, false);
+       _dbus_object_tree_add_interface(tree, "/", "org.ofono.Manager", NULL);
+
+       _dbus_object_tree_makepath(tree, "/phonesim");
+
+       buf = l_string_new(1024);
+       _dbus_object_tree_introspect(tree, "/", buf);
+       xml = l_string_unwrap(buf);
+       assert(!strcmp(ofono_manager_introspection, xml));
+       l_free(xml);
+
+       _dbus_object_tree_free(tree);
+}
+
+static void test_dbus_object_tree_dispatch(const void *test_data)
+{
+       struct _dbus_object_tree *tree;
+       struct l_dbus_message *message;
+
+       tree = _dbus_object_tree_new();
+
+       _dbus_object_tree_register_interface(tree, "org.ofono.Manager",
+                                               build_manager_interface,
+                                               NULL, false);
+       _dbus_object_tree_add_interface(tree, "/", "org.ofono.Manager",
+                                       dummy_data);
+
+       message = _dbus_message_new_method_call(1, "org.ofono", "/",
+                                               "org.ofono.Manager",
+                                               "GetModems");
+       l_dbus_message_set_arguments(message, "");
+
+       _dbus_object_tree_dispatch(tree, NULL, message);
+       assert(callback_called);
+
+       l_dbus_message_unref(message);
+
+       _dbus_object_tree_free(tree);
+}
+
+static bool test_property_getter(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_builder *builder,
+                                       void *if_user_data)
+{
+       return true;
+}
+
+static struct l_dbus_message *test_property_setter(struct l_dbus *dbus,
+                                       struct l_dbus_message *message,
+                                       struct l_dbus_message_iter *new_value,
+                                       l_dbus_property_complete_cb_t complete,
+                                       void *user_data)
+{
+       return NULL;
+}
+
+int main(int argc, char *argv[])
+{
+       int ret;
+
+       interface = _dbus_interface_new("org.freedesktop.SampleInterface");
+
+       l_test_init(&argc, &argv);
+
+       l_dbus_interface_method(interface, "Frobate",
+                               L_DBUS_METHOD_FLAG_DEPRECATED,
+                               NULL, "sa{us}", "i", "bar", "baz", "foo");
+       l_dbus_interface_method(interface, "Bazify", 0, NULL, "v", "(iiu)",
+                               "bar", "bar");
+       l_dbus_interface_method(interface, "Mogrify", 0, NULL, "",
+                               "(iiav)", "bar");
+
+       l_dbus_interface_signal(interface, "Changed", 0, "b", "new_value");
+
+       l_dbus_interface_property(interface, "Bar", 0, "y",
+                                       test_property_getter,
+                                       test_property_setter);
+
+       l_test_add("Test Frobate Introspection", test_introspect_method,
+                       &frobate_test);
+       l_test_add("Test Bazify Introspection", test_introspect_method,
+                       &bazify_test);
+       l_test_add("Test Mogrify Introspection", test_introspect_method,
+                       &mogrify_test);
+
+       l_test_add("Test Changed Introspection", test_introspect_signal,
+                       &changed_test);
+
+       l_test_add("Test Bar Property Introspection", test_introspect_property,
+                       &bar_test);
+
+       l_test_add("Test Interface Introspection", test_introspect_interface,
+                       &interface_test);
+
+       l_test_add("_dbus_object_tree Sanity Tests 1",
+                                       test_dbus_object_tree_1, NULL);
+
+       l_test_add("_dbus_object_tree Sanity Tests 2",
+                                       test_dbus_object_tree_2, NULL);
+
+       l_test_add("_dbus_object_tree Sanity Tests 3",
+                                       test_dbus_object_tree_3, NULL);
+
+       l_test_add("_dbus_object_tree Introspection",
+                                       test_dbus_object_tree_introspection,
+                                       NULL);
+
+       l_test_add("_dbus_object_tree Dispatcher",
+                                       test_dbus_object_tree_dispatch,
+                                       NULL);
+
+       ret = l_test_run();
+
+       _dbus_interface_free(interface);
+
+       return ret;
+}
diff --git a/unit/test-dbus-util.c b/unit/test-dbus-util.c
new file mode 100644 (file)
index 0000000..c3562d5
--- /dev/null
@@ -0,0 +1,197 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+#include "ell/dbus-private.h"
+
+struct signature_test {
+       bool valid;
+       const char *signature;
+};
+
+#define SIGNATURE_TEST(v, sig, i)                              \
+       static struct signature_test sig_test##i = {            \
+               .valid = v,                                     \
+               .signature = sig,                               \
+       }
+
+SIGNATURE_TEST(false, "a", 1);
+SIGNATURE_TEST(false, "a{vs}", 2);
+SIGNATURE_TEST(true, "(ss)", 3);
+SIGNATURE_TEST(true, "(s(ss))", 4);
+SIGNATURE_TEST(true, "as", 5);
+SIGNATURE_TEST(true, "ab", 6);
+SIGNATURE_TEST(true, "aas", 7);
+SIGNATURE_TEST(true, "a(ss)", 8);
+SIGNATURE_TEST(true, "asas", 9);
+SIGNATURE_TEST(true, "av", 10);
+SIGNATURE_TEST(true, "a{sv}", 11);
+SIGNATURE_TEST(true, "v", 12);
+SIGNATURE_TEST(true, "oa{sv}", 13);
+SIGNATURE_TEST(true, "a(oa{sv})", 14);
+SIGNATURE_TEST(true, "(sa{sv})sa{ss}us", 15);
+SIGNATURE_TEST(true, "(bba{ss})", 16);
+
+static void test_signature(const void *test_data)
+{
+       const struct signature_test *test = test_data;
+       bool valid;
+
+       valid = _dbus_valid_signature(test->signature);
+
+       assert(valid == test->valid);
+}
+
+struct interface_test {
+       bool valid;
+       const char *interface;
+};
+
+#define INTERFACE_TEST(v, iface, i)                            \
+       static struct interface_test iface_test##i = {          \
+               .valid = v,                                     \
+               .interface = iface,                             \
+       }
+
+INTERFACE_TEST(false, "org", 1);
+INTERFACE_TEST(true, "org.foobar", 2);
+INTERFACE_TEST(false, ".", 3);
+INTERFACE_TEST(false, "org.", 4);
+INTERFACE_TEST(false, "org.0bar", 5);
+INTERFACE_TEST(false, "org.bar-", 6);
+INTERFACE_TEST(true, "org.bar.baz", 7);
+INTERFACE_TEST(false, "org.bar.", 8);
+INTERFACE_TEST(true, "org.a.b.c", 9);
+
+static void test_interface(const void *test_data)
+{
+       const struct interface_test *test = test_data;
+       bool valid;
+
+       valid = _dbus_valid_interface(test->interface);
+
+       assert(valid == test->valid);
+}
+
+struct method_test {
+       bool valid;
+       const char *method;
+};
+
+#define METHOD_TEST(v, m, i)                                   \
+       static struct method_test method_test##i = {            \
+               .valid = v,                                     \
+               .method = m,                                    \
+       }
+
+METHOD_TEST(false, "0Bar", 1);
+METHOD_TEST(true, "Bar", 2);
+
+static void test_method(const void *test_data)
+{
+       const struct method_test *test = test_data;
+       bool valid;
+
+       valid = _dbus_valid_method(test->method);
+
+       assert(valid == test->valid);
+}
+
+struct bus_name_test {
+       bool valid;
+       const char *bus_name;
+};
+
+#define BUS_NAME_TEST(v, name, i)                              \
+       static struct bus_name_test bus_name_test##i = {        \
+               .valid = v,                                     \
+               .bus_name = name,                               \
+       }
+
+BUS_NAME_TEST(false, "org", 1);
+BUS_NAME_TEST(true, "org.foobar", 2);
+BUS_NAME_TEST(false, ".", 3);
+BUS_NAME_TEST(false, "0Bar", 4);
+BUS_NAME_TEST(true, "org.foo-bar", 5);
+BUS_NAME_TEST(false, ":1.2f", 6);
+BUS_NAME_TEST(true, ":1.2", 7);
+
+static void test_bus_name(const void *test_data)
+{
+       const struct bus_name_test *test = test_data;
+       bool valid;
+
+       valid = _dbus_valid_bus_name(test->bus_name);
+
+       assert(valid == test->valid);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Signature Test 1", test_signature, &sig_test1);
+       l_test_add("Signature test 2", test_signature, &sig_test2);
+       l_test_add("Signature test 3", test_signature, &sig_test3);
+       l_test_add("Signature test 4", test_signature, &sig_test4);
+       l_test_add("Signature test 5", test_signature, &sig_test5);
+       l_test_add("Signature test 6", test_signature, &sig_test6);
+       l_test_add("Signature test 7", test_signature, &sig_test7);
+       l_test_add("Signature test 8", test_signature, &sig_test8);
+       l_test_add("Signature test 9", test_signature, &sig_test9);
+       l_test_add("Signature test 10", test_signature, &sig_test10);
+       l_test_add("Signature test 11", test_signature, &sig_test11);
+       l_test_add("Signature test 12", test_signature, &sig_test12);
+       l_test_add("Signature test 13", test_signature, &sig_test13);
+       l_test_add("Signature test 14", test_signature, &sig_test14);
+       l_test_add("Signature test 15", test_signature, &sig_test15);
+       l_test_add("Signature test 16", test_signature, &sig_test16);
+
+       l_test_add("Interface Test 1", test_interface, &iface_test1);
+       l_test_add("Interface Test 2", test_interface, &iface_test2);
+       l_test_add("Interface Test 3", test_interface, &iface_test3);
+       l_test_add("Interface Test 4", test_interface, &iface_test4);
+       l_test_add("Interface Test 5", test_interface, &iface_test5);
+       l_test_add("Interface Test 6", test_interface, &iface_test6);
+       l_test_add("Interface Test 7", test_interface, &iface_test7);
+       l_test_add("Interface Test 8", test_interface, &iface_test8);
+       l_test_add("Interface Test 9", test_interface, &iface_test9);
+
+       l_test_add("Method Test 1", test_method, &method_test1);
+       l_test_add("Method Test 2", test_method, &method_test2);
+
+       l_test_add("Bus Name Test 1", test_bus_name, &bus_name_test1);
+       l_test_add("Bus Name Test 2", test_bus_name, &bus_name_test2);
+       l_test_add("Bus Name Test 3", test_bus_name, &bus_name_test3);
+       l_test_add("Bus Name Test 4", test_bus_name, &bus_name_test4);
+       l_test_add("Bus Name Test 5", test_bus_name, &bus_name_test5);
+       l_test_add("Bus Name Test 6", test_bus_name, &bus_name_test6);
+       l_test_add("Bus Name Test 7", test_bus_name, &bus_name_test7);
+
+       return l_test_run();
+}
diff --git a/unit/test-dbus-watch.c b/unit/test-dbus-watch.c
new file mode 100644 (file)
index 0000000..029d71c
--- /dev/null
@@ -0,0 +1,295 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+#include "ell/dbus-private.h"
+#include "ell/private.h"
+
+#define DBUS_SERVICE_DBUS      "org.freedesktop.DBus"
+#define DBUS_PATH_DBUS         "/org/freedesktop/DBus"
+#define DBUS_INTERFACE_DBUS    "org.freedesktop.DBus"
+
+static void test_rule_to_str(const void *test_data)
+{
+       static const struct _dbus_filter_condition rule1[] = {
+               { L_DBUS_MATCH_TYPE, "signal" },
+               { L_DBUS_MATCH_SENDER, DBUS_SERVICE_DBUS },
+               { L_DBUS_MATCH_PATH, DBUS_PATH_DBUS },
+               { L_DBUS_MATCH_INTERFACE, DBUS_INTERFACE_DBUS },
+               { L_DBUS_MATCH_MEMBER, "NameOwnerChanged" },
+               { L_DBUS_MATCH_ARGUMENT(0), ":1.101" }
+       };
+       static const char *expected1 = "type='signal',"
+               "sender='org.freedesktop.DBus',"
+               "path='/org/freedesktop/DBus',"
+               "interface='org.freedesktop.DBus',"
+               "member='NameOwnerChanged',"
+               "arg0=':1.101'";
+       static const struct _dbus_filter_condition rule2[] = {
+               { L_DBUS_MATCH_ARGUMENT(0), "'" },
+               { L_DBUS_MATCH_ARGUMENT(1), "\\" },
+               { L_DBUS_MATCH_ARGUMENT(2), "," },
+               { L_DBUS_MATCH_ARGUMENT(3), "\\\\" }
+       };
+       static const char *expected2 =
+               "arg0=''\\''',arg1='\\',arg2=',',arg3='\\\\'";
+       char *str;
+
+       str = _dbus_filter_rule_to_str(rule1, L_ARRAY_SIZE(rule1));
+       assert(str && !strcmp(str, expected1));
+       l_free(str);
+
+       str = _dbus_filter_rule_to_str(rule2, L_ARRAY_SIZE(rule2));
+       assert(str && !strcmp(str, expected2));
+       l_free(str);
+}
+
+struct l_dbus {
+};
+
+struct filter_test_state {
+       struct l_dbus dbus;
+       const struct _dbus_filter_condition *expected_rule;
+       int expected_rule_len;
+       unsigned int expected_id, new_id;
+       int calls[5];
+};
+
+static void rule_compare(const struct _dbus_filter_condition *a, int len_a,
+                       const struct _dbus_filter_condition *b, int len_b)
+{
+       int i, j;
+       bool matched[len_a];
+
+       assert(len_a == len_b);
+
+       for (i = 0; i < len_a; i++)
+               matched[i] = false;
+
+       for (i = 0; i < len_a; i++) {
+               for (j = 0; j < len_a; j++)
+                       if (!matched[j] && a[i].type == b[j].type &&
+                                       !strcmp(a[i].value, b[j].value))
+                               break;
+
+               assert(j < len_a);
+               matched[j] = true;
+       }
+}
+
+static bool test_add_match(struct l_dbus *dbus, unsigned int id,
+                               const struct _dbus_filter_condition *rule,
+                               int rule_len)
+{
+       struct filter_test_state *test =
+               l_container_of(dbus, struct filter_test_state, dbus);
+
+       assert(test->expected_rule);
+
+       rule_compare(test->expected_rule, test->expected_rule_len,
+                       rule, rule_len);
+
+       test->new_id = id;
+       test->expected_rule = NULL;
+
+       return true;
+}
+
+static bool test_remove_match(struct l_dbus *dbus, unsigned int id)
+{
+       struct filter_test_state *test =
+               l_container_of(dbus, struct filter_test_state, dbus);
+
+       assert(test->expected_id == id && id);
+
+       test->expected_id = 0;
+
+       return true;
+}
+
+static void test_rule1_cb(struct l_dbus_message *message, void *user_data)
+{
+       struct filter_test_state *test = user_data;
+
+       test->calls[0]++;
+}
+
+static void test_rule2_cb(struct l_dbus_message *message, void *user_data)
+{
+       struct filter_test_state *test = user_data;
+
+       test->calls[1]++;
+}
+
+static void test_rule3_cb(struct l_dbus_message *message, void *user_data)
+{
+       struct filter_test_state *test = user_data;
+
+       test->calls[2]++;
+}
+
+static void test_rule4_cb(struct l_dbus_message *message, void *user_data)
+{
+       struct filter_test_state *test = user_data;
+
+       test->calls[3]++;
+}
+
+static void test_rule5_cb(struct l_dbus_message *message, void *user_data)
+{
+       struct filter_test_state *test = user_data;
+
+       test->calls[4]++;
+}
+
+static void test_filter_tree(const void *test_data)
+{
+       struct _dbus_filter *filter;
+       struct filter_test_state test = { .calls = { 0, 0, 0, 0 } };
+       static const struct _dbus_filter_ops filter_ops = {
+               .skip_register = true,
+               .add_match = test_add_match,
+               .remove_match = test_remove_match,
+       };
+       static const struct _dbus_filter_condition rule123[] = {
+               { L_DBUS_MATCH_TYPE, "signal" },
+               { L_DBUS_MATCH_SENDER, DBUS_SERVICE_DBUS },
+               { L_DBUS_MATCH_PATH, DBUS_PATH_DBUS },
+               { L_DBUS_MATCH_INTERFACE, DBUS_INTERFACE_DBUS },
+               { L_DBUS_MATCH_MEMBER, "NameOwnerChanged" },
+               { L_DBUS_MATCH_ARGUMENT(0), "org.test" }
+       };
+       static const struct _dbus_filter_condition rule45[] = {
+               { L_DBUS_MATCH_TYPE, "signal" },
+               { L_DBUS_MATCH_PATH, "/" },
+               { L_DBUS_MATCH_SENDER, "org.foo" },
+       };
+       unsigned int id1, id2, id3, id4, id5, internal_id1, internal_id4;
+       struct l_dbus_message *message;
+
+       filter = _dbus_filter_new(&test.dbus, &filter_ops, NULL);
+       assert(filter);
+
+       test.expected_rule = rule123;
+       test.expected_rule_len = 2;
+       id1 = _dbus_filter_add_rule(filter, rule123, 2, test_rule1_cb, &test);
+       assert(id1);
+       assert(!test.expected_rule);
+       internal_id1 = test.new_id;
+
+       id2 = _dbus_filter_add_rule(filter, rule123, 4, test_rule2_cb, &test);
+       id3 = _dbus_filter_add_rule(filter, rule123, 6, test_rule3_cb, &test);
+       assert(id2 && id3 && id2 != id1 && id3 != id1 && id3 != id2);
+
+       test.expected_rule = rule45;
+       test.expected_rule_len = 2;
+       id4 = _dbus_filter_add_rule(filter, rule45, 2, test_rule4_cb, &test);
+       assert(id4 && id4 != id1 && id4 != id2 && id4 != id3);
+       assert(!test.expected_rule);
+       internal_id4 = test.new_id;
+
+       id5 = _dbus_filter_add_rule(filter, rule45, 3, test_rule5_cb, &test);
+       assert(id5 && id5 != id1 && id5 != id2 && id5 != id3 && id5 != id4);
+
+       assert(test.calls[0] == 0 && test.calls[1] == 0 &&
+                       test.calls[2] == 0 && test.calls[3] == 0 &&
+                       test.calls[4] == 0);
+
+       message = _dbus_message_new_signal(2, DBUS_PATH_DBUS,
+                                               DBUS_INTERFACE_DBUS,
+                                               "NameOwnerChanged");
+       l_dbus_message_set_arguments(message, "sss", "org.test",
+                                       "", ":1.101");
+       _dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
+       _dbus_filter_dispatch(message, filter);
+       _dbus_message_set_sender(message, NULL);
+       l_dbus_message_unref(message);
+
+       message = _dbus_message_new_signal(2, DBUS_PATH_DBUS,
+                                               DBUS_INTERFACE_DBUS,
+                                               "NameOwnerChanged");
+       l_dbus_message_set_arguments(message, "");
+       _dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
+       _dbus_filter_dispatch(message, filter);
+       _dbus_message_set_sender(message, NULL);
+       l_dbus_message_unref(message);
+
+       message = _dbus_message_new_signal(2, DBUS_PATH_DBUS, "foo", "Bar");
+       l_dbus_message_set_arguments(message, "");
+       _dbus_message_set_sender(message, DBUS_SERVICE_DBUS);
+       _dbus_filter_dispatch(message, filter);
+       _dbus_message_set_sender(message, NULL);
+       l_dbus_message_unref(message);
+
+       message = _dbus_message_new_signal(2, "/", "foo", "Bar");
+       l_dbus_message_set_arguments(message, "");
+       _dbus_message_set_sender(message, "org.foo");
+       _dbus_filter_dispatch(message, filter);
+
+       _dbus_message_set_sender(message, "org.bar");
+       _dbus_filter_dispatch(message, filter);
+       _dbus_message_set_sender(message, NULL);
+       l_dbus_message_unref(message);
+
+       assert(test.calls[0] == 3 && test.calls[1] == 2 &&
+                       test.calls[2] == 1 && test.calls[3] == 2 &&
+                       test.calls[4] == 1);
+
+       test.expected_id = 0;
+       assert(_dbus_filter_remove_rule(filter, id2));
+
+       assert(_dbus_filter_remove_rule(filter, id1));
+
+       assert(_dbus_filter_remove_rule(filter, id5));
+
+       test.expected_id = internal_id4;
+       assert(_dbus_filter_remove_rule(filter, id4));
+       assert(!test.expected_id);
+
+       test.expected_id = internal_id1;
+       assert(_dbus_filter_remove_rule(filter, id3));
+       assert(!test.expected_id);
+
+       _dbus_filter_free(filter);
+
+       assert(test.calls[0] == 3 && test.calls[1] == 2 &&
+                       test.calls[2] == 1 && test.calls[3] == 2 &&
+                       test.calls[4] == 1);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("_dbus_filter_rule_to_str", test_rule_to_str, NULL);
+
+       l_test_add("DBus filter tree", test_filter_tree, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-dbus.c b/unit/test-dbus.c
new file mode 100644 (file)
index 0000000..67f0a7b
--- /dev/null
@@ -0,0 +1,259 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+
+#include <ell/ell.h>
+
+#ifndef WAIT_ANY
+#define WAIT_ANY (-1) /* Any process */
+#endif
+
+#define TEST_BUS_ADDRESS "unix:path=/tmp/ell-test-bus"
+
+static pid_t dbus_daemon_pid = -1;
+
+static void start_dbus_daemon(void)
+{
+       char *prg_argv[5];
+       char *prg_envp[1];
+       pid_t pid;
+
+       prg_argv[0] = "/usr/bin/dbus-daemon";
+       prg_argv[1] = "--nopidfile";
+       prg_argv[2] = "--nofork";
+       prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
+       prg_argv[4] = NULL;
+
+       prg_envp[0] = NULL;
+
+       l_info("launching dbus-daemon");
+
+       pid = fork();
+       if (pid < 0) {
+               l_error("failed to fork new process");
+               return;
+       }
+
+       if (pid == 0) {
+               execve(prg_argv[0], prg_argv, prg_envp);
+               exit(EXIT_SUCCESS);
+       }
+
+       l_info("dbus-daemon process %d created", pid);
+
+       dbus_daemon_pid = pid;
+}
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void sigchld_handler(void *user_data)
+{
+       while (1) {
+               pid_t pid;
+               int status;
+
+               pid = waitpid(WAIT_ANY, &status, WNOHANG);
+               if (pid < 0 || pid == 0)
+                       break;
+
+               l_info("process %d terminated with status=%d\n", pid, status);
+
+               if (pid == dbus_daemon_pid) {
+                       dbus_daemon_pid = -1;
+                       l_main_quit();
+               }
+       }
+}
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void signal_message(struct l_dbus_message *message, void *user_data)
+{
+       const char *path, *interface, *member, *destination, *sender;
+
+       path = l_dbus_message_get_path(message);
+       destination = l_dbus_message_get_destination(message);
+
+       l_info("path=%s destination=%s", path, destination);
+
+       interface = l_dbus_message_get_interface(message);
+       member = l_dbus_message_get_member(message);
+
+       l_info("interface=%s member=%s", interface, member);
+
+       sender = l_dbus_message_get_sender(message);
+
+       l_info("sender=%s", sender);
+
+       if (!strcmp(member, "NameOwnerChanged")) {
+               const char *name, *old_owner, *new_owner;
+
+               if (!l_dbus_message_get_arguments(message, "sss",
+                                       &name, &old_owner, &new_owner))
+                       return;
+
+               l_info("name=%s old=%s new=%s", name, old_owner, new_owner);
+       }
+}
+
+static void request_name_setup(struct l_dbus_message *message, void *user_data)
+{
+       const char *name = "org.test";
+
+       l_dbus_message_set_arguments(message, "su", name, 0);
+}
+
+static void request_name_callback(struct l_dbus_message *message,
+                                                       void *user_data)
+{
+       const char *error, *text;
+       uint32_t result;
+
+       if (l_dbus_message_get_error(message, &error, &text)) {
+               l_error("error=%s", error);
+               l_error("message=%s", text);
+               goto done;
+       }
+
+       if (!l_dbus_message_get_arguments(message, "u", &result))
+               goto done;
+
+       l_info("request name result=%d", result);
+
+done:
+       l_main_quit();
+}
+
+static const char *match_rule = "type=signal,sender=org.freedesktop.DBus";
+
+static void add_match_setup(struct l_dbus_message *message, void *user_data)
+{
+       l_dbus_message_set_arguments(message, "s", match_rule);
+}
+
+static void add_match_callback(struct l_dbus_message *message, void *user_data)
+{
+       const char *error, *text;
+
+       if (l_dbus_message_get_error(message, &error, &text)) {
+               l_error("error=%s", error);
+               l_error("message=%s", text);
+               return;
+       }
+
+       if (!l_dbus_message_get_arguments(message, ""))
+               return;
+
+       l_info("add match");
+}
+
+static void ready_callback(void *user_data)
+{
+       l_info("ready");
+}
+
+static void disconnect_callback(void *user_data)
+{
+       l_main_quit();
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_dbus *dbus;
+       struct l_signal *sigchld;
+       int i;
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       start_dbus_daemon();
+
+       for (i = 0; i < 10; i++) {
+               usleep(200 * 1000);
+
+               dbus = l_dbus_new(TEST_BUS_ADDRESS);
+               if (dbus)
+                       break;
+       }
+
+       sigchld = l_signal_create(SIGCHLD, sigchld_handler, NULL, NULL);
+
+       if (!dbus)
+               goto done;
+
+       l_dbus_set_debug(dbus, do_debug, "[DBUS] ", NULL);
+
+       l_dbus_set_ready_handler(dbus, ready_callback, dbus, NULL);
+       l_dbus_set_disconnect_handler(dbus, disconnect_callback, NULL, NULL);
+
+       l_dbus_register(dbus, signal_message, NULL, NULL);
+
+       l_dbus_method_call(dbus, "org.freedesktop.DBus",
+                               "/org/freedesktop/DBus",
+                               "org.freedesktop.DBus", "AddMatch",
+                               add_match_setup,
+                               add_match_callback, NULL, NULL);
+
+       l_dbus_method_call(dbus, "org.freedesktop.DBus",
+                               "/org/freedesktop/DBus",
+                               "org.freedesktop.DBus", "RequestName",
+                               request_name_setup,
+                               request_name_callback, NULL, NULL);
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+       l_dbus_destroy(dbus);
+
+done:
+       if (dbus_daemon_pid > 0)
+               kill(dbus_daemon_pid, SIGKILL);
+
+       l_signal_remove(sigchld);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/unit/test-dhcp.c b/unit/test-dhcp.c
new file mode 100644 (file)
index 0000000..d825401
--- /dev/null
@@ -0,0 +1,771 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <linux/types.h>
+#include <netinet/ip.h>
+#include <linux/if_arp.h>
+#include <errno.h>
+
+#include <ell/ell.h>
+#include "ell/dhcp-private.h"
+
+static bool verbose = false;
+static uint8_t client_packet[1024];
+static size_t client_packet_len;
+
+static void test_request_option(const void *data)
+{
+       struct l_dhcp_client *dhcp;
+
+       dhcp = l_dhcp_client_new(0);
+       assert(dhcp);
+
+       assert(!l_dhcp_client_add_request_option(NULL, 0));
+
+       assert(l_dhcp_client_add_request_option(dhcp,
+                                               L_DHCP_OPTION_SUBNET_MASK));
+       assert(l_dhcp_client_add_request_option(dhcp,
+                                               L_DHCP_OPTION_ROUTER));
+       assert(l_dhcp_client_add_request_option(dhcp,
+                                               L_DHCP_OPTION_HOST_NAME));
+       assert(l_dhcp_client_add_request_option(dhcp,
+                                               L_DHCP_OPTION_DOMAIN_NAME));
+       assert(l_dhcp_client_add_request_option(dhcp,
+                                       L_DHCP_OPTION_DOMAIN_NAME_SERVER));
+       assert(l_dhcp_client_add_request_option(dhcp,
+                                       L_DHCP_OPTION_NTP_SERVERS));
+       assert(!l_dhcp_client_add_request_option(dhcp, 0));
+       assert(!l_dhcp_client_add_request_option(dhcp, 255));
+       assert(!l_dhcp_client_add_request_option(dhcp, 52));
+       assert(!l_dhcp_client_add_request_option(dhcp, 53));
+       assert(!l_dhcp_client_add_request_option(dhcp, 55));
+
+       assert(l_dhcp_client_add_request_option(dhcp, 33));
+       assert(l_dhcp_client_add_request_option(dhcp, 44));
+
+       l_dhcp_client_destroy(dhcp);
+}
+
+static void test_invalid_message_length(const void *data)
+{
+       struct dhcp_message message;
+       struct dhcp_message_iter iter;
+
+       memset(&message, 0, sizeof(message));
+       assert(!_dhcp_message_iter_init(&iter, NULL, 0));
+       assert(!_dhcp_message_iter_init(&iter, &message, sizeof(message)));
+}
+
+static void test_cookie(const void *data)
+{
+       struct dhcp_message *message;
+       size_t len = sizeof(struct dhcp_message);
+       uint8_t *opt;
+       struct dhcp_message_iter iter;
+
+       message = (struct dhcp_message *) l_new(uint8_t, len);
+       opt = (uint8_t *)(&message->magic);
+       opt[0] = 0xff;
+
+       assert(!_dhcp_message_iter_init(&iter, message, len));
+
+       opt[0] = 99;
+       opt[1] = 130;
+       opt[2] = 83;
+       opt[3] = 99;
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(!_dhcp_message_iter_next(&iter, NULL, NULL, NULL));
+
+       l_free(message);
+}
+
+struct option_test {
+       uint8_t sname[64];
+       int snamelen;
+       uint8_t file[128];
+       int filelen;
+       uint8_t options[128];
+       int len;
+};
+
+static const struct option_test option_test_1 = {
+       .options = { 42, 5, 65, 66, 67, 68, 69 },
+       .len = 7,
+};
+
+static const struct option_test option_test_2 = {
+       .options = { 42, 5, 65, 66, 67, 68, 69, 0, 0, 53, 1, 5 },
+       .len = 12,
+};
+
+static const struct option_test option_test_3 = {
+       .options = { 8, 255, 70, 71, 72 },
+       .len = 5,
+};
+
+static const struct option_test option_test_4 = {
+       .options = { 0x35, 0x01, 0x05, 0x36, 0x04, 0x01, 0x00, 0xa8,
+                       0xc0, 0x33, 0x04, 0x00, 0x01, 0x51, 0x80, 0x01,
+                       0x04, 0xff, 0xff, 0xff, 0x00, 0x03, 0x04, 0xc0,
+                       0xa8, 0x00, 0x01, 0x06, 0x04, 0xc0, 0xa8, 0x00,
+                       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
+       .len = 40,
+};
+
+static const struct option_test option_test_5 = {
+       .options = { 53, 1, 2, 42, 3, 0, 0, 0 },
+       .len =  8,
+};
+
+static const struct option_test option_test_6 = {
+       .options = { 42, 2, 1, 2, 44 },
+       .len = 5,
+};
+
+static const struct option_test option_test_7 = {
+       .file = { 222, 3, 1, 2, 3, 53, 1, 6 },
+       .filelen = 8,
+       .options = { 52, 0x1, 0x1 },
+       .len = 3,
+};
+
+static const struct option_test option_test_8 = {
+       .sname = { 1, 4, 1, 2, 3, 4, 53, 1, 5 },
+       .snamelen = 9,
+       .file = { 222, 3, 1, 2, 3 },
+       .filelen = 5,
+       .options = { 52, 0x1, 0x3 },
+       .len = 3,
+};
+
+static struct dhcp_message *create_message(const struct option_test *test,
+                                               size_t *out_len)
+{
+       struct dhcp_message *message;
+       size_t len = sizeof(struct dhcp_message) + test->len;
+       uint8_t *opt;
+
+       message = (struct dhcp_message *) l_new(uint8_t, len);
+       opt = (uint8_t *)(&message->magic);
+
+       opt[0] = 99;
+       opt[1] = 130;
+       opt[2] = 83;
+       opt[3] = 99;
+
+       if (test->len)
+               memcpy(&opt[4], test->options, test->len);
+
+       if (test->filelen <= 128)
+               memcpy(&message->file, test->file, test->filelen);
+
+       if (test->snamelen <= 64)
+               memcpy(&message->sname, test->sname, test->snamelen);
+
+       if (out_len)
+               *out_len = len;
+
+       return message;
+}
+
+static void test_option_1(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t,l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 42);
+       assert(l == 5);
+       assert(!_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       l_free(message);
+}
+
+static void test_option_2(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t,l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 42);
+       assert(l == 5);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 53);
+       assert(l == 1);
+       assert(!_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       l_free(message);
+}
+
+static void test_option_3(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(!_dhcp_message_iter_next(&iter, NULL, NULL, NULL));
+       l_free(message);
+}
+
+static void test_option_4(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t,l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 0x35);
+       assert(l == 1);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 0x36);
+       assert(l == 4);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 0x33);
+       assert(l == 4);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 0x1);
+       assert(l == 4);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 0x3);
+       assert(l == 4);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 0x6);
+       assert(l == 4);
+       assert(!_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       l_free(message);
+}
+
+static void test_option_5(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t,l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 53);
+       assert(l == 1);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 42);
+       assert(l == 3);
+       assert(!_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       l_free(message);
+}
+
+static void test_option_6(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t,l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 42);
+       assert(l == 2);
+       assert(!_dhcp_message_iter_next(&iter, NULL, NULL, NULL));
+       l_free(message);
+}
+
+static void test_option_7(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t,l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 222);
+       assert(l == 3);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 53);
+       assert(l == 1);
+       assert(!_dhcp_message_iter_next(&iter, NULL, NULL, NULL));
+       l_free(message);
+}
+
+static void test_option_8(const void *data)
+{
+       const struct option_test *test = data;
+       struct dhcp_message *message;
+       struct dhcp_message_iter iter;
+       size_t len;
+       uint8_t t, l;
+
+       message = create_message(test, &len);
+
+       assert(_dhcp_message_iter_init(&iter, message, len));
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 222);
+       assert(l == 3);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 1);
+       assert(l == 4);
+       assert(_dhcp_message_iter_next(&iter, &t, &l, NULL));
+       assert(t == 53);
+       assert(l == 1);
+       assert(!_dhcp_message_iter_next(&iter, NULL, NULL, NULL));
+       l_free(message);
+}
+
+static void test_option_set(const void *data)
+{
+       static uint8_t result[64] = {'A', 'B', 'C', 'D' };
+       static uint8_t options[64] = {
+                       'A', 'B', 'C', 'D',
+                       160, 2, 0x11, 0x12,
+                       0,
+                       31, 8, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+                       0,
+                       55, 3, 0x51, 0x52, 0x53,
+                       17, 7, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+                       255
+       };
+
+       size_t len, oldlen;
+       int pos, i;
+       uint8_t *opt;
+
+       assert(_dhcp_option_append(NULL, NULL, 0, 0, NULL) == -EINVAL);
+
+       len = 0;
+       opt = &result[0];
+       assert(_dhcp_option_append(&opt, NULL, 0, 0, NULL) == -EINVAL);
+       assert(opt == &result[0] && len == 0);
+
+       assert(_dhcp_option_append(&opt, &len, 0, 0, NULL) == -ENOBUFS);
+       assert(opt == &result[0] && len == 0);
+
+       opt = &result[4];
+       len = 1;
+       assert(_dhcp_option_append(&opt, &len, 0, 0, NULL) >= 0);
+       assert(opt == &result[5] && len == 0);
+
+       pos = 4;
+       len = 60;
+       while (pos < 64 && options[pos] != 255) {
+               opt = &result[pos];
+               oldlen = len;
+
+               assert(_dhcp_option_append(&opt, &len, options[pos],
+                                               options[pos + 1],
+                                               &options[pos + 2]) >= 0);
+
+               if (options[pos] == 0) {
+                       assert(opt == &result[pos + 1]);
+                       assert(len == oldlen - 1);
+                       pos++;
+               } else {
+                       assert(opt == &result[pos + 2 + options[pos + 1]]);
+                       assert(len == oldlen - 2 - options[pos + 1]);
+                       pos += 2 + options[pos + 1];
+               }
+       }
+
+       for (i = 0; i < pos; i++) {
+               if (verbose)
+                       l_info("%2d: 0x%02x(0x%02x)\n",
+                                       i, result[i], options[i]);
+               assert(result[i] == options[i]);
+       }
+}
+
+static void test_checksum(const void *data)
+{
+       static const uint8_t buf[20] = {
+               0x45, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00,
+               0x40, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+               0xff, 0xff, 0xff, 0xff
+       };
+
+       struct iovec iov[2];
+
+       assert(_dhcp_checksum(&buf, 20) == L_BE16_TO_CPU(0x78ae));
+
+       iov[0].iov_base = (void *) buf;
+       iov[0].iov_len = 8;
+       iov[1].iov_base = (void *) buf + 8;
+       iov[1].iov_len = 12;
+
+       assert(_dhcp_checksumv(iov, 2) == L_BE16_TO_CPU(0x78ae));
+}
+
+static const uint8_t discover_data_1[] = {
+       0x01, 0x01, 0x06, 0x00, 0x4d, 0x7c, 0x67, 0xc6, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x82, 0x53, 0x63,
+       0x35, 0x01, 0x01, 0x39, 0x02, 0x02, 0x40, 0x37, 0x06, 0x03, 0x2a, 0x0f,
+       0x06, 0x01, 0x0c, 0x0c, 0x0a, 0x3c, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61,
+       0x6d, 0x65, 0x3e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const uint8_t offer_data_1[] = {
+       0x02, 0x01, 0x06, 0x00, 0x4d, 0x7c, 0x67, 0xc6, 0x00, 0x00, 0x80, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x01, 0xf9, 0xc0, 0xa8, 0x01, 0x01,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x82, 0x53, 0x63,
+       0x35, 0x01, 0x02, 0x36, 0x04, 0xc0, 0xa8, 0x01, 0x01, 0x33, 0x04, 0x00,
+       0x01, 0x51, 0x80, 0x3a, 0x04, 0x00, 0x00, 0xa8, 0xc0, 0x3b, 0x04, 0x00,
+       0x01, 0x27, 0x50, 0x01, 0x04, 0xff, 0xff, 0xff, 0x00, 0x1c, 0x04, 0xc0,
+       0xa8, 0x01, 0xff, 0x06, 0x04, 0xc0, 0xa8, 0x01, 0x01, 0x03, 0x04, 0xc0,
+       0xa8, 0x01, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const uint8_t request_data_1[] = {
+       0x01, 0x01, 0x06, 0x00, 0x4d, 0x7c, 0x67, 0xc6, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x82, 0x53, 0x63,
+       0x35, 0x01, 0x03, 0x32, 0x04, 0xc0, 0xa8, 0x01, 0xf9, 0x36, 0x04, 0xc0,
+       0xa8, 0x01, 0x01, 0x39, 0x02, 0x02, 0x40, 0x37, 0x06, 0x03, 0x2a, 0x0f,
+       0x06, 0x01, 0x0c, 0x0c, 0x0a, 0x3c, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61,
+       0x6d, 0x65, 0x3e, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const uint8_t ack_data_1[] = {
+       0x02, 0x01, 0x06, 0x00, 0x4d, 0x7c, 0x67, 0xc6, 0x00, 0x00, 0x80, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0xc0, 0xa8, 0x01, 0xf9, 0xc0, 0xa8, 0x01, 0x01,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x82, 0x53, 0x63,
+       0x35, 0x01, 0x05, 0x36, 0x04, 0xc0, 0xa8, 0x01, 0x01, 0x33, 0x04, 0x00,
+       0x01, 0x51, 0x80, 0x3a, 0x04, 0x00, 0x00, 0xa8, 0xc0, 0x3b, 0x04, 0x00,
+       0x01, 0x27, 0x50, 0x01, 0x04, 0xff, 0xff, 0xff, 0x00, 0x1c, 0x04, 0xc0,
+       0xa8, 0x01, 0xff, 0x06, 0x04, 0xc0, 0xa8, 0x01, 0x01, 0x03, 0x04, 0xc0,
+       0xa8, 0x01, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+bool event_handler_called = false;
+
+static int dhcp_message_prl_equal(const uint8_t *haystack,
+                                       uint8_t len, const uint8_t *prl)
+{
+       unsigned int i, j;
+       uint8_t needle;
+
+       for (i = 0; i < len; i++) {
+               needle = prl[i];
+
+               for (j = 0; j < len; j++)
+                       if (haystack[j] == needle)
+                               break;
+
+               if (j == len)
+                       return false;
+       }
+
+       return true;
+}
+
+static int dhcp_message_has_option(struct dhcp_message_iter *iter,
+                                       uint8_t type, uint8_t len,
+                                       const uint8_t *data)
+{
+       uint8_t t,l;
+       const void *v;
+
+       while (_dhcp_message_iter_next(iter, &t, &l, &v)) {
+               if (t != type)
+                       continue;
+
+               if (l != len)
+                       return -EMSGSIZE;
+
+               if (type == 55)
+                       return dhcp_message_prl_equal(v, len, data);
+
+               if (memcmp(data, v, len))
+                       return -EINVAL;
+
+               return 0;
+       }
+
+       return -ENOENT;
+}
+
+static bool dhcp_message_compare(const uint8_t *expected, size_t expected_len,
+                               const uint8_t *obtained, size_t obtained_len)
+{
+       struct dhcp_message *e = (struct dhcp_message *) expected;
+       struct dhcp_message *o = (struct dhcp_message *) obtained;
+       struct dhcp_message_iter ei;
+       bool r = true;
+       uint8_t t, l;
+       const void *v;
+
+       assert(e->op == o->op);
+       assert(e->htype == o->htype);
+       assert(e->hlen == o->hlen);
+       assert(e->hops == o->hops);
+
+       /* Ignore xid & secs */
+
+       assert(e->flags == o->flags);
+       assert(e->ciaddr == o->ciaddr);
+       assert(e->yiaddr == o->yiaddr);
+       assert(e->giaddr == o->giaddr);
+       assert(!memcmp(e->chaddr, o->chaddr, sizeof(e->chaddr)));
+
+       assert(_dhcp_message_iter_init(&ei, e, expected_len));
+
+       while (_dhcp_message_iter_next(&ei, &t, &l, &v)) {
+               struct dhcp_message_iter oi;
+               int err;
+
+               assert(_dhcp_message_iter_init(&oi, o, obtained_len));
+               err = dhcp_message_has_option(&oi, t, l, v);
+
+               if (err >= 0)
+                       continue;
+
+               r = false;
+               switch (err) {
+               case -EINVAL:
+                       l_info("Option %s(%hhu) payload doesn't match",
+                               _dhcp_option_to_string(t), t);
+                       break;
+               case -EMSGSIZE:
+                       l_info("Option %s(%hhu) length doesn't match",
+                               _dhcp_option_to_string(t), t);
+                       break;
+               case -ENOENT:
+                       l_info("Option %s(%hhu) missing",
+                               _dhcp_option_to_string(t), t);
+                       break;
+               default:
+                       assert(false);
+               }
+       }
+
+       return r;
+}
+
+static int fake_transport_send(struct dhcp_transport *transport,
+                               const struct sockaddr_in *dest,
+                               const void *data, size_t len)
+{
+       assert(len <= sizeof(client_packet));
+       memcpy(client_packet, data, len);
+       client_packet_len = len;
+
+       return len;
+}
+
+static int fake_transport_broadcast(struct dhcp_transport *transprot,
+                                       uint32_t saddr, uint16_t sport,
+                                       uint32_t daddr, uint16_t dport,
+                                       const void *data, size_t len)
+{
+       assert(len <= sizeof(client_packet));
+       memcpy(client_packet, data, len);
+       client_packet_len = len;
+
+       return len;
+}
+
+static void event_handler_lease_obtained(struct l_dhcp_client *client,
+                                               enum l_dhcp_client_event event,
+                                               void *userdata)
+{
+       assert(client);
+       assert(event == L_DHCP_CLIENT_EVENT_LEASE_OBTAINED);
+       event_handler_called = true;
+}
+
+static void test_discover(const void *data)
+{
+       static const uint8_t addr[6] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
+       struct l_dhcp_client *client;
+       struct dhcp_transport *transport = l_new(struct dhcp_transport, 1);
+       const struct l_dhcp_lease *lease;
+
+       transport->send = fake_transport_send;
+       transport->broadcast = fake_transport_broadcast;
+       transport->ifindex = 42;
+
+       client = l_dhcp_client_new(42);
+       assert(l_dhcp_client_set_address(client, ARPHRD_ETHER, addr, 6));
+       assert(l_dhcp_client_set_interface_name(client, "fake"));
+       assert(_dhcp_client_set_transport(client, transport));
+       assert(l_dhcp_client_set_hostname(client, "<hostname>"));
+       _dhcp_client_override_xid(client, 0x4d7c67c6);
+       assert(l_dhcp_client_set_event_handler(client,
+                               event_handler_lease_obtained, NULL, NULL));
+
+       assert(l_dhcp_client_start(client));
+
+       assert(dhcp_message_compare(discover_data_1, sizeof(discover_data_1),
+                                       client_packet, client_packet_len));
+
+       transport->rx_cb(offer_data_1, sizeof(offer_data_1), client);
+
+       assert(dhcp_message_compare(request_data_1, sizeof(request_data_1),
+                                       client_packet, client_packet_len));
+
+       event_handler_called = false;
+       transport->rx_cb(ack_data_1, sizeof(ack_data_1), client);
+       assert(event_handler_called);
+
+       lease = l_dhcp_client_get_lease(client);
+       assert(lease);
+
+       assert(lease->server_address == L_CPU_TO_BE32(0xc0a80101));
+       assert(lease->subnet_mask == L_CPU_TO_BE32(0xffffff00));
+       assert(lease->broadcast == L_CPU_TO_BE32(0xc0a801ff));
+       assert(lease->router == L_CPU_TO_BE32(0xc0a80101));
+       assert(lease->address == L_CPU_TO_BE32(0xc0a801f9));
+
+       assert(lease->lifetime == 0x00015180);
+       assert(lease->t1 == 0x0000a8c0);
+       assert(lease->t2 == 0x00012750);
+
+       l_dhcp_client_destroy(client);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("request-option", test_request_option, NULL);
+       l_test_add("invalid-message-length", test_invalid_message_length, NULL);
+       l_test_add("cookie", test_cookie, NULL);
+
+       l_test_add("option test 1", test_option_1, &option_test_1);
+       l_test_add("option test 2", test_option_2, &option_test_2);
+       l_test_add("option test 3", test_option_3, &option_test_3);
+       l_test_add("option test 4", test_option_4, &option_test_4);
+       l_test_add("option test 5", test_option_5, &option_test_5);
+       l_test_add("option test 6", test_option_6, &option_test_6);
+       l_test_add("option test 7", test_option_7, &option_test_7);
+       l_test_add("option test 8", test_option_8, &option_test_8);
+
+       l_test_add("option set", test_option_set, NULL);
+
+       l_test_add("checksum", test_checksum, NULL);
+
+       l_test_add("discover", test_discover, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-dir-watch.c b/unit/test-dir-watch.c
new file mode 100644 (file)
index 0000000..8187963
--- /dev/null
@@ -0,0 +1,625 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <assert.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <ell/ell.h>
+
+enum test_op {
+       OP_NULL,
+       OP_OPEN,
+       OP_CREAT,
+       OP_UNLINK,
+       OP_TRUNCATE,
+       OP_RENAME,
+};
+
+struct test_result {
+       const char *dir;
+       const char *file;
+       bool ignore;
+       enum l_dir_watch_event event;
+};
+
+typedef struct test_result test_result_t;
+
+#define MAX_RESULTS 2
+
+struct test_data {
+       enum test_op op;
+       const char *orig_dir;
+       const char *orig_file;
+       const char *dest_dir;
+       const char *dest_file;
+       unsigned int length;
+       const char *content;
+       const struct test_result *results[MAX_RESULTS + 1];
+};
+
+struct test_entry {
+       const char *name;
+       const struct test_data *data;
+       char **test_dirs;
+       char **test_files;
+       char **watch_dirs;
+       unsigned int idx;
+       unsigned int res_idx;
+       struct l_queue *watch_list;
+       bool failed;
+};
+
+struct test_watch {
+       char *pathname;
+       struct test_entry *entry;
+};
+
+static struct l_queue *test_queue;
+
+#define TEST_FULL(_dir, _file, _op) \
+                       .orig_dir = _dir, .orig_file = _file, .op = _op
+
+#define test_open(_dir, _file, _length) \
+                       TEST_FULL(_dir, _file, OP_OPEN), .length = _length
+#define test_creat(_dir, _file, _content) \
+                       TEST_FULL(_dir, _file, OP_CREAT), .content = _content
+#define test_unlink(_dir, _file) \
+                       TEST_FULL(_dir, _file, OP_UNLINK)
+#define test_truncate(_dir, _file, _length) \
+                       TEST_FULL(_dir, _file, OP_TRUNCATE), .length = _length
+#define test_rename(_olddir, _oldfile, _newdir, _newfile) \
+                       TEST_FULL(_olddir, _oldfile, OP_RENAME), \
+                               .dest_dir = _newdir, .dest_file = _newfile
+
+#define RESULT_PTR(_dir, _file, _ignore, _event) \
+                       (&(test_result_t) { _dir, _file, _ignore, _event })
+
+#define results(args...)       .results = { args, RESULT_PTR(NULL, NULL, true, 0) }
+
+#define created(_dir, _file)   RESULT_PTR(_dir, _file, false, L_DIR_WATCH_EVENT_CREATED)
+#define removed(_dir, _file)   RESULT_PTR(_dir, _file, false, L_DIR_WATCH_EVENT_REMOVED)
+#define modified(_dir, _file)  RESULT_PTR(_dir, _file, false, L_DIR_WATCH_EVENT_MODIFIED)
+#define accessed(_dir, _file)  RESULT_PTR(_dir, _file, false, L_DIR_WATCH_EVENT_ACCESSED)
+
+#define result_ignore()                        .results = { RESULT_PTR(NULL, NULL, true, 0) }
+#define result_created(_dir, _file)    results(created(_dir, _file))
+#define result_removed(_dir, _file)    results(removed(_dir, _file))
+#define result_modified(_dir, _file)   results(modified(_dir, _file))
+#define result_accessed(_dir, _file)   results(accessed(_dir, _file))
+
+static void start_single_test(void *user_data);
+
+static void event_callback(const char *pathname, enum l_dir_watch_event event,
+                                                               void *user_data)
+{
+       struct test_watch *watch_data = user_data;
+       struct test_entry *entry = watch_data->entry;
+       const struct test_data *data = &entry->data[entry->idx];
+       const struct test_result *result = data->results[entry->res_idx];
+       const char *str;
+
+       switch (event) {
+       case L_DIR_WATCH_EVENT_CREATED:
+               str = "CREATED";
+               break;
+       case L_DIR_WATCH_EVENT_REMOVED:
+               str = "REMOVED";
+               break;
+       case L_DIR_WATCH_EVENT_MODIFIED:
+               str = "MODIFIED";
+               break;
+       case L_DIR_WATCH_EVENT_ACCESSED:
+               str = "ACCESSED";
+               break;
+       case L_DIR_WATCH_EVENT_ATTRIB:
+               str = "ATTRIB";
+               break;
+       default:
+               str = "UNKNOWN";
+               break;
+       }
+
+       l_debug("l_dir_watch event:%s pathname:%s [%s]", str, pathname,
+                                                       watch_data->pathname);
+
+       /* This will result in waiting for the timeout */
+       if (result->ignore)
+               return;
+
+       /* The watching directory needs to match the watch callback data */
+       if (strcmp(result->dir, watch_data->pathname))
+               return;
+
+       /* The file inside the watch directory needs to match */
+       if (strcmp(result->file, pathname)) {
+               entry->failed = true;
+               return;
+       }
+
+       /* The expected event needs to match as well */
+       if (result->event != event) {
+               entry->failed = true;
+               return;
+       }
+
+       /* Successful match of the expected event data */
+       l_debug("l_dir_watch ==> MATCH index %u", entry->res_idx);
+
+       if (entry->res_idx < MAX_RESULTS) {
+               entry->res_idx++;
+               result = data->results[entry->res_idx];
+               if (result->dir) {
+                       /* More results are required to match */
+                       return;
+               }
+       }
+
+       /* Move to next test case */
+       entry->idx++;
+       entry->res_idx = 0;
+
+       l_idle_oneshot(start_single_test, entry, NULL);
+}
+
+static void run_cleanup(char **dirs, char **files)
+{
+       int i;
+
+       for (i = 0; files[i]; i++) {
+               l_debug("unlink(\"%s\")", files[i]);
+               unlink(files[i]);
+       }
+
+       for (i = 0; dirs[i]; i++) {
+               l_debug("rmdir(\"%s\")", dirs[i]);
+               rmdir(dirs[i]);
+       }
+}
+
+static void dir_watch_free(void *data)
+{
+       struct l_dir_watch *watch = data;
+
+       l_debug("free l_dir_watch [%p]", watch);
+
+       l_dir_watch_destroy(watch);
+}
+
+static void free_test_entry(void *data)
+{
+       struct test_entry *entry = data;
+
+       l_debug("free test_entry [%s]", entry->name);
+
+       l_queue_destroy(entry->watch_list, dir_watch_free);
+
+       /* Clean run should remove any leftovers */
+       run_cleanup(entry->test_dirs, entry->test_files);
+
+       l_strv_free(entry->test_dirs);
+       l_strv_free(entry->test_files);
+       l_strv_free(entry->watch_dirs);
+
+       l_free(entry);
+}
+
+static void op_open(const char *dir, const char *file, unsigned int length)
+{
+       char *pathname;
+       int fd, err;
+
+       pathname = l_strdup_printf("%s/%s", dir, file);
+
+       l_debug("open(\"%s\", O_RDONLY)", pathname);
+       fd = open(pathname, O_RDONLY);
+       l_debug("=> %d", fd);
+
+       if (length > 0) {
+               unsigned char *buf = l_malloc(length);
+               ssize_t res;
+
+               l_debug("read(%d, %p, %u)", fd, buf, length);
+               res = read(fd, buf, length);
+               l_debug("=> %zd", res);
+
+               l_free(buf);
+       }
+
+       l_debug("close(%d)", fd);
+       err = close(fd);
+       l_debug("=> %d", err);
+
+       l_free(pathname);
+}
+
+static void op_creat(const char *dir, const char *file, const char *content)
+{
+       char *pathname;
+       int fd, err;
+
+       pathname = l_strdup_printf("%s/%s", dir, file);
+
+       l_debug("creat(\"%s\", 0600)", pathname);
+       fd = creat(pathname, 0600);
+       l_debug("=> %d", fd);
+
+       if (content) {
+               int len = strlen(content);
+               ssize_t res;
+
+               l_debug("write(%d, \"%s\", %d)", fd, content, len);
+               res = write(fd, content, len);
+               l_debug("=> %zd", res);
+       }
+
+       l_debug("close(%d)", fd);
+       err = close(fd);
+       l_debug("=> %d", err);
+
+       l_free(pathname);
+}
+
+static void op_unlink(const char *dir, const char *file)
+{
+       char *pathname;
+       int err;
+
+       pathname = l_strdup_printf("%s/%s", dir, file);
+
+       l_debug("unlink(\"%s\")", pathname);
+       err = unlink(pathname);
+       l_debug("=> %d", err);
+
+       l_free(pathname);
+}
+
+static void op_truncate(const char *dir, const char *file, unsigned int length)
+{
+       char *pathname;
+       int err;
+
+       pathname = l_strdup_printf("%s/%s", dir, file);
+
+       l_debug("truncate(\"%s\", %u)", pathname, length);
+       err = truncate(pathname, length);
+       l_debug("=> %d", err);
+
+       l_free(pathname);
+}
+
+static void op_rename(const char *olddir, const char *oldfile,
+                               const char *newdir, const char *newfile)
+{
+       char *oldpath, *newpath;
+       int err;
+
+       oldpath = l_strdup_printf("%s/%s", olddir, oldfile);
+       newpath = l_strdup_printf("%s/%s", newdir, newfile);
+
+       l_debug("rename(\"%s\", \"%s\")", oldpath, newpath);
+       err = rename(oldpath, newpath);
+       l_debug("=> %d", err);
+
+       l_free(oldpath);
+       l_free(newpath);
+}
+
+static void process_test_queue(void *user_data);
+
+static void start_single_test(void *user_data)
+{
+       struct test_entry *entry = user_data;
+       const struct test_data *data = &entry->data[entry->idx];
+       const struct test_result *result = data->results[entry->res_idx];
+       bool ignore = false;
+
+       switch (data->op) {
+       case OP_NULL:
+               if (entry->failed)
+                       l_info("[%s] FAILED", entry->name);
+               else
+                       l_info("[%s] PASSED", entry->name);
+               free_test_entry(entry);
+               l_idle_oneshot(process_test_queue, NULL, NULL);
+               return;
+       case OP_OPEN:
+               op_open(data->orig_dir, data->orig_file, data->length);
+               break;
+       case OP_CREAT:
+               op_creat(data->orig_dir, data->orig_file, data->content);
+               break;
+       case OP_UNLINK:
+               op_unlink(data->orig_dir, data->orig_file);
+               break;
+       case OP_TRUNCATE:
+               op_truncate(data->orig_dir, data->orig_file, data->length);
+               break;
+       case OP_RENAME:
+               op_rename(data->orig_dir, data->orig_file,
+                                       data->dest_dir, data->dest_file);
+               break;
+       default:
+               ignore = true;
+               break;
+       }
+
+       if (!result->ignore && !ignore)
+               return;
+
+       /* Move to next test case */
+       entry->idx++;
+       entry->res_idx = 0;
+
+       l_idle_oneshot(start_single_test, entry, NULL);
+}
+
+static void watch_data_free(void *data)
+{
+       struct test_watch *watch_data = data;
+
+       l_debug("free test_watch [%s]", watch_data->pathname);
+
+       l_free(watch_data->pathname);
+       l_free(watch_data);
+}
+
+static void process_test_queue(void *user_data)
+{
+       struct test_entry *entry;
+       int i;
+
+       entry = l_queue_pop_head(test_queue);
+       if (!entry) {
+               l_main_quit();
+               return;
+       }
+
+       /* In case there is any leftovers */
+       run_cleanup(entry->test_dirs, entry->test_files);
+
+       /* Create the directories in use */
+       for (i = 0; entry->test_dirs[i]; i++) {
+               l_debug("mkdir(%s, 0700)", entry->test_dirs[i]);
+               mkdir(entry->test_dirs[i], 0700);
+       }
+
+       for (i = 0; entry->watch_dirs[i]; i++) {
+               struct test_watch *watch_data;
+               struct l_dir_watch *watch;
+
+               watch_data = l_new(struct test_watch, 1);
+               watch_data->pathname = l_strdup(entry->watch_dirs[i]);
+               watch_data->entry = entry;
+
+               l_debug("new test_watch [%s]", watch_data->pathname);
+
+               watch = l_dir_watch_new(watch_data->pathname, event_callback,
+                                               watch_data, watch_data_free);
+
+               l_debug("new l_dir_watch [%p]", watch);
+
+               l_queue_push_tail(entry->watch_list, watch);
+       }
+
+       l_idle_oneshot(start_single_test, entry, NULL);
+}
+
+static void add_test(const char *name, const struct test_data data[])
+{
+       struct test_entry *entry;
+       int i;
+
+       entry = l_new(struct test_entry, 1);
+       entry->name = name;
+       entry->data = data;
+
+       l_debug("new test_entry [%s]", entry->name);
+
+       for (i = 0; data[i].op; i++) {
+               char *file;
+               int n;
+
+               if (!l_strv_contains(entry->test_dirs, data[i].orig_dir))
+                       entry->test_dirs = l_strv_append(entry->test_dirs,
+                                                       data[i].orig_dir);
+
+               if (data[i].orig_dir) {
+                       file = l_strdup_printf("%s/%s", data[i].orig_dir,
+                                                       data[i].orig_file);
+                       if (!l_strv_contains(entry->test_files, file))
+                               entry->test_files = l_strv_append(entry->test_files,
+                                                                       file);
+                       l_free(file);
+               }
+
+               if (data[i].dest_dir) {
+                       file = l_strdup_printf("%s/%s", data[i].dest_dir,
+                                                       data[i].dest_file);
+                       if (!l_strv_contains(entry->test_files, file))
+                               entry->test_files = l_strv_append(entry->test_files,
+                                                                       file);
+                       l_free(file);
+               }
+
+               for (n = 0; n < MAX_RESULTS; n++) {
+                       if (!data[i].results[n])
+                               break;
+                       if (l_strv_contains(entry->watch_dirs,
+                                               data[i].results[n]->dir))
+                               continue;
+                       entry->watch_dirs = l_strv_append(entry->watch_dirs,
+                                               data[i].results[n]->dir);
+               }
+
+       }
+
+       entry->watch_list = l_queue_new();
+       entry->failed = false;
+
+       l_queue_push_tail(test_queue, entry);
+}
+
+#define DIR_1  "/tmp/ell-test-dir-1"
+#define DIR_2  "/tmp/ell-test-dir-2"
+#define FILE_1 "file-1"
+#define FILE_2 "file-2"
+#define FILE_3 "file-3"
+#define FILE_4 "file-4"
+
+static const struct test_data test_data_1[] = {
+       {
+               test_creat(DIR_1, FILE_1, NULL),
+               result_created(DIR_1, FILE_1),
+       },
+       {
+               test_unlink(DIR_1, FILE_1),
+               result_removed(DIR_1, FILE_1),
+       },
+       {
+               test_creat(DIR_1, FILE_2, "File content"),
+               result_created(DIR_1, FILE_2),
+       },
+       {
+               test_rename(DIR_1, FILE_2, DIR_1, FILE_3),
+               results(removed(DIR_1, FILE_2), created(DIR_1, FILE_3)),
+       },
+       {
+               test_open(DIR_1, FILE_3, 4),
+               result_accessed(DIR_1, FILE_3),
+       },
+       {
+               test_truncate(DIR_1, FILE_3, 4),
+               result_modified(DIR_1, FILE_3),
+       },
+       {
+               test_unlink(DIR_1, FILE_3),
+               result_removed(DIR_1, FILE_3),
+       },
+       {
+               test_creat(DIR_2, FILE_4, NULL),
+               result_ignore(),
+       },
+       {
+               test_rename(DIR_2, FILE_4, DIR_1, FILE_4),
+               result_created(DIR_1, FILE_4),
+       },
+       {
+               test_rename(DIR_1, FILE_4, DIR_2, FILE_4),
+               result_removed(DIR_1, FILE_4),
+       },
+       {
+               test_unlink(DIR_2, FILE_4),
+               result_ignore(),
+       },
+       { }
+};
+
+static const struct test_data test_data_2[] = {
+       {
+               test_creat(DIR_1, FILE_1, NULL),
+               result_created(DIR_1, FILE_1),
+       },
+       {
+               test_rename(DIR_1, FILE_1, DIR_2, FILE_1),
+               results(removed(DIR_1, FILE_1), created(DIR_2, FILE_1)),
+       },
+       {
+               test_unlink(DIR_2, FILE_1),
+               result_removed(DIR_2, FILE_1),
+       },
+       { }
+};
+
+static const struct test_data test_data_3[] = {
+       {
+               test_creat(DIR_1, FILE_1, "X"),
+               result_created(DIR_1, FILE_1),
+       },
+       {
+               test_open(DIR_1, FILE_1, 1),
+               result_accessed(DIR_1, FILE_1),
+       },
+       {
+               test_unlink(DIR_1, FILE_1),
+               result_removed(DIR_1, FILE_1),
+       },
+       { }
+};
+
+static const struct test_data test_data_4[] = {
+       {
+               test_creat(DIR_1, FILE_1, "ABC"),
+               result_created(DIR_1, FILE_1),
+       },
+       {
+               test_creat(DIR_1, FILE_2, "XYZ"),
+               result_created(DIR_1, FILE_2),
+       },
+       {
+               test_rename(DIR_1, FILE_2, DIR_1, FILE_1),
+               results(removed(DIR_1, FILE_2), created(DIR_1, FILE_1)),
+       },
+       {
+               test_unlink(DIR_1, FILE_1),
+               result_removed(DIR_1, FILE_1),
+       },
+       { }
+};
+
+int main(int argc, char *argv[])
+{
+       int opt, exit_status;
+
+       l_main_init();
+       l_log_set_stderr();
+
+       while ((opt = getopt(argc, argv, "d")) != -1) {
+               switch (opt) {
+               case 'd':
+                       l_debug_enable("*");
+                       break;
+               }
+       }
+
+       test_queue = l_queue_new();
+       add_test("Single directory test", test_data_1);
+       add_test("Move between directories", test_data_2);
+       add_test("Create and open file", test_data_3);
+       add_test("Replace existing file", test_data_4);
+
+       l_idle_oneshot(process_test_queue, NULL, NULL);
+       exit_status = l_main_run();
+
+       l_queue_destroy(test_queue, free_test_entry);
+       l_main_exit();
+
+       return exit_status;
+}
diff --git a/unit/test-ecc.c b/unit/test-ecc.c
new file mode 100644 (file)
index 0000000..821640d
--- /dev/null
@@ -0,0 +1,340 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+#include "ell/ecc.h"
+#include "ell/ecc-private.h"
+
+#define HEX2BUF(s, buf) { \
+       unsigned char *tmp = l_util_from_hexstring(s, NULL); \
+       memcpy(buf, tmp, curve->ndigits * 8); \
+       l_free(tmp); \
+}
+
+#define CURVE_P_32_STR "ffffffffffffffffffffffff00000000"\
+                       "000000000000000001000000ffffffff"
+
+enum ecc_test_type {
+       TEST_ADD = 0,
+       TEST_SUB,
+       TEST_MULT,
+       TEST_INV,
+       TEST_EXP,
+       TEST_POINT_ADD,
+       TEST_SCALAR_MULT,
+       TEST_LEGENDRE,
+};
+
+struct ecc_test_data {
+       enum ecc_test_type type;
+       /* basic math arguments/result */
+       char *a;
+       char *b;
+       char *qr;
+       char *qnr;
+       char *r;
+       bool is_residue;
+       char *mod;
+       char *result;
+       int lres;
+       /* point operations */
+       char *scalar;
+       char *ax, *ay;
+       char *bx, *by;
+       char *rx, *ry;
+};
+
+/* (a + b) mod c */
+struct ecc_test_data add_test = {
+       .type = TEST_ADD,
+       .a = "cae1d5624344984073fd955a72d4ebacedc084679333e4beebff94869e9f6ca8",
+       .b = "93a02ae89d15e38a33bf3fea4c99937825b279fa8fa81dded1ccb687cec88461",
+       .mod = CURVE_P_32_STR,
+       .result = "5e82004ae05a7bcaa7bcd545bf6e7f25"
+                       "1372fe6222dc029dbccc4b0d6d67f10a"
+};
+
+/* (a - b) mod c */
+struct ecc_test_data sub_test = {
+       .type = TEST_SUB,
+       .a = "cae1d5624344984073fd955a72d4ebacedc084679333e4beebff94869e9f6ca8",
+       .b = "93a02ae89d15e38a33bf3fea4c99937825b279fa8fa81dded1ccb687cec88461",
+       .mod = CURVE_P_32_STR,
+       .result = "3741aa79a62eb4b6403e5570263b5834"
+                       "c80e0a6d038bc6e01a32ddfecfd6e847"
+};
+
+/* (a * b) mod c */
+struct ecc_test_data mult_test = {
+       .type = TEST_MULT,
+       .a = "cae1d5624344984073fd955a72d4ebacedc084679333e4beebff94869e9f6ca8",
+       .b = "93a02ae89d15e38a33bf3fea4c99937825b279fa8fa81dded1ccb687cec88461",
+       .mod = CURVE_P_32_STR,
+       .result = "a31ff5c7d65d8bd806b0407f27d1f1bc"
+                       "2c072e28c19720f6a654a75efc2faab5"
+
+};
+
+/* (a^-1) mod c */
+struct ecc_test_data inv_test = {
+       .type = TEST_INV,
+       .a = "cae1d5624344984073fd955a72d4ebacedc084679333e4beebff94869e9f6ca8",
+       .mod = CURVE_P_32_STR,
+       .result = "48faaac115571047ead565911fc334fd"
+                       "633c986755e87ab10fd79a4453a60bc5"
+
+};
+
+/* (a^-1) mod c */
+struct ecc_test_data inv_test2 = {
+       .type = TEST_INV,
+       .a = "698e5c10b63a9c79a9720b3f7f4d2f5c9fbb31daf93ac0f8fa8ca5cde8234418",
+       .mod = CURVE_P_32_STR,
+       .result = "5fd113c3b6053c38e54e5917826c8520"
+                       "c5a0708a8a47345edbb7fc1d67d9b42b"
+
+};
+
+/* (a ^ b) mod c */
+struct ecc_test_data exp_test = {
+       .type = TEST_EXP,
+       .a = "cae1d5624344984073fd955a72d4ebacedc084679333e4beebff94869e9f6ca8",
+       .b = "93a02ae89d15e38a33bf3fea4c99937825b279fa8fa81dded1ccb687cec88461",
+       .mod = CURVE_P_32_STR,
+       .result = "e7488e3a4d56938bbddc2a615c768d48"
+                       "9e5634aced9ceee37249fae1caa36fec"
+
+};
+
+struct ecc_test_data legendre_test1 = {
+       .type = TEST_LEGENDRE,
+       .a = "b59c0c366aa89ba229f857190497261d5a0a7a0a774caa72aef041ff00092447",
+       .mod = "ffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
+       .lres = -1
+};
+
+struct ecc_test_data legendre_test2 = {
+       .type = TEST_LEGENDRE,
+       .a = "1214f9607d348c998b3fba332d884d65945561fd007ff56d8bf603148d74d2e4",
+       .mod = "ffffffff000000010000000000000000"
+                       "00000000ffffffffffffffffffffffff",
+       .lres = 1
+};
+
+struct ecc_test_data legendre_test3 = {
+       .type = TEST_LEGENDRE,
+       .a = "282d751c898bfc593b1d21b6812df48e3ec811f40349b30b7294575c47b871d8",
+       .mod = "ffffffff000000010000000000000000"
+                       "00000000ffffffffffffffffffffffff",
+       .lres = 1
+};
+
+struct ecc_test_data legendre_test4 = {
+       .type = TEST_LEGENDRE,
+       .a = "0694ccde1db3d02faa26856678bd9358ecc0d82791405eb3892a8b4f07f1e5d6",
+       .mod = "ffffffff000000010000000000000000"
+                       "00000000ffffffffffffffffffffffff",
+       .lres = -1
+};
+
+struct ecc_test_data legendre_test5 = {
+       .type = TEST_LEGENDRE,
+       .a = "92247f96df65a6d04af0c57318e999fd493c42864d156f7e5bba75c964f3c6b0",
+       .mod = "ffffffff000000010000000000000000"
+                       "00000000ffffffffffffffffffffffff",
+       .lres = 1
+};
+
+struct ecc_test_data legendre_test6 = {
+       .type = TEST_LEGENDRE,
+       .a = "084f7eb6ed8021d095787fd401b0f19b13937dc23f7c84dfe69bb9a204bb3768",
+       .mod = "ffffffff000000010000000000000000"
+                       "00000000ffffffffffffffffffffffff",
+       .lres = -1
+};
+
+struct ecc_test_data point_add_test = {
+       .type = TEST_POINT_ADD,
+       .ax = "d36b6768a3279fbe23a5bf5cc19b13354"
+               "fa2c6d6fd9de467d62db007c39452df",
+       .ay = "4d601e7be3efd7f357452de7584274c54"
+               "c18ddb0ef2f0f4cf43375152a9780c4",
+       .bx = "c833c5d3ab916ed37f16597ace5dcf41f"
+               "080891c0c41b6ce561705bd736a29e0",
+       .by = "9d266e5ba8ba3e8d9679238f44a376b05"
+               "133df0510a7b8e6e7dd3a654d40a04a",
+       .rx = "24c4ede340dbdd144ccaaea67e5b1fca"
+               "87b3aa26dc11114fcd12186318533101",
+       .ry = "1d96391fb2942bf286e9251c257b960e"
+               "7d23d4caff4b6fc898aff87e1f6f5514"
+
+};
+
+struct ecc_test_data point_mult_test = {
+       .type = TEST_SCALAR_MULT,
+       .ax = "768bc2f17fbf4e49282fbd4068994562b"
+               "fc7145306762c26a90be1e9c346ac67",
+       .ay = "93a02ae89d15e38a33bf3fea4c9993782"
+               "5b279fa8fa81dded1ccb687cec88461",
+       .scalar = "7521d940aa073c1675114ed27b866561"
+               "9c826cac8eaa341f70d61b43ad32058b",
+       .rx = "d4c80de349966df5542c984e80885d36"
+               "a965ceb74ffe6a0fdc8343184dedfe66",
+       .ry = "6d3a1ac3d1d392413286a0e00e94b01e"
+               "ae8423c7f53b9d39cc7fc9c3a5880f3b"
+
+};
+
+static void run_test_p256(const void *arg)
+{
+       const struct ecc_test_data *data = arg;
+       uint64_t a[L_ECC_MAX_DIGITS], b[L_ECC_MAX_DIGITS], mod[L_ECC_MAX_DIGITS],
+                       scalar[L_ECC_MAX_DIGITS], result[L_ECC_MAX_DIGITS],
+                       check[L_ECC_MAX_DIGITS];
+       struct l_ecc_point point1, point2, point_ret;
+       const struct l_ecc_curve *curve = l_ecc_curve_get_ike_group(19);
+
+       point_ret.curve = curve;
+
+       memset(result, 0, sizeof(result));
+
+       if (data->a) {
+               HEX2BUF(data->a, a);
+               _ecc_be2native(a, a, curve->ndigits);
+       }
+
+       if (data->b) {
+               HEX2BUF(data->b, b);
+               _ecc_be2native(b, b, curve->ndigits);
+       }
+
+       if (data->mod) {
+               HEX2BUF(data->mod, mod);
+               _ecc_be2native(mod, mod, curve->ndigits);
+       }
+
+       if (data->ax) {
+               HEX2BUF(data->ax, point1.x);
+               _ecc_be2native(point1.x, point1.x, curve->ndigits);
+               point1.curve = curve;
+       }
+
+       if (data->ay) {
+               HEX2BUF(data->ay, point1.y);
+               _ecc_be2native(point1.y, point1.y, curve->ndigits);
+       }
+
+       if (data->bx) {
+               HEX2BUF(data->bx, point2.x);
+               _ecc_be2native(point2.x, point2.x, curve->ndigits);
+               point2.curve = curve;
+       }
+
+       if (data->by) {
+               HEX2BUF(data->by, point2.y);
+               _ecc_be2native(point2.y, point2.y, curve->ndigits);
+       }
+
+       if (data->scalar) {
+               HEX2BUF(data->scalar, scalar);
+               _ecc_be2native(scalar, scalar, curve->ndigits);
+       }
+
+       switch (data->type) {
+       case TEST_ADD:
+               _vli_mod_add(result, a, b, mod, curve->ndigits);
+               break;
+       case TEST_SUB:
+               _vli_mod_sub(result, a, b, mod, curve->ndigits);
+               break;
+       case TEST_MULT:
+               _vli_mod_mult_fast(result, a, b, mod, curve->ndigits);
+               break;
+       case TEST_INV:
+               _vli_mod_inv(result, a, mod, curve->ndigits);
+               break;
+       case TEST_EXP:
+               _vli_mod_exp(result, a, b, mod, curve->ndigits);
+               break;
+       case TEST_LEGENDRE:
+       {
+               int lres = _vli_legendre(a, mod, curve->ndigits);
+               assert(data->lres == lres);
+               break;
+       }
+       case TEST_POINT_ADD:
+               _ecc_point_add(&point_ret, &point1, &point2, curve->p);
+
+               break;
+       case TEST_SCALAR_MULT:
+               _ecc_point_mult(&point_ret, &point1, scalar, NULL, curve->p);
+
+               break;
+       }
+
+       if (data->type <= TEST_EXP) {
+               HEX2BUF(data->result, check);
+               _ecc_native2be(check, check, curve->ndigits);
+
+               assert(memcmp(result, check, 32) == 0);
+       } else if (data->type <= TEST_SCALAR_MULT) {
+               uint64_t checkx[L_ECC_MAX_DIGITS];
+               uint64_t checky[L_ECC_MAX_DIGITS];
+
+               HEX2BUF(data->rx, checkx);
+               _ecc_native2be(checkx, checkx, curve->ndigits);
+               HEX2BUF(data->ry, checky);
+               _ecc_native2be(checky, checky, curve->ndigits);
+
+               assert(memcmp(checkx, point_ret.x, 32) == 0);
+               assert(memcmp(checky, point_ret.y, 32) == 0);
+       }
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("ECC add test", run_test_p256, &add_test);
+       l_test_add("ECC sub test", run_test_p256, &sub_test);
+       l_test_add("ECC mult test", run_test_p256, &mult_test);
+       l_test_add("ECC inv test", run_test_p256, &inv_test);
+       l_test_add("ECC inv test", run_test_p256, &inv_test2);
+       l_test_add("ECC exp test", run_test_p256, &exp_test);
+       l_test_add("ECC point add test", run_test_p256, &point_add_test);
+       l_test_add("ECC point mult test", run_test_p256, &point_mult_test);
+       l_test_add("ECC legendre", run_test_p256, &legendre_test1);
+       l_test_add("ECC legendre", run_test_p256, &legendre_test2);
+       l_test_add("ECC legendre", run_test_p256, &legendre_test3);
+       l_test_add("ECC legendre", run_test_p256, &legendre_test4);
+       l_test_add("ECC legendre", run_test_p256, &legendre_test5);
+       l_test_add("ECC legendre", run_test_p256, &legendre_test6);
+
+       return l_test_run();
+}
diff --git a/unit/test-ecdh.c b/unit/test-ecdh.c
new file mode 100644 (file)
index 0000000..0b58ead
--- /dev/null
@@ -0,0 +1,229 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2018 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+#include <assert.h>
+#include <ell/ell.h>
+
+#include "ell/ecc-private.h"
+
+static bool use_real_getrandom = true;
+
+bool __wrap_l_getrandom(void *buf, size_t len);
+bool __real_l_getrandom(void *buf, size_t len);
+
+bool __wrap_l_getrandom(void *buf, size_t len)
+{
+       static const uint8_t random_buf[] = { 0xba, 0xaf, 0x6d, 0x97, 0x71,
+                                               0xe5, 0xda, 0xc9, 0x89, 0x6e,
+                                               0x58, 0x18, 0x92, 0xf8, 0x55,
+                                               0x4f, 0x29, 0xf0, 0xbd, 0x10,
+                                               0xaf, 0x0e, 0x38, 0xb5, 0xe6,
+                                               0x44, 0x56, 0x9d, 0x99, 0x2a,
+                                               0x7f, 0xe2, 0x8d, 0x46, 0xb0,
+                                               0x73, 0xcd, 0xd3, 0x6a, 0x7b,
+                                               0xa6, 0xd3, 0xde, 0xbf, 0x38,
+                                               0x96, 0xb7, 0xc3 };
+
+       if (use_real_getrandom)
+               return __real_l_getrandom(buf, len);
+
+       if (len > sizeof(random_buf))
+               return false;
+
+       memcpy(buf, random_buf, len);
+
+       return true;
+}
+
+/*
+ * Tests the most basic case. Generate two full public keys and use to create
+ * two identical shared secrets.
+ */
+static void test_basic(const void *data)
+{
+       const struct l_ecc_curve *curve = l_ecc_curve_get_ike_group(19);
+
+       struct l_ecc_scalar *private1;
+       struct l_ecc_scalar *private2;
+
+       struct l_ecc_point *public1;
+       struct l_ecc_point *public2;
+
+       struct l_ecc_scalar *secret1;
+       struct l_ecc_scalar *secret2;
+
+       assert(l_ecdh_generate_key_pair(curve, &private1, &public1));
+       assert(l_ecdh_generate_key_pair(curve, &private2, &public2));
+
+       assert(l_ecdh_generate_shared_secret(private1, public2, &secret1));
+       assert(l_ecdh_generate_shared_secret(private2, public1, &secret2));
+
+       assert(!memcmp(secret1->c, secret2->c, 32));
+
+       l_ecc_scalar_free(private1);
+       l_ecc_scalar_free(private2);
+       l_ecc_point_free(public1);
+       l_ecc_point_free(public2);
+       l_ecc_scalar_free(secret1);
+       l_ecc_scalar_free(secret2);
+}
+
+/*
+ * Test vector from RFC 5114 - 256-bit Random ECP Group
+ */
+static void test_vector_p256(const void *data)
+{
+       const struct l_ecc_curve *curve = l_ecc_curve_get_ike_group(19);
+
+       uint64_t a_sec_buf[4] = { 0x867B7291D507A3AFull, 0x3FAF432A5ABCE59Eull,
+                               0xE96A8E337A128499ull, 0x814264145F2F56F2ull };
+       uint64_t a_pub_buf[8] = { 0x5E8D3B4BA83AEB15ull, 0x7165BE50BC42AE4Aull,
+                               0xC9B5A8D4160D09E9ull, 0x2AF502F3BE8952F2ull,
+                               0xC0F5015ECE5EFD85ull, 0x6795BD4BFF6E6DE3ull,
+                               0x8681A0F9872D79D5ull, 0xEB0FAF4CA986C4D3ull };
+
+       uint64_t b_sec_buf[4] = { 0xEE1B593761CF7F41ull, 0x19CE6BCCAD562B8Eull,
+                               0xDB95A200CC0AB26Aull, 0x2CE1788EC197E096ull };
+       uint64_t b_pub_buf[8] = { 0xB3AB0715F6CE51B0ull, 0xAE06AAEA279FA775ull,
+                               0x5346E8DE6C2C8646ull, 0xB120DE4AA3649279ull,
+                               0x85C34DDE5708B2B6ull, 0x3727027092A84113ull,
+                               0xD8EC685FA3F071D8ull, 0x9F1B7EECE20D7B5Eull };
+
+       uint64_t ss_buf[4] = { 0x7F80D21C820C2788ull,
+                                       0xF5811E9DC8EC8EEAull,
+                                       0x93310412D19A08F1ull,
+                                       0xDD0F5396219D1EA3ull };
+
+       struct l_ecc_scalar *a_shared;
+       struct l_ecc_scalar *b_shared;
+
+       struct l_ecc_scalar *a_secret = _ecc_constant_new(curve, a_sec_buf,
+                                                       sizeof(a_sec_buf));
+       struct l_ecc_point *a_public = l_ecc_point_new(curve);
+
+       struct l_ecc_scalar *b_secret = _ecc_constant_new(curve, b_sec_buf,
+                                                       sizeof(b_sec_buf));
+       struct l_ecc_point *b_public = l_ecc_point_new(curve);
+
+       memcpy(a_public->x, a_pub_buf, 32);
+       memcpy(a_public->y, a_pub_buf + 4, 32);
+       memcpy(b_public->x, b_pub_buf, 32);
+       memcpy(b_public->y, b_pub_buf + 4, 32);
+
+       use_real_getrandom = false;
+
+       assert(l_ecdh_generate_shared_secret(a_secret, b_public, &a_shared));
+       assert(l_ecdh_generate_shared_secret(b_secret, a_public, &b_shared));
+
+       assert(!memcmp(a_shared->c, ss_buf, 32));
+       assert(!memcmp(b_shared->c, ss_buf, 32));
+
+       use_real_getrandom = true;
+
+       l_ecc_scalar_free(a_secret);
+       l_ecc_scalar_free(b_secret);
+       l_ecc_point_free(a_public);
+       l_ecc_point_free(b_public);
+       l_ecc_scalar_free(a_shared);
+       l_ecc_scalar_free(b_shared);
+}
+
+/*
+ * Test vector from RFC 5114 - 384-bit Random ECP Group
+ */
+static void test_vector_p384(const void *data)
+{
+       const struct l_ecc_curve *curve = l_ecc_curve_get_ike_group(20);
+
+       uint64_t a_sec_buf[6] = { 0x86F05FEADB9376F1ull, 0xD706A90CBCB5DF29ull,
+                               0xD709EE7A7962A156ull, 0x5DFD8A7965571C48ull,
+                               0x44DD14E9FD126071ull, 0xD27335EA71664AF2ull };
+       uint64_t a_pub_buf[12] = { 0x7D016FE27A8B8C66ull, 0x7E6A8EA9D1FD7742ull,
+                               0x0EE6B0403D627954ull, 0xE057AB62F82054D1ull,
+                               0xDA4C6D9074417D05ull, 0x793148F1787634D5ull,
+                               0xBACED214A1A1D128ull, 0x8F7A685923DE3B67ull,
+                               0x6B8F398BB29E4236ull, 0xC947392E94F4C3F0ull,
+                               0xF480F4FB4CD40504ull, 0xC6C41294331D23E6ull };
+       uint64_t b_sec_buf[6] = { 0x2C4A6C768BCD94D2ull, 0x9BE52E00C194A413ull,
+                               0x1F80231121CCE3D3ull, 0x3B6125262C36A7DFull,
+                               0x9C0F00D456C2F702ull, 0x52D1791FDB4B70F8ull };
+       uint64_t b_pub_buf[12] = { 0x223F12B5A1ABC120ull, 0x789D72A84865AE2Full,
+                               0x4ABC17647B6B9999ull, 0x5B36DB65915359B4ull,
+                               0xF74B8D4EFB708B3Dull, 0x5CD42AB9C41B5347ull,
+                               0xE035B0EDF36755DEull, 0x40BDE8723415A8ECull,
+                               0x0CECA16356CA9332ull, 0x8F6D5B348C0FA4D8ull,
+                               0xA3A8BFAC46B404BDull, 0xE171458FEAA939AAull };
+       uint64_t ss_buf[6] = {
+                               0xDE159A58028ABC0Eull, 0x27AA8A4540884C37ull,
+                               0x59D926EB1B8456E4ull, 0xCAE53160137D904Cull,
+                               0x55981B110575E0A8ull, 0x5EA1FC4AF7256D20ull };
+       struct l_ecc_scalar *a_shared;
+       struct l_ecc_scalar *b_shared;
+
+       struct l_ecc_scalar *a_secret = _ecc_constant_new(curve, a_sec_buf,
+                                                       sizeof(a_sec_buf));
+       struct l_ecc_point *a_public = l_ecc_point_new(curve);
+
+       struct l_ecc_scalar *b_secret = _ecc_constant_new(curve, b_sec_buf,
+                                                       sizeof(b_sec_buf));
+       struct l_ecc_point *b_public = l_ecc_point_new(curve);
+
+       memcpy(a_public->x, a_pub_buf, 48);
+       memcpy(a_public->y, a_pub_buf + 6, 48);
+       memcpy(b_public->x, b_pub_buf, 48);
+       memcpy(b_public->y, b_pub_buf + 6, 48);
+
+       use_real_getrandom = false;
+
+       assert(l_ecdh_generate_shared_secret(a_secret, b_public, &a_shared));
+       assert(l_ecdh_generate_shared_secret(b_secret, a_public, &b_shared));
+
+       assert(!memcmp(a_shared->c, ss_buf, 48));
+       assert(!memcmp(b_shared->c, ss_buf, 48));
+
+       use_real_getrandom = true;
+
+       l_ecc_scalar_free(a_secret);
+       l_ecc_scalar_free(b_secret);
+       l_ecc_point_free(a_public);
+       l_ecc_point_free(b_public);
+       l_ecc_scalar_free(a_shared);
+       l_ecc_scalar_free(b_shared);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       if (l_getrandom_is_supported())
+               l_test_add("ECDH Basic", test_basic, NULL);
+
+       l_test_add("ECDH test vector P256", test_vector_p256, NULL);
+       l_test_add("ECDH test vector P384", test_vector_p384, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-endian.c b/unit/test-endian.c
new file mode 100644 (file)
index 0000000..50cc32d
--- /dev/null
@@ -0,0 +1,87 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void big_endian_16(const void *data)
+{
+       uint8_t val[2] = { 0x12, 0x34 }, *ptr = val;
+
+       assert(l_get_be16(ptr) == 0x1234);
+}
+
+static void big_endian_32(const void *data)
+{
+       uint8_t val[4] = { 0x12, 0x34, 0x56, 0x78 }, *ptr = val;
+
+       assert(l_get_be32(ptr) == 0x12345678);
+}
+
+static void big_endian_64(const void *data)
+{
+       uint8_t val[8] = { 0x12, 0x34, 0x56, 0x78,
+                               0x9a, 0xbc, 0xde, 0xf0 }, *ptr = val;
+
+       assert(l_get_be64(ptr) == 0x123456789abcdef0);
+}
+
+static void little_endian_16(const void *data)
+{
+       uint8_t val[2] = { 0x34, 0x12 }, *ptr = val;
+
+       assert(l_get_le16(ptr) == 0x1234);
+}
+
+static void little_endian_32(const void *data)
+{
+       uint8_t val[4] = { 0x78, 0x56, 0x34, 0x12 }, *ptr = val;
+
+       assert(l_get_le32(ptr) == 0x12345678);
+}
+
+static void little_endian_64(const void *data)
+{
+       uint8_t val[8] = { 0xf0, 0xde, 0xbc, 0x9a,
+                               0x78, 0x56, 0x34, 0x12 }, *ptr = val;
+
+       assert(l_get_le64(ptr) == 0x123456789abcdef0);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Big endian 16", big_endian_16, NULL);
+       l_test_add("Big endian 32", big_endian_32, NULL);
+       l_test_add("Big endian 64", big_endian_64, NULL);
+       l_test_add("Little endian 16", little_endian_16, NULL);
+       l_test_add("Little endian 32", little_endian_32, NULL);
+       l_test_add("Little endian 64", little_endian_64, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-genl-msg.c b/unit/test-genl-msg.c
new file mode 100644 (file)
index 0000000..b1c5275
--- /dev/null
@@ -0,0 +1,449 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <linux/genetlink.h>
+#include <ell/ell.h>
+
+#include "ell/genl-private.h"
+
+static bool do_print = false;
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       printf("%s%s\n", prefix, str);
+}
+
+static unsigned char set_station_request[] = {
+       0x34, 0x00, 0x00, 0x00, 0x17, 0x00, 0x05, 0x00, 0x8b, 0x53, 0x0d, 0x55,
+       0x14, 0x0e, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0x00,
+       0x03, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x06, 0x00, 0x24, 0xa2, 0xe1, 0xec,
+       0x17, 0x04, 0x00, 0x00, 0x0c, 0x00, 0x43, 0x00, 0x02, 0x00, 0x00, 0x00,
+       0x02, 0x00, 0x00, 0x00,
+};
+
+static void parse_set_station(const void *data)
+{
+       static const unsigned char mac[6] =
+               { 0x24, 0xa2, 0xe1, 0xec, 0x17, 0x04 };
+       struct nlmsghdr *nlmsg;
+       struct l_genl_msg *msg;
+       struct l_genl_attr attr;
+       bool result;
+       uint16_t type;
+       uint16_t len;
+       const void *payload;
+
+       nlmsg = (struct nlmsghdr *) set_station_request;
+       msg = _genl_msg_create(nlmsg);
+       assert(msg);
+
+       assert(l_genl_msg_get_command(msg) == 18);
+
+       result = l_genl_attr_init(&attr, msg);
+       assert(result);
+
+       /*Interface Index: 3 (0x00000003) */
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 3);
+       assert(len == 4);
+       assert(*((unsigned int *) payload) == 3);
+
+       /* MAC Address 24:A2:E1:EC:17:04 */
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 6);
+       assert(len == 6);
+       assert(!memcmp(payload, mac, 6));
+
+       /* Station Flags 2: len 8
+        *     Mask: 0x00000002
+        *         Authorized
+        *     Set: 0x00000002
+        *         Authorized
+        */
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 67);
+       assert(len == 8);
+       assert(((unsigned int *) payload)[0] == 2);
+       assert(((unsigned int *) payload)[1] == 2);
+
+       l_genl_msg_unref(msg);
+}
+
+static void build_set_station(const void *data)
+{
+       static uint32_t index = 3;
+       static const unsigned char mac[6] =
+               { 0x24, 0xa2, 0xe1, 0xec, 0x17, 0x04 };
+       static uint32_t flags[] = { 2, 2 };
+       struct l_genl_msg *msg;
+       const void *raw;
+       size_t size;
+
+       msg = l_genl_msg_new_sized(18, 512);
+       assert(msg);
+
+       assert(l_genl_msg_append_attr(msg, 3, 4, &index));
+       assert(l_genl_msg_append_attr(msg, 6, 6, mac));
+       assert(l_genl_msg_append_attr(msg, 67, 8, flags));
+
+       raw = _genl_msg_as_bytes(msg, 0x17, 0x05, 0x550d538b, 3604, &size);
+
+       if (do_print) {
+               l_util_hexdump(false, raw, size, do_debug, "[MSG] ");
+               l_util_hexdump(true, set_station_request, size,
+                                       do_debug, "[MSG] ");
+       }
+
+       assert(size == sizeof(set_station_request));
+       assert(!memcmp(raw, set_station_request, size));
+
+       l_genl_msg_unref(msg);
+}
+
+static const unsigned char set_rekey_offload_request[] = {
+       0x54, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x05, 0x00, 0x59, 0xa3, 0xe1, 0x53,
+       0xba, 0x02, 0x40, 0xe7, 0x4f, 0x00, 0x00, 0x00, 0x08, 0x00, 0x03, 0x00,
+       0x03, 0x00, 0x00, 0x00, 0x38, 0x00, 0x7a, 0x00, 0x14, 0x00, 0x01, 0x00,
+       0x2f, 0x82, 0xbb, 0x0d, 0x93, 0x56, 0x60, 0x4b, 0xb1, 0x55, 0x1c, 0x85,
+       0xc0, 0xeb, 0x32, 0x8b, 0x14, 0x00, 0x02, 0x00, 0x43, 0x25, 0xcf, 0x08,
+       0x0b, 0x92, 0xa7, 0x2d, 0x86, 0xdc, 0x43, 0x21, 0xd6, 0x0c, 0x12, 0x03,
+       0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+};
+
+static void parse_set_rekey_offload(const void *data)
+{
+       static const unsigned char kek[] = {
+               0x2f, 0x82, 0xbb, 0x0d, 0x93, 0x56, 0x60, 0x4b,
+               0xb1, 0x55, 0x1c, 0x85, 0xc0, 0xeb, 0x32, 0x8b };
+       static const unsigned char kck[] = {
+               0x43, 0x25, 0xcf, 0x08, 0x0b, 0x92, 0xa7, 0x2d,
+               0x86, 0xdc, 0x43, 0x21, 0xd6, 0x0c, 0x12, 0x03 };
+       static const unsigned char replay_counter[] = {
+               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+       struct nlmsghdr *nlmsg;
+       struct l_genl_msg *msg;
+       struct l_genl_attr attr;
+       struct l_genl_attr nested;
+       bool result;
+       uint16_t type;
+       uint16_t len;
+       const void *payload;
+
+       nlmsg = (struct nlmsghdr *) set_rekey_offload_request;
+       msg = _genl_msg_create(nlmsg);
+       assert(msg);
+
+       assert(l_genl_msg_get_command(msg) == 79);
+
+       result = l_genl_attr_init(&attr, msg);
+       assert(result);
+
+       /*Interface Index: 3 (0x00000003) */
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 3);
+       assert(len == 4);
+       assert(*((unsigned int *) payload) == 3);
+
+       /*
+        * Rekey Data: len 52
+        *     KEK: len 16
+        *         2f 82 bb 0d 93 56 60 4b b1 55 1c 85 c0 eb 32 8b
+        *     KCK: len 16
+        *         43 25 cf 08 0b 92 a7 2d 86 dc 43 21 d6 0c 12 03
+        *     Replay CTR: len 8
+        *         00 00 00 00 00 00 00 01
+        */
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 122);
+       assert(len == 52);
+
+       assert(l_genl_attr_recurse(&attr, &nested));
+
+       assert(l_genl_attr_next(&nested, &type, &len, &payload));
+       assert(type == 1);
+       assert(len == 16);
+       assert(!memcmp(payload, kek, 16));
+
+       assert(l_genl_attr_next(&nested, &type, &len, &payload));
+       assert(type == 2);
+       assert(len == 16);
+       assert(!memcmp(payload, kck, 16));
+
+       assert(l_genl_attr_next(&nested, &type, &len, &payload));
+       assert(type == 3);
+       assert(len == 8);
+       assert(!memcmp(payload, replay_counter, 8));
+
+       l_genl_msg_unref(msg);
+}
+
+static void build_set_rekey_offload(const void *data)
+{
+       static uint32_t index = 3;
+       static const unsigned char kek[] = {
+               0x2f, 0x82, 0xbb, 0x0d, 0x93, 0x56, 0x60, 0x4b,
+               0xb1, 0x55, 0x1c, 0x85, 0xc0, 0xeb, 0x32, 0x8b };
+       static const unsigned char kck[] = {
+               0x43, 0x25, 0xcf, 0x08, 0x0b, 0x92, 0xa7, 0x2d,
+               0x86, 0xdc, 0x43, 0x21, 0xd6, 0x0c, 0x12, 0x03 };
+       static const unsigned char replay_counter[] = {
+               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+       struct l_genl_msg *msg;
+       const void *raw;
+       size_t size;
+
+       msg = l_genl_msg_new_sized(79, 0);
+       assert(msg);
+
+       assert(l_genl_msg_append_attr(msg, 3, 4, &index));
+
+       assert(l_genl_msg_enter_nested(msg, 122));
+       assert(l_genl_msg_append_attr(msg, 1, 16, kek));
+       assert(l_genl_msg_append_attr(msg, 2, 16, kck));
+       assert(l_genl_msg_append_attr(msg, 3, 8, replay_counter));
+       assert(l_genl_msg_leave_nested(msg));
+
+       raw = _genl_msg_as_bytes(msg, 0x1b, 0x05, 0x53e1a359, 0xe74002ba,
+                                       &size);
+       if (do_print) {
+               l_util_hexdump(false, raw, size, do_debug, "[MSG] ");
+               l_util_hexdump(true, set_rekey_offload_request, size,
+                                       do_debug, "[MSG] ");
+       }
+
+       assert(size == sizeof(set_rekey_offload_request));
+       assert(!memcmp(raw, set_rekey_offload_request, size));
+
+       l_genl_msg_unref(msg);
+}
+
+/*
+ * This example is generated by libnl:
+       msg = nlmsg_alloc();
+       hdr = genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, ops.o_id,
+                       0, 0, TASKSTATS_CMD_GET, TASKSTATS_GENL_VERSION);
+       nla_put_u32(msg, TASKSTATS_CMD_ATTR_PID, 1);
+
+       nest1 = nla_nest_start(msg, 0x45);
+       nla_put_string(msg, 0x46, "f");
+       nla_put_string(msg, 0x47, "foob");
+       nla_put_string(msg, 0x48, "foobar");
+
+       nest2 = nla_nest_start(msg, 0x49);
+       nla_put_string(msg, 0x50, "ba");
+       nla_nest_end(msg, nest2);
+       nla_nest_end(msg, nest1);
+*/
+
+static const unsigned char libnl_nested[] = {
+       0x4c, 0x00, 0x00, 0x00, 0x15, 0x00, 0x05, 0x00, 0x72, 0x05, 0x13, 0x55,
+       0x77, 0x68, 0x40, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00,
+       0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x45, 0x00, 0x06, 0x00, 0x46, 0x00,
+       0x66, 0x00, 0x00, 0x00, 0x09, 0x00, 0x47, 0x00, 0x66, 0x6f, 0x6f, 0x62,
+       0x00, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x48, 0x00, 0x66, 0x6f, 0x6f, 0x62,
+       0x61, 0x72, 0x00, 0x00, 0x0c, 0x00, 0x49, 0x00, 0x07, 0x00, 0x50, 0x00,
+       0x62, 0x61, 0x00, 0x00,
+};
+
+static void parse_libnl_nested(const void *data)
+{
+       struct nlmsghdr *nlmsg;
+       struct l_genl_msg *msg;
+       struct l_genl_attr attr;
+       struct l_genl_attr nested1;
+       struct l_genl_attr nested2;
+       bool result;
+       uint16_t type;
+       uint16_t len;
+       const void *payload;
+
+       nlmsg = (struct nlmsghdr *) libnl_nested;
+       msg = _genl_msg_create(nlmsg);
+       assert(msg);
+
+       assert(l_genl_msg_get_command(msg) == 1);
+
+       result = l_genl_attr_init(&attr, msg);
+       assert(result);
+
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 1);
+       assert(len == 4);
+       assert(*((unsigned int *) payload) == 1);
+
+       assert(l_genl_attr_next(&attr, &type, &len, &payload));
+       assert(type == 0x45);
+       assert(len == 44);
+
+       assert(l_genl_attr_recurse(&attr, &nested1));
+
+       assert(l_genl_attr_next(&nested1, &type, &len, &payload));
+       assert(type == 0x46);
+       assert(len == 2);
+       assert(!strcmp(payload, "f"));
+
+       assert(l_genl_attr_next(&nested1, &type, &len, &payload));
+       assert(type == 0x47);
+       assert(len == 5);
+       assert(!strcmp(payload, "foob"));
+
+       assert(l_genl_attr_next(&nested1, &type, &len, &payload));
+       assert(type == 0x48);
+       assert(len == 7);
+       assert(!strcmp(payload, "foobar"));
+
+       assert(l_genl_attr_next(&nested1, &type, &len, &payload));
+       assert(type == 0x49);
+       assert(len == 8);
+
+       assert(l_genl_attr_recurse(&nested1, &nested2));
+       assert(l_genl_attr_next(&nested2, &type, &len, &payload));
+       assert(type == 0x50);
+       assert(len == 3);
+       assert(!strcmp(payload, "ba"));
+
+       l_genl_msg_unref(msg);
+}
+
+static void build_libnl_nested(const void *data)
+{
+       static uint32_t index = 1;
+       struct l_genl_msg *msg;
+       const void *raw;
+       size_t size;
+
+       msg = l_genl_msg_new_sized(1, 16);
+       assert(msg);
+
+       assert(l_genl_msg_append_attr(msg, 1, 4, &index));
+
+       assert(l_genl_msg_enter_nested(msg, 0x45));
+       assert(l_genl_msg_append_attr(msg, 0x46, 2, "f"));
+       assert(l_genl_msg_append_attr(msg, 0x47, 5, "foob"));
+       assert(l_genl_msg_append_attr(msg, 0x48, 7, "foobar"));
+       assert(l_genl_msg_enter_nested(msg, 0x49));
+       assert(l_genl_msg_append_attr(msg, 0x50, 3, "ba"));
+       assert(l_genl_msg_leave_nested(msg));
+       assert(l_genl_msg_leave_nested(msg));
+
+       raw = _genl_msg_as_bytes(msg, 0x15, 0x05, 0x55130572, 0x0c406877,
+                                       &size);
+       if (do_print) {
+               l_util_hexdump(false, raw, size, do_debug, "[MSG] ");
+               l_util_hexdump(true, libnl_nested, sizeof(libnl_nested),
+                                                       do_debug, "[MSG] ");
+       }
+
+       assert(size == sizeof(libnl_nested));
+       assert(!memcmp(raw, libnl_nested, size));
+
+       l_genl_msg_unref(msg);
+}
+
+static void test_append_attrv(const void *data)
+{
+       static const int num_blocks = 3;
+       unsigned char * const payload = set_station_request;
+       const size_t total_len = L_ARRAY_SIZE(set_station_request);
+       const size_t block_len = total_len / num_blocks;
+       const struct iovec iov[] = {
+           {
+               .iov_base = payload,
+               .iov_len  = block_len
+           },
+           {
+               .iov_base = payload + block_len,
+               .iov_len  = block_len
+           },
+           {
+               .iov_base = payload + block_len * 2,
+               .iov_len  = total_len - block_len * 2
+           }
+       };
+
+       struct l_genl_msg *msg;
+       const uint16_t type = 2;
+       struct l_genl_attr attr;
+       uint16_t attr_type;
+       uint16_t attr_len;
+       const void *attr_payload;
+
+       assert(L_ARRAY_SIZE(iov) == num_blocks);
+
+       msg = l_genl_msg_new_sized(1, NLA_HDRLEN + NLA_ALIGN(total_len));
+       assert(msg);
+
+       assert(l_genl_msg_append_attrv(msg, type, iov, L_ARRAY_SIZE(iov)));
+       assert(l_genl_attr_init(&attr, msg));
+       assert(l_genl_attr_next(&attr, &attr_type, &attr_len, &attr_payload));
+
+       assert(type == attr_type);
+       assert(total_len == attr_len);
+       assert(memcmp(payload, attr_payload, total_len) == 0);
+
+       l_genl_msg_unref(msg);
+}
+
+int main(int argc, char *argv[])
+{
+       bool little_endian;
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+       little_endian = true;
+#elif __BYTE_ORDER == __BIG_ENDIAN
+       little_endian = false;
+#else
+#error "Unknown byte order"
+#endif
+
+       l_test_init(&argc, &argv);
+
+       if (!little_endian)
+               goto done;
+
+       l_test_add("Parse Set Station Request", parse_set_station, NULL);
+       l_test_add("Parse Set Rekey Offload Request",
+                               parse_set_rekey_offload, NULL);
+
+       l_test_add("Build Set Station Request", build_set_station, NULL);
+       l_test_add("Build Set Rekey Offload Request",
+                               build_set_rekey_offload, NULL);
+
+       l_test_add("libnl-generated Example with Nesting",
+                               parse_libnl_nested, NULL);
+       l_test_add("Build libnl-generated Example with Nesting",
+                               build_libnl_nested, NULL);
+
+       l_test_add("Test l_genl_msg_append_attrv",
+                               test_append_attrv, NULL);
+
+done:
+       return l_test_run();
+}
diff --git a/unit/test-gvariant-message.c b/unit/test-gvariant-message.c
new file mode 100644 (file)
index 0000000..8ded4cd
--- /dev/null
@@ -0,0 +1,423 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+#include "ell/dbus-private.h"
+
+static bool do_print = true;
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+struct message_data {
+       const char *type;
+       const char *path;
+       const char *interface;
+       const char *member;
+       const char *destination;
+       const char *signature;
+       const unsigned char *binary;
+       size_t binary_len;
+};
+
+static const unsigned char basic_1[] = {
+       0x6c, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x57, 0x04, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x2f, 0x66, 0x6f, 0x6f, 0x2f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x6f, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x46, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x2e, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x2e, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x13, 0x29,
+       0x42, 0x5a, 0x00, 0x00, 0x01, 0xff, 0xe0, 0xff, 0x20, 0x00, 0x00, 0x00,
+       0xe8, 0xff, 0xff, 0xff, 0x18, 0x00, 0x00, 0x00, 0x9d, 0xff, 0xff, 0xff,
+       0x7d, 0x7f, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x00, 0x28, 0x62, 0x79,
+       0x6e, 0x71, 0x69, 0x75, 0x78, 0x74, 0x64, 0x29, 0x6e,
+};
+
+static const struct message_data message_data_basic_1 = {
+       .type           = "method_call",
+       .path           = "/foo/bar",
+       .interface      = "foo.bar",
+       .member         = "Foobar",
+       .destination    = "foo.bar",
+       .signature      = "bynqiuxtd",
+       .binary         = basic_1,
+       .binary_len     = sizeof(basic_1),
+};
+
+static const unsigned char message_binary_complex_1[] = {
+       0x6c, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x57, 0x04, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+       0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x00, 0x00, 0x6f, 0x00, 0x00,
+       0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x65, 0x74, 0x68,
+       0x6f, 0x64, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6d, 0x2e,
+       0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+       0x72, 0x66, 0x61, 0x63, 0x65, 0x00, 0x00, 0x73, 0x06, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+       0x70, 0x6c, 0x65, 0x00, 0x00, 0x73, 0x1e, 0x31, 0x58, 0x6e, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x2f, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x78, 0x61,
+       0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x4e, 0x61, 0x6d, 0x65, 0x00, 0x00, 0x00, 0x00,
+       0x4c, 0x69, 0x6e, 0x75, 0x73, 0x20, 0x54, 0x6f, 0x72, 0x76, 0x61, 0x6c,
+       0x64, 0x73, 0x00, 0x00, 0x73, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x72, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x62, 0x0a, 0x1a, 0x34, 0x14, 0x00,
+       0x28, 0x6f, 0x61, 0x7b, 0x73, 0x76, 0x7d, 0x29, 0x82,
+};
+
+static const struct message_data message_data_complex_1 = {
+       .type           = "method_call",
+       .path           = "/com/example/object",
+       .interface      = "com.example.interface",
+       .member         = "method",
+       .destination    = "com.example",
+       .signature      = "oa{sv}",
+       .binary         = message_binary_complex_1,
+       .binary_len     = sizeof(message_binary_complex_1),
+};
+
+static const unsigned char message_binary_empty_sig[] = {
+       0x6c, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x57, 0x04, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x2f, 0x66, 0x6f, 0x6f, 0x2f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x6f, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x46, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x2e, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x2e, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x13, 0x29,
+       0x42, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x28, 0x29, 0x6e,
+};
+
+static const struct message_data message_data_empty_sig = {
+       .type           = "method_call",
+       .path           = "/foo/bar",
+       .interface      = "foo.bar",
+       .member         = "Foobar",
+       .destination    = "foo.bar",
+       .signature      = "",
+       .binary         = message_binary_empty_sig,
+       .binary_len     = sizeof(message_binary_empty_sig),
+};
+
+static struct l_dbus_message *check_message(const struct message_data *msg_data)
+{
+       struct l_dbus_message *msg;
+
+       msg = dbus_message_from_blob(msg_data->binary, msg_data->binary_len,
+                                       NULL, 0);
+       assert(msg);
+
+       if (msg_data->path) {
+               const char *path = l_dbus_message_get_path(msg);
+               assert(path);
+               assert(!strcmp(msg_data->path, path));
+
+               if (do_print)
+                       l_info("path=%s", path);
+       }
+
+       if (msg_data->interface) {
+               const char *interface = l_dbus_message_get_interface(msg);
+               assert(interface);
+               assert(!strcmp(msg_data->interface, interface));
+
+               if (do_print)
+                       l_info("interface=%s", interface);
+       }
+
+       if (msg_data->member) {
+               const char *member = l_dbus_message_get_member(msg);
+               assert(member);
+               assert(!strcmp(msg_data->member, member));
+
+               if (do_print)
+                       l_info("member=%s", member);
+       }
+       if (msg_data->destination) {
+               const char *destination = l_dbus_message_get_destination(msg);
+               assert(destination);
+               assert(!strcmp(msg_data->destination, destination));
+
+               if (do_print)
+                       l_info("destination=%s", destination);
+       }
+
+       if (msg_data->signature) {
+               const char *signature = l_dbus_message_get_signature(msg);
+               assert(signature);
+               assert(!strcmp(msg_data->signature, signature));
+
+               if (do_print)
+                       l_info("signature=%s", signature);
+       }
+
+       return msg;
+}
+
+static struct l_dbus_message *build_message(const struct message_data *msg_data)
+{
+       struct l_dbus_message *msg;
+
+       msg = _dbus_message_new_method_call(2, msg_data->destination,
+                       msg_data->path, msg_data->interface, msg_data->member);
+       assert(msg);
+
+       return msg;
+}
+
+static void compare_message(struct l_dbus_message *msg,
+                                       const struct message_data *msg_data)
+{
+       bool result;
+
+       if (do_print) {
+               void *blob;
+               void *header, *body;
+               size_t header_size, body_size;
+
+               header = _dbus_message_get_header(msg, &header_size);
+               body = _dbus_message_get_body(msg, &body_size);
+               blob = l_malloc(header_size + body_size);
+               memcpy(blob, header, header_size);
+               memcpy(blob + header_size, body, body_size);
+
+               l_util_hexdump(true, blob, header_size + body_size,
+                               do_debug, "[MSG] ");
+
+               l_free(blob);
+
+               l_util_hexdump(true, msg_data->binary, msg_data->binary_len,
+                                                       do_debug, "[MSG] ");
+       }
+
+       result = dbus_message_compare(msg, msg_data->binary,
+                                               msg_data->binary_len);
+       assert(result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void parse_basic_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       bool result;
+       bool b;
+       uint8_t y;
+       uint16_t q;
+       int16_t n;
+       uint32_t u;
+       int32_t i;
+       uint64_t t;
+       int64_t x;
+       double d;
+
+       result = l_dbus_message_get_arguments(msg, "bynqiuxtd", &b, &y, &n, &q,
+                                               &i, &u, &x, &t, &d);
+       assert(result);
+
+       assert(b == true);
+       assert(y == 255);
+       assert(n == -32);
+       assert(q == 32);
+       assert(i == -24);
+       assert(u == 24);
+       assert(x == 140179142606749);
+       assert(t == 99);
+       assert(d == 5.0);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_basic_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "bynqiuxtd", true, 255,
+                                               -32, 32, -24, 24,
+                                               (uint64_t) 140179142606749,
+                                               (int64_t) 99, 5.0);
+       assert(result);
+
+       _dbus_message_set_serial(msg, 1111);
+
+       compare_message(msg, data);
+}
+
+static void check_complex_1(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+       struct l_dbus_message_iter dict, iter;
+       const char *path, *str;
+       bool result, val;
+
+       result = l_dbus_message_get_arguments(msg, "oa{sv}", &path, &dict);
+       assert(result);
+       assert(!strcmp(path, "/com/example/object"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Name"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "s", &str);
+       assert(result);
+       assert(!strcmp(str, "Linus Torvalds"));
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(result);
+       assert(!strcmp(str, "Developer"));
+
+       result = l_dbus_message_iter_get_variant(&iter, "b", &val);
+       assert(result);
+       assert(val);
+
+       result = l_dbus_message_iter_next_entry(&dict, &str, &iter);
+       assert(!result);
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_complex_1(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "oa{sv}",
+                                               "/com/example/object", 2,
+                                               "Name", "s", "Linus Torvalds",
+                                               "Developer", "b", true);
+       assert(result);
+
+       _dbus_message_set_serial(msg, 1111);
+
+       compare_message(msg, data);
+}
+
+static void check_empty_sig(const void *data)
+{
+       struct l_dbus_message *msg = check_message(data);
+
+       assert(l_dbus_message_get_arguments(msg, ""));
+
+       l_dbus_message_unref(msg);
+}
+
+static void build_empty_sig(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       bool result;
+
+       result = l_dbus_message_set_arguments(msg, "");
+       assert(result);
+
+       _dbus_message_set_serial(msg, 1111);
+
+       compare_message(msg, data);
+}
+
+static void builder_rewind(const void *data)
+{
+       struct l_dbus_message *msg = build_message(data);
+       struct l_dbus_message_builder *builder;
+       bool b = true;
+
+       builder = l_dbus_message_builder_new(msg);
+       assert(builder);
+
+       assert(l_dbus_message_builder_append_basic(builder, 'o',
+                                                       "/com/example/object"));
+
+       assert(l_dbus_message_builder_enter_array(builder, "{sv}"));
+
+       assert(_dbus_message_builder_mark(builder));
+
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "Name"));
+       assert(l_dbus_message_builder_enter_variant(builder, "s"));
+       assert(l_dbus_message_builder_append_basic(builder, 's',
+                                                       "Invalid"));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+
+       assert(_dbus_message_builder_rewind(builder));
+
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "Name"));
+       assert(l_dbus_message_builder_enter_variant(builder, "s"));
+       assert(l_dbus_message_builder_append_basic(builder, 's',
+                                                       "Linus Torvalds"));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+
+       assert(l_dbus_message_builder_enter_dict(builder, "sv"));
+       assert(l_dbus_message_builder_append_basic(builder, 's', "Developer"));
+       assert(l_dbus_message_builder_enter_variant(builder, "b"));
+       assert(l_dbus_message_builder_append_basic(builder, 'b', &b));
+       assert(l_dbus_message_builder_leave_variant(builder));
+       assert(l_dbus_message_builder_leave_dict(builder));
+
+       assert(l_dbus_message_builder_leave_array(builder));
+
+       assert(l_dbus_message_builder_finalize(builder));
+       l_dbus_message_builder_destroy(builder);
+
+       compare_message(msg, data);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Basic 1 (parse)", parse_basic_1, &message_data_basic_1);
+       l_test_add("Basic 1 (build)", build_basic_1, &message_data_basic_1);
+
+       l_test_add("Complex 1 (parse)", check_complex_1,
+                                               &message_data_complex_1);
+       l_test_add("Complex 1 (build)", build_complex_1,
+                                               &message_data_complex_1);
+
+       l_test_add("Empty signature (parse)", check_empty_sig,
+                                               &message_data_empty_sig);
+       l_test_add("Empty signature (build)", build_empty_sig,
+                                               &message_data_empty_sig);
+
+       l_test_add("Message Builder Rewind Complex 1", builder_rewind,
+                                               &message_data_complex_1);
+
+       return l_test_run();
+}
diff --git a/unit/test-gvariant-util.c b/unit/test-gvariant-util.c
new file mode 100644 (file)
index 0000000..4bc2b46
--- /dev/null
@@ -0,0 +1,1953 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <math.h>
+#include <float.h>
+#include <stdio.h>
+
+#include <ell/ell.h>
+#include "ell/gvariant-private.h"
+
+struct signature_test {
+       bool valid;
+       const char *signature;
+};
+
+#define SIGNATURE_TEST(v, sig, i)                              \
+       static struct signature_test sig_test##i = {            \
+               .valid = v,                                     \
+               .signature = sig,                               \
+       }
+
+SIGNATURE_TEST(false, "a", 1);
+SIGNATURE_TEST(false, "a{vs}", 2);
+SIGNATURE_TEST(true, "(ss)", 3);
+SIGNATURE_TEST(true, "(s(ss))", 4);
+SIGNATURE_TEST(true, "as", 5);
+SIGNATURE_TEST(true, "ab", 6);
+SIGNATURE_TEST(true, "aas", 7);
+SIGNATURE_TEST(true, "a(ss)", 8);
+SIGNATURE_TEST(true, "asas", 9);
+SIGNATURE_TEST(true, "av", 10);
+SIGNATURE_TEST(true, "a{sv}", 11);
+SIGNATURE_TEST(true, "v", 12);
+SIGNATURE_TEST(true, "oa{sv}", 13);
+SIGNATURE_TEST(true, "a(oa{sv})", 14);
+SIGNATURE_TEST(true, "(sa{sv})sa{ss}us", 15);
+SIGNATURE_TEST(true, "(bba{ss})", 16);
+SIGNATURE_TEST(true, "{sv}", 17);
+SIGNATURE_TEST(false, "{vu}", 18);
+SIGNATURE_TEST(false, "{uv", 19);
+SIGNATURE_TEST(false, "(ss", 20);
+SIGNATURE_TEST(false, "aaaaa", 21);
+SIGNATURE_TEST(true, "()", 22);
+SIGNATURE_TEST(false, "", 23);
+
+static void test_signature(const void *test_data)
+{
+       const struct signature_test *test = test_data;
+       bool valid;
+
+       valid = _gvariant_valid_signature(test->signature);
+
+       assert(valid == test->valid);
+}
+
+struct alignment_test {
+       int alignment;
+       const char *signature;
+};
+
+#define ALIGNMENT_TEST(sig, a, i)                              \
+       static struct alignment_test align_test##i = {          \
+               .alignment = a,                                 \
+               .signature = sig,                               \
+       }
+
+ALIGNMENT_TEST("()", 1, 1);
+ALIGNMENT_TEST("y", 1, 2);
+ALIGNMENT_TEST("b", 1, 3);
+ALIGNMENT_TEST("s", 1, 4);
+ALIGNMENT_TEST("o", 1, 5);
+ALIGNMENT_TEST("g", 1, 6);
+ALIGNMENT_TEST("q", 2, 7);
+ALIGNMENT_TEST("n", 2, 8);
+ALIGNMENT_TEST("u", 4, 9);
+ALIGNMENT_TEST("h", 4, 10);
+ALIGNMENT_TEST("i", 4, 11);
+ALIGNMENT_TEST("v", 8, 12);
+ALIGNMENT_TEST("t", 8, 13);
+ALIGNMENT_TEST("x", 8, 14);
+ALIGNMENT_TEST("d", 8, 15);
+ALIGNMENT_TEST("ay", 1, 16);
+ALIGNMENT_TEST("as", 1, 17);
+ALIGNMENT_TEST("au", 4, 18);
+ALIGNMENT_TEST("an", 2, 19);
+ALIGNMENT_TEST("ans", 2, 20);
+ALIGNMENT_TEST("ant", 8, 21);
+ALIGNMENT_TEST("(ss)", 1, 22);
+ALIGNMENT_TEST("(ssu)", 4, 23);
+ALIGNMENT_TEST("a(ssu)", 4, 24);
+ALIGNMENT_TEST("(u)", 4, 25);
+ALIGNMENT_TEST("(uuuuy)", 4, 26);
+ALIGNMENT_TEST("(uusuuy)", 4, 27);
+ALIGNMENT_TEST("a{ss}", 1, 28);
+ALIGNMENT_TEST("((u)yyy(b(iiii)))", 4, 29);
+ALIGNMENT_TEST("((u)yyy(b(iiivi)))", 8, 30);
+ALIGNMENT_TEST("((b)(t))", 8, 31);
+ALIGNMENT_TEST("((b)(b)(t))", 8, 32);
+ALIGNMENT_TEST("(bt)", 8, 33);
+ALIGNMENT_TEST("((t)(b))", 8, 34);
+ALIGNMENT_TEST("(tb)", 8, 35);
+ALIGNMENT_TEST("((b)(b))", 1, 36);
+ALIGNMENT_TEST("((t)(t))", 8, 37);
+
+static void test_alignment(const void *test_data)
+{
+       const struct alignment_test *test = test_data;
+       int alignment;
+
+       alignment = _gvariant_get_alignment(test->signature);
+
+       assert(alignment == test->alignment);
+}
+
+struct is_fixed_size_test {
+       bool fixed_size;
+       const char *signature;
+};
+
+struct get_fixed_size_test {
+       int size;
+       const char *signature;
+};
+
+#define IS_FIXED_SIZE_TEST(sig, v, i)                                  \
+       static struct is_fixed_size_test is_fixed_size_test##i = {      \
+               .fixed_size = v,                                        \
+               .signature = sig,                                       \
+       }
+
+IS_FIXED_SIZE_TEST("", true, 1);
+IS_FIXED_SIZE_TEST("()", true, 2);
+IS_FIXED_SIZE_TEST("y", true, 3);
+IS_FIXED_SIZE_TEST("u", true, 4);
+IS_FIXED_SIZE_TEST("b", true, 5);
+IS_FIXED_SIZE_TEST("n", true, 6);
+IS_FIXED_SIZE_TEST("q", true, 7);
+IS_FIXED_SIZE_TEST("i", true, 8);
+IS_FIXED_SIZE_TEST("t", true, 9);
+IS_FIXED_SIZE_TEST("d", true, 10);
+IS_FIXED_SIZE_TEST("s", false, 11);
+IS_FIXED_SIZE_TEST("o", false, 12);
+IS_FIXED_SIZE_TEST("g", false, 13);
+IS_FIXED_SIZE_TEST("h", true, 14);
+IS_FIXED_SIZE_TEST("ay", false, 15);
+IS_FIXED_SIZE_TEST("v", false, 16);
+IS_FIXED_SIZE_TEST("(u)", true, 17);
+IS_FIXED_SIZE_TEST("(uuuuy)", true, 18);
+IS_FIXED_SIZE_TEST("(uusuuy)", false, 19);
+IS_FIXED_SIZE_TEST("a{ss}", false, 20);
+IS_FIXED_SIZE_TEST("((u)yyy(b(iiii)))", true, 21);
+IS_FIXED_SIZE_TEST("((u)yyy(b(iiivi)))", false, 22);
+
+static void test_is_fixed_size(const void *test_data)
+{
+       const struct is_fixed_size_test *test = test_data;
+       bool fixed_size;
+
+       fixed_size = _gvariant_is_fixed_size(test->signature);
+
+       assert(fixed_size == test->fixed_size);
+}
+
+#define GET_FIXED_SIZE_TEST(sig, n, i)                         \
+       static struct get_fixed_size_test size_test##i = {      \
+               .size = n,                                      \
+               .signature = sig,                               \
+       }
+
+GET_FIXED_SIZE_TEST("", 0, 1);
+GET_FIXED_SIZE_TEST("()", 1, 2);
+GET_FIXED_SIZE_TEST("y", 1, 3);
+GET_FIXED_SIZE_TEST("u", 4, 4);
+GET_FIXED_SIZE_TEST("b", 1, 5);
+GET_FIXED_SIZE_TEST("n", 2, 6);
+GET_FIXED_SIZE_TEST("q", 2, 7);
+GET_FIXED_SIZE_TEST("i", 4, 8);
+GET_FIXED_SIZE_TEST("t", 8, 9);
+GET_FIXED_SIZE_TEST("d", 8, 10);
+GET_FIXED_SIZE_TEST("s", 0, 11);
+GET_FIXED_SIZE_TEST("o", 0, 12);
+GET_FIXED_SIZE_TEST("g", 0, 13);
+GET_FIXED_SIZE_TEST("h", 4, 14);
+GET_FIXED_SIZE_TEST("ay", 0, 15);
+GET_FIXED_SIZE_TEST("v", 0, 16);
+GET_FIXED_SIZE_TEST("(u)", 4, 17);
+GET_FIXED_SIZE_TEST("(uuuuy)", 20, 18);
+GET_FIXED_SIZE_TEST("(uusuuy)", 0, 19);
+GET_FIXED_SIZE_TEST("a{ss}", 0, 20);
+GET_FIXED_SIZE_TEST("((u)yyy(b(iiii)))", 28, 21);
+GET_FIXED_SIZE_TEST("((u)yyy(b(iiivi)))", 0, 22);
+GET_FIXED_SIZE_TEST("((b)(t))", 16, 23);
+GET_FIXED_SIZE_TEST("((b)(b)(t))", 16, 24);
+GET_FIXED_SIZE_TEST("(bt)", 16, 25);
+GET_FIXED_SIZE_TEST("((t)(b))", 16, 26);
+GET_FIXED_SIZE_TEST("(tb)", 16, 27);
+GET_FIXED_SIZE_TEST("((b)(b))", 2, 28);
+GET_FIXED_SIZE_TEST("((t)(t))", 16, 29);
+
+static void test_get_fixed_size(const void *test_data)
+{
+       const struct get_fixed_size_test *test = test_data;
+       int size;
+
+       size = _gvariant_get_fixed_size(test->signature);
+
+       assert(size == test->size);
+}
+
+struct parser_data {
+       const unsigned char *data;
+       size_t len;
+       const char *signature;
+};
+
+static const unsigned char basic_data_1[] = {
+       0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21,
+       0x00,
+};
+
+static struct parser_data parser_data_1 = {
+       .data = basic_data_1,
+       .len = 13,
+       .signature = "s",
+};
+
+static void test_iter_basic_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       const char *s;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       assert(_gvariant_iter_next_entry_basic(&iter, 's', &s));
+       assert(!strcmp(s, "Hello World!"));
+}
+
+static const unsigned char basic_data_2[] = {
+       0x05, 0x00, 0x00, 0x00, 0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00,
+};
+
+static struct parser_data parser_data_2 = {
+       .data = basic_data_2,
+       .len = 11,
+       .signature = "is",
+};
+
+static void test_iter_basic_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       const char *s;
+       int i;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'i', &i);
+       assert(ret);
+       assert(i == 5);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar"));
+}
+
+static const unsigned char basic_data_3[] = {
+       0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x14, 0x40, 0xdf, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x1c, 0xaf, 0x7d, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x21, 0x7f, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0xe4, 0xd4, 0x59, 0xfd, 0xff, 0xff, 0xff, 0xff,
+       0xff, 0x00, 0x00, 0x00, 0x02, 0xad, 0x31, 0x00, 0x66, 0x6f, 0x6f, 0x62,
+       0x61, 0x72, 0x00, 0x00, 0xfe, 0x52, 0xce, 0xff, 0x3f,
+};
+
+static struct parser_data parser_data_3 = {
+       .data = basic_data_3,
+       .len = 69,
+       .signature = "bdntqxyusi",
+};
+
+static void test_iter_basic_3(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       bool b;
+       double d;
+       int16_t n;
+       uint64_t t;
+       uint16_t q;
+       int64_t x;
+       uint8_t y;
+       uint32_t u;
+       const char *s;
+       int32_t i;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'd', &b);
+       assert(ret == false);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'b', &b);
+       assert(ret);
+       assert(b == true);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'd', &d);
+       assert(ret);
+       assert(fabs(d - 5.0) < DBL_EPSILON);
+       assert(d == 5.0);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'n', &n);
+       assert(ret);
+       assert(n == -32545);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 't', &t);
+       assert(ret);
+       assert(t == 444444444LL);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'q', &q);
+       assert(ret);
+       assert(q == 32545);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'x', &x);
+       assert(ret);
+       assert(x == -44444444LL);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'y', &y);
+       assert(ret);
+       assert(y == 255);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'u', &u);
+       assert(ret);
+       assert(u == 3255554);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar"));
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'i', &i);
+       assert(ret);
+       assert(i == -3255554);
+}
+
+static const unsigned char basic_data_4[] = {
+       0x66, 0x6f, 0x6f, 0x00, 0x62, 0x61, 0x72, 0x00,
+       0x62, 0x61, 0x7a, 0x00, 0x08, 0x04,
+};
+
+static struct parser_data parser_data_4 = {
+       .data = basic_data_4,
+       .len = 14,
+       .signature = "sss",
+};
+
+static void test_iter_basic_4(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       const char *s;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 's', &s);
+       assert(ret == true);
+       assert(!strcmp(s, "foo"));
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 's', &s);
+       assert(ret == true);
+       assert(!strcmp(s, "bar"));
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 's', &s);
+       assert(ret == true);
+       assert(!strcmp(s, "baz"));
+}
+
+static const unsigned char fixed_struct_data_1[] = {
+       0x0a, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00,
+};
+
+static struct parser_data fixed_struct_1 = {
+       .data = fixed_struct_data_1,
+       .len = 8,
+       .signature = "i(yy)",
+};
+
+static void test_iter_fixed_struct_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       int32_t i;
+       uint8_t y;
+       bool ret;
+       struct l_dbus_message_iter structure;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'i', &i);
+       assert(ret);
+       assert(i == 10);
+
+       ret = _gvariant_iter_enter_struct(&iter, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 255);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 1);
+}
+
+static const unsigned char fixed_struct_data_2[] = {
+       0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb3, 0x15, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0xb3, 0x15, 0x00, 0x00,
+};
+
+static struct parser_data fixed_struct_2 = {
+       .data = fixed_struct_data_2,
+       .len = 24,
+       .signature = "(yyt)(yyu)",
+};
+
+static void test_iter_fixed_struct_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       uint64_t t;
+       uint32_t u;
+       uint8_t y;
+       bool ret;
+       struct l_dbus_message_iter structure;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_struct(&iter, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 2);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 't', &t);
+       assert(ret);
+       assert(t == 5555);
+
+       ret = _gvariant_iter_enter_struct(&iter, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 2);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'u', &u);
+       assert(ret);
+       assert(u == 5555);
+}
+
+static const unsigned char nested_struct_data_1[] = {
+       0x01, 0x00, 0x00, 0x00, 0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00, 0xff,
+       0xff, 0xff, 0xff, 0xff, 0x0b,
+};
+
+static struct parser_data nested_struct_1 = {
+       .data = nested_struct_data_1,
+       .len = 17,
+       .signature = "((us)yi)",
+};
+
+static void test_iter_nested_struct_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       uint32_t u;
+       uint8_t y;
+       int32_t i;
+       const char *s;
+       bool ret;
+       struct l_dbus_message_iter outer;
+       struct l_dbus_message_iter inner;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_struct(&iter, &outer);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_struct(&outer, &inner);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar"));
+
+       ret = _gvariant_iter_next_entry_basic(&outer, 'y', &y);
+       assert(ret);
+       assert(y == 255);
+
+       ret = _gvariant_iter_next_entry_basic(&outer, 'i', &i);
+       assert(ret);
+       assert(i == -1);
+}
+
+static const unsigned char empty_struct_data_1[] = {
+       0x00
+};
+
+static struct parser_data empty_struct_1 = {
+       .data = empty_struct_data_1,
+       .len = sizeof(empty_struct_data_1),
+       .signature = "()",
+};
+
+static void test_iter_empty_struct_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       bool ret;
+       struct l_dbus_message_iter str;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_struct(&iter, &str);
+       assert(ret);
+       assert(str.sig_len == 0);
+}
+
+static const unsigned char variant_data_1[] = {
+       0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x6f, 0x6f, 0x62,
+       0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+       0x11, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x19,
+};
+
+static struct parser_data variant_1 = {
+       .data = variant_data_1,
+       .len = 33,
+       .signature = "(uvu)i",
+};
+
+static void test_iter_variant_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter structure;
+       struct l_dbus_message_iter variant;
+       int32_t i;
+       uint32_t u;
+       const char *s;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_struct(&iter, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'u', &u);
+       assert(ret);
+       assert(u == 5);
+
+       ret = _gvariant_iter_enter_variant(&structure, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar"));
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'u', &u);
+       assert(ret);
+       assert(u == 5);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'i', &i);
+       assert(ret);
+       assert(i == 5);
+}
+
+static const unsigned char variant_data_2[] = {
+       0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+       0xff, 0x07, 0x00, 0x28, 0x73, 0x75, 0x79, 0x29,
+};
+
+static struct parser_data variant_2 = {
+       .data = variant_data_2,
+       .len = 20,
+       .signature = "v",
+};
+
+static void test_iter_variant_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter variant;
+       struct l_dbus_message_iter structure;
+       uint8_t y;
+       uint32_t u;
+       const char *s;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_variant(&iter, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_struct(&variant, &structure);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar"));
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'u', &u);
+       assert(ret);
+       assert(u == 20);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 255);
+}
+
+static const unsigned char fixed_array_data_1[] = {
+       0x14, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00,
+};
+
+static struct parser_data fixed_array_1 = {
+       .data = fixed_array_data_1,
+       .len = 8,
+       .signature = "au",
+};
+
+static void test_iter_fixed_array_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter array;
+       uint32_t u;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_array(&iter, &array);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&array, 'u', &u);
+       assert(ret);
+       assert(u == 20);
+
+       ret = _gvariant_iter_next_entry_basic(&array, 'u', &u);
+       assert(ret);
+       assert(u == 22);
+
+       ret = _gvariant_iter_next_entry_basic(&array, 'u', &u);
+       assert(!ret);
+}
+
+static const unsigned char variable_array_data_1[] = {
+       0x66, 0x6f, 0x6f, 0x00, 0x62, 0x61, 0x72, 0x00, 0x66, 0x6f, 0x6f, 0x62,
+       0x61, 0x72, 0x00, 0x04, 0x08, 0x0f,
+};
+
+static struct parser_data variable_array_1 = {
+       .data = variable_array_data_1,
+       .len = 18,
+       .signature = "as",
+};
+
+static void test_iter_variable_array_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter array;
+       const char *s;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_array(&iter, &array);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&array, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foo"));
+
+       ret = _gvariant_iter_next_entry_basic(&array, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "bar"));
+
+       ret = _gvariant_iter_next_entry_basic(&array, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar"));
+
+       ret = _gvariant_iter_next_entry_basic(&array, 's', &s);
+       assert(!ret);
+}
+
+static const unsigned char variable_array_data_2[] = {
+       0x66, 0x6f, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x62, 0x61, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x31, 0x32, 0x33, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x0a, 0x11, 0x29, 0x49,
+};
+
+static struct parser_data variable_array_2 = {
+       .data = variable_array_data_2,
+       .len = 76,
+       .signature = "a(st)",
+};
+
+static void test_iter_variable_array_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter array;
+       struct l_dbus_message_iter structure;
+       const char *s;
+       uint64_t t;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_array(&iter, &array);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foo"));
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 't', &t);
+       assert(ret);
+       assert(t == 15LL);
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "bar"));
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 't', &t);
+       assert(ret);
+       assert(t == 16LL);
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foobar123"));
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 't', &t);
+       assert(ret);
+       assert(t == 31LL);
+}
+
+static const unsigned char dict_data_1[] = {
+       0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static struct parser_data dict_1 = {
+       .data = dict_data_1,
+       .len = 16,
+       .signature = "a{ub}",
+};
+
+static void test_iter_dict_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter array;
+       struct l_dbus_message_iter structure;
+       uint32_t u;
+       bool b;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_array(&iter, &array);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'u', &u);
+       assert(ret);
+       assert(u == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'b', &b);
+       assert(ret);
+       assert(b == true);
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'u', &u);
+       assert(ret);
+       assert(u == 2);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'b', &b);
+       assert(ret);
+       assert(b == false);
+}
+
+static const unsigned char aau_data_1[] = {
+       0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+       0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+       0x0c, 0x14, 0x18, 0x18,
+};
+
+static struct parser_data aau_1 = {
+       .data = aau_data_1,
+       .len = 28,
+       .signature = "aau",
+};
+
+static void test_iter_aau_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter outer;
+       struct l_dbus_message_iter inner;
+       uint32_t u;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_array(&iter, &outer);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_array(&outer, &inner);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 2);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 3);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(!ret);
+
+       ret = _gvariant_iter_enter_array(&outer, &inner);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 2);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(!ret);
+
+       ret = _gvariant_iter_enter_array(&outer, &inner);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(ret);
+       assert(u == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(!ret);
+
+       ret = _gvariant_iter_enter_array(&outer, &inner);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&inner, 'u', &u);
+       assert(!ret);
+}
+
+static const unsigned char av_data_1[] = {
+       0x46, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x75, 0x09, 0x16,
+};
+
+static struct parser_data av_1 = {
+       .data = av_data_1,
+       .len = 24,
+       .signature = "av",
+};
+
+static void test_iter_av_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter array;
+       struct l_dbus_message_iter variant;
+       uint32_t u;
+       const char *s;
+       bool ret;
+
+       _gvariant_iter_init(&iter, NULL, test->signature,
+                               test->signature + strlen(test->signature),
+                               test->data, test->len);
+
+       ret = _gvariant_iter_enter_array(&iter, &array);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_variant(&array, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "Foobar"));
+
+       ret = _gvariant_iter_enter_variant(&array, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 'u', &u);
+       assert(ret);
+       assert(u == 10);
+
+       ret = _gvariant_iter_enter_variant(&array, &variant);
+       assert(!ret);
+}
+
+static const unsigned char header_data_1[] = {
+       0x6c, 0x01, 0x00, 0x02, 0x28, 0x00, 0x00, 0x00, 0x57, 0x04, 0x00, 0x00,
+       0x79, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x2f, 0x66, 0x6f, 0x6f, 0x2f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x6f, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x46, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x2e, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x66, 0x6f, 0x6f, 0x2e, 0x62, 0x61, 0x72, 0x00, 0x00, 0x73, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x62, 0x79, 0x6e, 0x71, 0x69, 0x75, 0x78, 0x74, 0x64, 0x00, 0x00, 0x67,
+       0x13, 0x29, 0x42, 0x5a, 0x74,
+};
+
+static struct parser_data header_1 = {
+       .data = header_data_1,
+       .len = 137,
+       .signature = "a(yv)",
+};
+
+static void test_iter_header_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct l_dbus_message_iter iter;
+       struct l_dbus_message_iter array;
+       struct l_dbus_message_iter structure;
+       struct l_dbus_message_iter variant;
+       bool ret;
+       uint8_t y;
+       uint32_t u;
+       const char *o;
+       const char *s;
+       const char *g;
+
+       ret = _gvariant_iter_init(&iter, NULL, "yyyyuuu", NULL,
+                                       test->data, 16);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'y', &y);
+       assert(ret);
+       assert(y == 'l');
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'y', &y);
+       assert(ret);
+       assert(y == 1);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'y', &y);
+       assert(ret);
+       assert(y == 0);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'y', &y);
+       assert(ret);
+       assert(y == 2);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'u', &u);
+       assert(ret);
+       assert(u == 40);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'u', &u);
+       assert(ret);
+       assert(u == 1111);
+
+       ret = _gvariant_iter_next_entry_basic(&iter, 'u', &u);
+       assert(ret);
+       assert(u == 121);
+
+       ret = _gvariant_iter_init(&iter, NULL, "a(yv)", NULL,
+                                       test->data + 16, u);
+       ret = _gvariant_iter_enter_array(&iter, &array);
+       assert(ret);
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 1);
+
+       ret = _gvariant_iter_enter_variant(&structure, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 'o', &o);
+       assert(ret);
+       assert(!strcmp(o, "/foo/bar"));
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 3);
+
+       ret = _gvariant_iter_enter_variant(&structure, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "Foobar"));
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 2);
+
+       ret = _gvariant_iter_enter_variant(&structure, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foo.bar"));
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 6);
+
+       ret = _gvariant_iter_enter_variant(&structure, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 's', &s);
+       assert(ret);
+       assert(!strcmp(s, "foo.bar"));
+
+       ret = _gvariant_iter_enter_struct(&array, &structure);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&structure, 'y', &y);
+       assert(ret);
+       assert(y == 8);
+
+       ret = _gvariant_iter_enter_variant(&structure, &variant);
+       assert(ret);
+
+       ret = _gvariant_iter_next_entry_basic(&variant, 'g', &g);
+       assert(ret);
+       assert(!strcmp(g, "bynqiuxtd"));
+}
+
+#define BUILDER_TEST_HEADER()\
+       void *body;\
+       size_t body_size;\
+       char *signature\
+
+#define FINISH_AND_CHECK_BUILT_RESULT()\
+       signature = _gvariant_builder_finish(builder, &body, &body_size);\
+       assert(signature);\
+       assert(!strcmp(signature, test->signature));\
+       assert(body);\
+       assert(body_size == test->len);\
+       assert(!memcmp(test->data, body, body_size));\
+       l_free(signature);\
+       l_free(body);\
+       _gvariant_builder_free(builder)\
+
+static void test_builder_basic_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s = "Hello World!";
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_basic_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s = "foobar";
+       int i = 5;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_append_basic(builder, 'i', &i);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_basic_3(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       bool b = true;
+       double d = 5.0;
+       int16_t n = -32545;
+       uint64_t t = 444444444LL;
+       uint16_t q = 32545;
+       int64_t x = -44444444LL;
+       uint8_t y = 255;
+       uint32_t u = 3255554;
+       const char *s = "foobar";
+       int32_t i = -3255554;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_append_basic(builder, 'b', &b);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'd', &d);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'n', &n);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 't', &t);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'q', &q);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'x', &x);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'i', &i);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_basic_4(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s1 = "foo";
+       const char *s2 = "bar";
+       const char *s3 = "baz";
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s2);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s3);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_fixed_struct_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t i = 10;
+       uint8_t y1 = 255;
+       uint8_t y2 = 1;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_append_basic(builder, 'i', &i);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "yy");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y2);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_fixed_struct_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t u = 5555;
+       uint8_t y1 = 1;
+       uint8_t y2 = 2;
+       uint64_t t = 5555;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_struct(builder, "yyt");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y2);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 't', &t);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "yyu");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y2);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_nested_struct_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t u = 1;
+       const char *s = "foobar";
+       uint8_t y = 255;
+       int32_t i = -1;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_struct(builder, "(us)yi");
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "us");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'i', &i);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_empty_struct_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_struct(builder, "");
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_variant_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t u = 5;
+       const char *s = "foobar";
+       int32_t i = 5;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_struct(builder, "uvu");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_variant(builder, "s");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_variant(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'i', &i);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_variant_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s = "foobar";
+       uint32_t u = 20;
+       uint8_t y = 255;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_variant(builder, "(suy)");
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "suy");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'y', &y);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_variant(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_fixed_array_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t u1 = 20;
+       uint32_t u2 = 22;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_array(builder, "u");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u2);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_dict_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t u1 = 1;
+       bool b1 = true;
+       uint32_t u2 = 2;
+       bool b2 = false;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_array(builder, "{ub}");
+       assert(ret);
+
+       ret = _gvariant_builder_enter_dict(builder, "ub");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'b', &b1);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_dict(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_dict(builder, "ub");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'u', &u2);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 'b', &b2);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_dict(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_variable_array_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s1 = "foo";
+       const char *s2 = "bar";
+       const char *s3 = "foobar";
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_array(builder, "s");
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s1);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s2);
+       assert(ret);
+
+       ret = _gvariant_builder_append_basic(builder, 's', s3);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_variable_array_2(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s1 = "foo";
+       uint64_t t1 = 15LL;
+       const char *s2 = "bar";
+       uint64_t t2 = 16LL;
+       const char *s3 = "foobar123";
+       uint64_t t3 = 31LL;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_array(builder, "(st)");
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "st");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 's', s1);
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 't', &t1);
+       assert(ret);
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "st");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 's', s2);
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 't', &t2);
+       assert(ret);
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_struct(builder, "st");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 's', s3);
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 't', &t3);
+       assert(ret);
+       ret = _gvariant_builder_leave_struct(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_aau_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       uint32_t u1 = 1;
+       uint32_t u2 = 2;
+       uint32_t u3 = 3;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_array(builder, "au");
+       assert(ret);
+
+       ret = _gvariant_builder_enter_array(builder, "u");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u1);
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u2);
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u3);
+       assert(ret);
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_array(builder, "u");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u1);
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u2);
+       assert(ret);
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_array(builder, "u");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u1);
+       assert(ret);
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_array(builder, "u");
+       assert(ret);
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+static void test_builder_av_1(const void *test_data)
+{
+       const struct parser_data *test = test_data;
+       const char *s = "Foobar";
+       uint32_t u = 10;
+       struct dbus_builder *builder;
+       bool ret;
+       BUILDER_TEST_HEADER();
+
+       builder = _gvariant_builder_new(NULL, 0);
+       assert(builder);
+
+       ret = _gvariant_builder_enter_array(builder, "v");
+       assert(ret);
+
+       ret = _gvariant_builder_enter_variant(builder, "s");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 's', s);
+       assert(ret);
+       ret = _gvariant_builder_leave_variant(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_enter_variant(builder, "u");
+       assert(ret);
+       ret = _gvariant_builder_append_basic(builder, 'u', &u);
+       assert(ret);
+       ret = _gvariant_builder_leave_variant(builder);
+       assert(ret);
+
+       ret = _gvariant_builder_leave_array(builder);
+       assert(ret);
+
+       FINISH_AND_CHECK_BUILT_RESULT();
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Signature Test 1", test_signature, &sig_test1);
+       l_test_add("Signature test 2", test_signature, &sig_test2);
+       l_test_add("Signature test 3", test_signature, &sig_test3);
+       l_test_add("Signature test 4", test_signature, &sig_test4);
+       l_test_add("Signature test 5", test_signature, &sig_test5);
+       l_test_add("Signature test 6", test_signature, &sig_test6);
+       l_test_add("Signature test 7", test_signature, &sig_test7);
+       l_test_add("Signature test 8", test_signature, &sig_test8);
+       l_test_add("Signature test 9", test_signature, &sig_test9);
+       l_test_add("Signature test 10", test_signature, &sig_test10);
+       l_test_add("Signature test 11", test_signature, &sig_test11);
+       l_test_add("Signature test 12", test_signature, &sig_test12);
+       l_test_add("Signature test 13", test_signature, &sig_test13);
+       l_test_add("Signature test 14", test_signature, &sig_test14);
+       l_test_add("Signature test 15", test_signature, &sig_test15);
+       l_test_add("Signature test 16", test_signature, &sig_test16);
+       l_test_add("Signature test 17", test_signature, &sig_test17);
+       l_test_add("Signature test 18", test_signature, &sig_test18);
+       l_test_add("Signature test 19", test_signature, &sig_test19);
+       l_test_add("Signature test 20", test_signature, &sig_test20);
+       l_test_add("Signature test 21", test_signature, &sig_test21);
+       l_test_add("Signature test 22", test_signature, &sig_test22);
+       l_test_add("Signature test 23", test_signature, &sig_test23);
+
+       l_test_add("Alignment test 1", test_alignment, &align_test1);
+       l_test_add("Alignment test 2", test_alignment, &align_test2);
+       l_test_add("Alignment test 3", test_alignment, &align_test3);
+       l_test_add("Alignment test 4", test_alignment, &align_test4);
+       l_test_add("Alignment test 5", test_alignment, &align_test5);
+       l_test_add("Alignment test 6", test_alignment, &align_test6);
+       l_test_add("Alignment test 7", test_alignment, &align_test7);
+       l_test_add("Alignment test 8", test_alignment, &align_test8);
+       l_test_add("Alignment test 9", test_alignment, &align_test9);
+       l_test_add("Alignment test 10", test_alignment, &align_test10);
+       l_test_add("Alignment test 11", test_alignment, &align_test11);
+       l_test_add("Alignment test 12", test_alignment, &align_test12);
+       l_test_add("Alignment test 13", test_alignment, &align_test13);
+       l_test_add("Alignment test 14", test_alignment, &align_test14);
+       l_test_add("Alignment test 15", test_alignment, &align_test15);
+       l_test_add("Alignment test 16", test_alignment, &align_test16);
+       l_test_add("Alignment test 17", test_alignment, &align_test17);
+       l_test_add("Alignment test 18", test_alignment, &align_test18);
+       l_test_add("Alignment test 19", test_alignment, &align_test19);
+       l_test_add("Alignment test 20", test_alignment, &align_test20);
+       l_test_add("Alignment test 21", test_alignment, &align_test21);
+       l_test_add("Alignment test 22", test_alignment, &align_test22);
+       l_test_add("Alignment test 23", test_alignment, &align_test23);
+       l_test_add("Alignment test 24", test_alignment, &align_test24);
+       l_test_add("Alignment test 25", test_alignment, &align_test25);
+       l_test_add("Alignment test 26", test_alignment, &align_test26);
+       l_test_add("Alignment test 27", test_alignment, &align_test27);
+       l_test_add("Alignment test 28", test_alignment, &align_test28);
+       l_test_add("Alignment test 29", test_alignment, &align_test29);
+       l_test_add("Alignment test 30", test_alignment, &align_test30);
+       l_test_add("Alignment test 31", test_alignment, &align_test31);
+       l_test_add("Alignment test 32", test_alignment, &align_test32);
+       l_test_add("Alignment test 33", test_alignment, &align_test33);
+       l_test_add("Alignment test 34", test_alignment, &align_test34);
+       l_test_add("Alignment test 35", test_alignment, &align_test35);
+       l_test_add("Alignment test 36", test_alignment, &align_test36);
+       l_test_add("Alignment test 37", test_alignment, &align_test37);
+
+       l_test_add("Is Fixed Size test 1", test_is_fixed_size,
+                       &is_fixed_size_test1);
+       l_test_add("Is Fixed Size test 2", test_is_fixed_size,
+                       &is_fixed_size_test2);
+       l_test_add("Is Fixed Size test 3", test_is_fixed_size,
+                       &is_fixed_size_test3);
+       l_test_add("Is Fixed Size test 4", test_is_fixed_size,
+                       &is_fixed_size_test4);
+       l_test_add("Is Fixed Size test 4", test_is_fixed_size,
+                       &is_fixed_size_test4);
+       l_test_add("Is Fixed Size test 5", test_is_fixed_size,
+                       &is_fixed_size_test5);
+       l_test_add("Is Fixed Size test 6", test_is_fixed_size,
+                       &is_fixed_size_test6);
+       l_test_add("Is Fixed Size test 7", test_is_fixed_size,
+                       &is_fixed_size_test7);
+       l_test_add("Is Fixed Size test 8", test_is_fixed_size,
+                       &is_fixed_size_test8);
+       l_test_add("Is Fixed Size test 9", test_is_fixed_size,
+                       &is_fixed_size_test9);
+       l_test_add("Is Fixed Size test 10", test_is_fixed_size,
+                       &is_fixed_size_test10);
+       l_test_add("Is Fixed Size test 11", test_is_fixed_size,
+                       &is_fixed_size_test11);
+       l_test_add("Is Fixed Size test 12", test_is_fixed_size,
+                       &is_fixed_size_test12);
+       l_test_add("Is Fixed Size test 13", test_is_fixed_size,
+                       &is_fixed_size_test13);
+       l_test_add("Is Fixed Size test 14", test_is_fixed_size,
+                       &is_fixed_size_test14);
+       l_test_add("Is Fixed Size test 15", test_is_fixed_size,
+                       &is_fixed_size_test15);
+       l_test_add("Is Fixed Size test 16", test_is_fixed_size,
+                       &is_fixed_size_test16);
+       l_test_add("Is Fixed Size test 17", test_is_fixed_size,
+                       &is_fixed_size_test17);
+       l_test_add("Is Fixed Size test 18", test_is_fixed_size,
+                       &is_fixed_size_test18);
+       l_test_add("Is Fixed Size test 19", test_is_fixed_size,
+                       &is_fixed_size_test19);
+       l_test_add("Is Fixed Size test 20", test_is_fixed_size,
+                       &is_fixed_size_test20);
+       l_test_add("Is Fixed Size test 21", test_is_fixed_size,
+                       &is_fixed_size_test21);
+       l_test_add("Is Fixed Size test 22", test_is_fixed_size,
+                       &is_fixed_size_test22);
+
+       l_test_add("Get Fixed Size test 1", test_get_fixed_size, &size_test1);
+       l_test_add("Get Fixed Size test 2", test_get_fixed_size, &size_test2);
+       l_test_add("Get Fixed Size test 3", test_get_fixed_size, &size_test3);
+       l_test_add("Get Fixed Size test 4", test_get_fixed_size, &size_test4);
+       l_test_add("Get Fixed Size test 5", test_get_fixed_size, &size_test5);
+       l_test_add("Get Fixed Size test 6", test_get_fixed_size, &size_test6);
+       l_test_add("Get Fixed Size test 7", test_get_fixed_size, &size_test7);
+       l_test_add("Get Fixed Size test 8", test_get_fixed_size, &size_test8);
+       l_test_add("Get Fixed Size test 9", test_get_fixed_size, &size_test9);
+       l_test_add("Get Fixed Size test 10", test_get_fixed_size, &size_test10);
+       l_test_add("Get Fixed Size test 11", test_get_fixed_size, &size_test11);
+       l_test_add("Get Fixed Size test 12", test_get_fixed_size, &size_test12);
+       l_test_add("Get Fixed Size test 13", test_get_fixed_size, &size_test13);
+       l_test_add("Get Fixed Size test 14", test_get_fixed_size, &size_test14);
+       l_test_add("Get Fixed Size test 15", test_get_fixed_size, &size_test15);
+       l_test_add("Get Fixed Size test 16", test_get_fixed_size, &size_test16);
+       l_test_add("Get Fixed Size test 17", test_get_fixed_size, &size_test17);
+       l_test_add("Get Fixed Size test 18", test_get_fixed_size, &size_test18);
+       l_test_add("Get Fixed Size test 19", test_get_fixed_size, &size_test19);
+       l_test_add("Get Fixed Size test 20", test_get_fixed_size, &size_test20);
+       l_test_add("Get Fixed Size test 21", test_get_fixed_size, &size_test21);
+       l_test_add("Get Fixed Size test 22", test_get_fixed_size, &size_test22);
+       l_test_add("Get Fixed Size test 23", test_get_fixed_size, &size_test23);
+       l_test_add("Get Fixed Size test 24", test_get_fixed_size, &size_test24);
+       l_test_add("Get Fixed Size test 25", test_get_fixed_size, &size_test25);
+       l_test_add("Get Fixed Size test 26", test_get_fixed_size, &size_test26);
+       l_test_add("Get Fixed Size test 27", test_get_fixed_size, &size_test27);
+       l_test_add("Get Fixed Size test 28", test_get_fixed_size, &size_test28);
+       l_test_add("Get Fixed Size test 29", test_get_fixed_size, &size_test29);
+
+       l_test_add("Iter Test Basic 's'", test_iter_basic_1, &parser_data_1);
+       l_test_add("Iter Test Basic 'is'", test_iter_basic_2, &parser_data_2);
+       l_test_add("Iter Test Basic 'bdntqxyusi'",
+                               test_iter_basic_3, &parser_data_3);
+       l_test_add("Iter Test Basic 'sss'", test_iter_basic_4, &parser_data_4);
+
+       l_test_add("Iter Test Fixed Struct 'i(yy)'", test_iter_fixed_struct_1,
+                       &fixed_struct_1);
+       l_test_add("Iter Test Fixed Struct '(yyt)(yyu)'",
+                       test_iter_fixed_struct_2, &fixed_struct_2);
+
+       l_test_add("Iter Test Nested Struct '((us)yi)'",
+                       test_iter_nested_struct_1, &nested_struct_1);
+
+       l_test_add("Iter Test Empty Struct '()'",
+                       test_iter_empty_struct_1, &empty_struct_1);
+
+       l_test_add("Iter Test Variant '(uvu)i'", test_iter_variant_1,
+                                               &variant_1);
+       l_test_add("Iter Test Variant 'v'", test_iter_variant_2, &variant_2);
+
+       l_test_add("Iter Test Fixed Array 'au'", test_iter_fixed_array_1,
+                                       &fixed_array_1);
+       l_test_add("Iter Test Fixed Dict 'a{ub}'", test_iter_dict_1, &dict_1);
+
+       l_test_add("Iter Test Variable Array 'as'", test_iter_variable_array_1,
+                                       &variable_array_1);
+       l_test_add("Iter Test Variable Array 'a(st)'",
+                               test_iter_variable_array_2, &variable_array_2);
+
+       l_test_add("Iter Test Array of Array 'aau'", test_iter_aau_1, &aau_1);
+
+       l_test_add("Iter Test Array of Variant 'av'", test_iter_av_1, &av_1);
+
+       l_test_add("Iter Test Header 'a(yv)'", test_iter_header_1, &header_1);
+
+       l_test_add("Builder Test Basic 's'", test_builder_basic_1,
+                                       &parser_data_1);
+       l_test_add("Builder Test Basic 'is'", test_builder_basic_2,
+                                       &parser_data_2);
+       l_test_add("Builder Test Basic 'bdntqxyusi'", test_builder_basic_3,
+                                       &parser_data_3);
+       l_test_add("Builder Test Basic 'sss'", test_builder_basic_4,
+                                       &parser_data_4);
+
+       l_test_add("Builder Test Fixed Struct 'i(yy)'",
+                       test_builder_fixed_struct_1, &fixed_struct_1);
+       l_test_add("Builder Test Fixed Struct '(yyt)(yyu)'",
+                       test_builder_fixed_struct_2, &fixed_struct_2);
+
+       l_test_add("Builder Test Nested Struct '((us)yi)'",
+                       test_builder_nested_struct_1, &nested_struct_1);
+
+       l_test_add("Builder Test Empty Struct '()'",
+                       test_builder_empty_struct_1, &empty_struct_1);
+
+       l_test_add("Builder Test Variant '(uvu)i'", test_builder_variant_1,
+                                               &variant_1);
+       l_test_add("Builder Test Variant 'v'", test_builder_variant_2,
+                                               &variant_2);
+
+       l_test_add("Builder Test Fixed Array 'au'", test_builder_fixed_array_1,
+                                       &fixed_array_1);
+       l_test_add("Builder Test Fixed Dict 'a{ub}'", test_builder_dict_1,
+                                       &dict_1);
+       l_test_add("Builder Test Variable Array 'as'",
+                               test_builder_variable_array_1,
+                               &variable_array_1);
+       l_test_add("Builder Test Variable Array 'a(st)'",
+                               test_builder_variable_array_2,
+                               &variable_array_2);
+
+       l_test_add("Builder Test Array of Array 'aau'",
+                               test_builder_aau_1, &aau_1);
+
+       l_test_add("Builder Test Array of Variant 'av'",
+                               test_builder_av_1, &av_1);
+
+       return l_test_run();
+}
diff --git a/unit/test-hashmap.c b/unit/test-hashmap.c
new file mode 100644 (file)
index 0000000..a75bb38
--- /dev/null
@@ -0,0 +1,284 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_ptr(const void *test_data)
+{
+       struct l_hashmap *hashmap;
+       unsigned int n, i;
+
+       hashmap = l_hashmap_new();
+       assert(hashmap);
+
+       for (n = 0; n < 1024; n++) {
+               for (i = 1; i < n + 2; i++) {
+                       if (!l_hashmap_insert(hashmap, L_UINT_TO_PTR(i),
+                                                       L_UINT_TO_PTR(i)))
+                               printf("[%u] insert error: %u\n", n, i);
+               }
+
+               if (l_hashmap_size(hashmap) != n + 1) {
+                       printf("[%u] size mismatch: %u\n", n,
+                                               l_hashmap_size(hashmap));
+               }
+
+               for (i = 1; i < n + 2; i++) {
+                       void *ptr = l_hashmap_lookup(hashmap, L_UINT_TO_PTR(i));
+
+                       if (!ptr) {
+                               printf("[%u] lookup empty: %u\n", n, i);
+                               continue;
+                       }
+
+                       if (i != L_PTR_TO_UINT(ptr)) {
+                               printf("[%u] lookup misatch: %u != %u\n",
+                                               n, i, L_PTR_TO_UINT(ptr));
+                       }
+               }
+
+               for (i = 1; i < n + 2; i++) {
+                       void *ptr = l_hashmap_remove(hashmap, L_UINT_TO_PTR(i));
+
+                       if (!ptr) {
+                               printf("[%u] remove empty: %u\n", n, i);
+                               continue;
+                       }
+
+                       if (i != L_PTR_TO_UINT(ptr)) {
+                               printf("[%u] remove misatch: %u != %u\n",
+                                               n, i, L_PTR_TO_UINT(ptr));
+                       }
+               }
+
+               if (!l_hashmap_isempty(hashmap)) {
+                       printf("[%u] not empty: %u\n", n,
+                                               l_hashmap_size(hashmap));
+               }
+       }
+
+       l_hashmap_destroy(hashmap, NULL);
+}
+
+static void test_str(const void *test_data)
+{
+       struct l_hashmap *hashmap;
+       const void *ptr;
+       const char **itr, *strings[] = {
+               "hello",
+               "world",
+               "a",
+               "a long key here, bla bla bla bla bla hey! enough?",
+               NULL
+       };
+
+       hashmap = l_hashmap_string_new();
+       assert(hashmap);
+
+       /* basics */
+       for (itr = strings; *itr != NULL; itr++) {
+               assert(l_hashmap_insert(hashmap, *itr, itr));
+               ptr = l_hashmap_lookup(hashmap, *itr);
+               assert(ptr == itr);
+       }
+
+       assert(l_hashmap_lookup(hashmap, "not in hash") == NULL);
+
+       /* remove and look post */
+       for (itr = strings; *itr != NULL; itr++) {
+               const char **subitr;
+               assert(l_hashmap_remove(hashmap, *itr));
+               ptr = l_hashmap_lookup(hashmap, *itr);
+               assert(ptr == NULL);
+
+               for (subitr = itr + 1; *subitr != NULL; subitr++) {
+                       ptr = l_hashmap_lookup(hashmap, *subitr);
+                       assert(ptr == subitr);
+               }
+       }
+       assert(l_hashmap_size(hashmap) == 0);
+
+       /* add again, to remove backwards */
+       for (itr = strings; *itr != NULL; itr++) {
+               assert(l_hashmap_insert(hashmap, *itr, itr));
+               ptr = l_hashmap_lookup(hashmap, *itr);
+               assert(ptr == itr);
+       }
+
+       /* remove and look previous */
+       for (itr--; itr >= strings; itr--) {
+               const char **subitr;
+               assert(l_hashmap_remove(hashmap, *itr));
+               ptr = l_hashmap_lookup(hashmap, *itr);
+               assert(ptr == NULL);
+
+               for (subitr = strings; subitr < itr; subitr++) {
+                       ptr = l_hashmap_lookup(hashmap, *subitr);
+                       assert(ptr == subitr);
+               }
+       }
+       assert(l_hashmap_size(hashmap) == 0);
+
+       /* force different insert and lookup pointers */
+       for (itr = strings; *itr != NULL; itr++) {
+               char *str = l_strdup(*itr);
+               assert(l_hashmap_insert(hashmap, *itr, itr));
+               ptr = l_hashmap_lookup(hashmap, str);
+               l_free(str);
+               assert(ptr == itr);
+       }
+
+       assert(l_hashmap_lookup(hashmap, "not in hash") == NULL);
+
+       l_hashmap_destroy(hashmap, NULL);
+}
+
+static void test_duplicate(const void *test_data)
+{
+       struct l_hashmap *hashmap;
+       int one = 1;
+       int two = 2;
+       int three = 3;
+
+       hashmap = l_hashmap_string_new();
+       assert(hashmap);
+
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "one", &three));
+
+       assert(l_hashmap_lookup(hashmap, "two") == &two);
+       assert(l_hashmap_lookup(hashmap, "one") == &one);
+
+       assert(l_hashmap_remove(hashmap, "one") == &one);
+       assert(l_hashmap_lookup(hashmap, "one") == &three);
+
+       l_hashmap_destroy(hashmap, NULL);
+};
+
+static unsigned int always_0(const void *p)
+{
+       return 0;
+}
+
+static bool remove_with_key(const void *key, void *value, void *user_data)
+{
+       if (!strcmp(key, user_data))
+               return true;
+
+       return false;
+}
+
+static bool remove_always(const void *key, void *value, void *user_data)
+{
+       return true;
+}
+
+static void test_foreach_remove(const void *test_data)
+{
+       struct l_hashmap *hashmap;
+       int one = 1;
+       int two = 2;
+       int three = 3;
+       unsigned int n;
+
+       hashmap = l_hashmap_string_new();
+       assert(hashmap);
+
+       l_hashmap_set_hash_function(hashmap, always_0);
+
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "three", &three));
+
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "three");
+       assert(n == 1);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "two");
+       assert(n == 1);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "one");
+       assert(n == 1);
+
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "three", &three));
+       assert(l_hashmap_insert(hashmap, "three", &three));
+
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "three");
+       assert(n == 2);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "two");
+       assert(n == 1);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "one");
+       assert(n == 1);
+
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "three", &three));
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "one");
+       assert(n == 2);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "two");
+       assert(n == 1);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "three");
+       assert(n == 1);
+
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "three", &three));
+
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "two");
+       assert(n == 2);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "one");
+       assert(n == 1);
+       n = l_hashmap_foreach_remove(hashmap, remove_with_key, "three");
+       assert(n == 1);
+
+       assert(l_hashmap_insert(hashmap, "one", &one));
+       assert(l_hashmap_insert(hashmap, "two", &two));
+       assert(l_hashmap_insert(hashmap, "three", &three));
+       n = l_hashmap_foreach_remove(hashmap, remove_always, NULL);
+       assert(n == 3);
+
+       n = l_hashmap_size(hashmap);
+       assert(n == 0);
+
+       l_hashmap_destroy(hashmap, NULL);
+};
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Pointer Test", test_ptr, NULL);
+       l_test_add("String Test", test_str, NULL);
+       l_test_add("Duplicate Test", test_duplicate, NULL);
+       l_test_add("Foreach Remove Test", test_foreach_remove, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-hwdb.c b/unit/test-hwdb.c
new file mode 100644 (file)
index 0000000..d0efc8d
--- /dev/null
@@ -0,0 +1,106 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <ell/ell.h>
+
+struct hwdb_stats {
+       int aliases;
+       int entries;
+};
+
+static void print_modalias(struct l_hwdb *hwdb, const char *format, ...)
+{
+       struct l_hwdb_entry *entries, *entry;
+       va_list args;
+
+       va_start(args, format);
+       vprintf(format, args);
+       va_end(args);
+
+       printf("\n");
+
+       va_start(args, format);
+       entries = l_hwdb_lookup_valist(hwdb, format, args);
+       va_end(args);
+
+       for (entry = entries; entry; entry = entry->next)
+               printf(" %s=%s\n", entry->key, entry->value);
+
+       l_hwdb_lookup_free(entries);
+
+       printf("\n");
+}
+
+static void check_entry(const char *modalias, struct l_hwdb_entry *entries,
+                       void *user_data)
+{
+       struct l_hwdb_entry *entry;
+       struct hwdb_stats *stats = user_data;
+
+       assert(modalias);
+       stats->aliases++;
+
+       for (entry = entries; entry; entry = entry->next) {
+               assert(entry->key);
+               assert(entry->value);
+               stats->entries++;
+       }
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_hwdb *hwdb;
+       struct hwdb_stats stats = { 0 };
+
+       hwdb = l_hwdb_new_default();
+       if (!hwdb) {
+               printf("hwdb.bin not loaded\n");
+               return 0;
+       }
+
+       l_hwdb_foreach(hwdb, check_entry, &stats);
+       printf("Found %d aliases with %d total entries\n\n",
+              stats.aliases, stats.entries);
+
+       /* Bluetooth Interest Group Inc. */
+       print_modalias(hwdb, "OUI:000F79");
+
+       /* Bluetooth SIG, Inc. */
+       print_modalias(hwdb, "bluetooth:v%04X", 0x003f);
+
+       /* Nike+ FuelBand */
+       print_modalias(hwdb, "bluetooth:v%04Xp%04X", 0x0078, 0x0001);
+
+       /* Bluetooth Type-A standard interface */
+       print_modalias(hwdb, "sdio:c02");
+
+       l_hwdb_unref(hwdb);
+
+       return 0;
+}
diff --git a/unit/test-io.c b/unit/test-io.c
new file mode 100644 (file)
index 0000000..922ecad
--- /dev/null
@@ -0,0 +1,108 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static bool write_handler(struct l_io *io, void *user_data)
+{
+       int fd = l_io_get_fd(io);
+       char *str = "Hello";
+       ssize_t written;
+
+       written = write(fd, str, strlen(str));
+
+       l_info("%zd bytes written", written);
+
+       return false;
+}
+
+static bool read_handler(struct l_io *io, void *user_data)
+{
+       int fd = l_io_get_fd(io);
+       char str[32];
+       ssize_t result;
+
+       result = read(fd, str, sizeof(str));
+
+       l_info("%zd bytes read", result);
+
+       l_main_quit();
+
+       return false;
+}
+
+static void disconnect_handler(struct l_io *io, void *user_data)
+{
+       l_info("disconnect");
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_io *io1, *io2;
+       int fd[2];
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       if (socketpair(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, fd) < 0) {
+               l_error("Failed to create socket pair");
+               return 0;
+       }
+
+       io1 = l_io_new(fd[0]);
+       l_io_set_close_on_destroy(io1, true);
+       l_io_set_debug(io1, do_debug, "[IO-1] ", NULL);
+       l_io_set_read_handler(io1, read_handler, NULL, NULL);
+       l_io_set_disconnect_handler(io1, disconnect_handler, NULL, NULL);
+
+       io2 = l_io_new(fd[1]);
+       l_io_set_close_on_destroy(io2, true);
+       l_io_set_debug(io2, do_debug, "[IO-2] ", NULL);
+       l_io_set_write_handler(io2, write_handler, NULL, NULL);
+       l_io_set_disconnect_handler(io2, disconnect_handler, NULL, NULL);
+
+       l_main_run();
+
+       l_io_destroy(io2);
+       l_io_destroy(io1);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/unit/test-key.c b/unit/test-key.c
new file mode 100644 (file)
index 0000000..697ff47
--- /dev/null
@@ -0,0 +1,680 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2016  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+#include "ell/tls-private.h"
+
+#define KEY1_STR "This key has exactly _32_ bytes!"
+#define KEY1_LEN (strlen(KEY1_STR))
+#define KEY2_STR "This key is longer than 32 bytes, just to be different."
+#define KEY2_LEN (strlen(KEY2_STR))
+
+static const char plaintext[] = {
+#include "unit/key-plaintext.h"
+, 0x00 /* terminate string with nul-byte */
+};
+
+static const uint8_t reference_ciphertext[256] = {
+#include "unit/key-ciphertext.h"
+};
+
+static const uint8_t reference_signature[256] = {
+#include "unit/key-signature.h"
+};
+
+static void test_unsupported(const void *data)
+{
+       struct l_key *key;
+
+       key = l_key_new(42, KEY1_STR, KEY1_LEN);
+       assert(!key);
+}
+
+static void test_user(const void *data)
+{
+       struct l_key *key;
+       bool ok;
+       char buf[64] = { 0 };
+       size_t len;
+       ssize_t reported_len;
+
+       assert(KEY1_LEN < KEY2_LEN);
+       assert(KEY2_LEN < sizeof(buf));
+
+       key = l_key_new(L_KEY_RAW, KEY1_STR, KEY1_LEN);
+       assert(key);
+
+       reported_len = l_key_get_payload_size(key);
+       assert(reported_len == KEY1_LEN);
+
+       len = KEY1_LEN - 1;
+       ok = l_key_extract(key, buf, &len);
+       assert(!ok);
+
+       len = sizeof(buf);
+       ok = l_key_extract(key, buf, &len);
+       assert(ok);
+       assert(len == KEY1_LEN);
+       assert(!strcmp(buf, KEY1_STR));
+
+       ok = l_key_update(key, KEY2_STR, KEY2_LEN);
+       assert(ok);
+
+       len = sizeof(buf);
+       ok = l_key_extract(key, buf, &len);
+       assert(ok);
+       assert(len == KEY2_LEN);
+       assert(!strcmp(buf, KEY2_STR));
+
+       l_key_free(key);
+}
+
+struct dh_test_vector {
+       char *prime;
+       char *generator;
+       char *priv1;
+       char *pub1;
+       char *priv2;
+       char *pub2;
+       char *secret;
+};
+
+/* Test cases from http://csrc.nist.gov/groups/STM/cavp/key-management.html#kas
+ * http://csrc.nist.gov/groups/STM/cavp/documents/keymgmt/KASTestVectorsFFC2014.zip
+ */
+
+/* Parameter set: FB
+ * Index: 2
+ */
+static const struct dh_test_vector dh_valid1 = {
+       .prime =
+       "ca60d25245efbba8c7f61d2344fd692aa42df7842b83131ad8e6afd94f51adf0"
+       "1fc79a5db87ce2f7c2235fec416ae9d1268e1827b179a3602add735d167d6034"
+       "cc4f6e33671e6e68bb5340ffc7e8172ed183881d20f773e271ff5db5524bdc3b"
+       "8bf3ea9e505c993c7879b2c3575c25e0c66800266998ec45a0f8fcfb44884d07"
+       "156ae63b5be321944453a5c425612a6d76d44fda03530423ffe08245a86702f6"
+       "b9d7bc87103c4094d9cbb2a69a6560386f025cea444c2779a576efdfbe470209"
+       "d091609c29a3321402993f820a67de6044a9a3eae9c11d882de1c19a8dd8f8bd"
+       "c4193c432826cac60bed5e691b441a4c6995d1fe3117a9418777e767afdcdeff",
+       .generator =
+       "758d43fb520121e1ad3d6af76e9e84da1057741594d14ca75d6ca296217df11f"
+       "62db8703f3e212c8bbd381a961a83815f41e4135c068d27417d320acce628539"
+       "3d8c456bf1298c29545426ede51ae129063159c9467ae7fea75864863a4b2d01"
+       "feaf6e3da76caf62cfdb5d63751a6188f31b1191f46c0dd141079b16cf545d7c"
+       "8db633759295efeb4357f8c7bb23006b5f541eb8b7d16f8d43d65b69455e1597"
+       "27fa281cd80a01c4376922a2f0ddd3e1f61f42297a212f9f27fde0ded87974eb"
+       "63eb1bf3f65986bce9868a88590196779f95e00a87bb271ab159e09c2596ae58"
+       "e507ab285a0b0b1cf67aac8c31d51bf8da4d0ef99c7e9d5d7cfb765f75cc0a63",
+       .priv1 =
+       "901729dff82c5cfff88714e327ea3ecc91b196697c4a214fee614222",
+       .pub1 =
+       "8be42d22a595c7e00c96a17e13976c91fd8da0b9a67ffc5f76295c07df05153d"
+       "6c4ee14ce3731f290f3aa06bdd35e2d5e069227a2eea34cb0e7c83d9458a9b90"
+       "4f84ef08cab7281ae68a17f18e2a183241b6f4dd7eba7ee2b1b27279ea38c685"
+       "70d9747020d111d55963a1680a870bd92637abd24e1050d96584823a7e22ef67"
+       "5e54027d20bcd71ecab5d2093e4001f861226b398563a00b88d1dbfcba12315b"
+       "9285ed8cbf5d183a6f27c8705b2d2da4563582b9b6c4876f3cdc6e41dd593e04"
+       "bac5a3c4598cbe3f67d3bc723de2f13b4847b2266b7f2ae4b7f2f3c092e0fb5c"
+       "78b6d65afd54141ec9ba29ec607ccd8c1329bce166029b8395805e6e18441c97",
+       .priv2 =
+       "7a0fcb52b0497a6830a3efe0828054aa629fc9818bb1562c4a6b1af6",
+       .pub2 =
+       "3df2f085a43491c109567037d6d21f75fff6e1b458d81f63a29f673c67f1fc64"
+       "6fa07a938a678370e2c412e224d8ad8cb5d7d0d1bd2a340d07d107449d7c6498"
+       "c3911cb275789fef3e27c3322cad2376b74bce8fd045831f2db8803131a6502b"
+       "7a9b6e515e93c1653cc410a2fbea6be0d05b337fe3a992d4c871815adb3218d7"
+       "bd10e2bf870006f45658c0e8e3f15e8e7bd67ccd104bf2445b2681a2739effa2"
+       "34dc567afeece9c4a1debdbb0c615539eeb756b7d4966ec8354d7add5812abfd"
+       "fdd3fb82b284e00c3cbe11c195b85aef818c90f0220575e3eb629a52514b2542"
+       "5bd01cb390905874c241d3c9dc771a359694d7bc6bac42b3ababd78005a6360c",
+       .secret =
+       "8a5b80886761bcfe35c50bd16a5295d88071ad11d8201b0dcac83d1836c0603e"
+       "1ced6a7e074e57cd2bc009a74723a88f2dda650110f2b5af8005f5d5b4805ca8"
+       "169ee738c188be533c4fac444fc70dd280aad6cb818ecee408f7556dfb0b0af4"
+       "f07b26d81dc2037a3fdf57f0d20373b0e63462e20ea5bb9481572dd1b2b5ef26"
+       "3dd88148e871e48e8146ceebc49d986dc79f42683ee0d64790f4cac79a857801"
+       "69df50d2eb68a6fd76a9c19b20254701d09808c5a072845c467845b492875339"
+       "6c1843407acacf2b6d8d9e1f6b07e9e272d553762e4cf8c16da2fb683b74c210"
+       "722c4fe576a252353162f9a690de6b76f29db8b8f556942a57499ce310459351",
+};
+
+/* Parameter set: FC
+ * Count: 22
+ */
+static const struct dh_test_vector dh_valid2 = {
+       .prime =
+       "dc53dfa73a49a384f603173c93c17a59baa4c18bf0305e587ded5c8c56f6e44c"
+       "645ba8a2eb26c87a9e2be8b28d407eb7a82be004bfbe4ff097ba97b2b4dc980f"
+       "349b75540c71120b49c279be3a610414ae984a781382ded04e64cd26dca3cb4e"
+       "cf8866db23af4c12db308148f281bbe0953165e0fe58fd6c806ace0152190018"
+       "6d0c0b4a3d636bb834bab9218441fb3117814621d5bf4558dfcca4cb8e1e680b"
+       "df525760a2cf79352114cd913c64d1b56836be86b2059aca3d4fc18818dab52c"
+       "f0031bab41b75f2b27519cc39fd557ba88f6765cd380ace9e7f2ceb9077b6b51"
+       "09ce7d4deffb0767717e9a475a5a7ef313daf79dd4026c114df248660de436c7",
+       .generator =
+       "c05367267fe0dc4fa92250ecceb658054d462be7aeb88334fc6d61a7140278c9"
+       "8d2fffee0079cc8906882ef7f9471d7f72aa586a8ed8361c42f88a7a698aa7df"
+       "37317ee326af8ade89fbaf17e22b67b674f9801cb5c9858faf469478d255851f"
+       "ee2fc2c4a47655f6060c0b23a2a4a343f6031441bbdf934283e11a64326f32c3"
+       "6ec1dd64cb92138ae3951488a65df6d1fcdf502fbaf68bbe53cb4bba1eae8a8e"
+       "7e7ae98cf71fd50fa58bbc0854f56f2f19c1b2a6ef99cdbce3a92240700c06a2"
+       "8c496e9e62f470f4e316ed9b358e8eb9d0c9caefffdab2a7f68b022439ddfaff"
+       "9aa389df051fc222be6546212b9480ef19a2e1749ba94f1cdd35e9a1c74c4c42",
+       .priv1 =
+       "637d28e58d67aef445681844519a9efba5a12331c4d3d73515f1e7426cf57359",
+       .pub1 =
+       "8d96c1878c86961304081b0c8959ba23cdefa9fb599c6b96ef813e22a7ffaeac"
+       "3bac4afdce2625c59e53e8566f86badb56e4ea4c462d58a3de6e0401cc109653"
+       "a0c99c7c938af4351f32c995164d0073c701b1cc154a862ba59d0765a9e5af6f"
+       "c2f17997fae46afa4afdb1ed654391a30334251e8b5b97b2ba0597177dae047e"
+       "c2582bc2755be5036dd06fed1ab74d869ade882da849d94ad9815f6c5b336a43"
+       "f26c9f82d8b14699ff961590d6a2b65365e1b1128861eec08c4e840c4f80f19b"
+       "ca2d752bf8116a368866fdd8a2c088190654b851957b26e2569f7830b912a447"
+       "7ad56d270c295af37ea21310505d344ee624cb9d3a417f999b2efa243dd2435b",
+       .priv2 =
+       "3ccee743b0c634ae4353e56537a3ec2ce557c5e75f42fcfb3a16f76236112e6f",
+       .pub2 =
+       "76d7610d90efe2f4c7ac7459261237d36ea709c5ad477f19c334149839d50b83"
+       "56ee2b0b089439f31ff153c1a946d3302c3a062523118bc1c495875e6a0459b7"
+       "6c7c8e13b2ab0950443fff186f9fd3810309ccb3cee7b102f1e882a5337f6ef7"
+       "7124816577d046cb62c6bd6a33ec12d986aec9c16fce316321241e8199bd128a"
+       "f460a2e909e724573beb4fd80a653e7348bd3ca1f8f7b697ae5861d4a0fa7d6d"
+       "c670449d777627fa88ef4961ebd6ab692a3b023ac181f6e9e215eef80fa7b6b7"
+       "44ec03786219f8a46d5f08285cf60c12ad2067691cdfee0c069dd6499844ab8b"
+       "306c4f39444c6193214dec93a1529f7914eaf063835f549598c294e196dde86e",
+       .secret =
+       "a097f9500687fa51fb4005107296b7217b7637407c2df45e01aac5286a0481c3"
+       "283ad1613e0ab5143e755e47feacddf9d8f507249bd9ef0d74af69c94c4c808f"
+       "f706aca74450668289de5008ed872f700aa2420dfc81593bef8ee922915e3232"
+       "3a81a8a7dad8decfa4941f8cb22be95fce9ac1361c5ca5fb58d1b113cd90fb2c"
+       "34bc5f3f87b3b5af5baa3af2cff3394a7d35ddbd5254837a438aa59ea86bdac7"
+       "dcbc23715030c22263e90150503bb03261a770cb6ff1c9cf1e2cd36de6b85bba"
+       "b9ba91c8cd14ecc07dccbdb7c0a8761f347cf3e69326b6370f7833a5b50620bf"
+       "d6aab69ab7f1992a9164b93aca29a8348a1ef883a3045f00f9b9ce0e05647502",
+};
+
+static const struct dh_test_vector dh_degenerate = {
+       .prime =
+       "dc53dfa73a49a384f603173c93c17a59baa4c18bf0305e587ded5c8c56f6e44c"
+       "645ba8a2eb26c87a9e2be8b28d407eb7a82be004bfbe4ff097ba97b2b4dc980f"
+       "349b75540c71120b49c279be3a610414ae984a781382ded04e64cd26dca3cb4e"
+       "cf8866db23af4c12db308148f281bbe0953165e0fe58fd6c806ace0152190018"
+       "6d0c0b4a3d636bb834bab9218441fb3117814621d5bf4558dfcca4cb8e1e680b"
+       "df525760a2cf79352114cd913c64d1b56836be86b2059aca3d4fc18818dab52c"
+       "f0031bab41b75f2b27519cc39fd557ba88f6765cd380ace9e7f2ceb9077b6b51"
+       "09ce7d4deffb0767717e9a475a5a7ef313daf79dd4026c114df248660de436c7",
+       .generator = "01",
+       .priv1 = "01",
+       .pub1 = "01",
+       .priv2 = "01",
+       .pub2 = "01",
+       .secret = "01",
+};
+
+struct testkey {
+       struct l_key *key;
+       uint8_t *bytes;
+       size_t len;
+};
+
+static void testkey_from_string(const char *keystr, struct testkey *tk)
+{
+       tk->bytes = l_util_from_hexstring(keystr, &tk->len);
+       assert(tk->bytes);
+       assert(tk->len);
+
+       /* Tests assume keys do not have a leading zero byte */
+       assert(tk->bytes[0]);
+
+       tk->key = l_key_new(L_KEY_RAW, tk->bytes, tk->len);
+       assert(tk->key);
+}
+
+static void testkey_free_contents(struct testkey *tk)
+{
+       l_key_free(tk->key);
+       l_free(tk->bytes);
+}
+
+static bool equal_with_leading_zeros(uint8_t *buf1, size_t size1,
+                                       uint8_t *buf2, size_t size2)
+{
+       size_t extrabytes;
+       size_t index;
+
+       if (size1 < size2) {
+               uint8_t *tmpbuf;
+               size_t tmpsize;
+
+               tmpbuf = buf2;
+               buf2 = buf1;
+               buf1 = tmpbuf;
+
+               tmpsize = size2;
+               size2 = size1;
+               size1 = tmpsize;
+       }
+
+       extrabytes = size1 - size2;
+
+       for (index = 0; index < extrabytes; index++) {
+               if (buf1[index])
+                       return false;
+       }
+
+       return !memcmp(buf1 + extrabytes, buf2, size2);
+}
+
+static void test_dh(const void *data)
+{
+       const struct dh_test_vector *vector = data;
+       uint8_t *buffer, *secret;
+       size_t buflen, secretlen, resultlen;
+       struct testkey prime, generator, priv1, pub1, priv2, pub2;
+
+       testkey_from_string(vector->prime, &prime);
+       testkey_from_string(vector->generator, &generator);
+       testkey_from_string(vector->priv1, &priv1);
+       testkey_from_string(vector->pub1, &pub1);
+       testkey_from_string(vector->priv2, &priv2);
+       testkey_from_string(vector->pub2, &pub2);
+
+       secret = l_util_from_hexstring(vector->secret, &secretlen);
+       assert(secret);
+
+       buflen = prime.len;
+       buffer = l_malloc(buflen);
+
+       resultlen = buflen;
+       memset(buffer, 0, buflen);
+       assert(l_key_compute_dh_public(generator.key, priv1.key, prime.key,
+                                       buffer, &resultlen));
+       assert(equal_with_leading_zeros(pub1.bytes, pub1.len, buffer,
+                                       resultlen));
+
+       resultlen = buflen;
+       memset(buffer, 0, buflen);
+       assert(l_key_compute_dh_public(generator.key, priv2.key, prime.key,
+                                       buffer, &resultlen));
+       assert(equal_with_leading_zeros(pub2.bytes, pub2.len, buffer,
+                                       resultlen));
+
+       resultlen = buflen - 1;
+       memset(buffer, 0, buflen);
+       assert(!l_key_compute_dh_public(generator.key, priv2.key, prime.key,
+                                       buffer, &resultlen));
+
+       resultlen = 0;
+       memset(buffer, 0, buflen);
+       assert(!l_key_compute_dh_public(generator.key, priv2.key, prime.key,
+                                       buffer, &resultlen));
+
+       resultlen = buflen;
+       memset(buffer, 0, buflen);
+       assert(l_key_compute_dh_secret(pub1.key, priv2.key, prime.key,
+                                       buffer, &resultlen));
+       assert(equal_with_leading_zeros(secret, secretlen, buffer, resultlen));
+
+       resultlen = buflen;
+       memset(buffer, 0, buflen);
+       assert(l_key_compute_dh_secret(pub2.key, priv1.key, prime.key,
+                                       buffer, &resultlen));
+       assert(equal_with_leading_zeros(secret, secretlen, buffer, resultlen));
+
+       resultlen = 0;
+       memset(buffer, 0, buflen);
+       assert(!l_key_compute_dh_secret(pub1.key, priv2.key, prime.key,
+                                       buffer, &resultlen));
+
+       resultlen = secretlen - 1;
+       memset(buffer, 0, buflen);
+       assert(!l_key_compute_dh_secret(pub1.key, priv2.key, prime.key,
+                                       buffer, &resultlen));
+
+       testkey_free_contents(&prime);
+       testkey_free_contents(&generator);
+       testkey_free_contents(&priv1);
+       testkey_free_contents(&pub1);
+       testkey_free_contents(&priv2);
+       testkey_free_contents(&pub2);
+       l_free(secret);
+       l_free(buffer);
+}
+
+static void test_simple_keyring(const void *data)
+{
+       struct l_keyring *ring;
+       struct l_key *key1;
+       struct l_key *key2;
+       bool success;
+
+       ring = l_keyring_new();
+       assert(ring);
+
+       key1 = l_key_new(L_KEY_RAW, "1", 1);
+       key2 = l_key_new(L_KEY_RAW, "2", 1);
+
+       success = l_keyring_link(ring, key1);
+       assert(success);
+       success = l_keyring_link(ring, key2);
+       assert(success);
+
+       l_key_free(key1);
+       success = l_keyring_unlink(ring, key2);
+       assert(success);
+       l_keyring_free(ring);
+       l_key_free(key2);
+}
+
+static struct l_cert *load_cert_file(const char *filename)
+{
+       uint8_t *der;
+       size_t len;
+       char *label;
+       struct l_cert *cert;
+
+       der = l_pem_load_file(filename, &label, &len);
+       if (!der)
+               return NULL;
+
+       l_free(label);
+
+       cert = l_cert_new_from_der(der, len);
+       l_free(der);
+       return cert;
+}
+
+static void test_trusted_keyring(const void *data)
+{
+       struct l_keyring *ring;
+       struct l_keyring *trust;
+       struct l_cert *cacert;
+       struct l_cert *cert;
+       struct l_key *cakey;
+       struct l_key *key;
+       bool success;
+
+       cacert = load_cert_file(CERTDIR "cert-ca.pem");
+       assert(cacert);
+       cert = load_cert_file(CERTDIR "cert-server.pem");
+       assert(cert);
+
+       cakey = l_cert_get_pubkey(cacert);
+       assert(cakey);
+       key = l_cert_get_pubkey(cert);
+       assert(key);
+
+       trust = l_keyring_new();
+       assert(trust);
+       ring = l_keyring_new();
+       assert(ring);
+       success = l_keyring_restrict(ring, L_KEYRING_RESTRICT_ASYM, trust);
+       assert(success);
+
+       success = l_keyring_link(ring, key);
+       assert(!success);
+       success = l_keyring_link(trust, cakey);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(success);
+
+       l_keyring_free(trust);
+       l_keyring_free(ring);
+       l_key_free(cakey);
+       l_key_free(key);
+       l_cert_free(cacert);
+       l_cert_free(cert);
+}
+
+static void test_trust_chain(const void *data)
+{
+       struct l_keyring *ring;
+       struct l_keyring *trust;
+       struct l_keyring *trust2;
+       struct l_cert *cacert;
+       struct l_cert *intcert;
+       struct l_cert *cert;
+       struct l_key *cakey;
+       struct l_key *intkey;
+       struct l_key *key;
+       bool success;
+
+       cacert = load_cert_file(CERTDIR "cert-ca.pem");
+       assert(cacert);
+       intcert = load_cert_file(CERTDIR "cert-intca.pem");
+       assert(intcert);
+       cert = load_cert_file(CERTDIR "cert-entity-int.pem");
+       assert(cert);
+
+       cakey = l_cert_get_pubkey(cacert);
+       assert(cakey);
+       intkey = l_cert_get_pubkey(intcert);
+       assert(intkey);
+       key = l_cert_get_pubkey(cert);
+       assert(key);
+
+       trust = l_keyring_new();
+       assert(trust);
+       trust2 = l_keyring_new();
+       assert(trust2);
+       ring = l_keyring_new();
+       assert(ring);
+
+       success = l_keyring_restrict(ring, L_KEYRING_RESTRICT_ASYM_CHAIN,
+                                       trust);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(!success);
+       success = l_keyring_link(ring, intkey);
+       assert(!success);
+       success = l_keyring_link(trust, cakey);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(!success);
+       success = l_keyring_link(ring, intkey);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(success);
+       success = l_keyring_link_nested(ring, trust);
+       assert(!success);
+       success = l_keyring_link_nested(ring, trust2);
+       assert(!success);
+       success = l_keyring_link_nested(ring, ring);
+       assert(!success);
+       success = l_keyring_unlink(ring, key);
+       assert(success);
+       success = l_keyring_unlink(ring, intkey);
+       assert(success);
+       l_key_free(cakey);
+       success = l_keyring_unlink(ring, intkey);
+       assert(!success);
+       success = l_keyring_link_nested(trust, trust2);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(!success);
+       success = l_keyring_link(trust2, intkey);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(success);
+       success = l_keyring_unlink(ring, key);
+       assert(success);
+       success = l_keyring_unlink_nested(trust, trust2);
+       assert(success);
+       success = l_keyring_link(ring, key);
+       assert(!success);
+       success = l_keyring_link_nested(trust, trust2);
+       assert(success);
+       l_keyring_free_norevoke(trust2);
+       success = l_keyring_link(ring, key);
+       assert(success);
+       success = l_keyring_unlink(ring, key);
+       assert(success);
+       l_key_free_norevoke(intkey);
+       success = l_keyring_link(ring, key);
+       assert(success);
+
+       l_keyring_free(trust);
+       l_keyring_free(ring);
+       l_key_free(key);
+       l_cert_free(cacert);
+       l_cert_free(intcert);
+       l_cert_free(cert);
+}
+
+static void test_key_crypto(const void *data)
+{
+       struct l_cert *cert;
+       struct l_key *privkey;
+       struct l_key *pubkey;
+       bool is_public;
+       size_t keybits;
+       bool success;
+       uint8_t ciphertext[256];
+       uint8_t decrypted[256];
+       ssize_t len;
+       int hash = L_CHECKSUM_NONE;
+       int rsa = L_KEY_RSA_PKCS1_V1_5;
+
+       cert = load_cert_file(CERTDIR "cert-client.pem");
+       assert(cert);
+       pubkey = l_cert_get_pubkey(cert);
+       assert(pubkey);
+       l_cert_free(cert);
+
+       privkey = l_pem_load_private_key(CERTDIR "cert-client-key-pkcs8.pem",
+                                               NULL, NULL);
+       assert(privkey);
+       success = l_key_get_info(privkey, rsa, hash, &keybits, &is_public);
+       assert(success);
+       assert(keybits == 2048);
+       assert(!is_public);
+
+       success = l_key_get_info(privkey, rsa, L_CHECKSUM_NONE, &keybits,
+                                       &is_public);
+       assert(success);
+       assert(keybits == 2048);
+       assert(!is_public);
+
+       success = l_key_get_info(pubkey, rsa, hash, &keybits, &is_public);
+       assert(success);
+       assert(keybits == 2048);
+       assert(is_public);
+
+       memset(ciphertext, 0, sizeof(ciphertext));
+       memset(decrypted, 0, sizeof(decrypted));
+
+       len = l_key_encrypt(pubkey, rsa, hash, plaintext, ciphertext,
+                               strlen(plaintext), sizeof(ciphertext));
+       assert(len == sizeof(ciphertext));
+
+       /* Can't decrypt with public key */
+       len = l_key_decrypt(pubkey, rsa, hash, ciphertext, decrypted,
+                               sizeof(ciphertext), sizeof(decrypted));
+       assert(len < 0);
+
+       len = l_key_decrypt(privkey, rsa, hash, ciphertext, decrypted,
+                               sizeof(ciphertext), sizeof(decrypted));
+       assert(len == (ssize_t)strlen(plaintext));
+       assert(strcmp(plaintext, (char *)decrypted) == 0);
+
+       /* Decrypt reference ciphertext */
+       memset(decrypted, 0, sizeof(decrypted));
+       len = l_key_decrypt(privkey, rsa, hash, reference_ciphertext, decrypted,
+                               sizeof(reference_ciphertext),
+                               sizeof(decrypted));
+       assert(len == (ssize_t)strlen(plaintext));
+       assert(strcmp(plaintext, (char *)decrypted) == 0);
+
+       /* Decrypt corrupted ciphertext */
+       memset(decrypted, 0, sizeof(decrypted));
+       memcpy(ciphertext, reference_ciphertext, sizeof(ciphertext));
+       ciphertext[0] = ciphertext[0] ^ (uint8_t)0xFF;
+       len = l_key_decrypt(privkey, rsa, hash, ciphertext, decrypted,
+                               sizeof(ciphertext),
+                               sizeof(decrypted));
+       assert(len < 0);
+
+       /* Can't sign with public key */
+       len = l_key_sign(pubkey, rsa, hash, plaintext, ciphertext,
+                               strlen(plaintext), sizeof(ciphertext));
+       assert(len < 0);
+
+       len = l_key_sign(privkey, rsa, hash, plaintext, ciphertext,
+                               strlen(plaintext), sizeof(ciphertext));
+       assert(len == sizeof(ciphertext));
+
+       success = l_key_verify(pubkey, rsa, hash, plaintext, ciphertext,
+                               strlen(plaintext), sizeof(ciphertext));
+       assert(success);
+
+       success = l_key_verify(privkey, rsa, hash, plaintext, ciphertext,
+                               strlen(plaintext), sizeof(ciphertext));
+       assert(success);
+
+       success = l_key_verify(pubkey, rsa, hash, plaintext,
+                               reference_signature, strlen(plaintext),
+                               sizeof(reference_signature));
+       assert(success);
+
+       /* Corrupt signature */
+       ciphertext[42] = ciphertext[52] ^ (uint8_t)0xFF;
+       success = l_key_verify(privkey, rsa, hash, plaintext, ciphertext,
+                               strlen(plaintext), sizeof(ciphertext));
+       assert(!success);
+
+       l_key_free(privkey);
+       l_key_free(pubkey);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("unsupported", test_unsupported, NULL);
+
+       l_test_add("user key", test_user, NULL);
+
+       if (l_key_is_supported(L_KEY_FEATURE_DH)) {
+               l_test_add("Diffie-Hellman 1", test_dh, &dh_valid1);
+               l_test_add("Diffie-Hellman 2", test_dh, &dh_valid2);
+               l_test_add("Diffie-Hellman 3", test_dh, &dh_degenerate);
+       }
+
+       l_test_add("simple keyring", test_simple_keyring, NULL);
+
+       if (l_key_is_supported(L_KEY_FEATURE_RESTRICT)) {
+               l_test_add("trusted keyring", test_trusted_keyring, NULL);
+               l_test_add("trust chain", test_trust_chain, NULL);
+       }
+
+       if (l_key_is_supported(L_KEY_FEATURE_CRYPTO))
+               l_test_add("key crypto", test_key_crypto, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-main.c b/unit/test-main.c
new file mode 100644 (file)
index 0000000..b4e73f7
--- /dev/null
@@ -0,0 +1,136 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <assert.h>
+#include <limits.h>
+#include <signal.h>
+
+#include <ell/ell.h>
+
+static void signal_handler(uint32_t signo, void *user_data)
+{
+       switch (signo) {
+       case SIGINT:
+       case SIGTERM:
+               l_info("Terminate");
+               l_main_quit();
+               break;
+       }
+}
+
+static void timeout_quit_handler(struct l_timeout *timeout, void *user_data)
+{
+       l_main_quit();
+}
+
+static void idle_handler(struct l_idle *idle, void *user_data)
+{
+       static int count = 0;
+
+       if ((count % 1000000) == 0)
+               l_info("Idling...");
+
+       count += 1;
+}
+
+static void oneshot_handler(void *user_data)
+{
+       l_info("One-shot");
+}
+
+static void race_delay_handler(struct l_timeout *timeout, void *user_data)
+{
+       l_info("Delay");
+       usleep(250 * 1000);
+}
+
+static void race_handler(struct l_timeout *timeout, void *user_data)
+{
+       struct l_timeout **other_racer = user_data;
+
+       l_info("Remove pending event");
+       l_timeout_remove(*other_racer);
+       *other_racer = NULL;
+}
+
+static void remove_handler(struct l_timeout *timeout, void *user_data)
+{
+       l_timeout_remove(timeout);
+       l_info("Timer removed itself");
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_timeout *timeout_quit;
+       struct l_timeout *race_delay;
+       struct l_timeout *race1;
+       struct l_timeout *race2;
+       struct l_timeout *remove_self;
+       struct l_idle *idle;
+
+       if (!l_main_init())
+               return -1;
+
+       timeout_quit = l_timeout_create(3, timeout_quit_handler, NULL, NULL);
+
+       race_delay = l_timeout_create(1, race_delay_handler, NULL, NULL);
+       race1 = l_timeout_create_ms(1100, race_handler, &race2, NULL);
+       race2 = l_timeout_create_ms(1100, race_handler, &race1, NULL);
+
+       remove_self = l_timeout_create(2, remove_handler, &remove_self, NULL);
+
+       idle = l_idle_create(idle_handler, NULL, NULL);
+
+       l_log_set_stderr();
+
+       l_debug_enable("*");
+
+       l_debug("hello");
+
+#if (ULONG_MAX > UINT_MAX)
+       l_debug("Checking timeout time limit");
+       assert(!l_timeout_create_ms((UINT_MAX + 1UL) * 1000,
+                                       timeout_quit_handler, NULL, NULL));
+#endif
+
+       l_idle_oneshot(oneshot_handler, NULL, NULL);
+
+       l_main_run_with_signal(signal_handler, NULL);
+
+       l_timeout_remove(race_delay);
+       l_timeout_remove(race1);
+       l_timeout_remove(race2);
+
+       l_timeout_remove(timeout_quit);
+
+       l_idle_remove(idle);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/unit/test-net.c b/unit/test-net.c
new file mode 100644 (file)
index 0000000..2f7bf48
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_net_hostname_is_localhost(const void *data)
+{
+       assert(l_net_hostname_is_localhost("localhost"));
+       assert(l_net_hostname_is_localhost("localhost."));
+       assert(l_net_hostname_is_localhost("localhost.localdomain"));
+       assert(l_net_hostname_is_localhost("localhost.localdomain."));
+       assert(l_net_hostname_is_localhost("other.localhost"));
+       assert(l_net_hostname_is_localhost("other.localhost."));
+       assert(l_net_hostname_is_localhost("other.localhost.localdomain"));
+       assert(l_net_hostname_is_localhost("other.localhost.localdomain."));
+
+       assert(l_net_hostname_is_localhost("LOCALHOST"));
+
+       assert(!l_net_hostname_is_localhost("notsolocalhost"));
+       assert(!l_net_hostname_is_localhost("localhost.com"));
+       assert(!l_net_hostname_is_localhost(""));
+}
+
+static void test_net_hostname_is_root(const void *data)
+{
+       assert(l_net_hostname_is_root(""));
+       assert(l_net_hostname_is_root("."));
+       assert(!l_net_hostname_is_root("notsoroot"));
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("net/hostname_is_localhost", test_net_hostname_is_localhost,
+                                                                       NULL);
+       l_test_add("net/hostname_is_root", test_net_hostname_is_root,
+                                                                       NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-netlink.c b/unit/test-netlink.c
new file mode 100644 (file)
index 0000000..928830a
--- /dev/null
@@ -0,0 +1,113 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
+#include <net/if.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void do_debug(const char *str, void *user_data)
+{
+       const char *prefix = user_data;
+
+       l_info("%s%s", prefix, str);
+}
+
+static void getlink_callback(int error, uint16_t type, const void *data,
+                                               uint32_t len, void *user_data)
+{
+       const struct ifinfomsg *ifi = data;
+       struct rtattr *rta;
+       int bytes;
+       char ifname[IF_NAMESIZE];
+       uint32_t index, flags;
+
+       if (error)
+               goto done;
+
+       bytes = len - NLMSG_ALIGN(sizeof(struct ifinfomsg));
+
+       memset(ifname, 0, sizeof(ifname));
+
+       index = ifi->ifi_index;
+       flags = ifi->ifi_flags;
+
+       for (rta = IFLA_RTA(ifi); RTA_OK(rta, bytes);
+                                       rta = RTA_NEXT(rta, bytes)) {
+               switch (rta->rta_type) {
+               case IFLA_IFNAME:
+                       if (RTA_PAYLOAD(rta) <= IF_NAMESIZE)
+                               strcpy(ifname, RTA_DATA(rta));
+                       break;
+               }
+       }
+
+       l_info("index=%d flags=0x%08x name=%s", index, flags, ifname);
+
+done:
+       l_main_quit();
+}
+
+static void link_notification(uint16_t type, void const * data,
+                                       uint32_t len, void * user_data)
+{
+}
+
+int main(int argc, char *argv[])
+{
+       struct l_netlink *netlink;
+       struct ifinfomsg msg;
+       unsigned int link_id;
+
+       if (!l_main_init())
+               return -1;
+
+       l_log_set_stderr();
+
+       netlink = l_netlink_new(NETLINK_ROUTE);
+
+       l_netlink_set_debug(netlink, do_debug, "[NETLINK] ", NULL);
+
+       memset(&msg, 0, sizeof(msg));
+
+       l_netlink_send(netlink, RTM_GETLINK, NLM_F_DUMP, &msg, sizeof(msg),
+                                               getlink_callback, NULL, NULL);
+
+       link_id = l_netlink_register(netlink, RTNLGRP_LINK,
+                                       link_notification, NULL, NULL);
+
+       l_main_run();
+
+       assert(l_netlink_unregister(netlink, link_id));
+
+       l_netlink_destroy(netlink);
+
+       l_main_exit();
+
+       return 0;
+}
diff --git a/unit/test-path.c b/unit/test-path.c
new file mode 100644 (file)
index 0000000..e1c9175
--- /dev/null
@@ -0,0 +1,99 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <assert.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+
+#include <ell/ell.h>
+
+static void test_path_next(const void *data)
+{
+       char *path;
+       const char *path_str;
+
+       path_str = l_path_next("Foo:bar", &path);
+       assert(path_str);
+       assert(!strcmp(path, "Foo"));
+       l_free(path);
+
+       path_str = l_path_next(path_str, &path);
+       assert(path_str);
+       assert(*path_str == '\0');
+       assert(!strcmp(path, "bar"));
+       l_free(path);
+
+       path_str = l_path_next("\"foo\\:::bar\\", &path);
+       assert(path_str);
+       assert(!strcmp(path, "\"foo:"));
+       l_free(path);
+
+       path_str = l_path_next(path_str, &path);
+       assert(path_str);
+       assert(!strcmp(path, ""));
+       l_free(path);
+
+       path_str = l_path_next(path_str, &path);
+       assert(path_str);
+       assert(!strcmp(path, "bar"));
+       l_free(path);
+}
+
+static void test_path_find(const void *data)
+{
+       static const char *cant_find = "/foo:/bar:/dir:fr";
+       static const char *can_find = "/tmp";
+       char *tmp_path = l_strdup("/tmp/foobarXXXXXX.tmp");
+       char *base;
+       char *path;
+       int fd;
+
+       fd = L_TFR(mkostemps(tmp_path, 4, O_CLOEXEC));
+       assert(fd > 0);
+       L_TFR(close(fd));
+       base = basename(tmp_path);
+
+       assert(l_path_find(base, cant_find, F_OK) == NULL);
+
+       path = l_path_find(base, can_find, F_OK);
+       assert(path);
+       assert(!strcmp(path, tmp_path));
+       l_free(path);
+       l_free(tmp_path);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("path/next", test_path_next, NULL);
+       l_test_add("path/find", test_path_find, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-pbkdf2.c b/unit/test-pbkdf2.c
new file mode 100644 (file)
index 0000000..37d87ed
--- /dev/null
@@ -0,0 +1,195 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2017  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <ell/ell.h>
+
+struct pbkdf2_data {
+       const char *password;
+       const char *salt;
+       unsigned int salt_len;
+       unsigned int count;
+       unsigned int key_len;
+       const char *key;
+};
+
+static void pbkdf2_test(const void *data)
+{
+       const struct pbkdf2_data *test = data;
+       unsigned int salt_len;
+       unsigned int key_len;
+       unsigned char output[25];
+       char *key;
+       bool result;
+
+       salt_len = test->salt_len ? : strlen(test->salt);
+
+       key_len = test->key_len ? : (strlen(test->key) / 2);
+
+       result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, test->password,
+                               (const uint8_t *) test->salt, salt_len,
+                               test->count, output, key_len);
+
+       assert(result == true);
+
+       key = l_util_hexstring(output, key_len);
+
+       assert(strcmp(test->key, key) == 0);
+
+       l_free(key);
+}
+
+static const struct pbkdf2_data pbkdf2_test_vector_1 = {
+       .password       = "password",
+       .salt           = "salt",
+       .count          = 1,
+       .key            = "0c60c80f961f0e71f3a9b524af6012062fe037a6",
+       .key_len        = 20,
+};
+
+static const struct pbkdf2_data pbkdf2_test_vector_2 = {
+       .password       = "password",
+       .salt           = "salt",
+       .count          = 2,
+       .key            = "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957",
+       .key_len        = 20,
+};
+
+static const struct pbkdf2_data pbkdf2_test_vector_3 = {
+       .password       = "password",
+       .salt           = "salt",
+       .count          = 4096,
+       .key            = "4b007901b765489abead49d926f721d065a429c1",
+       .key_len        = 20,
+};
+
+static const struct pbkdf2_data pbkdf2_test_vector_4 = {
+       .password       = "password",
+       .salt           = "salt",
+       .count          = 16777216,
+       .key            = "eefe3d61cd4da4e4e9945b3d6ba2158c2634e984",
+       .key_len        = 20,
+};
+
+static const struct pbkdf2_data pbkdf2_test_vector_5 = {
+       .password       = "passwordPASSWORDpassword",
+       .salt           = "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+       .count          = 4096,
+       .key            = "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038",
+       .key_len        = 25,
+};
+
+static const struct pbkdf2_data athena_test_vector_1 = {
+       .password       = "password",
+       .salt           = "ATHENA.MIT.EDUraeburn",
+       .count          = 1,
+       .key            = "cdedb5281bb2f801565a1122b2563515",
+};
+
+static const struct pbkdf2_data athena_test_vector_2 = {
+       .password       = "password",
+       .salt           = "ATHENA.MIT.EDUraeburn",
+       .count          = 2,
+       .key            = "01dbee7f4a9e243e988b62c73cda935d",
+};
+
+static const struct pbkdf2_data athena_test_vector_3 = {
+       .password       = "password",
+       .salt           = "ATHENA.MIT.EDUraeburn",
+       .count          = 1200,
+       .key            = "5c08eb61fdf71e4e4ec3cf6ba1f5512b",
+};
+
+static const struct pbkdf2_data athena_test_vector_4 = {
+       .password       = "password",
+       .salt           = "\x12\x34\x56\x78\x78\x56\x34\x12",
+       .count          = 5,
+       .key            = "d1daa78615f287e6a1c8b120d7062a49",
+};
+
+static const struct pbkdf2_data athena_test_vector_5 = {
+       .password       = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+                         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+       .salt           = "pass phrase equals block size",
+       .count          = 1200,
+       .key            = "139c30c0966bc32ba55fdbf212530ac9",
+};
+
+static const struct pbkdf2_data athena_test_vector_6 = {
+       .password       = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+                         "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+       .salt           = "pass phrase exceeds block size",
+       .count          = 1200,
+       .key            = "9ccad6d468770cd51b10e6a68721be61",
+};
+
+static const struct pbkdf2_data athena_test_vector_7 = {
+       .password       = "\xf0\x9d\x84\x9e",   /* g-clef (0xf09d849e) */
+       .salt           = "EXAMPLE.COMpianist",
+       .count          = 50,
+       .key            = "6b9cf26d45455a43a5b8bb276a403b39",
+};
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       if (!l_checksum_is_supported(L_CHECKSUM_SHA1, true)) {
+               printf("SHA1 support missing, skipping...\n");
+               goto done;
+       }
+
+       l_test_add("/pbkdf2-sha1/PBKDF2 Test vector 1",
+                                       pbkdf2_test, &pbkdf2_test_vector_1);
+       l_test_add("/pbkdf2-sha1/PBKDF2 Test vector 2",
+                                       pbkdf2_test, &pbkdf2_test_vector_2);
+       l_test_add("/pbkdf2-sha1/PBKDF2 Test vector 3",
+                                       pbkdf2_test, &pbkdf2_test_vector_3);
+       l_test_add("/pbkdf2-sha1/PBKDF2 Test vector 4",
+                                       pbkdf2_test, &pbkdf2_test_vector_4);
+       l_test_add("/pbkdf2-sha1/PBKDF2 Test vector 5",
+                                       pbkdf2_test, &pbkdf2_test_vector_5);
+
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 1",
+                                       pbkdf2_test, &athena_test_vector_1);
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 2",
+                                       pbkdf2_test, &athena_test_vector_2);
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 3",
+                                       pbkdf2_test, &athena_test_vector_3);
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 4",
+                                       pbkdf2_test, &athena_test_vector_4);
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 5",
+                                       pbkdf2_test, &athena_test_vector_5);
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 6",
+                                       pbkdf2_test, &athena_test_vector_6);
+       l_test_add("/pbkdf2-sha1/ATHENA Test vector 7",
+                                       pbkdf2_test, &athena_test_vector_7);
+
+done:
+       return l_test_run();
+}
diff --git a/unit/test-pem.c b/unit/test-pem.c
new file mode 100644 (file)
index 0000000..d39003e
--- /dev/null
@@ -0,0 +1,348 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+struct pem_test {
+       const char *input;
+       bool valid;
+       const char *label;
+       size_t decoded_size;
+};
+
+static const struct pem_test invalid_header1 = {
+       .input = "-----BEGIN FOOBAR -----\r\n"
+                       "----END FOOBAR -----\r\n",
+       .valid = false,
+};
+
+static const struct pem_test invalid_header2 = {
+       .input = "-----BEGIN CERT  IFICATE-----\r\n"
+                       "-----END CERT  IFICATE----\r\n",
+       .valid = false,
+};
+
+static const struct pem_test empty = {
+       .input = "-----BEGIN CERTIFICATE-----\r\n"
+                       "-----END CERTIFICATE-----\r\n",
+       .valid = false,
+};
+
+static const struct pem_test empty_label = {
+       .input = "-----BEGIN -----\r\n"
+                       "U28/PHA+\r\n"
+                       "-----END -----\r\n",
+       .valid = true,
+       .label = "",
+       .decoded_size = 6,
+};
+
+struct pem_from_data_test {
+       const char *list;
+       const char *ca;
+};
+
+static const struct pem_from_data_test single_line_cert_chain = {
+       /* Copied from cert-chain.pem */
+       .list =
+               "-----BEGIN CERTIFICATE-----\n"
+               "MIIEXDCCA0SgAwIBAgIJALjNE85c9plgMA0GCSqGSIb3DQEBCwUAMHgxNTAzBgNV\n"
+               "BAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRpb25z\n"
+               "MR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcNAQkB\n"
+               "Fg9jYUBtYWlsLmV4YW1wbGUwHhcNMTkwOTE2MTcxMzAzWhcNNDcwMjAxMTcxMzAz\n"
+               "WjB4MTUwMwYDVQQKDCxJbnRlcm5hdGlvbmFsIFVuaW9uIG9mIEV4YW1wbGUgT3Jn\n"
+               "YW5pemF0aW9uczEfMB0GA1UEAwwWQ2VydGlmaWNhdGUgaXNzdWVyIGd1eTEeMBwG\n"
+               "CSqGSIb3DQEJARYPY2FAbWFpbC5leGFtcGxlMIIBIjANBgkqhkiG9w0BAQEFAAOC\n"
+               "AQ8AMIIBCgKCAQEA7Lft5O6BtUUokuueQ7mBQVzRzPeH0Nl3NjgGnfBYcz7O2Jca\n"
+               "rFSBPsV76reUG4QFQudsdwyaLOpniFFSFaI3GRXMxjwZJJjLqvT0aebTiLUSKseA\n"
+               "QkP/NSITmIljs2yclnPJGIApLuFvykPagx+yc9ckbziEz1PvKB/ukbiU/zt6QCru\n"
+               "BbyCQ1kWBuyrS3RC0/UgmrSbL7YkkmuD2B1vyZLIoPsJijXs2GJQY3a+zpLemTth\n"
+               "i/Vw4AURJS1gfEUDNzf9Y9+o7vWJfzk+g7xm1XpMTsNTd7q6UwHOi1xdiKCEPT+q\n"
+               "c3LXi7qgWqSXeD+F513PM3JMJ3Wk1H8K4VwJwQIDAQABo4HoMIHlMAwGA1UdEwQF\n"
+               "MAMBAf8wHQYDVR0OBBYEFMuhnjqw8YGMg0cyYlQppMncWis/MIG1BgNVHSMEga0w\n"
+               "gaqAFJ75Zb78cte1aqkdBX4EuDcM140noXykejB4MTUwMwYDVQQKDCxJbnRlcm5h\n"
+               "dGlvbmFsIFVuaW9uIG9mIEV4YW1wbGUgT3JnYW5pemF0aW9uczEfMB0GA1UEAwwW\n"
+               "Q2VydGlmaWNhdGUgaXNzdWVyIGd1eTEeMBwGCSqGSIb3DQEJARYPY2FAbWFpbC5l\n"
+               "eGFtcGxlghQog5dBcTIdmw4XD/6KEME0ZNCdZTANBgkqhkiG9w0BAQsFAAOCAQEA\n"
+               "PjX5n/fgkskZmh9aRhX8r9985JtxMdgogJP4uwRbfuQPzAqYyu9QlAOcRl6tNGN7\n"
+               "mztB5RfJ9HDyjS9iGXsvKXS8wT5ELbuATev+C1Ppxakd3gvJMN4ZqYn32JqRYigN\n"
+               "L2V2jo9RzVUuFa3YP6sw0KfZAfHsfUmQCxAm8HAfQg98aYyIXu/OzeVUsAuhfqWN\n"
+               "qvWcOLjTQTn6t10OHHdIYw59EpIEOPD3Opq7pLgIm+EV3eVMWthSLYbEhIavh8Pc\n"
+               "xN9lqCg887kTawbXbXd49Z8jYZxjxQl7IoonvIyrPhhabKjKCpE2bRFzzpia0PkC\n"
+               "fRgh+KB2tqIeAoekDllmbA==\n"
+               "-----END CERTIFICATE-----\n"
+               "-----BEGIN CERTIFICATE-----\n"
+               "MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL\n"
+               "BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y\n"
+               "Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc\n"
+               "BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00\n"
+               "NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg\n"
+               "RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1\n"
+               "ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG\n"
+               "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet\n"
+               "1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0\n"
+               "v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H\n"
+               "ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO\n"
+               "A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq\n"
+               "wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw\n"
+               "gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX\n"
+               "jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz\n"
+               "BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp\n"
+               "b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN\n"
+               "AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG\n"
+               "SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53\n"
+               "4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d\n"
+               "tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS\n"
+               "SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th\n"
+               "MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P\n"
+               "DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK\n"
+               "-----END CERTIFICATE-----\n",
+       /* copied from cert-ca.pem */
+       .ca =   "-----BEGIN CERTIFICATE-----\n"
+               "MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL\n"
+               "BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y\n"
+               "Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc\n"
+               "BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00\n"
+               "NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg\n"
+               "RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1\n"
+               "ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG\n"
+               "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet\n"
+               "1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0\n"
+               "v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H\n"
+               "ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO\n"
+               "A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq\n"
+               "wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw\n"
+               "gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX\n"
+               "jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz\n"
+               "BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp\n"
+               "b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN\n"
+               "AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG\n"
+               "SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53\n"
+               "4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d\n"
+               "tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS\n"
+               "SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th\n"
+               "MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P\n"
+               "DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK\n"
+               "-----END CERTIFICATE-----\n",
+};
+
+static void destroy_cert(void *cert)
+{
+       l_cert_free(cert);
+}
+
+static void test_chain_from_data(const void *data)
+{
+       const struct pem_from_data_test *test = data;
+       struct l_queue *twocas;
+       struct l_certchain *chain;
+
+       twocas = l_pem_load_certificate_list_from_data(test->list,
+                                                       strlen(test->list));
+       assert(twocas);
+
+       chain = l_pem_load_certificate_chain_from_data(test->ca,
+                                                       strlen(test->ca));
+       assert(chain);
+
+       assert(l_certchain_verify(chain, twocas, NULL));
+
+       l_certchain_free(chain);
+       l_queue_destroy(twocas, destroy_cert);
+}
+
+static void test_priv_key_from_data(const void *data)
+{
+       bool is_encrypted = false;
+       struct l_key *key;
+
+       const char *raw_private_key =
+               "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+               "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIvjkVXsNnUUgCAggA\n"
+               "MAwGCCqGSIb3DQILBQAwHQYJYIZIAWUDBAEqBBAQfXcH4tJZzrKM0bmpXyQWBIIE\n"
+               "0FwZdv9kfXAZVbPIC2UZLpAqrFqxaaxPMA7FxZrS2sI7QmkXEIfO5TkR8IupYigh\n"
+               "s/41jv7V5Mij1syrSodfiYDq3Y0gb9tF9Cb0FNoJwJ9f29X/h1GgnG5NPQBQEH4d\n"
+               "zkqCA8Q8tzh8UTGXLcPwKYSmsAK9Rq739qre5qwHY0+hcoCtUfrev4twFUSC/PUj\n"
+               "oJDFUxQyVt+WCjcuOG+ugWZSENJJe2O8pAqmt7ChuNKGZTe0UEFn/pxgAAgQYfaz\n"
+               "lH/Nx7OQBSVqxdVkFr03/j8eeBy/SzZubirThd0aehwsQTw5/M9rSX8p2ldyjUWF\n"
+               "Fb+UjXFFWdOs21rZtO0LcbdZlIVK94mswI4zo+Vv3f7DsAZPgW+Y36UJbzZNtxRl\n"
+               "C8t97KH3NozGZIq0znC3CmdYk3EsIlMasp1vgyIpjnsyZcCVtCqbl2+PORv4gZyA\n"
+               "9/PMNDNGambIERa4WCLc+Sx5lTryK6wNzQXCMigrpB7yaD+s2CA4OxvdU99iMQzD\n"
+               "9/7cRvEQn/qFhcdTpz3wt97Gs51A+IleJbj9l/50sEsfQmcLVlUM3VbKtozUkaV1\n"
+               "+5/O15HtMQp0jsjwTlz1AzW5eanPIGoFzLiHKfauzrO5L3i5I2G9GGeCtbUV0+Ts\n"
+               "CTwT2kCUnypaNl4D5qdtxe3h+78uW3Yz0f5t4Yw/RlYVSJQZ7irdi3QTgDEEBrpL\n"
+               "pOXTd8nRNxZ+zJZ5ifnBB0Ed+cMxmyKcliVnVLSV0KseNn3tKZwmRUtMBiPqKUD1\n"
+               "qh8KskfJ0ye8jdcWIubP/gvDh5OgkSz1OdDZKH/RmkktUWCJoyXOMxIz+7GH9u3n\n"
+               "n9Z6uAteNTefTJyawA3dwlGvRhySAI2nMl2Aj0g+6/ztpUUjXVx09oxZqh9Bn9k4\n"
+               "t+gKaf4osH51QcKFs8J2YcYCwEYilzRAUwyw65Bo/k4myNXA5t2xSWfQIYRY+Yob\n"
+               "pmbhOfDMLY1spEVHQ49hXvKE99eP5dyA0CmwZw2gkbXCYBEE1IPthJGYxO4zZdrq\n"
+               "AYZq22L+09o0899pnD+p/eDTwKaFenjHVqO71khXurF6q7EPz9m4SkphDSNe/9Tc\n"
+               "O11yMrQE9OUBTTd3zYuN8KuZpj2aW2p5/Z7pqCYJTDwlV/+HRmS/8aJ/sgHfYXpS\n"
+               "Wpl/SHav6qI7fE5BlKwOwWE6O+vf0Nm9AMsbMErXTFdXe5dAin/uNuFyJM3bTHVO\n"
+               "SR/R7/zsNoMJwsgogGMSiFbG1ebcSTgMNHKMFS8RvCBNX44fErW2r0bfNjHU4GgO\n"
+               "KJFukksz/6tNfpIi9lU0Xojc7W8CJVdA9RTx8+LClM5nwFQlqyfIrtEXUK5BM+Vz\n"
+               "2OI8DlMTpp0+JbSAdE3z1i8cEDFmbfaJ2pNX/1M0JPfcZmZsJiMtNC5Fn6MFBQME\n"
+               "Fu1MyJuUr+maOqPLb6c4aYa7gVWpiRwwK8nTe1FofKeEY7mi7PyNJI7pARIDmoD4\n"
+               "d5yFZ9Itg/5/XK7GfuRdve1m5/YGpV+u3HWqDnk/xBJ5FhyF9aIPzROYhXkRkVZz\n"
+               "rn7DSN3XL2XXtUMle9++kRNmjB8h9GGn4ljunjs9YJBVTb1Y9C9vH1xLh2hknL4M\n"
+               "h+XY4w5Os5FZNEkIQd/0gLUwgQRK5+j3aetp085GutPR\n"
+               "-----END ENCRYPTED PRIVATE KEY-----\n";
+
+       key = l_pem_load_private_key_from_data(raw_private_key,
+                                               strlen(raw_private_key),
+                                               "abc", &is_encrypted);
+       assert(key);
+       assert(is_encrypted);
+
+       l_key_free(key);
+}
+
+static void test_pem(const void *data)
+{
+       const struct pem_test *test = data;
+       uint8_t *decoded;
+       char *label = NULL;
+       size_t decoded_size;
+
+       decoded = l_pem_load_buffer((const uint8_t *) test->input,
+                                       strlen(test->input),
+                                       &label, &decoded_size);
+
+       if (!test->valid) {
+               l_free(label);
+               assert(!decoded);
+               return;
+       }
+
+       assert(decoded);
+
+       assert(!strcmp(test->label, label));
+       assert(decoded_size == test->decoded_size);
+
+       l_free(label);
+       l_free(decoded);
+}
+
+static void test_encrypted_pkey(const void *data)
+{
+       const char *encrypted_pem = data;
+       const char *plaintext_pem = CERTDIR "cert-client-key-pkcs8.pem";
+       bool is_encrypted;
+       size_t size;
+       uint8_t encrypted1[256], encrypted2[256], plaintext[256];
+       struct l_key *pkey1, *pkey2;
+       bool is_public;
+
+       is_encrypted = false;
+       assert(!l_pem_load_private_key(encrypted_pem, NULL, &is_encrypted));
+       assert(is_encrypted);
+
+       is_encrypted = false;
+       assert(!l_pem_load_private_key(encrypted_pem, "wrong-passwd",
+                                       &is_encrypted));
+       assert(is_encrypted);
+
+       is_encrypted = false;
+       pkey1 = l_pem_load_private_key(encrypted_pem, "abc", &is_encrypted);
+       assert(pkey1);
+       assert(is_encrypted);
+
+       pkey2 = l_pem_load_private_key(plaintext_pem, NULL, &is_encrypted);
+       assert(pkey2);
+       assert(!is_encrypted);
+
+       /*
+        * l_key_extract doesn't work for private keys so compare encrypt
+        * results instead of key exponent.
+        */
+       memset(plaintext, 42, 256);
+       assert(l_key_get_info(pkey1, L_KEY_RSA_RAW, L_CHECKSUM_NONE,
+                               &size, &is_public));
+       assert(size == 2048);
+       assert(!is_public);
+       assert(l_key_encrypt(pkey1, L_KEY_RSA_RAW, L_CHECKSUM_NONE,
+                               plaintext, encrypted1, 256, 256) == 256);
+       assert(l_key_encrypt(pkey2, L_KEY_RSA_RAW, L_CHECKSUM_NONE,
+                               plaintext, encrypted2, 256, 256) == 256);
+       assert(!memcmp(encrypted1, encrypted2, 256));
+
+       l_key_free(pkey1);
+       l_key_free(pkey2);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("pem/invalid header/test 1", test_pem, &invalid_header1);
+       l_test_add("pem/invalid header/test 2", test_pem, &invalid_header2);
+
+       l_test_add("pem/empty", test_pem, &empty);
+
+       l_test_add("pem/empty label", test_pem, &empty_label);
+       l_test_add("pem/cert chain from data", test_chain_from_data,
+                       &single_line_cert_chain);
+       l_test_add("pem/private key from data", test_priv_key_from_data, NULL);
+
+       if (!l_checksum_is_supported(L_CHECKSUM_MD5, false) ||
+                       !l_checksum_is_supported(L_CHECKSUM_SHA1, false) ||
+                       !l_cipher_is_supported(L_CIPHER_DES_CBC) ||
+                       !l_key_is_supported(L_KEY_FEATURE_CRYPTO))
+               goto done;
+
+       l_test_add("pem/v1 MD5AndDES encrypted Private Key",
+                       test_encrypted_pkey,
+                       CERTDIR "cert-client-key-md5-des.pem");
+       l_test_add("pem/v1 SHA1AndDES encrypted Private Key",
+                       test_encrypted_pkey,
+                       CERTDIR "cert-client-key-sha1-des.pem");
+       l_test_add("pem/v2 DES encrypted Private Key", test_encrypted_pkey,
+                       CERTDIR "cert-client-key-v2-des.pem");
+
+       if (l_cipher_is_supported(L_CIPHER_DES3_EDE_CBC) &&
+                       l_checksum_is_supported(L_CHECKSUM_SHA224, false))
+               l_test_add("pem/v2 DES EDE3 encrypted Private Key",
+                               test_encrypted_pkey,
+                               CERTDIR "cert-client-key-v2-des-ede3.pem");
+
+       if (!l_cipher_is_supported(L_CIPHER_AES))
+               goto done;
+
+       if (l_checksum_is_supported(L_CHECKSUM_SHA256, false))
+               l_test_add("pem/v2 AES128 encrypted Private Key",
+                               test_encrypted_pkey,
+                               CERTDIR "cert-client-key-v2-aes128.pem");
+
+       if (l_checksum_is_supported(L_CHECKSUM_SHA512, false))
+               l_test_add("pem/v2 AES256 encrypted Private Key",
+                               test_encrypted_pkey,
+                               CERTDIR "cert-client-key-v2-aes256.pem");
+
+done:
+       return l_test_run();
+}
diff --git a/unit/test-plugin.c b/unit/test-plugin.c
new file mode 100644 (file)
index 0000000..89642bd
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ell/ell.h>
+
+static int builtin_init(void)
+{
+       l_info("Builtin demo plugin init");
+
+       return 0;
+}
+
+static void builtin_exit(void)
+{
+       l_info("Builtin demo plugin exit");
+}
+
+L_PLUGIN_DEFINE(__builtin_desc, builtin_demo, "Builtin demo plugin", VERSION,
+                       L_PLUGIN_PRIORITY_DEFAULT, builtin_init, builtin_exit)
+
+int main(int argc, char *argv[])
+{
+       l_log_set_stderr();
+       l_debug_enable("*");
+
+       l_plugin_add(&__builtin_desc, VERSION);
+
+       l_plugin_load("unit/.libs/*.so", "demo_plugin_desc", VERSION);
+
+       l_plugin_unload();
+
+       return 0;
+}
diff --git a/unit/test-queue.c b/unit/test-queue.c
new file mode 100644 (file)
index 0000000..6fbda43
--- /dev/null
@@ -0,0 +1,114 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_push_pop(const void *data)
+{
+       struct l_queue *queue;
+       unsigned int n, i;
+
+       queue = l_queue_new();
+       assert(queue);
+
+       for (n = 0; n < 1024; n++) {
+               for (i = 1; i < n + 2; i++) {
+                       l_queue_push_tail(queue, L_UINT_TO_PTR(i));
+               }
+
+               if (l_queue_length(queue) != n + 1) {
+                       printf("[%u] length mismatch: %u\n", n,
+                                               l_queue_length(queue));
+               }
+
+               for (i = 1; i < n + 2; i++) {
+                       void *ptr = l_queue_pop_head(queue);
+
+                       if (!ptr) {
+                               printf("[%u] entry empty: %u\n", n, i);
+                               continue;
+                       }
+
+                       if (i != L_PTR_TO_UINT(ptr)) {
+                               printf("[%u] entry misatch: %u != %u\n",
+                                               n, i, L_PTR_TO_UINT(ptr));
+                       }
+               }
+
+               if (!l_queue_isempty(queue)) {
+                       printf("[%u] not empty: %u\n", n,
+                                               l_queue_length(queue));
+               }
+       }
+
+       l_queue_destroy(queue, NULL);
+}
+
+static int queue_compare(const void *a, const void *b, void *user)
+{
+       int ai = L_PTR_TO_INT(a);
+       int bi = L_PTR_TO_INT(b);
+
+       return ai - bi;
+}
+
+static void test_insert(const void *data)
+{
+       int unsorted[] = { 0, 50, 10, 20, 30, 5, 30 };
+       int sorted[] = { 0, 5, 10, 20, 30, 30, 50 };
+       struct l_queue *queue;
+       const struct l_queue_entry *entry;
+       unsigned int i;
+       int n;
+
+       queue = l_queue_new();
+       assert(queue);
+
+       for (i = 0; i < L_ARRAY_SIZE(unsorted); i++)
+               l_queue_insert(queue, L_INT_TO_PTR(unsorted[i]),
+                                               queue_compare, NULL);
+
+       for (i = 0, entry = l_queue_get_entries(queue); entry;
+                                       entry = entry->next, i++) {
+               n = L_PTR_TO_INT(entry->data);
+               assert(n == sorted[i]);
+       }
+
+       l_queue_destroy(queue, NULL);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("queue push & pop", test_push_pop, NULL);
+       l_test_add("queue insert", test_insert, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-random.c b/unit/test-random.c
new file mode 100644 (file)
index 0000000..47b5849
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <ell/ell.h>
+
+static void test_random(const void *data)
+{
+       uint8_t buf1[128];
+       uint8_t buf2[128];
+       char *str;
+
+       assert(l_getrandom(buf1, 128));
+       str = l_util_hexstring(buf1, 128);
+       printf("buf1: %s\n", str);
+       l_free(str);
+
+       assert(l_getrandom(buf2, 128));
+       str = l_util_hexstring(buf2, 128);
+       printf("buf2: %s\n", str);
+       l_free(str);
+
+       assert(memcmp(buf1, buf2, 128));
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       if (!l_getrandom_is_supported()) {
+               printf("getrandom syscall missing, skipping...");
+               goto done;
+       }
+
+       l_test_add("l_getrandom sanity check", test_random, NULL);
+
+done:
+       return l_test_run();
+}
diff --git a/unit/test-ringbuf.c b/unit/test-ringbuf.c
new file mode 100644 (file)
index 0000000..1ce54d1
--- /dev/null
@@ -0,0 +1,228 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static unsigned int nlpo2(unsigned int x)
+{
+       x--;
+       x |= (x >> 1);
+       x |= (x >> 2);
+       x |= (x >> 4);
+       x |= (x >> 8);
+       x |= (x >> 16);
+       return x + 1;
+}
+
+static unsigned int fls(unsigned int x)
+{
+       return x ? sizeof(x) * 8 - __builtin_clz(x) : 0;
+}
+
+static unsigned int align_power2(unsigned int u)
+{
+       return 1 << fls(u - 1);
+}
+
+static void test_power2(const void *data)
+{
+       size_t i;
+
+       for (i = 1; i < 1000000; i++) {
+               size_t size1, size2, size3 = 1;
+
+               size1 = nlpo2(i);
+               size2 = align_power2(i);
+
+               /* Find the next power of two */
+               while (size3 < i && size3 < SIZE_MAX)
+                       size3 <<= 1;
+
+               assert(size1 == size2);
+               assert(size2 == size3);
+               assert(size3 == size1);
+       }
+}
+
+static void test_alloc(const void *data)
+{
+       int i;
+
+       for (i = 2; i < 10000; i++) {
+               struct l_ringbuf *rb;
+
+               rb = l_ringbuf_new(i);
+               assert(rb != NULL);
+
+               assert(l_ringbuf_capacity(rb) == l_ringbuf_avail(rb));
+
+               l_ringbuf_free(rb);
+       }
+}
+
+static void test_printf(const void *data)
+{
+       static size_t rb_size = 500;
+       static size_t rb_capa = 512;
+       struct l_ringbuf *rb;
+       int i;
+
+       rb = l_ringbuf_new(rb_size);
+       assert(rb != NULL);
+       assert(l_ringbuf_capacity(rb) == rb_capa);
+
+       for (i = 0; i < 10000; i++) {
+               size_t len, count = i % rb_capa;
+               char *str, *ptr;
+
+               if (!count)
+                       continue;
+
+               len = asprintf(&str, "%*c", (int) count, 'x');
+               assert(len == count);
+
+               len = l_ringbuf_printf(rb, "%s", str);
+               assert(len == count);
+               assert(l_ringbuf_len(rb) == count);
+               assert(l_ringbuf_avail(rb) == rb_capa - len);
+
+               ptr = l_ringbuf_peek(rb, 0, &len);
+               assert(ptr != NULL);
+               assert(len == count);
+               assert(strncmp(str, ptr, len) == 0);
+
+               len = l_ringbuf_drain(rb, count);
+               assert(len == count);
+               assert(l_ringbuf_len(rb) == 0);
+               assert(l_ringbuf_avail(rb) == rb_capa);
+
+               free(str);
+       }
+
+       l_ringbuf_free(rb);
+}
+
+static void test_append(const void *unused)
+{
+       static const uint8_t data[6] = { 1, 2, 3, 4, 5, 6 };
+       static const size_t rb_size = 12;
+       static const size_t rb_capa = 16;
+       size_t len_no_wrap;
+       ssize_t appended;
+       ssize_t space_left;
+       void *rb_data;
+       struct l_ringbuf *rb;
+
+       rb = l_ringbuf_new(rb_size);
+       assert(rb != NULL);
+       assert(l_ringbuf_capacity(rb) == rb_capa);
+
+       appended = l_ringbuf_append(rb, data, sizeof(data));
+       assert(appended == sizeof(data));
+
+       appended = l_ringbuf_append(rb, data, sizeof(data));
+       assert(appended == sizeof(data));
+
+       space_left = minsize(l_ringbuf_avail(rb), sizeof(data));
+       appended = l_ringbuf_append(rb, data, sizeof(data));
+       assert(appended == space_left);
+
+       rb_data = l_ringbuf_peek(rb, 0, &len_no_wrap);
+       assert(memcmp(rb_data, data, sizeof(data)) == 0);
+       l_ringbuf_drain(rb, sizeof(data));
+
+       rb_data = l_ringbuf_peek(rb, 0, &len_no_wrap);
+       assert(memcmp(rb_data, data, sizeof(data)) == 0);
+       l_ringbuf_drain(rb, sizeof(data));
+
+       rb_data = l_ringbuf_peek(rb, 0, &len_no_wrap);
+       assert(memcmp(rb_data, data, len_no_wrap) == 0);
+       l_ringbuf_drain(rb, len_no_wrap);
+
+       l_ringbuf_free(rb);
+}
+
+static void test_append2(const void *unused)
+{
+       static const uint8_t expected_data1[14] =  {3, 4, 5, 6, 1, 2, 3, 4, 5,
+                                                       6, 1, 2, 3, 4 };
+       static const uint8_t expected_data2[2] = { 5, 6 };
+       static const uint8_t data[6] = { 1, 2, 3, 4, 5, 6 };
+       static const size_t rb_size = 12;
+       static const size_t rb_capa = 16;
+       size_t len_no_wrap;
+       ssize_t appended;
+       ssize_t space_left;
+       void *rb_data;
+       struct l_ringbuf *rb;
+
+       rb = l_ringbuf_new(rb_size);
+       assert(rb != NULL);
+       assert(l_ringbuf_capacity(rb) == rb_capa);
+
+       appended = l_ringbuf_append(rb, data, sizeof(data));
+       assert(appended == sizeof(data));
+
+       appended = l_ringbuf_append(rb, data, sizeof(data));
+       assert(appended == sizeof(data));
+
+       space_left = minsize(l_ringbuf_avail(rb), sizeof(data));
+       l_ringbuf_drain(rb, sizeof(data) - space_left);
+
+       appended = l_ringbuf_append(rb, data, sizeof(data));
+       assert(appended == sizeof(data));
+
+       rb_data = l_ringbuf_peek(rb, 0, &len_no_wrap);
+       assert(len_no_wrap == sizeof(expected_data1));
+       assert(memcmp(expected_data1, rb_data, len_no_wrap) == 0);
+
+       l_ringbuf_drain(rb, len_no_wrap);
+
+       rb_data = l_ringbuf_peek(rb, 0, &len_no_wrap);
+       assert(len_no_wrap == sizeof(expected_data2));
+       assert(memcmp(expected_data2, rb_data, len_no_wrap) == 0);
+
+       l_ringbuf_free(rb);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("/ringbuf/power2", test_power2, NULL);
+       l_test_add("/ringbuf/alloc", test_alloc, NULL);
+       l_test_add("/ringbuf/printf", test_printf, NULL);
+       l_test_add("/ringbuf/append", test_append, NULL);
+       l_test_add("/ringbuf/append2", test_append2, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-settings.c b/unit/test-settings.c
new file mode 100644 (file)
index 0000000..fa3a533
--- /dev/null
@@ -0,0 +1,563 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <limits.h>
+
+#include <ell/ell.h>
+
+#define TEST_CERTIFICATE \
+       "-----BEGIN CERTIFICATE-----\n" \
+       "MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL\n" \
+       "BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y\n" \
+       "Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc\n" \
+       "BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00\n" \
+       "NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg\n" \
+       "RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1\n" \
+       "ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG\n" \
+       "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet\n" \
+       "1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0\n" \
+       "v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H\n" \
+       "ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO\n" \
+       "A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq\n" \
+       "wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw\n" \
+       "gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX\n" \
+       "jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz\n" \
+       "BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp\n" \
+       "b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN\n" \
+       "AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG\n" \
+       "SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53\n" \
+       "4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d\n" \
+       "tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS\n" \
+       "SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th\n" \
+       "MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P\n" \
+       "DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK\n" \
+       "-----END CERTIFICATE-----\n"
+
+#define TEST_CERT_LIST \
+       "-----BEGIN CERTIFICATE-----\n" \
+       "MIIEXDCCA0SgAwIBAgIJALjNE85c9plgMA0GCSqGSIb3DQEBCwUAMHgxNTAzBgNV\n" \
+       "BAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRpb25z\n" \
+       "MR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcNAQkB\n" \
+       "Fg9jYUBtYWlsLmV4YW1wbGUwHhcNMTkwOTE2MTcxMzAzWhcNNDcwMjAxMTcxMzAz\n" \
+       "WjB4MTUwMwYDVQQKDCxJbnRlcm5hdGlvbmFsIFVuaW9uIG9mIEV4YW1wbGUgT3Jn\n" \
+       "YW5pemF0aW9uczEfMB0GA1UEAwwWQ2VydGlmaWNhdGUgaXNzdWVyIGd1eTEeMBwG\n" \
+       "CSqGSIb3DQEJARYPY2FAbWFpbC5leGFtcGxlMIIBIjANBgkqhkiG9w0BAQEFAAOC\n" \
+       "AQ8AMIIBCgKCAQEA7Lft5O6BtUUokuueQ7mBQVzRzPeH0Nl3NjgGnfBYcz7O2Jca\n" \
+       "rFSBPsV76reUG4QFQudsdwyaLOpniFFSFaI3GRXMxjwZJJjLqvT0aebTiLUSKseA\n" \
+       "QkP/NSITmIljs2yclnPJGIApLuFvykPagx+yc9ckbziEz1PvKB/ukbiU/zt6QCru\n" \
+       "BbyCQ1kWBuyrS3RC0/UgmrSbL7YkkmuD2B1vyZLIoPsJijXs2GJQY3a+zpLemTth\n" \
+       "i/Vw4AURJS1gfEUDNzf9Y9+o7vWJfzk+g7xm1XpMTsNTd7q6UwHOi1xdiKCEPT+q\n" \
+       "c3LXi7qgWqSXeD+F513PM3JMJ3Wk1H8K4VwJwQIDAQABo4HoMIHlMAwGA1UdEwQF\n" \
+       "MAMBAf8wHQYDVR0OBBYEFMuhnjqw8YGMg0cyYlQppMncWis/MIG1BgNVHSMEga0w\n" \
+       "gaqAFJ75Zb78cte1aqkdBX4EuDcM140noXykejB4MTUwMwYDVQQKDCxJbnRlcm5h\n" \
+       "dGlvbmFsIFVuaW9uIG9mIEV4YW1wbGUgT3JnYW5pemF0aW9uczEfMB0GA1UEAwwW\n" \
+       "Q2VydGlmaWNhdGUgaXNzdWVyIGd1eTEeMBwGCSqGSIb3DQEJARYPY2FAbWFpbC5l\n" \
+       "eGFtcGxlghQog5dBcTIdmw4XD/6KEME0ZNCdZTANBgkqhkiG9w0BAQsFAAOCAQEA\n" \
+       "PjX5n/fgkskZmh9aRhX8r9985JtxMdgogJP4uwRbfuQPzAqYyu9QlAOcRl6tNGN7\n" \
+       "mztB5RfJ9HDyjS9iGXsvKXS8wT5ELbuATev+C1Ppxakd3gvJMN4ZqYn32JqRYigN\n" \
+       "L2V2jo9RzVUuFa3YP6sw0KfZAfHsfUmQCxAm8HAfQg98aYyIXu/OzeVUsAuhfqWN\n" \
+       "qvWcOLjTQTn6t10OHHdIYw59EpIEOPD3Opq7pLgIm+EV3eVMWthSLYbEhIavh8Pc\n" \
+       "xN9lqCg887kTawbXbXd49Z8jYZxjxQl7IoonvIyrPhhabKjKCpE2bRFzzpia0PkC\n" \
+       "fRgh+KB2tqIeAoekDllmbA==\n" \
+       "-----END CERTIFICATE-----\n" \
+       "-----BEGIN CERTIFICATE-----\n" \
+       "MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL\n" \
+       "BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y\n" \
+       "Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc\n" \
+       "BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00\n" \
+       "NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg\n" \
+       "RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1\n" \
+       "ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG\n" \
+       "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet\n" \
+       "1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0\n" \
+       "v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H\n" \
+       "ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO\n" \
+       "A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq\n" \
+       "wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw\n" \
+       "gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX\n" \
+       "jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz\n" \
+       "BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp\n" \
+       "b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN\n" \
+       "AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG\n" \
+       "SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53\n" \
+       "4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d\n" \
+       "tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS\n" \
+       "SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th\n" \
+       "MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P\n" \
+       "DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK\n" \
+       "-----END CERTIFICATE-----\n"
+
+#define TEST_PRIV_KEY \
+       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n" \
+       "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIvjkVXsNnUUgCAggA\n" \
+       "MAwGCCqGSIb3DQILBQAwHQYJYIZIAWUDBAEqBBAQfXcH4tJZzrKM0bmpXyQWBIIE\n" \
+       "0FwZdv9kfXAZVbPIC2UZLpAqrFqxaaxPMA7FxZrS2sI7QmkXEIfO5TkR8IupYigh\n" \
+       "s/41jv7V5Mij1syrSodfiYDq3Y0gb9tF9Cb0FNoJwJ9f29X/h1GgnG5NPQBQEH4d\n" \
+       "zkqCA8Q8tzh8UTGXLcPwKYSmsAK9Rq739qre5qwHY0+hcoCtUfrev4twFUSC/PUj\n" \
+       "oJDFUxQyVt+WCjcuOG+ugWZSENJJe2O8pAqmt7ChuNKGZTe0UEFn/pxgAAgQYfaz\n" \
+       "lH/Nx7OQBSVqxdVkFr03/j8eeBy/SzZubirThd0aehwsQTw5/M9rSX8p2ldyjUWF\n" \
+       "Fb+UjXFFWdOs21rZtO0LcbdZlIVK94mswI4zo+Vv3f7DsAZPgW+Y36UJbzZNtxRl\n" \
+       "C8t97KH3NozGZIq0znC3CmdYk3EsIlMasp1vgyIpjnsyZcCVtCqbl2+PORv4gZyA\n" \
+       "9/PMNDNGambIERa4WCLc+Sx5lTryK6wNzQXCMigrpB7yaD+s2CA4OxvdU99iMQzD\n" \
+       "9/7cRvEQn/qFhcdTpz3wt97Gs51A+IleJbj9l/50sEsfQmcLVlUM3VbKtozUkaV1\n" \
+       "+5/O15HtMQp0jsjwTlz1AzW5eanPIGoFzLiHKfauzrO5L3i5I2G9GGeCtbUV0+Ts\n" \
+       "CTwT2kCUnypaNl4D5qdtxe3h+78uW3Yz0f5t4Yw/RlYVSJQZ7irdi3QTgDEEBrpL\n" \
+       "pOXTd8nRNxZ+zJZ5ifnBB0Ed+cMxmyKcliVnVLSV0KseNn3tKZwmRUtMBiPqKUD1\n" \
+       "qh8KskfJ0ye8jdcWIubP/gvDh5OgkSz1OdDZKH/RmkktUWCJoyXOMxIz+7GH9u3n\n" \
+       "n9Z6uAteNTefTJyawA3dwlGvRhySAI2nMl2Aj0g+6/ztpUUjXVx09oxZqh9Bn9k4\n" \
+       "t+gKaf4osH51QcKFs8J2YcYCwEYilzRAUwyw65Bo/k4myNXA5t2xSWfQIYRY+Yob\n" \
+       "pmbhOfDMLY1spEVHQ49hXvKE99eP5dyA0CmwZw2gkbXCYBEE1IPthJGYxO4zZdrq\n" \
+       "AYZq22L+09o0899pnD+p/eDTwKaFenjHVqO71khXurF6q7EPz9m4SkphDSNe/9Tc\n" \
+       "O11yMrQE9OUBTTd3zYuN8KuZpj2aW2p5/Z7pqCYJTDwlV/+HRmS/8aJ/sgHfYXpS\n" \
+       "Wpl/SHav6qI7fE5BlKwOwWE6O+vf0Nm9AMsbMErXTFdXe5dAin/uNuFyJM3bTHVO\n" \
+       "SR/R7/zsNoMJwsgogGMSiFbG1ebcSTgMNHKMFS8RvCBNX44fErW2r0bfNjHU4GgO\n" \
+       "KJFukksz/6tNfpIi9lU0Xojc7W8CJVdA9RTx8+LClM5nwFQlqyfIrtEXUK5BM+Vz\n" \
+       "2OI8DlMTpp0+JbSAdE3z1i8cEDFmbfaJ2pNX/1M0JPfcZmZsJiMtNC5Fn6MFBQME\n" \
+       "Fu1MyJuUr+maOqPLb6c4aYa7gVWpiRwwK8nTe1FofKeEY7mi7PyNJI7pARIDmoD4\n" \
+       "d5yFZ9Itg/5/XK7GfuRdve1m5/YGpV+u3HWqDnk/xBJ5FhyF9aIPzROYhXkRkVZz\n" \
+       "rn7DSN3XL2XXtUMle9++kRNmjB8h9GGn4ljunjs9YJBVTb1Y9C9vH1xLh2hknL4M\n" \
+       "h+XY4w5Os5FZNEkIQd/0gLUwgQRK5+j3aetp085GutPR\n" \
+       "-----END ENCRYPTED PRIVATE KEY-----\n"
+
+static const char *data1 = "[Foobar]\n#Comment\n#Comment2\nKey=Value\n"
+               "IntegerA=2147483647\nIntegerB=-2147483648\n"
+               "IntegerC=4294967295\nIntegerD=9223372036854775807\n"
+               "IntegerE=-9223372036854775808\n"
+               "IntegerF=18446744073709551615\n"
+               "IntegerG=2247483647\nIntegerH=4294967296\n"
+               "IntegerI=9223372036854775808\n"
+               "IntegerJ=18446744073709551616\n"
+               "String=\\tFoobar\\s\n"
+               "StringEmpty=\n"
+               "StringBad1=Foobar\\\n"
+               "StringBad2=Foobar\\b123\n"
+               "StringList=Foo,Bar,Baz\n"
+               "StringListEmpty=\n"
+               "StringListOne=FooBarBaz\n"
+               "StringWithSpaces=Bar B Q\n\n"
+               "[@pem@certificate]\n"
+               TEST_CERTIFICATE;
+
+static const char *data2 = "[Group1]\nKey=Value\n"
+                       "IntegerA=2147483647\nIntegerB=-2147483648\n"
+                       "IntegerC=4294967295\nIntegerD=9223372036854775807\n"
+                       "IntegerE=-9223372036854775808\n"
+                       "IntegerF=18446744073709551615\n"
+                       "IntegerG=2247483647\nIntegerH=4294967296\n"
+                       "String=\\tFoobar\\s\n"
+                       "StringEmpty=\n"
+                       "StringBad1=Foobar\\\n"
+                       "StringBad2=Foobar\\b123\n"
+                       "StringList=Foo,Bar,Baz\n"
+                       "StringListEmpty=\n"
+                       "StringListOne=FooBarBaz\n\n"
+                       "[Group2]\nKey=Value\n\n"
+                       "[@pem@example]\n"
+                       "-----BEGIN CERTIFICATE-----\n"
+                       "MIIEajCCA1KgAwIBAgoZIhvcNAQEL\n"
+                       "-----END CERTIFICATE-----\n";
+
+static void settings_debug(const char *str, void *userdata)
+{
+       printf("%s\n", str);
+}
+
+static void test_settings(struct l_settings *settings)
+{
+       int int32;
+       unsigned int uint32;
+       int64_t int64;
+       uint64_t uint64;
+       char *str;
+       char **strv;
+
+       assert(l_settings_has_group(settings, "Foobar"));
+       assert(!l_settings_has_group(settings, "Foobar2"));
+
+       assert(l_settings_has_key(settings, "Foobar", "Key"));
+       assert(!l_settings_has_key(settings, "Foobar", "Key2"));
+
+       assert(!l_settings_get_bool(settings, "Foobar", "Key", NULL));
+
+       assert(l_settings_get_int(settings, "Foobar", "IntegerA", &int32));
+       assert(l_settings_get_int(settings, "Foobar", "IntegerB", &int32));
+       assert(l_settings_get_uint(settings, "Foobar", "IntegerC", &uint32));
+       assert(l_settings_get_int64(settings, "Foobar", "IntegerD", &int64));
+       assert(l_settings_get_int64(settings, "Foobar", "IntegerE", &int64));
+       assert(l_settings_get_uint64(settings, "Foobar", "IntegerF", &uint64));
+       assert(!l_settings_get_int(settings, "Foobar", "IntegerG", &int32));
+       assert(!l_settings_get_uint(settings, "Foobar", "FoobarH", &uint32));
+       assert(!l_settings_get_int64(settings, "Foobar", "IntegerI", &int64));
+       assert(!l_settings_get_uint64(settings, "Foobar", "IntegerJ", &uint64));
+
+       str = l_settings_get_string(settings, "Foobar", "String");
+       assert(str);
+       assert(!strcmp(str, "\tFoobar "));
+       l_free(str);
+
+       str = l_settings_get_string(settings, "Foobar", "StringEmpty");
+       assert(str);
+       assert(!strcmp(str, ""));
+       l_free(str);
+
+       str = l_settings_get_string(settings, "Foobar", "StringBad1");
+       assert(!str);
+
+       str = l_settings_get_string(settings, "Foobar", "StringBad2");
+       assert(!str);
+
+       strv = l_settings_get_string_list(settings, "Foobar",
+                                               "StringList", ',');
+       assert(strv);
+       assert(!strcmp(strv[0], "Foo"));
+       assert(!strcmp(strv[1], "Bar"));
+       assert(!strcmp(strv[2], "Baz"));
+       assert(strv[3] == NULL);
+       l_strfreev(strv);
+
+       strv = l_settings_get_string_list(settings, "Foobar", "StringListEmpty",                                                ',');
+       assert(strv);
+       assert(strv[0] == NULL);
+       l_strfreev(strv);
+
+       strv = l_settings_get_string_list(settings, "Foobar", "StringListOne",
+                                               ',');
+       assert(strv);
+       assert(strv[0]);
+       assert(!strcmp(strv[0], "FooBarBaz"));
+       assert(strv[1] == NULL);
+       l_strfreev(strv);
+
+       str = l_settings_get_string(settings, "Foobar", "StringWithSpaces");
+       assert(str);
+       assert(!strcmp(str, "Bar B Q"));
+       l_free(str);
+
+       strv = l_settings_get_groups(settings);
+       assert(strv);
+       assert(!strcmp(strv[0], "Foobar"));
+       assert(!l_settings_has_embedded_group(settings, strv[0]));
+       assert(!strv[1]);
+       l_strfreev(strv);
+
+       strv = l_settings_get_embedded_groups(settings);
+       assert(strv);
+       assert(!strcmp(strv[0], "certificate"));
+       assert(l_settings_has_embedded_group(settings, "certificate"));
+       assert(!strv[1]);
+       l_strfreev(strv);
+
+       assert(!l_settings_get_keys(settings, "Nonexistent"));
+
+       strv = l_settings_get_keys(settings, "Foobar");
+       assert(strv);
+       l_strfreev(strv);
+
+       assert(!l_settings_remove_key(settings, "Bar", "Foo"));
+       assert(!l_settings_remove_key(settings, "Foobar", "Nonexistent"));
+       assert(l_settings_remove_key(settings, "Foobar", "Key"));
+       assert(!l_settings_has_key(settings, "Foobar", "Key"));
+
+       assert(!l_settings_remove_group(settings, "Bar"));
+       assert(l_settings_remove_group(settings, "Foobar"));
+       assert(!l_settings_has_group(settings, "Foobar"));
+}
+
+static void test_valid_extended_group(const void *test_data)
+{
+       const char *raw_data =
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@pem@single_cert]\n"
+                       TEST_CERTIFICATE
+                       "[next_group]\n"
+                       "another_key=another_value\n"
+                       "[@pem@two_certs]\n"
+                       TEST_CERT_LIST
+                       "\n"
+                       "[group_after_list]\n"
+                       "key=value\n\n\n\n"
+                       "[@pem@priv_key]\n"
+                       TEST_PRIV_KEY
+                       "\n\n\n\n";
+       struct l_settings *settings = l_settings_new();
+       const char *certificate = TEST_CERTIFICATE;
+       const char *two_certs = TEST_CERT_LIST;
+       const char *priv_key = TEST_PRIV_KEY;
+       const char *test_cert;
+       const char *out_type;
+
+       assert(l_settings_load_from_data(settings, raw_data, strlen(raw_data)));
+
+       assert(l_settings_has_group(settings, "normal"));
+       assert(l_settings_has_group(settings, "next_group"));
+       assert(!l_settings_get_value(settings, "single_cert", "value"));
+
+       assert(l_settings_has_embedded_group(settings, "single_cert"));
+       test_cert = l_settings_get_embedded_value(settings, "single_cert", &out_type);
+       assert(test_cert);
+       assert(!strcmp(test_cert, certificate));
+
+       assert(l_settings_has_embedded_group(settings, "two_certs"));
+       test_cert = l_settings_get_embedded_value(settings, "two_certs", &out_type);
+       assert(!strcmp(test_cert, two_certs));
+
+       assert(l_settings_has_embedded_group(settings, "priv_key"));
+       test_cert = l_settings_get_embedded_value(settings, "priv_key", &out_type);
+       assert(!strcmp(test_cert, priv_key));
+
+       l_settings_free(settings);
+}
+
+static void test_invalid_extended_group(const void *test_data)
+{
+       int i = 0;
+       const char *invalid_data[] = {
+                       /* Unterminated PEM */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@pem@unterminated_pem]\n"
+                       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+                       "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhki",
+                       /* Invalid ext type */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@invalid@name]\n"
+                       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+                       "-----END ENCRYPTED PRIVATE KEY-----\n",
+                       /* Valid ext type, invalid name */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@pem@]\n"
+                       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+                       "-----END ENCRYPTED PRIVATE KEY-----\n",
+                       /* Invalid ext type */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@@some_name]\n"
+                       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+                       "-----END ENCRYPTED PRIVATE KEY-----\n",
+                       /* second PEM invalid */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@pem@two_pems]\n"
+                       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+                       "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhki\n"
+                       "-----END ENCRYPTED PRIVATE KEY-----\n"
+                       "-----BEGIN \n",
+                       /* end boundary only */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@pem@two_pems]\n"
+                       "-----END ENCRYPTED PRIVATE KEY-----\n",
+                       /* No terminating newline */
+                       "[normal]\n"
+                       "key=value\n"
+                       "[@pem@certs]\n"
+                       "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+                       "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhki\n"
+                       "-----END ENCRYPTED PRIVATE KEY-----",
+                       NULL
+       };
+
+       struct l_settings *settings = l_settings_new();
+
+       while (invalid_data[i]) {
+               assert(!l_settings_load_from_data(settings, invalid_data[i],
+                                               strlen(invalid_data[i])));
+               i++;
+       }
+
+       l_settings_free(settings);
+}
+
+static void test_load_from_data(const void *test_data)
+{
+       struct l_settings *settings;
+
+       settings = l_settings_new();
+
+       l_settings_set_debug(settings, settings_debug, NULL, NULL);
+       l_settings_load_from_data(settings, data1, strlen(data1));
+
+       test_settings(settings);
+
+       l_settings_free(settings);
+}
+
+static void test_load_from_file(const void *test_data)
+{
+       struct l_settings *settings;
+
+       settings = l_settings_new();
+
+       l_settings_set_debug(settings, settings_debug, NULL, NULL);
+       assert(l_settings_load_from_file(settings, UNITDIR "settings.test"));
+
+       test_settings(settings);
+
+       l_settings_free(settings);
+}
+
+static void test_set_methods(const void *test_data)
+{
+       struct l_settings *settings;
+       int int32;
+       unsigned int uint32;
+       int64_t int64;
+       uint64_t uint64;
+       bool b;
+       const char *v;
+       char *s;
+
+       settings = l_settings_new();
+
+       l_settings_set_debug(settings, settings_debug, NULL, NULL);
+
+       /* Integer tests */
+       assert(l_settings_set_int(settings, "Main", "Integers", -15));
+       assert(l_settings_get_int(settings, "Main", "Integers", &int32));
+       assert(int32 == -15);
+       v = l_settings_get_value(settings, "Main", "Integers");
+       assert(v);
+       assert(!strcmp(v, "-15"));
+
+       assert(l_settings_set_uint(settings, "Main", "Integers", 15));
+       assert(l_settings_get_uint(settings, "Main", "Integers", &uint32));
+       assert(uint32 == 15);
+       v = l_settings_get_value(settings, "Main", "Integers");
+       assert(v);
+       assert(!strcmp(v, "15"));
+
+       assert(l_settings_set_int64(settings, "Main", "Integers", -2423492340ll));
+       assert(l_settings_get_int64(settings, "Main", "Integers", &int64));
+       assert(int64 == -2423492340ll);
+       v = l_settings_get_value(settings, "Main", "Integers");
+       assert(v);
+       assert(!strcmp(v, "-2423492340"));
+
+       assert(l_settings_set_uint64(settings, "Main", "Integers", 2423492340ul));
+       assert(l_settings_get_uint64(settings, "Main", "Integers", &uint64));
+       assert(uint64 == 2423492340ul);
+       v = l_settings_get_value(settings, "Main", "Integers");
+       assert(v);
+       assert(!strcmp(v, "2423492340"));
+
+       /* Boolean tests */
+       assert(l_settings_set_bool(settings, "Main", "Boolean", true));
+       assert(l_settings_get_bool(settings, "Main", "Boolean", &b));
+       assert(b == true);
+       v = l_settings_get_value(settings, "Main", "Boolean");
+       assert(v);
+       assert(!strcmp(v, "true"));
+
+       assert(l_settings_set_bool(settings, "Main", "Boolean", false));
+       assert(l_settings_get_bool(settings, "Main", "Boolean", &b));
+       assert(b == false);
+       v = l_settings_get_value(settings, "Main", "Boolean");
+       assert(v);
+       assert(!strcmp(v, "false"));
+
+       /* String tests */
+       assert(l_settings_set_string(settings, "Main", "String", "  \tFoobar"));
+       s = l_settings_get_string(settings, "Main", "String");
+       assert(s);
+       assert(!strcmp(s, "  \tFoobar"));
+       l_free(s);
+       v = l_settings_get_value(settings, "Main", "String");
+       assert(v);
+       assert(!strcmp(v, "\\s\\s\\tFoobar"));
+
+       assert(l_settings_set_string(settings, "Main", "Escapes",
+                                       " \\Text\t\n\r\\"));
+       s = l_settings_get_string(settings, "Main", "Escapes");
+       assert(s);
+       assert(!strcmp(s, " \\Text\t\n\r\\"));
+       l_free(s);
+       v = l_settings_get_value(settings, "Main", "Escapes");
+       assert(v);
+       assert(!strcmp(v, "\\s\\\\Text\t\\n\\r\\\\"));
+
+       l_settings_free(settings);
+}
+
+static void test_to_data(const void *test_data)
+{
+       const char *data = test_data;
+       struct l_settings *settings;
+       char *res;
+       size_t res_len;
+
+       settings = l_settings_new();
+
+       l_settings_set_debug(settings, settings_debug, NULL, NULL);
+       l_settings_load_from_data(settings, data2, strlen(data2));
+
+       res = l_settings_to_data(settings, &res_len);
+
+       assert(!strcmp(res, data));
+       l_free(res);
+
+       l_settings_free(settings);
+}
+
+static const char *no_group_data = "key_without_group=value\n";
+static const char *key_before_group_data = "key_without_group=value\n"
+                                               "[GROUP]\n"
+                                               "valid_key=value\n";
+
+static void test_invalid_data(const void *test_data)
+{
+       const char *data = test_data;
+       struct l_settings *settings;
+       bool r;
+
+       settings = l_settings_new();
+
+       r = l_settings_load_from_data(settings, data, strlen(data));
+       assert(r == false);
+
+       l_settings_free(settings);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Load from Data", test_load_from_data, NULL);
+       l_test_add("Load from File", test_load_from_file, NULL);
+       l_test_add("Set Methods", test_set_methods, NULL);
+       l_test_add("Export to Data 1", test_to_data, data2);
+       l_test_add("Invalid Data 1", test_invalid_data, no_group_data);
+       l_test_add("Invalid Data 2", test_invalid_data, key_before_group_data);
+       l_test_add("Test valid ext group", test_valid_extended_group, NULL);
+       l_test_add("Test invalid ext group", test_invalid_extended_group, NULL);
+
+
+       return l_test_run();
+}
diff --git a/unit/test-siphash.c b/unit/test-siphash.c
new file mode 100644 (file)
index 0000000..1f28461
--- /dev/null
@@ -0,0 +1,124 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include "ell/siphash-private.h"
+
+/*
+ * Based on public domain SipHash reference C implementation
+ *
+ * Written in 2012 by
+ * Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
+ * Daniel J. Bernstein <djb@cr.yp.to>
+ *
+ */
+
+static const uint8_t vectors[64][8] = {
+       { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72 },
+       { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74 },
+       { 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d },
+       { 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85 },
+       { 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf },
+       { 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18 },
+       { 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb },
+       { 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab },
+       { 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93 },
+       { 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e },
+       { 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a },
+       { 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4 },
+       { 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75 },
+       { 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14 },
+       { 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7 },
+       { 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1 },
+       { 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f },
+       { 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69 },
+       { 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b },
+       { 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb },
+       { 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe },
+       { 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0 },
+       { 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93 },
+       { 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8 },
+       { 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8 },
+       { 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc },
+       { 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17 },
+       { 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f },
+       { 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde },
+       { 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6 },
+       { 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad },
+       { 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32 },
+       { 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71 },
+       { 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7 },
+       { 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12 },
+       { 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15 },
+       { 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31 },
+       { 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02 },
+       { 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca },
+       { 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a },
+       { 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e },
+       { 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad },
+       { 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18 },
+       { 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4 },
+       { 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9 },
+       { 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9 },
+       { 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb },
+       { 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0 },
+       { 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6 },
+       { 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7 },
+       { 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee },
+       { 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1 },
+       { 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a },
+       { 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81 },
+       { 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f },
+       { 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24 },
+       { 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7 },
+       { 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea },
+       { 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60 },
+       { 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66 },
+       { 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c },
+       { 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f },
+       { 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5 },
+       { 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95 },
+};
+
+int main(int argc, char *argv[])
+{
+       uint8_t in[64], out[8], k[16];
+       int i;
+
+       for (i = 0; i < 16; i++)
+               k[i] = i;
+
+       for (i = 0; i < 64; i++) {
+               in[i] = i;
+
+               _siphash24(out, in, i, k);
+
+               if (memcmp(out, vectors[i], 8))
+                       printf("[%d] mismatch\n", i);
+       }
+
+       return 0;
+}
diff --git a/unit/test-string.c b/unit/test-string.c
new file mode 100644 (file)
index 0000000..d8aebcb
--- /dev/null
@@ -0,0 +1,345 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_grow(const void *test_data)
+{
+       struct l_string *str;
+       char *a;
+
+       str = l_string_new(7);
+       assert(str);
+
+       assert(l_string_append(str, "Foobar7") == str);
+       assert(l_string_append(str, "BarFoo"));
+       assert(l_string_length(str) == strlen("Foobar7BarFoo"));
+
+       a = l_string_unwrap(str);
+       assert(a);
+       assert(!strcmp(a, "Foobar7BarFoo"));
+
+       l_free(a);
+}
+
+static void test_printf(const void *test_data)
+{
+       struct l_string *str;
+       char *a;
+
+       str = l_string_new(7);
+       l_string_append(str, "Foobar7");
+
+       l_string_append_printf(str, "%d", 100);
+       l_string_append_printf(str, "%s", "BarFoo");
+
+       assert(l_string_length(str) == strlen("Foobar7100BarFoo"));
+
+       a = l_string_unwrap(str);
+       assert(a);
+       assert(!strcmp(a, "Foobar7100BarFoo"));
+
+       l_free(a);
+}
+
+static const char fixed1[] = { 'a', 'b', 'c', 'd', '\0', 'e', 'f', 'g' };
+static const char fixed2[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', '\0' };
+static const char fixed3[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h' };
+
+struct fixed_test {
+       const char *input;
+       unsigned int input_len;
+       const char *expected;
+};
+
+static struct fixed_test fixed_test1 = {
+       .input = fixed1,
+       .input_len = sizeof(fixed1),
+       .expected = "Foobar7abcd"
+};
+
+static struct fixed_test fixed_test2 = {
+       .input = fixed2,
+       .input_len = sizeof(fixed2),
+       .expected = "Foobar7abcdefg"
+};
+
+static struct fixed_test fixed_test3 = {
+       .input = fixed3,
+       .input_len = sizeof(fixed3),
+       .expected = "Foobar7abcdefgh"
+};
+
+static void test_fixed(const void *test_data)
+{
+       const struct fixed_test *test = test_data;
+       struct l_string *str;
+       char *a;
+
+       str = l_string_new(7);
+       l_string_append(str, "Foobar7");
+
+       l_string_append_fixed(str, test->input, test->input_len);
+       assert(l_string_length(str) == strlen(test->expected));
+
+       a = l_string_unwrap(str);
+       assert(a);
+       assert(!strcmp(a, test->expected));
+
+       l_free(a);
+}
+
+static void test_truncate(const void *test_data)
+{
+       struct l_string *str;
+       char *a;
+
+       str = l_string_new(7);
+       l_string_append(str, "Foobar7");
+
+       assert(!l_string_truncate(NULL, 8));
+
+       assert(l_string_truncate(str, 7));
+       a = l_string_unwrap(str);
+       assert(a);
+       assert(!strcmp(a, "Foobar7"));
+       l_free(a);
+
+       str = l_string_new(7);
+       l_string_append(str, "Foobar7");
+       assert(l_string_truncate(str, 3));
+       l_string_append_c(str, '4');
+       a = l_string_unwrap(str);
+       assert(a);
+       assert(!strcmp(a, "Foo4"));
+       l_free(a);
+}
+
+static void test_strsplit(const void *test_data)
+{
+       char **strv = l_strsplit("Foo:bar:bz", ':');
+
+       assert(strv);
+       assert(!strcmp(strv[0], "Foo"));
+       assert(!strcmp(strv[1], "bar"));
+       assert(!strcmp(strv[2], "bz"));
+       assert(strv[3] == NULL);
+       l_strfreev(strv);
+
+       strv = l_strsplit(":bar:::bz", ':');
+       assert(strv);
+       assert(!strcmp(strv[0], ""));
+       assert(!strcmp(strv[1], "bar"));
+       assert(!strcmp(strv[2], ""));
+       assert(!strcmp(strv[3], ""));
+       assert(!strcmp(strv[4], "bz"));
+       assert(strv[5] == NULL);
+       l_strfreev(strv);
+
+       strv = l_strsplit("Foo:bar:", ':');
+       assert(strv);
+       assert(!strcmp(strv[0], "Foo"));
+       assert(!strcmp(strv[1], "bar"));
+       assert(!strcmp(strv[2], ""));
+       assert(strv[3] == NULL);
+       l_strfreev(strv);
+}
+
+static void test_strsplit_set(const void *test_data)
+{
+       char **strv = l_strsplit_set("Foo:bar,Baz Blu", ":, ");
+
+       assert(strv);
+       assert(!strcmp(strv[0], "Foo"));
+       assert(!strcmp(strv[1], "bar"));
+       assert(!strcmp(strv[2], "Baz"));
+       assert(!strcmp(strv[3], "Blu"));
+       assert(strv[4] == NULL);
+       l_strfreev(strv);
+
+       strv = l_strsplit_set("Foo:bar,Baz Blu,:,Fee:Fie ", ":, ");
+       assert(strv);
+       assert(!strcmp(strv[0], "Foo"));
+       assert(!strcmp(strv[1], "bar"));
+       assert(!strcmp(strv[2], "Baz"));
+       assert(!strcmp(strv[3], "Blu"));
+       assert(!strcmp(strv[4], ""));
+       assert(!strcmp(strv[5], ""));
+       assert(!strcmp(strv[6], "Fee"));
+       assert(!strcmp(strv[7], "Fie"));
+       assert(!strcmp(strv[8], ""));
+       assert(strv[9] == NULL);
+       l_strfreev(strv);
+}
+
+static void test_joinv(const void *test_data)
+{
+       char *strv1[] = { NULL };
+       char *strv2[] = { "Foo", "Bar", NULL };
+       char **strv3 = l_strsplit("Foo:bar:bz", ':');
+       char *r;
+
+       assert(!l_strjoinv(NULL, ':'));
+
+       r = l_strjoinv(strv1, ':');
+       assert(r);
+       assert(!strcmp(r, ""));
+       l_free(r);
+
+       r = l_strjoinv(strv2, ':');
+       assert(r);
+       assert(!strcmp(r, "Foo:Bar"));
+       l_free(r);
+
+       r = l_strjoinv(strv3, ':');
+       assert(r);
+       assert(!strcmp(r, "Foo:bar:bz"));
+       l_free(r);
+
+       l_strfreev(strv3);
+}
+
+static void test_strv_length(const void *test_data)
+{
+       char *strv1[] = { NULL };
+       char *strv2[] = { "Foo", "Bar", NULL };
+
+       assert(l_strv_length(NULL) == 0);
+       assert(l_strv_length(strv1) == 0);
+       assert(l_strv_length(strv2) == 2);
+}
+
+static void test_strv_contains(const void *test_data)
+{
+       char *strv1[] = { NULL };
+       char *strv2[] = { "Foo", "Bar", NULL };
+       char *strv3[] = { "Foo", "Bar", "", NULL };
+
+       assert(l_strv_contains(NULL, "Foo") == false);
+       assert(l_strv_contains(strv2, NULL) == false);
+       assert(l_strv_contains(NULL, NULL) == false);
+       assert(l_strv_contains(strv1, "Baz") == false);
+       assert(l_strv_contains(strv1, "") == false);
+       assert(l_strv_contains(strv2, "Baz") == false);
+       assert(l_strv_contains(strv2, "") == false);
+       assert(l_strv_contains(strv2, "Bar") == true);
+       assert(l_strv_contains(strv3, "Baz") == false);
+       assert(l_strv_contains(strv3, "") == true);
+       assert(l_strv_contains(strv3, "Bar") == true);
+}
+
+static void test_strv_append(const void *test_data)
+{
+       const char *src[] = { "Foo", "Bar" };
+       char **dst = NULL;
+       size_t len = L_ARRAY_SIZE(src);
+       size_t i;
+
+       for (i = 0; i < len; i++)
+               dst = l_strv_append(dst, src[i]);
+
+       assert(l_strv_length(dst) == len);
+
+       for (i = 0; i < len; i++)
+               assert(strcmp(src[i], dst[i]) == 0);
+
+        l_strv_free(dst);
+}
+
+static void test_parse_args(const void *test_data)
+{
+       static struct test_case {
+               bool retval;
+               const char *args;
+               int n_args;
+               const char *result[10];
+       } tests[] = {
+       { true, "one", 1, { "one" } },
+       { true, "one two", 2, { "one", "two" } },
+       { true, "one two three ", 3, { "one", "two", "three" } },
+       { true, " \tfoo\t\tbar ", 2, { "foo", "bar" } },
+       { true, "red , white blue", 4, { "red", ",", "white", "blue" } },
+       { true, "one \"two three\"", 2, { "one", "two three" } },
+       { true, "\"quoted\"", 1, { "quoted" } },
+       { true, "'singly-quoted'", 1, { "singly-quoted" } },
+       { true, "contin\\\nuation", 1, { "continuation" } },
+       { true, "explicit ''", 2, { "explicit", "" } },
+       { true, "explicit \"\"", 2, { "explicit", "" } },
+       { true, "", 0, { } },
+       { false, "new\nline", 0, { } },
+       };
+
+       unsigned int i;
+
+       for (i = 0; i < L_ARRAY_SIZE(tests); i++) {
+               int j;
+               int n_args;
+               char **args = l_parse_args(tests[i].args, &n_args);
+
+               if (!tests[i].retval) {
+                       assert(!args);
+                       continue;
+               }
+
+               assert(args);
+               assert(n_args == tests[i].n_args);
+
+               for (j = 0; j < n_args; j++)
+                       assert(!strcmp(args[j], tests[i].result[j]));
+
+               assert(!args[j]);
+               l_strfreev(args);
+       }
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Grow Test", test_grow, NULL);
+       l_test_add("printf Test", test_printf, NULL);
+
+       l_test_add("append_fixed test 1", test_fixed, &fixed_test1);
+       l_test_add("append_fixed test 2", test_fixed, &fixed_test2);
+       l_test_add("append_fixed test 3", test_fixed, &fixed_test3);
+
+       l_test_add("truncate", test_truncate, NULL);
+
+       l_test_add("strsplit", test_strsplit, NULL);
+       l_test_add("strsplit_set", test_strsplit_set, NULL);
+
+       l_test_add("joinv", test_joinv, NULL);
+
+       l_test_add("strv_length", test_strv_length, NULL);
+       l_test_add("strv_contains", test_strv_contains, NULL);
+       l_test_add("strv_append", test_strv_append, NULL);
+
+       l_test_add("parse_args", test_parse_args, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-time.c b/unit/test-time.c
new file mode 100644 (file)
index 0000000..1301891
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2019 Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_before_after_diff(const void *data)
+{
+       uint64_t small = 10;
+       uint64_t big = 100;
+
+       assert(l_time_after(big, small));
+       assert(l_time_before(small, big));
+       assert(l_time_diff(small, big) == l_time_diff(big, small));
+}
+
+static void test_offset(const void *data)
+{
+       uint64_t max = UINT64_MAX;
+       uint64_t max_minus = UINT64_MAX - 1000;
+
+       assert(l_time_offset(max, 1) == UINT64_MAX);
+       assert(l_time_offset(max, max) == UINT64_MAX);
+       assert(l_time_offset(max_minus, 1000) == max);
+       assert(l_time_offset(max_minus, 1001) == UINT64_MAX);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Test before/after/diff", test_before_after_diff, NULL);
+       l_test_add("Test offset", test_offset, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-tls.c b/unit/test-tls.c
new file mode 100644 (file)
index 0000000..1d47787
--- /dev/null
@@ -0,0 +1,1011 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <ell/ell.h>
+
+#include "ell/tls-private.h"
+#include "ell/cert-private.h"
+
+static void test_tls10_prf(const void *data)
+{
+       /* Common 1.0 test vector, original URL dead */
+       uint8_t secret[48] = {
+               0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,
+               0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,
+               0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,
+               0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,
+               0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,
+               0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab,
+       };
+       char *label = "PRF Testvector";
+       uint8_t seed[64] = {
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+               0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+       };
+       uint8_t expected[104] = {
+               0xd3, 0xd4, 0xd1, 0xe3, 0x49, 0xb5, 0xd5, 0x15,
+               0x04, 0x46, 0x66, 0xd5, 0x1d, 0xe3, 0x2b, 0xab,
+               0x25, 0x8c, 0xb5, 0x21, 0xb6, 0xb0, 0x53, 0x46,
+               0x3e, 0x35, 0x48, 0x32, 0xfd, 0x97, 0x67, 0x54,
+               0x44, 0x3b, 0xcf, 0x9a, 0x29, 0x65, 0x19, 0xbc,
+               0x28, 0x9a, 0xbc, 0xbc, 0x11, 0x87, 0xe4, 0xeb,
+               0xd3, 0x1e, 0x60, 0x23, 0x53, 0x77, 0x6c, 0x40,
+               0x8a, 0xaf, 0xb7, 0x4c, 0xbc, 0x85, 0xef, 0xf6,
+               0x92, 0x55, 0xf9, 0x78, 0x8f, 0xaa, 0x18, 0x4c,
+               0xbb, 0x95, 0x7a, 0x98, 0x19, 0xd8, 0x4a, 0x5d,
+               0x7e, 0xb0, 0x06, 0xeb, 0x45, 0x9d, 0x3a, 0xe8,
+               0xde, 0x98, 0x10, 0x45, 0x4b, 0x8b, 0x2d, 0x8f,
+               0x1a, 0xfb, 0xc6, 0x55, 0xa8, 0xc9, 0xa0, 0x13
+       };
+       uint8_t out_buf[104];
+
+       tls10_prf(secret, sizeof(secret), label, seed, sizeof(seed),
+                       out_buf, sizeof(expected));
+
+       assert(!memcmp(out_buf, expected, sizeof(expected)));
+}
+
+/* https://www.ietf.org/mail-archive/web/tls/current/msg03416.html */
+static struct tls12_prf_test {
+       enum l_checksum_type hash;
+       const uint8_t *secret;
+       size_t secret_len;
+       const char *label;
+       const uint8_t *seed;
+       size_t seed_len;
+       const uint8_t *expected;
+       size_t out_len;
+} tls12_prf_sha256_0 = {
+       .hash = L_CHECKSUM_SHA256,
+       .secret_len = 16,
+       .secret = (const uint8_t []) {
+               0x9b, 0xbe, 0x43, 0x6b, 0xa9, 0x40, 0xf0, 0x17,
+               0xb1, 0x76, 0x52, 0x84, 0x9a, 0x71, 0xdb, 0x35,
+       },
+       .seed_len = 16,
+       .seed = (const uint8_t []) {
+               0xa0, 0xba, 0x9f, 0x93, 0x6c, 0xda, 0x31, 0x18,
+               0x27, 0xa6, 0xf7, 0x96, 0xff, 0xd5, 0x19, 0x8c,
+       },
+       .label = "test label",
+       .out_len = 100,
+       .expected = (const uint8_t []) {
+               0xe3, 0xf2, 0x29, 0xba, 0x72, 0x7b, 0xe1, 0x7b,
+               0x8d, 0x12, 0x26, 0x20, 0x55, 0x7c, 0xd4, 0x53,
+               0xc2, 0xaa, 0xb2, 0x1d, 0x07, 0xc3, 0xd4, 0x95,
+               0x32, 0x9b, 0x52, 0xd4, 0xe6, 0x1e, 0xdb, 0x5a,
+               0x6b, 0x30, 0x17, 0x91, 0xe9, 0x0d, 0x35, 0xc9,
+               0xc9, 0xa4, 0x6b, 0x4e, 0x14, 0xba, 0xf9, 0xaf,
+               0x0f, 0xa0, 0x22, 0xf7, 0x07, 0x7d, 0xef, 0x17,
+               0xab, 0xfd, 0x37, 0x97, 0xc0, 0x56, 0x4b, 0xab,
+               0x4f, 0xbc, 0x91, 0x66, 0x6e, 0x9d, 0xef, 0x9b,
+               0x97, 0xfc, 0xe3, 0x4f, 0x79, 0x67, 0x89, 0xba,
+               0xa4, 0x80, 0x82, 0xd1, 0x22, 0xee, 0x42, 0xc5,
+               0xa7, 0x2e, 0x5a, 0x51, 0x10, 0xff, 0xf7, 0x01,
+               0x87, 0x34, 0x7b, 0x66,
+       },
+}, tls12_prf_sha384_0 = {
+       .hash = L_CHECKSUM_SHA384,
+       .secret_len = 16,
+       .secret = (const uint8_t []) {
+               0xb8, 0x0b, 0x73, 0x3d, 0x6c, 0xee, 0xfc, 0xdc,
+               0x71, 0x56, 0x6e, 0xa4, 0x8e, 0x55, 0x67, 0xdf,
+       },
+       .seed_len = 16,
+       .seed = (const uint8_t []) {
+               0xcd, 0x66, 0x5c, 0xf6, 0xa8, 0x44, 0x7d, 0xd6,
+               0xff, 0x8b, 0x27, 0x55, 0x5e, 0xdb, 0x74, 0x65,
+       },
+       .label = "test label",
+       .out_len = 148,
+       .expected = (const uint8_t []) {
+               0x7b, 0x0c, 0x18, 0xe9, 0xce, 0xd4, 0x10, 0xed,
+               0x18, 0x04, 0xf2, 0xcf, 0xa3, 0x4a, 0x33, 0x6a,
+               0x1c, 0x14, 0xdf, 0xfb, 0x49, 0x00, 0xbb, 0x5f,
+               0xd7, 0x94, 0x21, 0x07, 0xe8, 0x1c, 0x83, 0xcd,
+               0xe9, 0xca, 0x0f, 0xaa, 0x60, 0xbe, 0x9f, 0xe3,
+               0x4f, 0x82, 0xb1, 0x23, 0x3c, 0x91, 0x46, 0xa0,
+               0xe5, 0x34, 0xcb, 0x40, 0x0f, 0xed, 0x27, 0x00,
+               0x88, 0x4f, 0x9d, 0xc2, 0x36, 0xf8, 0x0e, 0xdd,
+               0x8b, 0xfa, 0x96, 0x11, 0x44, 0xc9, 0xe8, 0xd7,
+               0x92, 0xec, 0xa7, 0x22, 0xa7, 0xb3, 0x2f, 0xc3,
+               0xd4, 0x16, 0xd4, 0x73, 0xeb, 0xc2, 0xc5, 0xfd,
+               0x4a, 0xbf, 0xda, 0xd0, 0x5d, 0x91, 0x84, 0x25,
+               0x9b, 0x5b, 0xf8, 0xcd, 0x4d, 0x90, 0xfa, 0x0d,
+               0x31, 0xe2, 0xde, 0xc4, 0x79, 0xe4, 0xf1, 0xa2,
+               0x60, 0x66, 0xf2, 0xee, 0xa9, 0xa6, 0x92, 0x36,
+               0xa3, 0xe5, 0x26, 0x55, 0xc9, 0xe9, 0xae, 0xe6,
+               0x91, 0xc8, 0xf3, 0xa2, 0x68, 0x54, 0x30, 0x8d,
+               0x5e, 0xaa, 0x3b, 0xe8, 0x5e, 0x09, 0x90, 0x70,
+               0x3d, 0x73, 0xe5, 0x6f,
+       },
+}, tls12_prf_sha512_0 = {
+       .hash = L_CHECKSUM_SHA512,
+       .secret_len = 16,
+       .secret = (const uint8_t []) {
+               0xb0, 0x32, 0x35, 0x23, 0xc1, 0x85, 0x35, 0x99,
+               0x58, 0x4d, 0x88, 0x56, 0x8b, 0xbb, 0x05, 0xeb,
+       },
+       .seed_len = 16,
+       .seed = (const uint8_t []) {
+               0xd4, 0x64, 0x0e, 0x12, 0xe4, 0xbc, 0xdb, 0xfb,
+               0x43, 0x7f, 0x03, 0xe6, 0xae, 0x41, 0x8e, 0xe5,
+       },
+       .label = "test label",
+       .out_len = 196,
+       .expected = (const uint8_t []) {
+               0x12, 0x61, 0xf5, 0x88, 0xc7, 0x98, 0xc5, 0xc2,
+               0x01, 0xff, 0x03, 0x6e, 0x7a, 0x9c, 0xb5, 0xed,
+               0xcd, 0x7f, 0xe3, 0xf9, 0x4c, 0x66, 0x9a, 0x12,
+               0x2a, 0x46, 0x38, 0xd7, 0xd5, 0x08, 0xb2, 0x83,
+               0x04, 0x2d, 0xf6, 0x78, 0x98, 0x75, 0xc7, 0x14,
+               0x7e, 0x90, 0x6d, 0x86, 0x8b, 0xc7, 0x5c, 0x45,
+               0xe2, 0x0e, 0xb4, 0x0c, 0x1c, 0xf4, 0xa1, 0x71,
+               0x3b, 0x27, 0x37, 0x1f, 0x68, 0x43, 0x25, 0x92,
+               0xf7, 0xdc, 0x8e, 0xa8, 0xef, 0x22, 0x3e, 0x12,
+               0xea, 0x85, 0x07, 0x84, 0x13, 0x11, 0xbf, 0x68,
+               0x65, 0x3d, 0x0c, 0xfc, 0x40, 0x56, 0xd8, 0x11,
+               0xf0, 0x25, 0xc4, 0x5d, 0xdf, 0xa6, 0xe6, 0xfe,
+               0xc7, 0x02, 0xf0, 0x54, 0xb4, 0x09, 0xd6, 0xf2,
+               0x8d, 0xd0, 0xa3, 0x23, 0x3e, 0x49, 0x8d, 0xa4,
+               0x1a, 0x3e, 0x75, 0xc5, 0x63, 0x0e, 0xed, 0xbe,
+               0x22, 0xfe, 0x25, 0x4e, 0x33, 0xa1, 0xb0, 0xe9,
+               0xf6, 0xb9, 0x82, 0x66, 0x75, 0xbe, 0xc7, 0xd0,
+               0x1a, 0x84, 0x56, 0x58, 0xdc, 0x9c, 0x39, 0x75,
+               0x45, 0x40, 0x1d, 0x40, 0xb9, 0xf4, 0x6c, 0x7a,
+               0x40, 0x0e, 0xe1, 0xb8, 0xf8, 0x1c, 0xa0, 0xa6,
+               0x0d, 0x1a, 0x39, 0x7a, 0x10, 0x28, 0xbf, 0xf5,
+               0xd2, 0xef, 0x50, 0x66, 0x12, 0x68, 0x42, 0xfb,
+               0x8d, 0xa4, 0x19, 0x76, 0x32, 0xbd, 0xb5, 0x4f,
+               0xf6, 0x63, 0x3f, 0x86, 0xbb, 0xc8, 0x36, 0xe6,
+               0x40, 0xd4, 0xd8, 0x98,
+       },
+};
+
+static void test_tls12_prf(const void *data)
+{
+       const struct tls12_prf_test *test = data;
+       uint8_t out_buf[test->out_len];
+
+       tls12_prf(test->hash, test->secret, test->secret_len,
+                       test->label, test->seed, test->seed_len,
+                       out_buf, test->out_len);
+
+       assert(!memcmp(out_buf, test->expected, test->out_len));
+}
+
+static struct l_cert *load_cert_file(const char *filename)
+{
+       uint8_t *der;
+       size_t len;
+       char *label;
+       struct l_cert *cert;
+
+       der = l_pem_load_file(filename, &label, &len);
+       if (!der)
+               return NULL;
+
+       l_free(label);
+       cert = l_cert_new_from_der(der, len);
+       l_free(der);
+       return cert;
+}
+
+static void test_certificates(const void *data)
+{
+       struct l_queue *cacert;
+       struct l_queue *wrongca;
+       struct l_queue *twocas;
+       struct l_certchain *chain;
+       struct l_certchain *chain2;
+       struct l_certchain *chain3;
+       struct l_certchain *chain4;
+
+       cacert = l_pem_load_certificate_list(CERTDIR "cert-ca.pem");
+       assert(cacert && !l_queue_isempty(cacert));
+
+       wrongca = l_pem_load_certificate_list(CERTDIR "cert-intca.pem");
+       assert(wrongca && !l_queue_isempty(wrongca));
+
+       twocas = l_pem_load_certificate_list(CERTDIR "cert-chain.pem");
+       assert(twocas);
+
+       chain = l_pem_load_certificate_chain(CERTDIR "cert-server.pem");
+       assert(chain);
+
+       assert(!l_certchain_verify(chain, wrongca, NULL));
+       assert(l_certchain_verify(chain, cacert, NULL));
+       assert(l_certchain_verify(chain, NULL, NULL));
+       assert(l_certchain_verify(chain, twocas, NULL));
+
+       chain2 = l_pem_load_certificate_chain(CERTDIR "cert-chain.pem");
+       assert(chain2);
+
+       assert(!l_certchain_verify(chain2, wrongca, NULL));
+       assert(l_certchain_verify(chain2, cacert, NULL));
+       assert(l_certchain_verify(chain2, NULL, NULL));
+       assert(l_certchain_verify(chain2, twocas, NULL));
+
+       chain3 = certchain_new_from_leaf(
+                       load_cert_file(CERTDIR "cert-server.pem"));
+       certchain_link_issuer(chain3,
+                       load_cert_file(CERTDIR "cert-entity-int.pem"));
+       certchain_link_issuer(chain3,
+                       load_cert_file(CERTDIR "cert-intca.pem"));
+       certchain_link_issuer(chain3,
+                       load_cert_file(CERTDIR "cert-ca.pem"));
+       assert(chain3);
+
+       assert(!l_certchain_verify(chain3, wrongca, NULL));
+       assert(!l_certchain_verify(chain3, cacert, NULL));
+       assert(!l_certchain_verify(chain3, NULL, NULL));
+       assert(!l_certchain_verify(chain3, twocas, NULL));
+
+       chain4 = certchain_new_from_leaf(
+                       load_cert_file(CERTDIR "cert-entity-int.pem"));
+       certchain_link_issuer(chain4,
+                       load_cert_file(CERTDIR "cert-intca.pem"));
+       certchain_link_issuer(chain4,
+                       load_cert_file(CERTDIR "cert-ca.pem"));
+       assert(chain4);
+
+       assert(!l_certchain_verify(chain4, wrongca, NULL));
+       assert(l_certchain_verify(chain4, cacert, NULL));
+       assert(l_certchain_verify(chain4, NULL, NULL));
+       assert(l_certchain_verify(chain4, twocas, NULL));
+
+       l_certchain_free(chain);
+       l_certchain_free(chain2);
+       l_certchain_free(chain3);
+       l_certchain_free(chain4);
+       l_queue_destroy(cacert, (l_queue_destroy_func_t) l_cert_free);
+       l_queue_destroy(wrongca, (l_queue_destroy_func_t) l_cert_free);
+       l_queue_destroy(twocas, (l_queue_destroy_func_t) l_cert_free);
+}
+
+struct tls_conn_test {
+       const char *server_cert_path;
+       const char *server_key_path;
+       const char *server_key_passphrase;
+       const char *server_ca_cert_path;
+       const char *server_expect_identity;
+       const char **server_cipher_suites;
+       const char *client_cert_path;
+       const char *client_key_path;
+       const char *client_key_passphrase;
+       const char *client_ca_cert_path;
+       const char *client_expect_identity;
+       const char **client_cipher_suites;
+       char **client_domain_mask;
+       bool expect_alert;
+       bool expect_client_start_fail;
+       enum l_tls_alert_desc alert_desc;
+};
+
+static const struct tls_conn_test tls_conn_test_no_auth = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_expect_identity = NULL,
+       .client_expect_identity = NULL,
+};
+
+static const struct tls_conn_test tls_conn_test_server_auth = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_expect_identity = NULL,
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+};
+
+static const struct tls_conn_test tls_conn_test_client_auth_attempt = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = NULL,
+       .client_expect_identity = NULL,
+};
+
+static const struct tls_conn_test tls_conn_test_client_auth = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_expect_identity = NULL,
+};
+
+static const struct tls_conn_test tls_conn_test_full_auth_attempt = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = NULL,
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+};
+
+static const struct tls_conn_test tls_conn_test_full_auth = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+};
+
+static const struct tls_conn_test tls_conn_test_bad_client_suite = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cipher_suites = (const char *[]) { "UNKNOWN", NULL },
+       .expect_client_start_fail = true,
+};
+
+static const struct tls_conn_test tls_conn_test_suite_mismatch = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .server_cipher_suites =
+               (const char *[]) { "TLS_RSA_WITH_AES_128_CBC_SHA256", NULL },
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cipher_suites =
+               (const char *[]) { "TLS_RSA_WITH_AES_256_CBC_SHA256", NULL },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_INSUFFICIENT_SECURITY,
+};
+
+static const struct tls_conn_test tls_conn_test_version_mismatch = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_PROTOCOL_VERSION,
+};
+
+#define identity_compare(a, b) ((!(a) && !(b)) || ((a) && (b) && !strcmp(a, b)))
+
+struct tls_test_state {
+       struct l_tls *tls;
+
+       bool ready, success;
+
+       uint8_t raw_buf[16384];
+       int raw_buf_len;
+
+       uint8_t plaintext_buf[128];
+       int plaintext_buf_len;
+
+       const char *send_data;
+       const char *expect_data;
+       const char *expect_peer;
+
+       bool expect_alert;
+       enum l_tls_alert_desc alert_desc;
+};
+
+static void tls_test_new_data(const uint8_t *data, size_t len, void *user_data)
+{
+       struct tls_test_state *s = user_data;
+
+       assert(s->ready);
+       assert(s->plaintext_buf_len + len <= strlen(s->expect_data));
+
+       memcpy(s->plaintext_buf + s->plaintext_buf_len, data, len);
+       s->plaintext_buf_len += len;
+
+       if (s->plaintext_buf_len == (int) strlen(s->expect_data) &&
+                       !memcmp(s->plaintext_buf, s->expect_data,
+                               s->plaintext_buf_len))
+               s->success = true;
+}
+
+static void tls_test_write(const uint8_t *data, size_t len, void *user_data)
+{
+       struct tls_test_state *s = user_data;
+
+       assert(s->raw_buf_len + len <= sizeof(s->raw_buf));
+
+       memcpy(s->raw_buf + s->raw_buf_len, data, len);
+       s->raw_buf_len += len;
+}
+
+static void tls_test_ready(const char *peer_identity, void *user_data)
+{
+       struct tls_test_state *s = user_data;
+
+       assert(!s->ready);
+       assert(!s->expect_alert);
+       assert((!s->expect_peer && !peer_identity) ||
+                       (s->expect_peer && peer_identity &&
+                        !strcmp(s->expect_peer, peer_identity)));
+       s->ready = true;
+
+       l_tls_write(s->tls, (const uint8_t *) s->send_data,
+                       strlen(s->send_data));
+}
+
+static void tls_test_disconnected(enum l_tls_alert_desc reason, bool remote,
+                                       void *user_data)
+{
+       struct tls_test_state *s = user_data;
+
+       assert(s->expect_alert);
+       assert(reason == s->alert_desc);
+       s->success = true;
+}
+
+static void tls_debug_cb(const char *str, void *user_data)
+{
+       l_info("%s %s", (const char *) user_data, str);
+}
+
+static void test_tls_with_ver(const struct tls_conn_test *test,
+                               uint16_t server_ver, uint16_t client_ver)
+{
+       struct tls_test_state s[2] = {
+               {
+                       .ready = false,
+                       .success = false,
+                       .raw_buf_len = 0,
+                       .plaintext_buf_len = 0,
+                       .send_data = "server to client",
+                       .expect_data = "client to server",
+                       .expect_peer = test->server_expect_identity,
+                       .expect_alert = test->expect_alert,
+                       .alert_desc = test->alert_desc,
+               },
+               {
+                       .ready = false,
+                       .success = false,
+                       .raw_buf_len = 0,
+                       .plaintext_buf_len = 0,
+                       .send_data = "client to server",
+                       .expect_data = "server to client",
+                       .expect_peer = test->client_expect_identity,
+                       .expect_alert = test->expect_alert,
+                       .alert_desc = test->alert_desc,
+               },
+       };
+
+       /* Server */
+       s[0].tls = l_tls_new(true, tls_test_new_data, tls_test_write,
+                               tls_test_ready, tls_test_disconnected, &s[0]);
+       /* Client */
+       s[1].tls = l_tls_new(false, tls_test_new_data, tls_test_write,
+                               tls_test_ready, tls_test_disconnected, &s[1]);
+
+       assert(s[0].tls);
+       assert(s[1].tls);
+
+       if (server_ver)
+               l_tls_set_version_range(s[0].tls, server_ver, server_ver);
+
+       if (client_ver)
+               l_tls_set_version_range(s[1].tls, client_ver, client_ver);
+
+       if (test->server_cipher_suites)
+               tls_set_cipher_suites(s[0].tls, test->server_cipher_suites);
+
+       if (test->client_cipher_suites)
+               tls_set_cipher_suites(s[1].tls, test->client_cipher_suites);
+
+       if (getenv("TLS_SERVER_DEBUG"))
+               l_tls_set_debug(s[0].tls, tls_debug_cb, "server", NULL);
+
+       if (getenv("TLS_DEBUG"))
+               l_tls_set_debug(s[1].tls, tls_debug_cb, "client", NULL);
+
+       if (test->server_cert_path || test->server_key_path) {
+               struct l_certchain *server_cert =
+                       l_pem_load_certificate_chain(test->server_cert_path);
+               struct l_key *server_key =
+                       l_pem_load_private_key(test->server_key_path,
+                                               test->server_key_passphrase,
+                                               NULL);
+               assert(server_cert);
+               assert(server_key);
+
+               assert(l_tls_set_auth_data(s[0].tls, server_cert, server_key));
+       }
+
+       if (test->client_key_path || test->client_cert_path) {
+               struct l_certchain *client_cert =
+                       l_pem_load_certificate_chain(test->client_cert_path);
+               struct l_key *client_key =
+                       l_pem_load_private_key(test->client_key_path,
+                                               test->client_key_passphrase,
+                                               NULL);
+               assert(client_cert);
+               assert(client_key);
+
+               assert(l_tls_set_auth_data(s[1].tls, client_cert, client_key));
+       }
+
+       if (test->server_ca_cert_path) {
+               struct l_queue *server_ca =
+                       l_pem_load_certificate_list(test->server_ca_cert_path);
+
+               assert(server_ca);
+               assert(l_tls_set_cacert(s[0].tls, server_ca));
+       }
+
+       if (test->client_ca_cert_path) {
+               struct l_queue *client_ca =
+                       l_pem_load_certificate_list(test->client_ca_cert_path);
+
+               assert(client_ca);
+               assert(l_tls_set_cacert(s[1].tls, client_ca));
+       }
+
+       if (test->client_domain_mask)
+               l_tls_set_domain_mask(s[1].tls, test->client_domain_mask);
+
+       assert(l_tls_start(s[0].tls));
+       assert(!!l_tls_start(s[1].tls) == !test->expect_client_start_fail);
+
+       if (test->expect_client_start_fail)
+               goto done;
+
+       while (!(test->expect_alert && s[0].success && s[1].success)) {
+               if (s[0].raw_buf_len) {
+                       l_tls_handle_rx(s[1].tls, s[0].raw_buf,
+                                       s[0].raw_buf_len);
+                       s[0].raw_buf_len = 0;
+               } else if (s[1].raw_buf_len) {
+                       l_tls_handle_rx(s[0].tls, s[1].raw_buf,
+                                       s[1].raw_buf_len);
+                       s[1].raw_buf_len = 0;
+               } else
+                       break;
+       }
+
+       assert(s[0].success && s[1].success);
+
+done:
+       l_tls_free(s[0].tls);
+       l_tls_free(s[1].tls);
+}
+
+static void test_tls_test(const void *data)
+{
+       const struct tls_conn_test *test = data;
+
+       /*
+        * 1.2 should get negotiated in the first case.  If the three
+        * scenarios succeed that's already good but can be checked with:
+        * $ TLS_DEBUG=1 unit/test-tls 2>&1 | grep "Negotiated"
+        */
+       test_tls_with_ver(test, 0, 0);
+       test_tls_with_ver(test, 0, L_TLS_V11);
+       test_tls_with_ver(test, L_TLS_V10, 0);
+}
+
+static void test_tls_version_mismatch_test(const void *data)
+{
+       test_tls_with_ver(&tls_conn_test_version_mismatch,
+                               L_TLS_V11, L_TLS_V12);
+       test_tls_with_ver(&tls_conn_test_version_mismatch,
+                               L_TLS_V12, L_TLS_V10);
+       test_tls_with_ver(&tls_conn_test_version_mismatch,
+                               L_TLS_V10, L_TLS_V11);
+}
+
+static const struct tls_conn_test tls_conn_test_domain_match1 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) { "Bar Example Organization", NULL },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_match2 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) {
+               "Bar Example Organization", "Foo Example Organization", NULL
+       },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_match3 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) {
+               "Foo Example Organization", "Bar Example Organization", NULL
+       },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_match4 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) { "*", NULL },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_match5 = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_domain_mask = (char *[]) { "foo.int.com", NULL },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_match6 = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_domain_mask = (char *[]) { "*.*", NULL },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_match7 = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_domain_mask = (char *[]) { "*.*.*", NULL },
+};
+
+static const struct tls_conn_test tls_conn_test_domain_mismatch1 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) { "", NULL },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_BAD_CERT,
+};
+
+static const struct tls_conn_test tls_conn_test_domain_mismatch2 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) { "Foo Example Organization", NULL },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_BAD_CERT,
+};
+
+static const struct tls_conn_test tls_conn_test_domain_mismatch3 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) {
+               "Bar Example Organization.com", NULL
+       },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_BAD_CERT,
+};
+
+static const struct tls_conn_test tls_conn_test_domain_mismatch4 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) {
+               "Bar Example Organization.*", NULL
+       },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_BAD_CERT,
+};
+
+static const struct tls_conn_test tls_conn_test_domain_mismatch5 = {
+       .server_cert_path = CERTDIR "cert-client.pem",
+       .server_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_cert_path = CERTDIR "cert-server.pem",
+       .client_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_domain_mask = (char *[]) {
+               "*.Bar Example Organization", NULL
+       },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_BAD_CERT,
+};
+
+static const struct tls_conn_test tls_conn_test_domain_mismatch6 = {
+       .server_cert_path = CERTDIR "cert-server.pem",
+       .server_key_path = CERTDIR "cert-server-key-pkcs8.pem",
+       .server_ca_cert_path = CERTDIR "cert-ca.pem",
+       .server_expect_identity = "/O=Bar Example Organization"
+               "/CN=Bar Example Organization/emailAddress=bar@mail.example",
+       .client_cert_path = CERTDIR "cert-client.pem",
+       .client_key_path = CERTDIR "cert-client-key-pkcs8.pem",
+       .client_ca_cert_path = CERTDIR "cert-ca.pem",
+       .client_expect_identity = "/O=Foo Example Organization"
+               "/CN=Foo Example Organization/emailAddress=foo@mail.example",
+       .client_domain_mask = (char *[]) {
+               "foo.*", NULL
+       },
+       .expect_alert = true,
+       .alert_desc = TLS_ALERT_BAD_CERT,
+};
+
+static void test_tls_suite_test(const void *data)
+{
+       const char *suite_name = data;
+       const char *client_cipher_suites[] = { suite_name, NULL };
+       struct tls_conn_test test = tls_conn_test_full_auth;
+
+       test.client_cipher_suites = client_cipher_suites;
+       test_tls_with_ver(&test, 0, 0);
+}
+
+static int read_int_from_file(const char *path)
+{
+       int ret;
+       FILE *file;
+
+       file = fopen(path, "r");
+       if (!file)
+               return 0;
+
+       if (fscanf(file, "%i", &ret) < 1)
+               ret = 0;
+
+       fclose(file);
+       return ret;
+}
+
+int main(int argc, char *argv[])
+{
+       unsigned int i;
+       int maxkeys;
+
+       l_test_init(&argc, &argv);
+
+       if (!l_checksum_is_supported(L_CHECKSUM_MD5, false) ||
+                       !l_checksum_is_supported(L_CHECKSUM_SHA1, false) ||
+                       !l_checksum_is_supported(L_CHECKSUM_SHA256, false) ||
+                       !l_checksum_is_supported(L_CHECKSUM_SHA384, false) ||
+                       !l_checksum_is_supported(L_CHECKSUM_SHA512, false)) {
+               printf("Needed checksum missing, skipping...\n");
+               goto done;
+       }
+
+       l_test_add("TLS 1.0 PRF", test_tls10_prf, NULL);
+
+       l_test_add("TLS 1.2 PRF with SHA256", test_tls12_prf,
+                       &tls12_prf_sha256_0);
+
+       l_test_add("TLS 1.2 PRF with SHA384", test_tls12_prf,
+                       &tls12_prf_sha384_0);
+
+       l_test_add("TLS 1.2 PRF with SHA512", test_tls12_prf,
+                       &tls12_prf_sha512_0);
+
+       if (l_key_is_supported(L_KEY_FEATURE_RESTRICT))
+               l_test_add("Certificate chains", test_certificates, NULL);
+
+       if (!l_getrandom_is_supported()) {
+               printf("getrandom missing, skipping TLS connection tests...\n");
+               goto done;
+       }
+
+       if (!l_cipher_is_supported(L_CIPHER_DES3_EDE_CBC) ||
+                       !l_cipher_is_supported(L_CIPHER_AES_CBC) ||
+                       !l_cipher_is_supported(L_CIPHER_ARC4)) {
+               printf("Needed ciphers missing, "
+                               "skipping TLS connection tests...\n");
+               goto done;
+       }
+
+       if (!l_key_is_supported(L_KEY_FEATURE_RESTRICT |
+                               L_KEY_FEATURE_CRYPTO)) {
+               printf("Kernel lacks key restrictions or crypto, "
+                       "skipping TLS connection tests...\n");
+               goto done;
+       }
+
+       maxkeys = read_int_from_file(getuid() > 0 ?
+                                       "/proc/sys/kernel/keys/maxkeys" :
+                                       "/proc/sys/kernel/keys/root_maxkeys");
+       if (maxkeys && maxkeys < 2000)
+               printf("Running sysctl kernel.keys.%s=2000 is recommended\n",
+                       getuid() > 0 ? "maxkeys" : "root_maxkeys");
+
+       l_test_add("TLS connection no auth", test_tls_test,
+                       &tls_conn_test_no_auth);
+       l_test_add("TLS connection server auth", test_tls_test,
+                       &tls_conn_test_server_auth);
+       l_test_add("TLS connection client auth attempt", test_tls_test,
+                       &tls_conn_test_client_auth_attempt);
+       l_test_add("TLS connection client auth", test_tls_test,
+                       &tls_conn_test_client_auth);
+       l_test_add("TLS connection full auth attempt", test_tls_test,
+                       &tls_conn_test_full_auth_attempt);
+       l_test_add("TLS connection full auth", test_tls_test,
+                       &tls_conn_test_full_auth);
+
+       l_test_add("TLS connection bad client cipher suite", test_tls_test,
+                       &tls_conn_test_bad_client_suite);
+       l_test_add("TLS connection cipher suite mismatch", test_tls_test,
+                       &tls_conn_test_suite_mismatch);
+
+       l_test_add("TLS connection version mismatch",
+                       test_tls_version_mismatch_test, NULL);
+
+       l_test_add("TLS connection domain match 1", test_tls_test,
+                       &tls_conn_test_domain_match1);
+       l_test_add("TLS connection domain match 2", test_tls_test,
+                       &tls_conn_test_domain_match2);
+       l_test_add("TLS connection domain match 3", test_tls_test,
+                       &tls_conn_test_domain_match3);
+       l_test_add("TLS connection domain match 4", test_tls_test,
+                       &tls_conn_test_domain_match4);
+       l_test_add("TLS connection domain match 5", test_tls_test,
+                       &tls_conn_test_domain_match5);
+       l_test_add("TLS connection domain match 6", test_tls_test,
+                       &tls_conn_test_domain_match6);
+       l_test_add("TLS connection domain match 7", test_tls_test,
+                       &tls_conn_test_domain_match7);
+       l_test_add("TLS connection domain mismatch 1", test_tls_test,
+                       &tls_conn_test_domain_mismatch1);
+       l_test_add("TLS connection domain mismatch 2", test_tls_test,
+                       &tls_conn_test_domain_mismatch2);
+       l_test_add("TLS connection domain mismatch 3", test_tls_test,
+                       &tls_conn_test_domain_mismatch3);
+       l_test_add("TLS connection domain mismatch 4", test_tls_test,
+                       &tls_conn_test_domain_mismatch4);
+       l_test_add("TLS connection domain mismatch 5", test_tls_test,
+                       &tls_conn_test_domain_mismatch5);
+       l_test_add("TLS connection domain mismatch 6", test_tls_test,
+                       &tls_conn_test_domain_mismatch6);
+
+       for (i = 0; tls_cipher_suite_pref[i]; i++) {
+               struct tls_cipher_suite *suite = tls_cipher_suite_pref[i];
+               struct tls_bulk_encryption_algorithm *alg = suite->encryption;
+               bool supported;
+
+               if (alg->cipher_type == TLS_CIPHER_AEAD)
+                       supported = l_aead_cipher_is_supported(alg->l_aead_id);
+               else
+                       supported = l_cipher_is_supported(alg->l_id);
+
+               if (supported) {
+                       l_test_add(suite->name, test_tls_suite_test,
+                                       suite->name);
+               } else {
+                       printf("Skipping %s due to missing cipher support\n",
+                               suite->name);
+               }
+       }
+
+done:
+       return l_test_run();
+}
diff --git a/unit/test-uintset.c b/unit/test-uintset.c
new file mode 100644 (file)
index 0000000..3c9790e
--- /dev/null
@@ -0,0 +1,386 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015-2019  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <limits.h>
+
+#include <ell/ell.h>
+
+static void test_uintset(const void *data)
+{
+       struct l_uintset *set;
+       int i;
+       bool r;
+
+       assert(l_uintset_get_min(NULL) == UINT_MAX);
+       assert(l_uintset_find_max(NULL) == UINT_MAX);
+       assert(l_uintset_find_min(NULL) == UINT_MAX);
+
+       set = l_uintset_new_from_range(1, 76);
+       assert(set);
+
+       assert(l_uintset_get_min(set) == 1);
+       assert(l_uintset_get_max(set) == 76);
+
+       assert(l_uintset_find_min(set) == 77);
+       assert(l_uintset_find_max(set) == 77);
+       assert(l_uintset_find_unused_min(set) == 1);
+
+       r = l_uintset_put(set, 78);
+       assert(!r);
+
+       r = l_uintset_contains(set, 1);
+       assert(!r);
+
+       r = l_uintset_put(set, 1);
+       assert(r);
+
+       r = l_uintset_contains(set, 1);
+       assert(r);
+
+       r = l_uintset_take(set, 78);
+       assert(!r);
+
+       r = l_uintset_take(set, 1);
+       assert(r);
+
+       r = l_uintset_contains(set, 1);
+       assert(!r);
+
+       assert(l_uintset_put(set, 2));
+       assert(l_uintset_put(set, 75));
+
+       assert(l_uintset_find_min(set) == 2);
+       assert(l_uintset_find_max(set) == 75);
+
+       for (i = 1; i <= 76; i++)
+               assert(l_uintset_put(set, i));
+
+       assert(l_uintset_find_unused_min(set) == 77);
+
+       assert(l_uintset_take(set, 76));
+       assert(l_uintset_find_unused_min(set) == 76);
+
+       l_uintset_free(set);
+}
+
+static void test_uintset_2(const void *data)
+{
+       struct l_uintset *set;
+
+       set = l_uintset_new_from_range(0, 63);
+       assert(set);
+
+       assert(l_uintset_find_min(set) == 64);
+       assert(l_uintset_find_max(set) == 64);
+
+       assert(l_uintset_put(set, 63));
+       assert(l_uintset_find_min(set) == 63);
+       assert(l_uintset_find_max(set) == 63);
+
+       l_uintset_free(set);
+}
+
+static void test_uintset_3(const void *data)
+{
+       struct l_uintset *set;
+
+       set = l_uintset_new_from_range(0, 62);
+       assert(set);
+
+       assert(l_uintset_find_min(set) == 63);
+       assert(l_uintset_find_max(set) == 63);
+       assert(l_uintset_put(set, 62));
+       assert(l_uintset_find_min(set) == 62);
+       assert(l_uintset_find_max(set) == 62);
+
+       l_uintset_free(set);
+}
+
+static void test_uintset_4(const void *data)
+{
+       assert(!l_uintset_take(NULL, 1));
+       assert(!l_uintset_put(NULL, 1));
+       assert(!l_uintset_contains(NULL, 1));
+}
+
+static void test_uintset_find_unused(const void *data)
+{
+       struct l_uintset *set;
+       int i;
+
+       set = l_uintset_new_from_range(0, 63);
+       assert(set);
+
+       assert(l_uintset_put(set, 0));
+       assert(l_uintset_find_unused_min(set) == 1);
+       assert(l_uintset_put(set, 1));
+       assert(l_uintset_find_unused_min(set) == 2);
+
+       for (i = 0; i < 64; i++)
+               assert(l_uintset_put(set, i));
+
+       assert(l_uintset_find_unused_min(set) == 64);
+
+       assert(l_uintset_take(set, 60));
+       assert(l_uintset_find_unused_min(set) == 60);
+       assert(l_uintset_find_unused(set, 55) == 60);
+       assert(l_uintset_find_unused(set, 60) == 60);
+       assert(l_uintset_find_unused(set, 61) == 60);
+       l_uintset_free(set);
+
+       set = l_uintset_new_from_range(15, 72);
+       assert(set);
+
+       for (i = 15; i < 64; i++)
+               assert(l_uintset_put(set, i));
+
+       assert(l_uintset_find_unused_min(set) == 64);
+       assert(l_uintset_find_unused(set, 55) == 64);
+       assert(l_uintset_find_unused(set, 70) == 70);
+       assert(l_uintset_put(set, 70));
+       assert(l_uintset_find_unused(set, 70) == 71);
+
+       l_uintset_free(set);
+}
+
+static void uintset_foreach(uint32_t number, void *user_data)
+{
+       struct l_uintset *check = user_data;
+
+       l_uintset_take(check, number);
+}
+
+static void test_uintset_foreach(const void *data)
+{
+       struct l_uintset *set;
+       struct l_uintset *check;
+       int i;
+
+       set = l_uintset_new_from_range(0, 63);
+       check = l_uintset_new_from_range(0, 63);
+       assert(set);
+       assert(check);
+
+       for (i = 0; i < 64; i++) {
+               assert(l_uintset_put(set, i));
+               assert(l_uintset_put(check, i));
+       }
+
+       l_uintset_foreach(set, uintset_foreach, check);
+       assert(l_uintset_find_max(check) == 64);
+
+       l_uintset_free(set);
+       l_uintset_free(check);
+
+       set = l_uintset_new_from_range(0, 127);
+       check = l_uintset_new_from_range(0, 127);
+       assert(set);
+       assert(check);
+
+       assert(l_uintset_put(set, 127));
+       assert(l_uintset_put(check, 127));
+
+       l_uintset_foreach(set, uintset_foreach, check);
+       assert(l_uintset_find_max(check) == 128);
+
+       l_uintset_free(set);
+       l_uintset_free(check);
+
+       set = l_uintset_new_from_range(0, 191);
+       check = l_uintset_new_from_range(0, 191);
+       assert(set);
+       assert(check);
+
+       assert(l_uintset_put(set, 50));
+       assert(l_uintset_put(check, 50));
+       assert(l_uintset_put(set, 150));
+       assert(l_uintset_put(check, 150));
+
+       l_uintset_foreach(set, uintset_foreach, check);
+       assert(l_uintset_find_max(check) == 192);
+
+       l_uintset_free(set);
+       l_uintset_free(check);
+
+       set = l_uintset_new_from_range(0, 192);
+       check = l_uintset_new_from_range(0, 192);
+       assert(set);
+       assert(check);
+
+       assert(l_uintset_put(set, 0));
+       assert(l_uintset_put(check, 0));
+       assert(l_uintset_put(set, 63));
+       assert(l_uintset_put(check, 63));
+       assert(l_uintset_put(set, 120));
+       assert(l_uintset_put(check, 120));
+
+       l_uintset_foreach(set, uintset_foreach, check);
+       assert(l_uintset_find_max(check) == 193);
+
+       l_uintset_free(set);
+       l_uintset_free(check);
+
+       set = l_uintset_new_from_range(0, 192);
+       check = l_uintset_new_from_range(0, 192);
+       assert(set);
+       assert(check);
+
+       assert(l_uintset_put(set, 0));
+       assert(l_uintset_put(check, 0));
+
+       assert(l_uintset_put(set, 192));
+       assert(l_uintset_put(check, 192));
+
+       l_uintset_foreach(set, uintset_foreach, check);
+       assert(l_uintset_find_max(check) == 193);
+
+       l_uintset_free(set);
+       l_uintset_free(check);
+}
+
+static void test_uintset_intersect_sanity_test(const void *data)
+{
+       struct l_uintset *set_a;
+       struct l_uintset *set_b;
+
+       assert(!l_uintset_intersect(NULL, NULL));
+
+       set_a = l_uintset_new_from_range(0, 5);
+       assert(!l_uintset_intersect(NULL, set_a));
+       assert(!l_uintset_intersect(set_a, NULL));
+
+       set_b = l_uintset_new_from_range(4, 10);
+       assert(!l_uintset_intersect(set_a, set_b));
+
+       l_uintset_free(set_a);
+       l_uintset_free(set_b);
+}
+
+struct uintset_data {
+       const uint32_t min;
+       const uint32_t max;
+       const uint32_t *vals;
+       const uint32_t size;
+};
+
+struct uintset_intersect_data {
+       const struct uintset_data set_a;
+       const struct uintset_data set_b;
+       const struct uintset_data set_r;
+};
+
+static const uint32_t vals1[] = { 1, 2, 3 };
+static const uint32_t vals2[] = { 3, 4};
+static const uint32_t vals3[] = { 3 };
+
+static const struct uintset_intersect_data intersect_data_1 = {
+       .set_a = { 0, 4, vals1, L_ARRAY_SIZE(vals1) },
+       .set_b = { 0, 4, vals2, L_ARRAY_SIZE(vals2) },
+       .set_r = { 0, 4, vals3, L_ARRAY_SIZE(vals3) },
+};
+
+static const uint32_t vals4[] = { 0, 1, 64, 127 };
+static const uint32_t vals5[] = { 1, 25, 64, 66, 127, 135 };
+static const uint32_t vals6[] = { 1, 64, 127 };
+
+static const struct uintset_intersect_data intersect_data_2 = {
+       .set_a = { 0, 191, vals4, L_ARRAY_SIZE(vals4) },
+       .set_b = { 0, 191, vals5, L_ARRAY_SIZE(vals5) },
+       .set_r = { 0, 191, vals6, L_ARRAY_SIZE(vals6) },
+};
+
+static void test_uintset_intersect_test(const void *user_data)
+{
+       const struct uintset_intersect_data *data = user_data;
+       struct l_uintset *set_a;
+       struct l_uintset *set_b;
+       struct l_uintset *set_r;
+       size_t i;
+
+       set_a = l_uintset_new_from_range(data->set_a.min, data->set_a.max);
+
+       for (i = 0; i < data->set_a.size; i++)
+               l_uintset_put(set_a, data->set_a.vals[i]);
+
+       set_b = l_uintset_new_from_range(data->set_b.min, data->set_b.max);
+
+       for (i = 0; i < data->set_b.size; i++)
+               l_uintset_put(set_b, data->set_b.vals[i]);
+
+       set_r = l_uintset_intersect(set_a, set_b);
+
+       assert(set_r);
+
+       for (i = 0; i < data->set_r.size; i++) {
+               assert(l_uintset_contains(set_r, data->set_r.vals[i]));
+               assert(l_uintset_take(set_r, data->set_r.vals[i]));
+       }
+
+       assert(l_uintset_find_max(set_r) == l_uintset_get_max(set_r) + 1);
+
+       l_uintset_free(set_a);
+       l_uintset_free(set_b);
+       l_uintset_free(set_r);
+}
+
+static void test_uintset_isempty(const void *user_data)
+{
+       struct l_uintset *a = NULL;
+       struct l_uintset *b = l_uintset_new(32);
+       struct l_uintset *c = l_uintset_new(32);
+
+       assert(l_uintset_put(c, 10));
+
+       assert(l_uintset_isempty(a));
+       assert(l_uintset_isempty(b));
+       assert(!l_uintset_isempty(c));
+
+       l_uintset_free(c);
+       l_uintset_free(b);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("l_uintset sanity check", test_uintset, NULL);
+       l_test_add("l_uintset sanity check #2", test_uintset_2, NULL);
+       l_test_add("l_uintset sanity check #3", test_uintset_3, NULL);
+       l_test_add("l_uintset sanity check #4", test_uintset_4, NULL);
+       l_test_add("l_uintset for each tests", test_uintset_foreach, NULL);
+       l_test_add("l_uintset find unused tests", test_uintset_find_unused,
+                                                       NULL);
+       l_test_add("l_uintset intersect sanity check",
+                       test_uintset_intersect_sanity_test, NULL);
+       l_test_add("l_uintset intersect test 1", test_uintset_intersect_test,
+                                                       &intersect_data_1);
+       l_test_add("l_uintset intersect test 2", test_uintset_intersect_test,
+                                                       &intersect_data_2);
+       l_test_add("l_uintset isempty", test_uintset_isempty, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-unit.c b/unit/test-unit.c
new file mode 100644 (file)
index 0000000..33dd45c
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <ell/ell.h>
+
+static void example_1(const void *data)
+{
+}
+
+static void example_2(const void *data)
+{
+}
+
+static void example_3(const void *data)
+{
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("example-1", example_1, NULL);
+       l_test_add("example-2", example_2, NULL);
+       l_test_add("example-3", example_3, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-utf8.c b/unit/test-utf8.c
new file mode 100644 (file)
index 0000000..9b5bc6e
--- /dev/null
@@ -0,0 +1,1120 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2014  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+enum utf8_validate_type {
+       UTF8_VALIDATE_TYPE_VALID,
+       UTF8_VALIDATE_TYPE_INCOMPLETE,
+       UTF8_VALIDATE_TYPE_NOTUNICODE,
+       UTF8_VALIDATE_TYPE_OVERLONG,
+       UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+struct utf8_validate_test {
+       const char *utf8;
+       size_t utf8_len;
+       enum utf8_validate_type type;
+       const wchar_t *ucs4;
+       size_t ucs4_len;
+};
+
+static const char utf8_1[] = {
+                       0xce, 0xba, 0xe1, 0xbd, 0xb9, 0xcf, 0x83, 0xce,
+                       0xbc, 0xce, 0xb5 };
+static const wchar_t ucs4_1[] = { 0x03ba, 0x1f79, 0x03c3, 0x03bc, 0x03b5 };
+
+static struct utf8_validate_test utf8_validate_test1 = {
+       .utf8 = utf8_1,
+       .utf8_len = 11,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_1,
+       .ucs4_len = 5,
+};
+
+static const char utf8_2[] = { 0xc2, 0x80 };
+static const wchar_t ucs4_2[] = { 0x0080 };
+
+static struct utf8_validate_test utf8_validate_test2 = {
+       .utf8 = utf8_2,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_2,
+       .ucs4_len = 1,
+};
+
+static const char utf8_3[] = { 0xe0, 0xa0, 0x80 };
+static const wchar_t ucs4_3[] = { 0x0800 };
+
+static struct utf8_validate_test utf8_validate_test3 = {
+       .utf8 = utf8_3,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_3,
+       .ucs4_len = 1,
+};
+
+static const char utf8_4[] = { 0xf0, 0x90, 0x80, 0x80 };
+static const wchar_t ucs4_4[] = { 0x00010000 };
+
+static struct utf8_validate_test utf8_validate_test4 = {
+       .utf8 = utf8_4,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_4,
+       .ucs4_len = 1,
+};
+
+static const char utf8_5[] = { 0xf8, 0x88, 0x80, 0x80, 0x80 };
+static const wchar_t ucs4_5[] = { 0x00200000 };
+
+static struct utf8_validate_test utf8_validate_test5 = {
+       .utf8 = utf8_5,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_5,
+       .ucs4_len = 1,
+};
+
+static const char utf8_6[] = { 0xfc, 0x84, 0x80, 0x80, 0x80, 0x80 };
+static const wchar_t ucs4_6[] = { 0x04000000 };
+
+static struct utf8_validate_test utf8_validate_test6 = {
+       .utf8 = utf8_6,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_6,
+       .ucs4_len = 1,
+};
+
+static const char utf8_7[] = { 0x7f };
+static const wchar_t ucs4_7[] = { 0x0000007f };
+
+static struct utf8_validate_test utf8_validate_test7 = {
+       .utf8 = utf8_7,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_7,
+       .ucs4_len = 1,
+};
+
+static const char utf8_8[] = { 0xdf, 0xbf };
+static const wchar_t ucs4_8[] = { 0x000007ff };
+
+static struct utf8_validate_test utf8_validate_test8 = {
+       .utf8 = utf8_8,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_8,
+       .ucs4_len = 1,
+};
+
+static const char utf8_9[] = { 0xef, 0xbf, 0xbf };
+static const wchar_t ucs4_9[] = { 0x0000ffff };
+
+static struct utf8_validate_test utf8_validate_test9 = {
+       .utf8 = utf8_9,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_9,
+       .ucs4_len = 1,
+};
+
+static const char utf8_10[] = { 0xf7, 0xbf, 0xbf, 0xbf };
+static const wchar_t ucs4_10[] = { 0x001fffff };
+
+static struct utf8_validate_test utf8_validate_test10 = {
+       .utf8 = utf8_10,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_10,
+       .ucs4_len = 1,
+};
+
+static const char utf8_11[] = { 0xfb, 0xbf, 0xbf, 0xbf, 0xbf };
+static const wchar_t ucs4_11[] = { 0x03ffffff };
+
+static struct utf8_validate_test utf8_validate_test11 = {
+       .utf8 = utf8_11,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_11,
+       .ucs4_len = 1,
+};
+
+static const char utf8_12[] = { 0xfd, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf };
+static const wchar_t ucs4_12[] = { 0x7fffffff };
+
+static struct utf8_validate_test utf8_validate_test12 = {
+       .utf8 = utf8_12,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_12,
+       .ucs4_len = 1,
+};
+
+static const char utf8_13[] = { 0xed, 0x9f, 0xbf };
+static const wchar_t ucs4_13[] = { 0xd7ff };
+
+static struct utf8_validate_test utf8_validate_test13 = {
+       .utf8 = utf8_13,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_13,
+       .ucs4_len = 1,
+};
+
+static const char utf8_14[] = { 0xee, 0x80, 0x80 };
+static const wchar_t ucs4_14[] = { 0xe000 };
+
+static struct utf8_validate_test utf8_validate_test14 = {
+       .utf8 = utf8_14,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_14,
+       .ucs4_len = 1,
+};
+
+static const char utf8_15[] = { 0xef, 0xbf, 0xbd };
+static const wchar_t ucs4_15[] = { 0xfffd };
+
+static struct utf8_validate_test utf8_validate_test15 = {
+       .utf8 = utf8_15,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_15,
+       .ucs4_len = 1,
+};
+
+static const char utf8_16[] = { 0xf4, 0x8f, 0xbf, 0xbd };
+static const wchar_t ucs4_16[] = { 0x0010fffd };
+
+static struct utf8_validate_test utf8_validate_test16 = {
+       .utf8 = utf8_16,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_16,
+       .ucs4_len = 1,
+};
+
+static const char utf8_17[] = { 0xf4, 0x8f, 0xbf, 0xbf };
+static const wchar_t ucs4_17[] = { 0x0010ffff };
+
+static struct utf8_validate_test utf8_validate_test17 = {
+       .utf8 = utf8_17,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_17,
+       .ucs4_len = 1,
+};
+
+static const char utf8_18[] = { 0xf4, 0x90, 0x80, 0x80 };
+static const wchar_t ucs4_18[] = { 0x00110000 };
+
+static struct utf8_validate_test utf8_validate_test18 = {
+       .utf8 = utf8_18,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_18,
+       .ucs4_len = 1,
+};
+
+static const char utf8_19[] = { 0x80 };
+
+static struct utf8_validate_test utf8_validate_test19 = {
+       .utf8 = utf8_19,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_20[] = { 0xbf };
+
+static struct utf8_validate_test utf8_validate_test20 = {
+       .utf8 = utf8_20,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_21[] = { 0x80, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test21 = {
+       .utf8 = utf8_21,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_22[] = { 0x80, 0xbf, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test22 = {
+       .utf8 = utf8_22,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_23[] = { 0x80, 0xbf, 0x80, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test23 = {
+       .utf8 = utf8_23,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_24[] = { 0x80, 0xbf, 0x80, 0xbf, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test24 = {
+       .utf8 = utf8_24,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_25[] = { 0x80, 0xbf, 0x80, 0xbf, 0x80, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test25 = {
+       .utf8 = utf8_25,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_26[] = { 0x80, 0xbf, 0x80, 0xbf, 0x80, 0xbf, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test26 = {
+       .utf8 = utf8_26,
+       .utf8_len = 7,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_27[] = {
+                       0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+                       0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+                       0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+                       0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+                       0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8,
+                       0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0,
+                       0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8,
+                       0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test27 = {
+       .utf8 = utf8_27,
+       .utf8_len = 63,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_28[] = {
+                       0xc0, 0x20, 0xc1, 0x20, 0xc2, 0x20, 0xc3, 0x20,
+                       0xc4, 0x20, 0xc5, 0x20, 0xc6, 0x20, 0xc7, 0x20,
+                       0xc8, 0x20, 0xc9, 0x20, 0xca, 0x20, 0xcb, 0x20,
+                       0xcc, 0x20, 0xcd, 0x20, 0xce, 0x20, 0xcf, 0x20,
+                       0xd0, 0x20, 0xd1, 0x20, 0xd2, 0x20, 0xd3, 0x20,
+                       0xd4, 0x20, 0xd5, 0x20, 0xd6, 0x20, 0xd7, 0x20,
+                       0xd8, 0x20, 0xd9, 0x20, 0xda, 0x20, 0xdb, 0x20,
+                       0xdc, 0x20, 0xdd, 0x20, 0xde, 0x20, 0xdf, 0x20 };
+
+static struct utf8_validate_test utf8_validate_test28 = {
+       .utf8 = utf8_28,
+       .utf8_len = 64,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_29[] = {
+                       0xe0, 0x20, 0xe1, 0x20, 0xe2, 0x20, 0xe3, 0x20,
+                       0xe4, 0x20, 0xe5, 0x20, 0xe6, 0x20, 0xe7, 0x20,
+                       0xe8, 0x20, 0xe9, 0x20, 0xea, 0x20, 0xeb, 0x20,
+                       0xec, 0x20, 0xed, 0x20, 0xee, 0x20, 0xef, 0x20 };
+
+static struct utf8_validate_test utf8_validate_test29 = {
+       .utf8 = utf8_29,
+       .utf8_len = 32,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_30[] = {
+                       0xf0, 0x20, 0xf1, 0x20, 0xf2, 0x20, 0xf3, 0x20,
+                       0xf4, 0x20, 0xf5, 0x20, 0xf6, 0x20, 0xf7, 0x20 };
+
+static struct utf8_validate_test utf8_validate_test30 = {
+       .utf8 = utf8_30,
+       .utf8_len = 16,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_31[] = {
+                       0xf8, 0x20, 0xf9, 0x20, 0xfa, 0x20, 0xfb, 0x20 };
+
+static struct utf8_validate_test utf8_validate_test31 = {
+       .utf8 = utf8_31,
+       .utf8_len = 8,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_32[] = { 0xfc, 0x20, 0xfd, 0x20 };
+
+static struct utf8_validate_test utf8_validate_test32 = {
+       .utf8 = utf8_32,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_33[] = { 0xc0 };
+
+static struct utf8_validate_test utf8_validate_test33 = {
+       .utf8 = utf8_33,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_34[] = { 0xe0, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test34 = {
+       .utf8 = utf8_34,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_35[] = { 0xf0, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test35 = {
+       .utf8 = utf8_35,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_36[] = { 0xf8, 0x80, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test36 = {
+       .utf8 = utf8_36,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_37[] = { 0xfc, 0x80, 0x80, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test37 = {
+       .utf8 = utf8_37,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_38[] = { 0xdf };
+
+static struct utf8_validate_test utf8_validate_test38 = {
+       .utf8 = utf8_38,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_39[] = { 0xef, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test39 = {
+       .utf8 = utf8_39,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_40[] = { 0xf7, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test40 = {
+       .utf8 = utf8_40,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_41[] = { 0xfb, 0xbf, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test41 = {
+       .utf8 = utf8_41,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_42[] = { 0xfd, 0xbf, 0xbf, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test42 = {
+       .utf8 = utf8_42,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_INCOMPLETE,
+};
+
+static const char utf8_43[] = {
+                       0xc0, 0xe0, 0x80, 0xf0, 0x80, 0x80, 0xf8, 0x80,
+                       0x80, 0x80, 0xfc, 0x80, 0x80, 0x80, 0x80, 0xdf,
+                       0xef, 0xbf, 0xf7, 0xbf, 0xbf, 0xfb, 0xbf, 0xbf,
+                       0xbf, 0xfd, 0xbf, 0xbf, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test43 = {
+       .utf8 = utf8_43,
+       .utf8_len = 30,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_44[] = { 0xfe };
+
+static struct utf8_validate_test utf8_validate_test44 = {
+       .utf8 = utf8_44,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_45[] = { 0xff };
+
+static struct utf8_validate_test utf8_validate_test45 = {
+       .utf8 = utf8_45,
+       .utf8_len = 1,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_46[] = { 0xfe, 0xfe, 0xff, 0xff };
+
+static struct utf8_validate_test utf8_validate_test46 = {
+       .utf8 = utf8_46,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_MALFORMED,
+};
+
+static const char utf8_47[] = { 0xc0, 0xaf };
+
+static struct utf8_validate_test utf8_validate_test47 = {
+       .utf8 = utf8_47,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_48[] = { 0xe0, 0x80, 0xaf };
+
+static struct utf8_validate_test utf8_validate_test48 = {
+       .utf8 = utf8_48,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_49[] = { 0xf0, 0x80, 0x80, 0xaf };
+
+static struct utf8_validate_test utf8_validate_test49 = {
+       .utf8 = utf8_49,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_50[] = { 0xf8, 0x80, 0x80, 0x80, 0xaf };
+
+static struct utf8_validate_test utf8_validate_test50 = {
+       .utf8 = utf8_50,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_51[] = { 0xfc, 0x80, 0x80, 0x80, 0x80, 0xaf };
+
+static struct utf8_validate_test utf8_validate_test51 = {
+       .utf8 = utf8_51,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_52[] = { 0xc1, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test52 = {
+       .utf8 = utf8_52,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_53[] = { 0xe0, 0x9f, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test53 = {
+       .utf8 = utf8_53,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_54[] = { 0xf0, 0x8f, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test54 = {
+       .utf8 = utf8_54,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_55[] = { 0xf8, 0x87, 0xbf, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test55 = {
+       .utf8 = utf8_55,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_56[] = { 0xfc, 0x83, 0xbf, 0xbf, 0xbf, 0xbf };
+
+static struct utf8_validate_test utf8_validate_test56 = {
+       .utf8 = utf8_56,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_57[] = { 0xc0, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test57 = {
+       .utf8 = utf8_57,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_58[] = { 0xe0, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test58 = {
+       .utf8 = utf8_58,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_59[] = { 0xf0, 0x80, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test59 = {
+       .utf8 = utf8_59,
+       .utf8_len = 4,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_60[] = { 0xf8, 0x80, 0x80, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test60 = {
+       .utf8 = utf8_60,
+       .utf8_len = 5,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_61[] = { 0xfc, 0x80, 0x80, 0x80, 0x80, 0x80 };
+
+static struct utf8_validate_test utf8_validate_test61 = {
+       .utf8 = utf8_61,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_OVERLONG,
+};
+
+static const char utf8_62[] = { 0xed, 0xa0, 0x80 };
+static const wchar_t ucs4_62[] = { 0xd800 };
+
+static struct utf8_validate_test utf8_validate_test62 = {
+       .utf8 = utf8_62,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_62,
+       .ucs4_len = 1,
+};
+
+static const char utf8_63[] = { 0xed, 0xad, 0xbf };
+static const wchar_t ucs4_63[] = { 0xdb7f };
+
+static struct utf8_validate_test utf8_validate_test63 = {
+       .utf8 = utf8_63,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_63,
+       .ucs4_len = 1,
+};
+
+static const char utf8_64[] = { 0xed, 0xae, 0x80 };
+static const wchar_t ucs4_64[] = { 0xdb80 };
+
+static struct utf8_validate_test utf8_validate_test64 = {
+       .utf8 = utf8_64,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_64,
+       .ucs4_len = 1,
+};
+
+static const char utf8_65[] = { 0xed, 0xaf, 0xbf };
+static const wchar_t ucs4_65[] = { 0xdbff };
+
+static struct utf8_validate_test utf8_validate_test65 = {
+       .utf8 = utf8_65,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_65,
+       .ucs4_len = 1,
+};
+
+static const char utf8_66[] = { 0xed, 0xb0, 0x80 };
+static const wchar_t ucs4_66[] = { 0xdc00 };
+
+static struct utf8_validate_test utf8_validate_test66 = {
+       .utf8 = utf8_66,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_66,
+       .ucs4_len = 1,
+};
+
+static const char utf8_67[] = { 0xed, 0xbe, 0x80 };
+static const wchar_t ucs4_67[] = { 0xdf80 };
+
+static struct utf8_validate_test utf8_validate_test67 = {
+       .utf8 = utf8_67,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_67,
+       .ucs4_len = 1,
+};
+
+static const char utf8_68[] = { 0xed, 0xbf, 0xbf };
+static const wchar_t ucs4_68[] = { 0xdfff };
+
+static struct utf8_validate_test utf8_validate_test68 = {
+       .utf8 = utf8_68,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_68,
+       .ucs4_len = 1,
+};
+
+static const char utf8_69[] = { 0xed, 0xa0, 0x80, 0xed, 0xb0, 0x80 };
+static const wchar_t ucs4_69[] = { 0xd800, 0xdc00 };
+
+static struct utf8_validate_test utf8_validate_test69 = {
+       .utf8 = utf8_69,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_69,
+       .ucs4_len = 2,
+};
+
+static const char utf8_70[] = { 0xed, 0xa0, 0x80, 0xed, 0xbf, 0xbf };
+static const wchar_t ucs4_70[] = { 0xd800, 0xdfff };
+
+static struct utf8_validate_test utf8_validate_test70 = {
+       .utf8 = utf8_70,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_70,
+       .ucs4_len = 2,
+};
+
+static const char utf8_71[] = { 0xed, 0xad, 0xbf, 0xed, 0xb0, 0x80 };
+static const wchar_t ucs4_71[] = { 0xdb7f, 0xdc00 };
+
+static struct utf8_validate_test utf8_validate_test71 = {
+       .utf8 = utf8_71,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_71,
+       .ucs4_len = 2,
+};
+
+static const char utf8_72[] = { 0xed, 0xad, 0xbf, 0xed, 0xbf, 0xbf };
+static const wchar_t ucs4_72[] = { 0xdb7f, 0xdfff };
+
+static struct utf8_validate_test utf8_validate_test72 = {
+       .utf8 = utf8_72,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_72,
+       .ucs4_len = 2,
+};
+
+static const char utf8_73[] = { 0xed, 0xae, 0x80, 0xed, 0xb0, 0x80 };
+static const wchar_t ucs4_73[] = { 0xdb80, 0xdc00 };
+
+static struct utf8_validate_test utf8_validate_test73 = {
+       .utf8 = utf8_73,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_73,
+       .ucs4_len = 2,
+};
+
+static const char utf8_74[] = { 0xed, 0xae, 0x80, 0xed, 0xbf, 0xbf };
+static const wchar_t ucs4_74[] = { 0xdb80, 0xdfff };
+
+static struct utf8_validate_test utf8_validate_test74 = {
+       .utf8 = utf8_74,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_74,
+       .ucs4_len = 2,
+};
+
+static const char utf8_75[] = { 0xed, 0xaf, 0xbf, 0xed, 0xb0, 0x80 };
+static const wchar_t ucs4_75[] = { 0xdbff, 0xdc00 };
+
+static struct utf8_validate_test utf8_validate_test75 = {
+       .utf8 = utf8_75,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_75,
+       .ucs4_len = 2,
+};
+
+static const char utf8_76[] = { 0xed, 0xaf, 0xbf, 0xed, 0xbf, 0xbf };
+static const wchar_t ucs4_76[] = { 0xdbff, 0xdfff };
+
+static struct utf8_validate_test utf8_validate_test76 = {
+       .utf8 = utf8_76,
+       .utf8_len = 6,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_76,
+       .ucs4_len = 2,
+};
+
+static const char utf8_77[] = { 0xef, 0xbf, 0xbe };
+static const wchar_t ucs4_77[] = { 0xfffe };
+
+static struct utf8_validate_test utf8_validate_test77 = {
+       .utf8 = utf8_77,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_77,
+       .ucs4_len = 1,
+};
+
+static const char utf8_78[] = { 0xef, 0xbf, 0xbf };
+static const wchar_t ucs4_78[] = { 0xffff };
+
+static struct utf8_validate_test utf8_validate_test78 = {
+       .utf8 = utf8_78,
+       .utf8_len = 3,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_78,
+       .ucs4_len = 1,
+};
+
+static const char utf8_79[] = {
+                       0x41, 0xf0, 0x90, 0x80, 0x80, 0x42, 0xf4, 0x8f,
+                       0xbf, 0xbd, 0x43 };
+static const wchar_t ucs4_79[] = { 0x41, 0x00010000, 0x42, 0x10fffd, 0x43 };
+
+static struct utf8_validate_test utf8_validate_test79 = {
+       .utf8 = utf8_79,
+       .utf8_len = 11,
+       .type = UTF8_VALIDATE_TYPE_VALID,
+       .ucs4 = ucs4_79,
+       .ucs4_len = 5,
+};
+
+static const char utf8_80[] = { 0xdf, 0x65 };
+static const wchar_t ucs4_80[] = { 0xffff };
+
+static struct utf8_validate_test utf8_validate_test80 = {
+       .utf8 = utf8_80,
+       .utf8_len = 2,
+       .type = UTF8_VALIDATE_TYPE_NOTUNICODE,
+       .ucs4 = ucs4_80,
+       .ucs4_len = 1,
+};
+
+static void test_utf8_codepoint(const struct utf8_validate_test *test)
+{
+       unsigned int i, pos;
+       int ret;
+       wchar_t val;
+
+       for (i = 0, pos = 0; i < test->ucs4_len; ++i) {
+               ret = l_utf8_get_codepoint(test->utf8 + pos,
+                                               test->utf8_len - pos, &val);
+               assert(ret > 0 && val == test->ucs4[i]);
+               pos += ret;
+       }
+}
+
+static void test_utf8_validate(const void *test_data)
+{
+       const struct utf8_validate_test *test = test_data;
+       const char *end;
+       bool res;
+
+       res = l_utf8_validate(test->utf8, test->utf8_len, &end);
+
+       if (test->type == UTF8_VALIDATE_TYPE_VALID)
+               assert(res == true);
+       else
+               assert(res == false);
+
+       if (test->type == UTF8_VALIDATE_TYPE_VALID && test->ucs4_len) {
+               test_utf8_codepoint(test);
+       }
+}
+
+struct utf8_strlen_test {
+       const char *utf8;
+       size_t utf8_len;
+};
+
+static struct utf8_strlen_test utf8_strlen_test1 = {
+       .utf8 = "abc\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5",
+       .utf8_len = 8,
+};
+
+static void test_utf8_strlen(const void *test_data)
+{
+       const struct utf8_strlen_test *test = test_data;
+       size_t len;
+
+       len = l_utf8_strlen(test->utf8);
+       assert(len == test->utf8_len);
+}
+
+struct utf8_from_utf16_test {
+       uint16_t utf16[64];
+       size_t utf16_size;
+       const char *utf8;
+};
+
+static struct utf8_from_utf16_test utf8_from_utf16_test1 = {
+       .utf16 = { 0x61, 0x62, 0x63, 0x00 },
+       .utf16_size = 8,
+       .utf8 = "abc",
+};
+
+static struct utf8_from_utf16_test utf8_from_utf16_test2 = {
+       .utf16 = { 0x03b1, 0x03b2, 0x03b3, 0x00 },
+       .utf16_size = 8,
+       .utf8 = "\316\261\316\262\316\263",
+};
+
+static struct utf8_from_utf16_test utf8_from_utf16_test3 = {
+       .utf16 = { 0x61, 0x62, 0xd801, 0x00 },
+       .utf16_size = 8,
+};
+
+static struct utf8_from_utf16_test utf8_from_utf16_test4 = {
+       .utf16 = { 0x61, 0x62, 0xdc01, 0x00 },
+       .utf16_size = 8,
+};
+
+static void test_utf8_from_utf16(const void *test_data)
+{
+       const struct utf8_from_utf16_test *test = test_data;
+       char *utf8;
+
+       utf8 = l_utf8_from_utf16(test->utf16, test->utf16_size);
+
+       if (test->utf8) {
+               assert(utf8);
+               assert(!strcmp(utf8, test->utf8));
+               l_free(utf8);
+       } else
+               assert(!utf8);
+}
+
+static void test_utf8_to_utf16(const void *test_data)
+{
+       const struct utf8_from_utf16_test *test = test_data;
+       void *utf16;
+       size_t size;
+
+       utf16 = l_utf8_to_utf16(test->utf8, &size);
+       assert(utf16);
+       assert(size == test->utf16_size);
+       assert(!memcmp(utf16, test->utf16, size));
+
+       l_free(utf16);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("Validate UTF 1", test_utf8_validate,
+                                       &utf8_validate_test1);
+       l_test_add("Validate UTF 2", test_utf8_validate,
+                                       &utf8_validate_test2);
+       l_test_add("Validate UTF 3", test_utf8_validate,
+                                       &utf8_validate_test3);
+       l_test_add("Validate UTF 4", test_utf8_validate,
+                                       &utf8_validate_test4);
+       l_test_add("Validate UTF 5", test_utf8_validate,
+                                       &utf8_validate_test5);
+       l_test_add("Validate UTF 6", test_utf8_validate,
+                                       &utf8_validate_test6);
+       l_test_add("Validate UTF 7", test_utf8_validate,
+                                       &utf8_validate_test7);
+       l_test_add("Validate UTF 8", test_utf8_validate,
+                                       &utf8_validate_test8);
+       l_test_add("Validate UTF 9", test_utf8_validate,
+                                       &utf8_validate_test9);
+       l_test_add("Validate UTF 10", test_utf8_validate,
+                                       &utf8_validate_test10);
+       l_test_add("Validate UTF 11", test_utf8_validate,
+                                       &utf8_validate_test11);
+       l_test_add("Validate UTF 12", test_utf8_validate,
+                                       &utf8_validate_test12);
+       l_test_add("Validate UTF 13", test_utf8_validate,
+                                       &utf8_validate_test13);
+       l_test_add("Validate UTF 14", test_utf8_validate,
+                                       &utf8_validate_test14);
+       l_test_add("Validate UTF 15", test_utf8_validate,
+                                       &utf8_validate_test15);
+       l_test_add("Validate UTF 16", test_utf8_validate,
+                                       &utf8_validate_test16);
+       l_test_add("Validate UTF 17", test_utf8_validate,
+                                       &utf8_validate_test17);
+       l_test_add("Validate UTF 18", test_utf8_validate,
+                                       &utf8_validate_test18);
+       l_test_add("Validate UTF 19", test_utf8_validate,
+                                       &utf8_validate_test19);
+       l_test_add("Validate UTF 20", test_utf8_validate,
+                                       &utf8_validate_test20);
+       l_test_add("Validate UTF 21", test_utf8_validate,
+                                       &utf8_validate_test21);
+       l_test_add("Validate UTF 22", test_utf8_validate,
+                                       &utf8_validate_test22);
+       l_test_add("Validate UTF 23", test_utf8_validate,
+                                       &utf8_validate_test23);
+       l_test_add("Validate UTF 24", test_utf8_validate,
+                                       &utf8_validate_test24);
+       l_test_add("Validate UTF 25", test_utf8_validate,
+                                       &utf8_validate_test25);
+       l_test_add("Validate UTF 26", test_utf8_validate,
+                                       &utf8_validate_test26);
+       l_test_add("Validate UTF 27", test_utf8_validate,
+                                       &utf8_validate_test27);
+       l_test_add("Validate UTF 28", test_utf8_validate,
+                                       &utf8_validate_test28);
+       l_test_add("Validate UTF 29", test_utf8_validate,
+                                       &utf8_validate_test29);
+       l_test_add("Validate UTF 30", test_utf8_validate,
+                                       &utf8_validate_test30);
+       l_test_add("Validate UTF 31", test_utf8_validate,
+                                       &utf8_validate_test31);
+       l_test_add("Validate UTF 32", test_utf8_validate,
+                                       &utf8_validate_test32);
+       l_test_add("Validate UTF 33", test_utf8_validate,
+                                       &utf8_validate_test33);
+       l_test_add("Validate UTF 34", test_utf8_validate,
+                                       &utf8_validate_test34);
+       l_test_add("Validate UTF 35", test_utf8_validate,
+                                       &utf8_validate_test35);
+       l_test_add("Validate UTF 36", test_utf8_validate,
+                                       &utf8_validate_test36);
+       l_test_add("Validate UTF 37", test_utf8_validate,
+                                       &utf8_validate_test37);
+       l_test_add("Validate UTF 38", test_utf8_validate,
+                                       &utf8_validate_test38);
+       l_test_add("Validate UTF 39", test_utf8_validate,
+                                       &utf8_validate_test39);
+       l_test_add("Validate UTF 40", test_utf8_validate,
+                                       &utf8_validate_test40);
+       l_test_add("Validate UTF 41", test_utf8_validate,
+                                       &utf8_validate_test41);
+       l_test_add("Validate UTF 42", test_utf8_validate,
+                                       &utf8_validate_test42);
+       l_test_add("Validate UTF 43", test_utf8_validate,
+                                       &utf8_validate_test43);
+       l_test_add("Validate UTF 44", test_utf8_validate,
+                                       &utf8_validate_test44);
+       l_test_add("Validate UTF 45", test_utf8_validate,
+                                       &utf8_validate_test45);
+       l_test_add("Validate UTF 46", test_utf8_validate,
+                                       &utf8_validate_test46);
+       l_test_add("Validate UTF 47", test_utf8_validate,
+                                       &utf8_validate_test47);
+       l_test_add("Validate UTF 48", test_utf8_validate,
+                                       &utf8_validate_test48);
+       l_test_add("Validate UTF 49", test_utf8_validate,
+                                       &utf8_validate_test49);
+       l_test_add("Validate UTF 50", test_utf8_validate,
+                                       &utf8_validate_test50);
+       l_test_add("Validate UTF 51", test_utf8_validate,
+                                       &utf8_validate_test51);
+       l_test_add("Validate UTF 52", test_utf8_validate,
+                                       &utf8_validate_test52);
+       l_test_add("Validate UTF 53", test_utf8_validate,
+                                       &utf8_validate_test53);
+       l_test_add("Validate UTF 54", test_utf8_validate,
+                                       &utf8_validate_test54);
+       l_test_add("Validate UTF 55", test_utf8_validate,
+                                       &utf8_validate_test55);
+       l_test_add("Validate UTF 56", test_utf8_validate,
+                                       &utf8_validate_test56);
+       l_test_add("Validate UTF 57", test_utf8_validate,
+                                       &utf8_validate_test57);
+       l_test_add("Validate UTF 58", test_utf8_validate,
+                                       &utf8_validate_test58);
+       l_test_add("Validate UTF 59", test_utf8_validate,
+                                       &utf8_validate_test59);
+       l_test_add("Validate UTF 60", test_utf8_validate,
+                                       &utf8_validate_test60);
+       l_test_add("Validate UTF 61", test_utf8_validate,
+                                       &utf8_validate_test61);
+       l_test_add("Validate UTF 62", test_utf8_validate,
+                                       &utf8_validate_test62);
+       l_test_add("Validate UTF 63", test_utf8_validate,
+                                       &utf8_validate_test63);
+       l_test_add("Validate UTF 64", test_utf8_validate,
+                                       &utf8_validate_test64);
+       l_test_add("Validate UTF 65", test_utf8_validate,
+                                       &utf8_validate_test65);
+       l_test_add("Validate UTF 66", test_utf8_validate,
+                                       &utf8_validate_test66);
+       l_test_add("Validate UTF 67", test_utf8_validate,
+                                       &utf8_validate_test67);
+       l_test_add("Validate UTF 68", test_utf8_validate,
+                                       &utf8_validate_test68);
+       l_test_add("Validate UTF 69", test_utf8_validate,
+                                       &utf8_validate_test69);
+       l_test_add("Validate UTF 70", test_utf8_validate,
+                                       &utf8_validate_test70);
+       l_test_add("Validate UTF 71", test_utf8_validate,
+                                       &utf8_validate_test71);
+       l_test_add("Validate UTF 72", test_utf8_validate,
+                                       &utf8_validate_test72);
+       l_test_add("Validate UTF 73", test_utf8_validate,
+                                       &utf8_validate_test73);
+       l_test_add("Validate UTF 74", test_utf8_validate,
+                                       &utf8_validate_test74);
+       l_test_add("Validate UTF 75", test_utf8_validate,
+                                       &utf8_validate_test75);
+       l_test_add("Validate UTF 76", test_utf8_validate,
+                                       &utf8_validate_test76);
+       l_test_add("Validate UTF 77", test_utf8_validate,
+                                       &utf8_validate_test77);
+       l_test_add("Validate UTF 78", test_utf8_validate,
+                                       &utf8_validate_test78);
+       l_test_add("Validate UTF 79", test_utf8_validate,
+                                       &utf8_validate_test79);
+       l_test_add("Validate UTF 80", test_utf8_validate,
+                                       &utf8_validate_test80);
+
+       l_test_add("Strlen UTF 1", test_utf8_strlen,
+                                       &utf8_strlen_test1);
+
+       l_test_add("utf8_from_utf16 1", test_utf8_from_utf16,
+                                       &utf8_from_utf16_test1);
+       l_test_add("utf8_from_utf16 2", test_utf8_from_utf16,
+                                       &utf8_from_utf16_test2);
+       l_test_add("utf8_from_utf16 3", test_utf8_from_utf16,
+                                       &utf8_from_utf16_test3);
+       l_test_add("utf8_from_utf16 4", test_utf8_from_utf16,
+                                       &utf8_from_utf16_test4);
+
+       l_test_add("utf8_to_utf16 1", test_utf8_to_utf16,
+                                       &utf8_from_utf16_test1);
+       l_test_add("utf8_to_utf16 2", test_utf8_to_utf16,
+                                       &utf8_from_utf16_test2);
+
+       return l_test_run();
+}
diff --git a/unit/test-util.c b/unit/test-util.c
new file mode 100644 (file)
index 0000000..883319c
--- /dev/null
@@ -0,0 +1,140 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2011-2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_hexstring(const void *test_data)
+{
+       unsigned char test[] = { 0x74, 0x65, 0x73, 0x74, 0x00 };
+       char *hex;
+
+       hex = l_util_hexstring(test, 5);
+       assert(hex);
+       assert(!strcmp(hex, "7465737400"));
+       l_free(hex);
+}
+
+static void test_hexstring_upper(const void *test_data)
+{
+       unsigned char test[] = { 0x0a, 0x0b, 0x0c, 0xde, 0xf2 };
+       char *hex;
+
+       hex = l_util_hexstring_upper(test, sizeof(test));
+       assert(hex);
+       assert(!strcmp(hex, "0A0B0CDEF2"));
+       l_free(hex);
+}
+
+static void test_from_hexstring(const void *test_data)
+{
+       const char *test = "7465737400";
+       unsigned char expected[] = { 0x74, 0x65, 0x73, 0x74, 0x00 };
+       const char *invalid1 = "74757";
+       const char *invalid2 = "746573740";
+
+       unsigned char *bytes;
+       size_t len;
+
+       bytes = l_util_from_hexstring(test, &len);
+       assert(bytes);
+       assert(len == 5);
+       assert(!memcmp(bytes, expected, len));
+       l_free(bytes);
+
+       bytes = l_util_from_hexstring(invalid1, &len);
+       assert(!bytes);
+
+       bytes = l_util_from_hexstring(invalid2, &len);
+       assert(!bytes);
+}
+
+static void test_has_suffix(const void *test_data)
+{
+       const char *str = "string";
+       const char *suffix = "ing";
+
+       assert(l_str_has_suffix(str, suffix));
+       assert(l_str_has_suffix(str, str));
+       assert(!l_str_has_suffix(NULL, suffix));
+       assert(!l_str_has_suffix(str, NULL));
+       assert(!l_str_has_suffix(suffix, str));
+}
+
+static void do_strlcpy(size_t dst_bytes, size_t src_bytes)
+{
+       /* A valid address is needed for the destination buffer
+        * even if l_strlcpy is told to not copy anything there
+        */
+       char *dst = l_malloc(dst_bytes ?: 1);
+       char *src = l_malloc(src_bytes);
+       size_t src_strlen = src_bytes - 1;
+
+       memset(dst, ' ', dst_bytes ?: 1);
+       memset(src, '@', src_strlen);
+       src[src_strlen] = '\0';
+
+       assert(l_strlcpy(dst, src, dst_bytes) == src_strlen);
+
+       if (!dst_bytes) {
+               assert(*dst == ' ');
+       } else if (src_strlen >= dst_bytes) {
+               /* Copy was truncated */
+               assert(strlen(dst) == dst_bytes - 1);
+               assert(l_str_has_prefix(src, dst));
+       } else
+               assert(!strcmp(src, dst));
+
+       l_free(dst);
+       l_free(src);
+}
+
+static void test_strlcpy(const void *test_data)
+{
+       do_strlcpy(0, 1);
+       do_strlcpy(0, 10);
+       do_strlcpy(10, 8);
+       do_strlcpy(10, 9);
+       do_strlcpy(10, 10);
+       do_strlcpy(10, 11);
+       do_strlcpy(10, 12);
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("l_util_hexstring", test_hexstring, NULL);
+       l_test_add("l_util_hexstring_upper", test_hexstring_upper, NULL);
+       l_test_add("l_util_from_hexstring", test_from_hexstring, NULL);
+
+       l_test_add("l_util_has_suffix", test_has_suffix, NULL);
+
+       l_test_add("l_strlcpy", test_strlcpy, NULL);
+
+       return l_test_run();
+}
diff --git a/unit/test-uuid.c b/unit/test-uuid.c
new file mode 100644 (file)
index 0000000..e9943b3
--- /dev/null
@@ -0,0 +1,245 @@
+/*
+ *
+ *  Embedded Linux library
+ *
+ *  Copyright (C) 2015  Intel Corporation. All rights reserved.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <assert.h>
+
+#include <ell/ell.h>
+
+static void test_v3(const void *data)
+{
+       uint8_t uuid[16];
+       bool r;
+       const char *dns = "01.org";
+       uint8_t dns_expected[16] = {
+               0xc4, 0x29, 0x62, 0xbe, 0xd8, 0xb6, 0x38, 0xf6,
+               0xa9, 0xdb, 0xea, 0x5b, 0x75, 0xca, 0x39, 0x2d,
+       };
+       const char *url = "http://01.org";
+       uint8_t url_expected[16] = {
+               0x4d, 0x73, 0xd5, 0x05, 0xd0, 0xf1, 0x34, 0x69,
+               0xb5, 0x0d, 0x27, 0x6d, 0x29, 0xac, 0x7e, 0x07,
+       };
+       const char *oid = "1.3.6.1";
+       uint8_t oid_expected[16] = {
+               0xdd, 0x1a, 0x1c, 0xef, 0x13, 0xd5, 0x36, 0x8a,
+               0xad, 0x82, 0xec, 0xa7, 0x1a, 0xcd, 0x4c, 0xd1,
+       };
+       const char *x500 = "c=ca";
+       uint8_t x500_expected[16] = {
+               0x65, 0x8d, 0x30, 0x02, 0xdb, 0x6b, 0x30, 0x40,
+               0xa1, 0xd1, 0x8d, 0xdd, 0x7d, 0x18, 0x9a, 0x4d,
+       };
+
+       r = l_uuid_v3(L_UUID_NAMESPACE_DNS, dns, strlen(dns), uuid);
+       assert(r);
+       assert(!memcmp(uuid, dns_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+       assert(l_uuid_get_version(uuid) == L_UUID_VERSION_3_MD5);
+
+       r = l_uuid_v3(L_UUID_NAMESPACE_URL, url, strlen(url), uuid);
+       assert(r);
+       assert(!memcmp(uuid, url_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+
+       r = l_uuid_v3(L_UUID_NAMESPACE_OID, oid, strlen(oid), uuid);
+       assert(r);
+       assert(!memcmp(uuid, oid_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+
+       r = l_uuid_v3(L_UUID_NAMESPACE_X500, x500, strlen(x500), uuid);
+       assert(r);
+       assert(!memcmp(uuid, x500_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+}
+
+static void test_v4(const void *data)
+{
+       uint8_t uuid1[16];
+       uint8_t uuid2[16];
+       bool r;
+
+       r = l_uuid_v4(uuid1);
+       assert(r);
+       assert(l_uuid_is_valid(uuid1));
+       assert(l_uuid_get_version(uuid1) == L_UUID_VERSION_4_RANDOM);
+
+       r = l_uuid_v4(uuid2);
+       assert(r);
+       assert(l_uuid_is_valid(uuid2));
+
+       assert(memcmp(uuid1, uuid2, 16));
+}
+
+static void test_v5(const void *data)
+{
+       uint8_t uuid[16];
+       bool r;
+       const char *dns = "01.org";
+       uint8_t dns_expected[16] = {
+               0x65, 0xfc, 0xc6, 0x97, 0x07, 0x76, 0x5b, 0xf9,
+               0x85, 0x73, 0x72, 0xa5, 0x10, 0x80, 0xc7, 0xde,
+       };
+       const char *url = "http://01.org";
+       uint8_t url_expected[16] = {
+               0x4c, 0x98, 0xbc, 0x3c, 0x20, 0xa1, 0x55, 0xb0,
+               0x9b, 0x7c, 0x42, 0xa4, 0xd0, 0x6e, 0xa6, 0xb6,
+       };
+       const char *oid = "1.3.6.1";
+       uint8_t oid_expected[16] = {
+               0x14, 0x47, 0xfa, 0x61, 0x52, 0x77, 0x5f, 0xef,
+               0xa9, 0xb3, 0xfb, 0xc6, 0xe4, 0x4f, 0x4a, 0xf3,
+       };
+       const char *x500 = "c=ca";
+       uint8_t x500_expected[16] = {
+               0xcc, 0x95, 0x7d, 0xd1, 0xa9, 0x72, 0x53, 0x49,
+               0x98, 0xcd, 0x87, 0x41, 0x90, 0x00, 0x27, 0x98,
+       };
+
+       r = l_uuid_v5(L_UUID_NAMESPACE_DNS, dns, strlen(dns), uuid);
+       assert(r);
+       assert(!memcmp(uuid, dns_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+       assert(l_uuid_get_version(uuid) == L_UUID_VERSION_5_SHA1);
+
+       r = l_uuid_v5(L_UUID_NAMESPACE_URL, url, strlen(url), uuid);
+       assert(r);
+       assert(!memcmp(uuid, url_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+
+       r = l_uuid_v5(L_UUID_NAMESPACE_OID, oid, strlen(oid), uuid);
+       assert(r);
+       assert(!memcmp(uuid, oid_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+
+       r = l_uuid_v5(L_UUID_NAMESPACE_X500, x500, strlen(x500), uuid);
+       assert(r);
+       assert(!memcmp(uuid, x500_expected, 16));
+       assert(l_uuid_is_valid(uuid));
+}
+
+static void test_to_string(const void *data)
+{
+       uint8_t uuid[16];
+       bool r;
+       const char *dns = "01.org";
+       const char *expected_uuid = "65fcc697-0776-5bf9-8573-72a51080c7de";
+       char buf[64];
+
+       r = l_uuid_v5(L_UUID_NAMESPACE_DNS, dns, strlen(dns), uuid);
+       assert(r);
+
+       r = l_uuid_to_string(uuid, buf, sizeof(buf));
+       assert(r);
+
+       assert(!strcmp(buf, expected_uuid));
+}
+
+static void test_from_string_too_short(const void *data)
+{
+       static const char *string_uuid = "65fcc697-0776-5bf9-8573-72a51080c7d";
+       uint8_t uuid[16];
+       bool r;
+
+       r = l_uuid_from_string(string_uuid, uuid);
+       assert(!r);
+}
+
+static void test_from_string_too_long(const void *data)
+{
+       static const char *string_uuid =
+                       "65fcc697-0776-5bf9-8573-72a51080c7detoolong";
+       static uint8_t expected_uuid[] = {
+               0x65, 0xfc, 0xc6, 0x97, 0x07, 0x76, 0x5b, 0xf9,
+               0x85, 0x73, 0x72, 0xa5, 0x10, 0x80, 0xc7, 0xde
+       };
+
+       uint8_t uuid[16];
+       bool r;
+
+       r = l_uuid_from_string(string_uuid, uuid);
+       assert(r);
+
+       assert(!memcmp(uuid, expected_uuid, sizeof(uuid)));
+}
+
+static void test_from_string_invalid_variant(const void *data)
+{
+       static const char *string_uuid = "65fcc697-0776-5bf9-c573-72a51080c7de";
+       uint8_t uuid[16];
+       bool r;
+
+       r = l_uuid_from_string(string_uuid, uuid);
+       assert(!r);
+}
+
+static void test_from_string_invalid_hex(const void *data)
+{
+       static const char *string_uuid = "65fcc697-this-isno-tava-lidhexstring";
+       uint8_t uuid[16];
+       bool r;
+
+       r = l_uuid_from_string(string_uuid, uuid);
+       assert(!r);
+}
+
+static void test_from_string(const void *data)
+{
+       static const char *string_uuid = "65fcc697-0776-5bf9-8573-72a51080c7de";
+       static uint8_t expected_uuid[] = {
+               0x65, 0xfc, 0xc6, 0x97, 0x07, 0x76, 0x5b, 0xf9,
+               0x85, 0x73, 0x72, 0xa5, 0x10, 0x80, 0xc7, 0xde
+       };
+
+       uint8_t uuid[16];
+       bool r;
+
+       r = l_uuid_from_string(string_uuid, uuid);
+       assert(r);
+
+       assert(!memcmp(uuid, expected_uuid, sizeof(uuid)));
+}
+
+int main(int argc, char *argv[])
+{
+       l_test_init(&argc, &argv);
+
+       l_test_add("/uuid/v3", test_v3, NULL);
+
+       if (l_getrandom_is_supported())
+               l_test_add("/uuid/v4", test_v4, NULL);
+
+       l_test_add("/uuid/v5", test_v5, NULL);
+       l_test_add("/uuid/to string", test_to_string, NULL);
+       l_test_add("/uuid/from string", test_from_string, NULL);
+       l_test_add("/uuid/from string/too short", test_from_string_too_short, NULL);
+       l_test_add("/uuid/from string/too long", test_from_string_too_long, NULL);
+       l_test_add("/uuid/from string/invalid variant", test_from_string_invalid_variant, NULL);
+       l_test_add("/uuid/from string/invalid hex", test_from_string_invalid_hex, NULL);
+
+       return l_test_run();
+
+}