no libltdl needed

12 files changed, 7 insertions, 5734 deletions

diff --git a/ChangeLog b/ChangeLog
index 37e553b6..e74826b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 18 17:28:43 MDT 2008
+        Removed libltdl tests and directory.  We do not need
+        those anymore since we use libgnunetutil anyway.
+
 Sun Mar  2 19:13:39 MST 2008
         Releasing gnunet-gtk 0.8.0pre0.
 
diff --git a/TODO b/TODO
index 8e5c5ae1..c0152bb3 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,7 @@ Annotations:
   => need to incorporate into code!
 - use new search ranking features
   => need to implement function in search.c and update tree views/model
+- better uritracker support
 - pop-up dialogs / context menus (show extra information, in particular full metadata) [RC]
 - much more testing!!!
 
diff --git a/bootstrap b/bootstrap
index 57648b9e..cffc4978 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,4 @@
 #!/bin/sh
 export MKDIR_P="mkdir -p"
 automake -fi
-cd libltdl
-autoreconf -f -i
-cd ..
 autoreconf -f -i
diff --git a/configure.ac b/configure.ac
index 7ec286fc..dd421a4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Christian Grothoff (and other contributing authors)
+# (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Christian Grothoff (and other contributing authors)
 #
 # GNUnet is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -42,17 +42,9 @@ AC_PROG_CXX
 AC_HEADER_STDC
 AC_CANONICAL_HOST
 
-
 # dynamic libraries/plugins
-AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_INSTALLABLE
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-AC_LIB_LTDL
-AC_CONFIG_SUBDIRS(libltdl)
-
 
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
diff --git a/libltdl/COPYING.LIB b/libltdl/COPYING.LIB
deleted file mode 100644
index 0d516d2d..00000000
--- a/libltdl/COPYING.LIB
+++ /dev/null
@@ -1,510 +0,0 @@
-
-                  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., 59 Temple Place, Suite 330, Boston, MA 02111-1307  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/libltdl/Makefile.am b/libltdl/Makefile.am
deleted file mode 100644
index 9b560285..00000000
--- a/libltdl/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = no-dependencies foreign
-
-if INSTALL_LTDL
-include_HEADERS = ltdl.h
-lib_LTLIBRARIES = libltdl.la
-else
-noinst_HEADERS = ltdl.h
-endif
-
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
-endif
-
-## Make sure these will be cleaned even when they're not built by
-## default.
-CLEANFILES = libltdl.la libltdlc.la
-
-libltdl_la_SOURCES = ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1
-libltdl_la_LIBADD = $(LIBADD_DL)
-
-libltdlc_la_SOURCES = ltdl.c
-libltdlc_la_LIBADD = $(LIBADD_DL)
-
-## Because we do not have automatic dependency tracking:
-ltdl.lo: ltdl.h config.h
-
-$(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
-        $(SHELL) ./config.status --recheck
-
-## This allows us to install libltdl without using ln and without creating
-## a world writeable directory.
-## FIXME:  Remove this rule once automake can do this properly by itself.
-local-install-files: $(DISTFILES)
-        -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
-        $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
-        @for file in $(DISTFILES); do \
-          case $$file in \
-            $(srcdir)/*) file=`echo "$$file" | sed "s|^$(srcdir)/||"`;; \
-          esac; \
-          d=$(srcdir); \
-          if test -d $$d/$$file; then \
-            cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
-          else \
-            test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
-            || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
-          fi; \
-        done
diff --git a/libltdl/README b/libltdl/README
deleted file mode 100644
index da0a449c..00000000
--- a/libltdl/README
+++ /dev/null
@@ -1,10 +0,0 @@
-This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
-
-It supports the following dlopen interfaces:
-* dlopen (Solaris, Linux and various BSD flavors)
-* shl_load (HP-UX)
-* LoadLibrary (Win16 and Win32)
-* load_add_on (BeOS)
-* GNU DLD (emulates dynamic linking for static libraries)
-* dyld (darwin/Mac OS X)
-* libtool's dlpreopen
diff --git a/libltdl/config-h.in b/libltdl/config-h.in
deleted file mode 100644
index b8640710..00000000
--- a/libltdl/config-h.in
+++ /dev/null
@@ -1,195 +0,0 @@
-/* config-h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `argz_append' function. */
-#undef HAVE_ARGZ_APPEND
-
-/* Define to 1 if you have the `argz_create_sep' function. */
-#undef HAVE_ARGZ_CREATE_SEP
-
-/* Define to 1 if you have the <argz.h> header file. */
-#undef HAVE_ARGZ_H
-
-/* Define to 1 if you have the `argz_insert' function. */
-#undef HAVE_ARGZ_INSERT
-
-/* Define to 1 if you have the `argz_next' function. */
-#undef HAVE_ARGZ_NEXT
-
-/* Define to 1 if you have the `argz_stringify' function. */
-#undef HAVE_ARGZ_STRINGIFY
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
-/* Define to 1 if you have the `closedir' function. */
-#undef HAVE_CLOSEDIR
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the GNU dld library. */
-#undef HAVE_DLD
-
-/* Define to 1 if you have the <dld.h> header file. */
-#undef HAVE_DLD_H
-
-/* Define to 1 if you have the `dlerror' function. */
-#undef HAVE_DLERROR
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <dl.h> header file. */
-#undef HAVE_DL_H
-
-/* Define if you have the _dyld_func_lookup function. */
-#undef HAVE_DYLD
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if the system has the type `error_t'. */
-#undef HAVE_ERROR_T
-
-/* Define to 1 if you have the `index' function. */
-#undef HAVE_INDEX
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have the libdl library or equivalent. */
-#undef HAVE_LIBDL
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-#undef HAVE_MACH_O_DYLD_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
-/* Define to 1 if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the `opendir' function. */
-#undef HAVE_OPENDIR
-
-/* Define if libtool can extract symbol lists from object files. */
-#undef HAVE_PRELOADED_SYMBOLS
-
-/* Define to 1 if you have the `readdir' function. */
-#undef HAVE_READDIR
-
-/* Define to 1 if you have the `rindex' function. */
-#undef HAVE_RINDEX
-
-/* Define if you have the shl_load function. */
-#undef HAVE_SHL_LOAD
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strcmp' function. */
-#undef HAVE_STRCMP
-
-/* 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 `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/dl.h> header file. */
-#undef HAVE_SYS_DL_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_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 if the OS needs help to load dependent libraries for dlopen(). */
-#undef LTDL_DLOPEN_DEPLIBS
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LTDL_OBJDIR
-
-/* Define to the name of the environment variable that determines the dynamic
-   library search path. */
-#undef LTDL_SHLIBPATH_VAR
-
-/* Define to the extension used for shared libraries, say, ".so". */
-#undef LTDL_SHLIB_EXT
-
-/* Define to the system default library search path. */
-#undef LTDL_SYSSEARCHPATH
-
-/* Define if dlsym() requires a leading underscore in symbol names. */
-#undef NEED_USCORE
-
-/* 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 version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to a type to use for `error_t' if it is not otherwise available. */
-#undef error_t
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
diff --git a/libltdl/configure.ac b/libltdl/configure.ac
deleted file mode 100644
index 56c9f237..00000000
--- a/libltdl/configure.ac
+++ /dev/null
@@ -1,80 +0,0 @@
-## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright 2001  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 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
-
-
-## FIXME: Is this really new enough? ##
-AC_PREREQ(2.50)
-
-
-## ------------------------ ##
-## Autoconf initialisation. ##
-## ------------------------ ##
-AC_INIT([libltdl], [1.2], [bug-libtool@gnu.org])
-AC_CONFIG_SRCDIR([ltdl.c])
-
-
-## ------------------------------- ##
-## Libltdl specific configuration. ##
-## ------------------------------- ##
-
-AC_CONFIG_AUX_DIR([.])
-
-if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
-  if test -f ${srcdir}/ltmain.sh; then
-    # if libltdl is libtoolized, it is assumed to be stand-alone and
-    # installed unless the command line overrides it (tested above)
-    enable_ltdl_install=yes
-  else
-    AC_MSG_WARN([*** The top-level configure must select either])
-    AC_MSG_WARN([*** [A""C_LIBLTDL_INSTALLABLE] or [A""C_LIBLTDL_CONVENIENCE].])
-    AC_MSG_ERROR([*** Maybe you want to --enable-ltdl-install?])
-  fi
-fi
-
-
-## ------------------------ ##
-## Automake Initialisation. ##
-## ------------------------ ##
-AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, -)
-AM_CONFIG_HEADER([config.h:config-h.in])
-AM_MAINTAINER_MODE
-
-
-## ------------------ ##
-## C compiler checks. ##
-## ------------------ ##
-AC_PROG_CC
-AC_C_CONST
-AC_C_INLINE
-
-
-## ----------------------- ##
-## Libtool initialisation. ##
-## ----------------------- ##
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_SUBST([LIBTOOL_DEPS])
-
-AC_LIB_LTDL
-
-
-## -------- ##
-## Outputs. ##
-## -------- ##
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
deleted file mode 100644
index 68037d23..00000000
--- a/libltdl/ltdl.c
+++ /dev/null
@@ -1,4525 +0,0 @@
-/* ltdl.c -- system independent dlopen wrapper
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-   Originally by Thomas Tanner <tanner@ffii.org>
-   This file is part of GNU Libtool.
-
-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 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-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., 59 Temple Place, Suite 330, Boston, MA
-02111-1307  USA
-
-*/
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#if HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#if HAVE_STDIO_H
-#  include <stdio.h>
-#endif
-
-/* Include the header defining malloc.  On K&R C compilers,
-   that's <malloc.h>, on ANSI C and ISO C compilers, that's <stdlib.h>.  */
-#if HAVE_STDLIB_H
-#  include <stdlib.h>
-#else
-#  if HAVE_GNUNET_malloc_H
-#    include <malloc.h>
-#  endif
-#endif
-
-#if HAVE_STRING_H
-#  include <string.h>
-#else
-#  if HAVE_STRINGS_H
-#    include <strings.h>
-#  endif
-#endif
-
-#if HAVE_CTYPE_H
-#  include <ctype.h>
-#endif
-
-#if HAVE_MEMORY_H
-#  include <memory.h>
-#endif
-
-#if HAVE_ERRNO_H
-#  include <errno.h>
-#endif
-
-
-#ifndef __WINDOWS__
-#  ifdef __WIN32__
-#    define __WINDOWS__
-#  endif
-#endif
-
-
-#undef LT_USE_POSIX_DIRENT
-#ifdef HAVE_CLOSEDIR
-#  ifdef HAVE_OPENDIR
-#    ifdef HAVE_READDIR
-#      ifdef HAVE_DIRENT_H
-#        define LT_USE_POSIX_DIRENT
-#      endif /* HAVE_DIRENT_H */
-#    endif /* HAVE_READDIR */
-#  endif /* HAVE_OPENDIR */
-#endif /* HAVE_CLOSEDIR */
-
-
-#undef LT_USE_WINDOWS_DIRENT_EMULATION
-#ifndef LT_USE_POSIX_DIRENT
-#  ifdef __WINDOWS__
-#    define LT_USE_WINDOWS_DIRENT_EMULATION
-#  endif /* __WINDOWS__ */
-#endif /* LT_USE_POSIX_DIRENT */
-
-
-#ifdef LT_USE_POSIX_DIRENT
-#  include <dirent.h>
-#  define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-#else
-#  ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-#    define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name))
-#  else
-#    define dirent direct
-#    define LT_D_NAMLEN(dirent) ((dirent)->d_namlen)
-#    if HAVE_SYS_NDIR_H
-#      include <sys/ndir.h>
-#    endif
-#    if HAVE_SYS_DIR_H
-#      include <sys/dir.h>
-#    endif
-#    if HAVE_NDIR_H
-#      include <ndir.h>
-#    endif
-#  endif
-#endif
-
-#if HAVE_ARGZ_H
-#  include <argz.h>
-#endif
-
-#if HAVE_ASSERT_H
-#  include <assert.h>
-#else
-#  define assert(arg)   ((void) 0)
-#endif
-
-#include "ltdl.h"
-
-#if WITH_DGNUNET_malloc
-#  include <dmalloc.h>
-#endif
-
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
-#ifdef DLL_EXPORT
-#  define LT_GLOBAL_DATA        __declspec(dllexport)
-#else
-#  define LT_GLOBAL_DATA
-#endif
-
-/* fopen() mode flags for reading a text file */
-#undef  LT_READTEXT_MODE
-#ifdef __WINDOWS__
-#  define LT_READTEXT_MODE "rt"
-#else
-#  define LT_READTEXT_MODE "r"
-#endif
-
-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-
-#include <windows.h>
-
-#define dirent lt_dirent
-#define DIR lt_DIR
-
-struct dirent
-{
-  char d_name[2048];
-  int d_namlen;
-};
-
-typedef struct _DIR
-{
-  HANDLE hSearch;
-  WIN32_FIND_DATA Win32FindData;
-  BOOL firsttime;
-  struct dirent file_info;
-} DIR;
-
-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
-
-/* --- MANIFEST CONSTANTS --- */
-
-
-/* Standard libltdl search path environment variable name  */
-#undef  LTDL_SEARCHPATH_VAR
-#define LTDL_SEARCHPATH_VAR     "LTDL_LIBRARY_PATH"
-
-/* Standard libtool archive file extension.  */
-#undef  LTDL_ARCHIVE_EXT
-#define LTDL_ARCHIVE_EXT        ".la"
-
-/* max. filename length */
-#ifndef LT_FILENAME_MAX
-#  define LT_FILENAME_MAX       1024
-#endif
-
-/* This is the maximum symbol size that won't require malloc/free */
-#undef  LT_SYMBOL_LENGTH
-#define LT_SYMBOL_LENGTH        128
-
-/* This accounts for the _LTX_ separator */
-#undef  LT_SYMBOL_OVERHEAD
-#define LT_SYMBOL_OVERHEAD      5
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* These are the functions used internally.  In addition to making
-   use of the associated function pointers above, they also perform
-   error handling.  */
-static char *lt_estrdup LT_PARAMS ((const char *str));
-static lt_ptr lt_emalloc LT_PARAMS ((size_t size));
-static lt_ptr lt_erealloc LT_PARAMS ((lt_ptr addr, size_t size));
-
-/* static lt_ptr rpl_realloc    LT_PARAMS((lt_ptr ptr, size_t size)); */
-#define rpl_realloc realloc
-
-/* These are the pointers that can be changed by the caller:  */
-LT_GLOBAL_DATA
-lt_ptr (*lt_dlmalloc)
-LT_PARAMS ((size_t size)) = (lt_ptr (*)LT_PARAMS ((size_t))) malloc;
-     LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc)
-  LT_PARAMS ((lt_ptr ptr, size_t size)) =
-  (lt_ptr (*)LT_PARAMS ((lt_ptr, size_t))) rpl_realloc;
-     LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS ((lt_ptr ptr)) =
-  (void (*)LT_PARAMS ((lt_ptr))) free;
-
-/* The following macros reduce the amount of typing needed to cast
-   assigned memory.  */
-#if WITH_DGNUNET_malloc
-
-#define LT_DLGNUNET_malloc(tp, n)       ((tp *) xmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n)  ((tp *) xrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLGNUNET_free(p)                                             \
-        LT_STMT_START { if (p) (p) = (xfree (p), (lt_ptr) 0); } LT_STMT_END
-
-#define LT_EGNUNET_malloc(tp, n)        ((tp *) xmalloc ((n) * sizeof(tp)))
-#define LT_EREALLOC(tp, p, n)   ((tp *) xrealloc ((p), (n) * sizeof(tp)))
-
-#else
-
-#define LT_DLGNUNET_malloc(tp, n)       ((tp *) lt_dlmalloc ((n) * sizeof(tp)))
-#define LT_DLREALLOC(tp, p, n)  ((tp *) lt_dlrealloc ((p), (n) * sizeof(tp)))
-#define LT_DLGNUNET_free(p)                                             \
-        LT_STMT_START { if (p) (p) = (lt_dlfree (p), (lt_ptr) 0); } LT_STMT_END
-
-#define LT_EGNUNET_malloc(tp, n)        ((tp *) lt_emalloc ((n) * sizeof(tp)))
-#define LT_EREALLOC(tp, p, n)   ((tp *) lt_erealloc ((p), (n) * sizeof(tp)))
-
-#endif
-
-#define LT_DLMEM_REASSIGN(p, q)                 LT_STMT_START { \
-        if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; }   \
-                                                } LT_STMT_END
-
-
-/* --- REPLACEMENT FUNCTIONS --- */
-
-
-#undef strdup
-#define strdup rpl_strdup
-
-     static char *strdup LT_PARAMS ((const char *str));
-
-     static char *strdup (str)
-     const char *str;
-{
-  char *tmp = 0;
-
-  if (str)
-    {
-      tmp = LT_DLGNUNET_malloc (char, 1 + strlen (str));
-      if (tmp)
-        {
-          strcpy (tmp, str);
-        }
-    }
-
-  return tmp;
-}
-
-
-#if ! HAVE_STRCMP
-
-#undef strcmp
-#define strcmp rpl_strcmp
-
-static int strcmp LT_PARAMS ((const char *str1, const char *str2));
-
-static int
-strcmp (str1, str2)
-     const char *str1;
-     const char *str2;
-{
-  if (str1 == str2)
-    return 0;
-  if (str1 == 0)
-    return -1;
-  if (str2 == 0)
-    return 1;
-
-  for (; *str1 && *str2; ++str1, ++str2)
-    {
-      if (*str1 != *str2)
-        break;
-    }
-
-  return (int) (*str1 - *str2);
-}
-#endif
-
-
-#if ! HAVE_STRCHR
-
-#  if HAVE_INDEX
-#    define strchr index
-#  else
-#    define strchr rpl_strchr
-
-static const char *strchr LT_PARAMS ((const char *str, int ch));
-
-static const char *
-strchr (str, ch)
-     const char *str;
-     int ch;
-{
-  const char *p;
-
-  for (p = str; *p != (char) ch && *p != LT_EOS_CHAR; ++p)
-     /*NOWORK*/;
-
-  return (*p == (char) ch) ? p : 0;
-}
-
-#  endif
-#endif /* !HAVE_STRCHR */
-
-
-#if ! HAVE_STRRCHR
-
-#  if HAVE_RINDEX
-#    define strrchr rindex
-#  else
-#    define strrchr rpl_strrchr
-
-static const char *strrchr LT_PARAMS ((const char *str, int ch));
-
-static const char *
-strrchr (str, ch)
-     const char *str;
-     int ch;
-{
-  const char *p, *q = 0;
-
-  for (p = str; *p != LT_EOS_CHAR; ++p)
-    {
-      if (*p == (char) ch)
-        {
-          q = p;
-        }
-    }
-
-  return q;
-}
-
-# endif
-#endif
-
-/* NOTE:  Neither bcopy nor the memcpy implementation below can
-          reliably handle copying in overlapping areas of memory.  Use
-          memmove (for which there is a fallback implmentation below)
-          if you need that behaviour.  */
-#if ! HAVE_MEMCPY
-
-#  if HAVE_BCOPY
-#    define memcpy(dest, src, size)     bcopy (src, dest, size)
-#  else
-#    define memcpy rpl_memcpy
-
-static lt_ptr memcpy LT_PARAMS ((lt_ptr dest, const lt_ptr src, size_t size));
-
-static lt_ptr
-memcpy (dest, src, size)
-     lt_ptr dest;
-     const lt_ptr src;
-     size_t size;
-{
-  size_t i = 0;
-
-  for (i = 0; i < size; ++i)
-    {
-      dest[i] = src[i];
-    }
-
-  return dest;
-}
-
-#  endif /* !HAVE_BCOPY */
-#endif /* !HAVE_MEMCPY */
-
-#if ! HAVE_MEMMOVE
-#  define memmove rpl_memmove
-
-static lt_ptr memmove
-LT_PARAMS ((lt_ptr dest, const lt_ptr src, size_t size));
-
-static lt_ptr
-memmove (dest, src, size)
-     lt_ptr dest;
-     const lt_ptr src;
-     size_t size;
-{
-  size_t i;
-
-  if (dest < src)
-    for (i = 0; i < size; ++i)
-      {
-        dest[i] = src[i];
-      }
-  else if (dest > src)
-    for (i = size - 1; i >= 0; --i)
-      {
-        dest[i] = src[i];
-      }
-
-  return dest;
-}
-
-#endif /* !HAVE_MEMMOVE */
-
-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION
-
-static void closedir LT_PARAMS ((DIR * entry));
-
-static void
-closedir (entry)
-     DIR *entry;
-{
-  assert (entry != (DIR *) NULL);
-  FindClose (entry->hSearch);
-  lt_dlfree ((lt_ptr) entry);
-}
-
-
-static DIR *opendir LT_PARAMS ((const char *path));
-
-static DIR *
-opendir (path)
-     const char *path;
-{
-  char file_specification[LT_FILENAME_MAX];
-  DIR *entry;
-
-  assert (path != (char *) NULL);
-  (void) strncpy (file_specification, path, LT_FILENAME_MAX - 1);
-  (void) strcat (file_specification, "\\");
-  entry = LT_DLGNUNET_malloc (DIR, sizeof (DIR));
-  if (entry != (DIR *) 0)
-    {
-      entry->firsttime = TRUE;
-      entry->hSearch =
-        FindFirstFile (file_specification, &entry->Win32FindData);
-    }
-  if (entry->hSearch == INVALID_HANDLE_VALUE)
-    {
-      (void) strcat (file_specification, "\\*.*");
-      entry->hSearch =
-        FindFirstFile (file_specification, &entry->Win32FindData);
-      if (entry->hSearch == INVALID_HANDLE_VALUE)
-        {
-          LT_DLGNUNET_free (entry);
-          return (DIR *) 0;
-        }
-    }
-  return (entry);
-}
-
-
-static struct dirent *readdir LT_PARAMS ((DIR * entry));
-
-static struct dirent *
-readdir (entry)
-     DIR *entry;
-{
-  int status;
-
-  if (entry == (DIR *) 0)
-    return ((struct dirent *) 0);
-  if (!entry->firsttime)
-    {
-      status = FindNextFile (entry->hSearch, &entry->Win32FindData);
-      if (status == 0)
-        return ((struct dirent *) 0);
-    }
-  entry->firsttime = FALSE;
-  (void) strncpy (entry->file_info.d_name, entry->Win32FindData.cFileName,
-                  LT_FILENAME_MAX - 1);
-  entry->file_info.d_namlen = strlen (entry->file_info.d_name);
-  return (&entry->file_info);
-}
-
-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
-/* According to Alexandre Oliva <oliva@lsd.ic.unicamp.br>,
-    ``realloc is not entirely portable''
-   In any case we want to use the allocator supplied by the user without
-   burdening them with an lt_dlrealloc function pointer to maintain.
-   Instead implement our own version (with known boundary conditions)
-   using lt_dlmalloc and lt_dlfree. */
-
-/* #undef realloc
-   #define realloc rpl_realloc
-*/
-#if 0
-  /* You can't (re)define realloc unless you also (re)define malloc.
-     Right now, this code uses the size of the *destination* to decide
-     how much to copy.  That's not right, but you can't know the size
-     of the source unless you know enough about, or wrote malloc.  So
-     this code is disabled... */
-
-static lt_ptr
-realloc (ptr, size)
-     lt_ptr ptr;
-     size_t size;
-{
-  if (size == 0)
-    {
-      /* For zero or less bytes, free the original memory */
-      if (ptr != 0)
-        {
-          lt_dlfree (ptr);
-        }
-
-      return (lt_ptr) 0;
-    }
-  else if (ptr == 0)
-    {
-      /* Allow reallocation of a NULL pointer.  */
-      return lt_dlmalloc (size);
-    }
-  else
-    {
-      /* Allocate a new block, copy and free the old block.  */
-      lt_ptr mem = lt_dlmalloc (size);
-
-      if (mem)
-        {
-          memcpy (mem, ptr, size);
-          lt_dlfree (ptr);
-        }
-
-      /* Note that the contents of PTR are not damaged if there is
-         insufficient memory to realloc.  */
-      return mem;
-    }
-}
-#endif
-
-
-#if ! HAVE_ARGZ_APPEND
-#  define argz_append rpl_argz_append
-
-static error_t argz_append LT_PARAMS ((char **pargz, size_t * pargz_len,
-                                       const char *buf, size_t buf_len));
-
-static error_t
-argz_append (pargz, pargz_len, buf, buf_len)
-     char **pargz;
-     size_t *pargz_len;
-     const char *buf;
-     size_t buf_len;
-{
-  size_t argz_len;
-  char *argz;
-
-  assert (pargz);
-  assert (pargz_len);
-  assert ((*pargz && *pargz_len) || (!*pargz && !*pargz_len));
-
-  /* If nothing needs to be appended, no more work is required.  */
-  if (buf_len == 0)
-    return 0;
-
-  /* Ensure there is enough room to append BUF_LEN.  */
-  argz_len = *pargz_len + buf_len;
-  argz = LT_DLREALLOC (char, *pargz, argz_len);
-  if (!argz)
-    return ENOMEM;
-
-  /* Copy characters from BUF after terminating '\0' in ARGZ.  */
-  memcpy (argz + *pargz_len, buf, buf_len);
-
-  /* Assign new values.  */
-  *pargz = argz;
-  *pargz_len = argz_len;
-
-  return 0;
-}
-#endif /* !HAVE_ARGZ_APPEND */
-
-
-#if ! HAVE_ARGZ_CREATE_SEP
-#  define argz_create_sep rpl_argz_create_sep
-
-static error_t argz_create_sep LT_PARAMS ((const char *str, int delim,
-                                           char **pargz, size_t * pargz_len));
-
-static error_t
-argz_create_sep (str, delim, pargz, pargz_len)
-     const char *str;
-     int delim;
-     char **pargz;
-     size_t *pargz_len;
-{
-  size_t argz_len;
-  char *argz = 0;
-
-  assert (str);
-  assert (pargz);
-  assert (pargz_len);
-
-  /* Make a copy of STR, but replacing each occurence of
-     DELIM with '\0'.  */
-  argz_len = 1 + LT_STRLEN (str);
-  if (argz_len)
-    {
-      const char *p;
-      char *q;
-
-      argz = LT_DLGNUNET_malloc (char, argz_len);
-      if (!argz)
-        return ENOMEM;
-
-      for (p = str, q = argz; *p != LT_EOS_CHAR; ++p)
-        {
-          if (*p == delim)
-            {
-              /* Ignore leading delimiters, and fold consecutive
-                 delimiters in STR into a single '\0' in ARGZ.  */
-              if ((q > argz) && (q[-1] != LT_EOS_CHAR))
-                *q++ = LT_EOS_CHAR;
-              else
-                --argz_len;
-            }
-          else
-            *q++ = *p;
-        }
-      /* Copy terminating LT_EOS_CHAR.  */
-      *q = *p;
-    }
-
-  /* If ARGZ_LEN has shrunk to nothing, release ARGZ's memory.  */
-  if (!argz_len)
-    LT_DLGNUNET_free (argz);
-
-  /* Assign new values.  */
-  *pargz = argz;
-  *pargz_len = argz_len;
-
-  return 0;
-}
-#endif /* !HAVE_ARGZ_CREATE_SEP */
-
-
-#if ! HAVE_ARGZ_INSERT
-#  define argz_insert rpl_argz_insert
-
-static error_t argz_insert LT_PARAMS ((char **pargz, size_t * pargz_len,
-                                       char *before, const char *entry));
-
-static error_t
-argz_insert (pargz, pargz_len, before, entry)
-     char **pargz;
-     size_t *pargz_len;
-     char *before;
-     const char *entry;
-{
-  assert (pargz);
-  assert (pargz_len);
-  assert (entry && *entry);
-
-  /* No BEFORE address indicates ENTRY should be inserted after the
-     current last element.  */
-  if (!before)
-    return argz_append (pargz, pargz_len, entry, 1 + LT_STRLEN (entry));
-
-  /* This probably indicates a programmer error, but to preserve
-     semantics, scan back to the start of an entry if BEFORE points
-     into the middle of it.  */
-  while ((before > *pargz) && (before[-1] != LT_EOS_CHAR))
-    --before;
-
-  {
-    size_t entry_len = 1 + LT_STRLEN (entry);
-    size_t argz_len = *pargz_len + entry_len;
-    size_t offset = before - *pargz;
-    char *argz = LT_DLREALLOC (char, *pargz, argz_len);
-
-    if (!argz)
-      return ENOMEM;
-
-    /* Make BEFORE point to the equivalent offset in ARGZ that it
-       used to have in *PARGZ incase realloc() moved the block.  */
-    before = argz + offset;
-
-    /* Move the ARGZ entries starting at BEFORE up into the new
-       space at the end -- making room to copy ENTRY into the
-       resulting gap.  */
-    memmove (before + entry_len, before, *pargz_len - offset);
-    memcpy (before, entry, entry_len);
-
-    /* Assign new values.  */
-    *pargz = argz;
-    *pargz_len = argz_len;
-  }
-
-  return 0;
-}
-#endif /* !HAVE_ARGZ_INSERT */
-
-
-#if ! HAVE_ARGZ_NEXT
-#  define argz_next rpl_argz_next
-
-static char *argz_next LT_PARAMS ((char *argz, size_t argz_len,
-                                   const char *entry));
-
-static char *
-argz_next (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  assert ((argz && argz_len) || (!argz && !argz_len));
-
-  if (entry)
-    {
-      /* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address
-         within the ARGZ vector.  */
-      assert ((!argz && !argz_len)
-              || ((argz <= entry) && (entry < (argz + argz_len))));
-
-      /* Move to the char immediately after the terminating
-         '\0' of ENTRY.  */
-      entry = 1 + strchr (entry, LT_EOS_CHAR);
-
-      /* Return either the new ENTRY, or else NULL if ARGZ is
-         exhausted.  */
-      return (entry >= argz + argz_len) ? 0 : (char *) entry;
-    }
-  else
-    {
-      /* This should probably be flagged as a programmer error,
-         since starting an argz_next loop with the iterator set
-         to ARGZ is safer.  To preserve semantics, handle the NULL
-         case by returning the start of ARGZ (if any).  */
-      if (argz_len > 0)
-        return argz;
-      else
-        return 0;
-    }
-}
-#endif /* !HAVE_ARGZ_NEXT */
-
-
-
-#if ! HAVE_ARGZ_STRINGIFY
-#  define argz_stringify rpl_argz_stringify
-
-static void argz_stringify LT_PARAMS ((char *argz, size_t argz_len, int sep));
-
-static void
-argz_stringify (argz, argz_len, sep)
-     char *argz;
-     size_t argz_len;
-     int sep;
-{
-  assert ((argz && argz_len) || (!argz && !argz_len));
-
-  if (sep)
-    {
-      --argz_len;               /* don't stringify the terminating EOS */
-      while (--argz_len > 0)
-        {
-          if (argz[argz_len] == LT_EOS_CHAR)
-            argz[argz_len] = sep;
-        }
-    }
-}
-#endif /* !HAVE_ARGZ_STRINGIFY */
-
-
-
-
-/* --- TYPE DEFINITIONS -- */
-
-
-/* This type is used for the array of caller data sets in each handler. */
-typedef struct
-{
-  lt_dlcaller_id key;
-  lt_ptr data;
-} lt_caller_data;
-
-
-
-
-/* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
-
-
-/* Extract the diagnostic strings from the error table macro in the same
-   order as the enumerated indices in ltdl.h. */
-
-static const char *lt_dlerror_strings[] = {
-#define LT_ERROR(name, diagnostic)      (diagnostic),
-  lt_dlerror_table
-#undef LT_ERROR
-  0
-};
-
-/* This structure is used for the list of registered loaders. */
-struct lt_dlloader
-{
-  struct lt_dlloader *next;
-  const char *loader_name;      /* identifying name for each loader */
-  const char *sym_prefix;       /* prefix for symbols */
-  lt_module_open *module_open;
-  lt_module_close *module_close;
-  lt_find_sym *find_sym;
-  lt_dlloader_exit *dlloader_exit;
-  lt_user_data dlloader_data;
-};
-
-struct lt_dlhandle_struct
-{
-  struct lt_dlhandle_struct *next;
-  lt_dlloader *loader;          /* dlopening interface */
-  lt_dlinfo info;
-  int depcount;                 /* number of dependencies */
-  lt_dlhandle *deplibs;         /* dependencies */
-  lt_module module;             /* system module handle */
-  lt_ptr system;                /* system specific data */
-  lt_caller_data *caller_data;  /* per caller associated data */
-  int flags;                    /* various boolean stats */
-};
-
-/* Various boolean flags can be stored in the flags field of an
-   lt_dlhandle_struct... */
-#define LT_DLGET_FLAG(handle, flag) (((handle)->flags & (flag)) == (flag))
-#define LT_DLSET_FLAG(handle, flag) ((handle)->flags |= (flag))
-
-#define LT_DLRESIDENT_FLAG          (0x01 << 0)
-/* ...add more flags here... */
-
-#define LT_DLIS_RESIDENT(handle)    LT_DLGET_FLAG(handle, LT_DLRESIDENT_FLAG)
-
-
-#define LT_DLSTRERROR(name)     lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
-
-static const char objdir[] = LTDL_OBJDIR;
-static const char archive_ext[] = LTDL_ARCHIVE_EXT;
-#ifdef  LTDL_SHLIB_EXT
-static const char shlib_ext[] = LTDL_SHLIB_EXT;
-#endif
-#ifdef  LTDL_SYSSEARCHPATH
-static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
-#endif
-
-
-
-
-/* --- GNUNET_Mutex LOCKING --- */
-
-
-/* Macros to make it easier to run the lock functions only if they have
-   been registered.  The reason for the complicated lock macro is to
-   ensure that the stored error message from the last error is not
-   accidentally erased if the current function doesn't generate an
-   error of its own.  */
-#define LT_DLGNUNET_mutex_lock()                        LT_STMT_START { \
-        if (lt_dlmutex_lock_func) (*lt_dlmutex_lock_func)();    \
-                                                } LT_STMT_END
-#define LT_DLMUTEX_UNLOCK()                     LT_STMT_START { \
-        if (lt_dlmutex_unlock_func) (*lt_dlmutex_unlock_func)();\
-                                                } LT_STMT_END
-#define LT_DLMUTEX_SETERROR(errormsg)           LT_STMT_START { \
-        if (lt_dlmutex_seterror_func)                           \
-                (*lt_dlmutex_seterror_func) (errormsg);         \
-        else    lt_dllast_error = (errormsg);   } LT_STMT_END
-#define LT_DLMUTEX_GETERROR(errormsg)           LT_STMT_START { \
-        if (lt_dlmutex_seterror_func)                           \
-                (errormsg) = (*lt_dlmutex_geterror_func) ();    \
-        else    (errormsg) = lt_dllast_error;   } LT_STMT_END
-
-/* The mutex functions stored here are global, and are necessarily the
-   same for all threads that wish to share access to libltdl.  */
-static lt_dlmutex_lock *lt_dlmutex_lock_func = 0;
-static lt_dlmutex_unlock *lt_dlmutex_unlock_func = 0;
-static lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
-static lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
-static const char *lt_dllast_error = 0;
-
-
-/* Either set or reset the mutex functions.  Either all the arguments must
-   be valid functions, or else all can be NULL to turn off locking entirely.
-   The registered functions should be manipulating a static global lock
-   from the lock() and unlock() callbacks, which needs to be reentrant.  */
-int
-lt_dlmutex_register (lock, unlock, seterror, geterror)
-     lt_dlmutex_lock *lock;
-     lt_dlmutex_unlock *unlock;
-     lt_dlmutex_seterror *seterror;
-     lt_dlmutex_geterror *geterror;
-{
-  lt_dlmutex_unlock *old_unlock = unlock;
-  int errors = 0;
-
-  /* Lock using the old lock() callback, if any.  */
-  LT_DLGNUNET_mutex_lock ();
-
-  if ((lock && unlock && seterror && geterror)
-      || !(lock || unlock || seterror || geterror))
-    {
-      lt_dlmutex_lock_func = lock;
-      lt_dlmutex_unlock_func = unlock;
-      lt_dlmutex_geterror_func = geterror;
-    }
-  else
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_MUTEX_ARGS));
-      ++errors;
-    }
-
-  /* Use the old unlock() callback we saved earlier, if any.  Otherwise
-     record any errors using internal storage.  */
-  if (old_unlock)
-    (*old_unlock) ();
-
-  /* Return the number of errors encountered during the execution of
-     this function.  */
-  return errors;
-}
-
-
-
-
-/* --- ERROR HANDLING --- */
-
-
-static const char **user_error_strings = 0;
-static int errorcount = LT_ERROR_MAX;
-
-int
-lt_dladderror (diagnostic)
-     const char *diagnostic;
-{
-  int errindex = 0;
-  int result = -1;
-  const char **temp = (const char **) 0;
-
-  assert (diagnostic);
-
-  LT_DLGNUNET_mutex_lock ();
-
-  errindex = errorcount - LT_ERROR_MAX;
-  temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex);
-  if (temp)
-    {
-      user_error_strings = temp;
-      user_error_strings[errindex] = diagnostic;
-      result = errorcount++;
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-int
-lt_dlseterror (errindex)
-     int errindex;
-{
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  if (errindex >= errorcount || errindex < 0)
-    {
-      /* Ack!  Error setting the error message! */
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_ERRORCODE));
-      ++errors;
-    }
-  else if (errindex < LT_ERROR_MAX)
-    {
-      /* No error setting the error message! */
-      LT_DLMUTEX_SETERROR (lt_dlerror_strings[errindex]);
-    }
-  else
-    {
-      /* No error setting the error message! */
-      LT_DLMUTEX_SETERROR (user_error_strings[errindex - LT_ERROR_MAX]);
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-static lt_ptr
-lt_emalloc (size)
-     size_t size;
-{
-  lt_ptr mem = lt_dlmalloc (size);
-  if (size && !mem)
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-  return mem;
-}
-
-static lt_ptr
-lt_erealloc (addr, size)
-     lt_ptr addr;
-     size_t size;
-{
-  lt_ptr mem = lt_dlrealloc (addr, size);
-  if (size && !mem)
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-  return mem;
-}
-
-static char *
-lt_estrdup (str)
-     const char *str;
-{
-  char *copy = strdup (str);
-  if (LT_STRLEN (str) && !copy)
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-  return copy;
-}
-
-
-
-
-/* --- DLOPEN() INTERFACE LOADER --- */
-
-
-#if HAVE_LIBDL
-
-/* dynamic linking with dlopen/dlsym */
-
-#if HAVE_DLFCN_H
-#  include <dlfcn.h>
-#endif
-
-#if HAVE_SYS_DL_H
-#  include <sys/dl.h>
-#endif
-
-/* We may have to define LT_LAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_LAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_LAZY_OR_NOW      RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_LAZY_OR_NOW    DL_LAZY
-#    endif
-#  endif /* !RTLD_LAZY */
-#endif
-#ifndef LT_LAZY_OR_NOW
-#  ifdef RTLD_NOW
-#    define LT_LAZY_OR_NOW      RTLD_NOW
-#  else
-#    ifdef DL_NOW
-#      define LT_LAZY_OR_NOW    DL_NOW
-#    endif
-#  endif /* !RTLD_NOW */
-#endif
-#ifndef LT_LAZY_OR_NOW
-#  define LT_LAZY_OR_NOW        0
-#endif /* !LT_LAZY_OR_NOW */
-
-#if HAVE_DLERROR
-#  define DLERROR(arg)  dlerror ()
-#else
-#  define DLERROR(arg)  LT_DLSTRERROR (arg)
-#endif
-
-static lt_module
-sys_dl_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_module module = dlopen (filename, LT_LAZY_OR_NOW);
-
-  if (!module)
-    {
-      LT_DLMUTEX_SETERROR (DLERROR (CANNOT_OPEN));
-    }
-
-  return module;
-}
-
-static int
-sys_dl_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (dlclose (module) != 0)
-    {
-      LT_DLMUTEX_SETERROR (DLERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_dl_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = dlsym (module, symbol);
-
-  if (!address)
-    {
-      LT_DLMUTEX_SETERROR (DLERROR (SYMBOL_NOT_FOUND));
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_dl = {
-#  ifdef NEED_USCORE
-  "_",
-#  else
-  0,
-#  endif
-  sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0
-};
-
-
-#endif /* HAVE_LIBDL */
-
-
-
-/* --- SHL_LOAD() INTERFACE LOADER --- */
-
-#if HAVE_SHL_LOAD
-
-/* dynamic linking with shl_load (HP-UX) (comments from gmodule) */
-
-#ifdef HAVE_DL_H
-#  include <dl.h>
-#endif
-
-/* some flags are missing on some systems, so we provide
- * harmless defaults.
- *
- * Mandatory:
- * BIND_IMMEDIATE  - Resolve symbol references when the library is loaded.
- * BIND_DEFERRED   - Delay code symbol resolution until actual reference.
- *
- * Optionally:
- * BIND_FIRST      - Place the library at the head of the symbol search
- *                   order.
- * BIND_NONFATAL   - The default BIND_IMMEDIATE behavior is to treat all
- *                   unsatisfied symbols as fatal.  This flag allows
- *                   binding of unsatisfied code symbols to be deferred
- *                   until use.
- *                   [Perl: For certain libraries, like DCE, deferred
- *                   binding often causes run time problems. Adding
- *                   BIND_NONFATAL to BIND_IMMEDIATE still allows
- *                   unresolved references in situations like this.]
- * BIND_NOSTART    - Do not call the initializer for the shared library
- *                   when the library is loaded, nor on a future call to
- *                   shl_unload().
- * BIND_VERBOSE    - Print verbose messages concerning possible
- *                   unsatisfied symbols.
- *
- * hp9000s700/hp9000s800:
- * BIND_RESTRICTED - Restrict symbols visible by the library to those
- *                   present at library load time.
- * DYNAMIC_PATH    - Allow the loader to dynamically search for the
- *                   library specified by the path argument.
- */
-
-#ifndef DYNAMIC_PATH
-#  define DYNAMIC_PATH          0
-#endif
-#ifndef BIND_RESTRICTED
-#  define BIND_RESTRICTED       0
-#endif
-
-#define LT_BIND_FLAGS   (BIND_IMMEDIATE | BIND_NONFATAL | DYNAMIC_PATH)
-
-static lt_module
-sys_shl_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  static shl_t self = (shl_t) 0;
-  lt_module module = shl_load (filename, LT_BIND_FLAGS, 0L);
-
-  /* Since searching for a symbol against a NULL module handle will also
-     look in everything else that was already loaded and exported with
-     the -E compiler flag, we always cache a handle saved before any
-     modules are loaded.  */
-  if (!self)
-    {
-      lt_ptr address;
-      shl_findsym (&self, "main", TYPE_UNDEFINED, &address);
-    }
-
-  if (!filename)
-    {
-      module = self;
-    }
-  else
-    {
-      module = shl_load (filename, LT_BIND_FLAGS, 0L);
-
-      if (!module)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-        }
-    }
-
-  return module;
-}
-
-static int
-sys_shl_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (module && (shl_unload ((shl_t) (module)) != 0))
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_shl_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = 0;
-
-  /* sys_shl_open should never return a NULL module handle */
-  if (module == (lt_module) 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-    }
-  else
-    if (!shl_findsym ((shl_t *) & module, symbol, TYPE_UNDEFINED, &address))
-    {
-      if (!address)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-        }
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_shl = {
-  0, sys_shl_open, sys_shl_close, sys_shl_sym, 0, 0
-};
-
-#endif /* HAVE_SHL_LOAD */
-
-
-
-
-/* --- LOADLIBRARY() INTERFACE LOADER --- */
-
-#ifdef __WINDOWS__
-
-/* dynamic linking for Win32 */
-
-#include <windows.h>
-
-/* Forward declaration; required to implement handle search below. */
-static lt_dlhandle handles;
-
-static lt_module
-sys_wll_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_dlhandle cur;
-  lt_module module = 0;
-  const char *errormsg = 0;
-  char *searchname = 0;
-  char *ext;
-  char self_name_buf[MAX_PATH];
-
-  if (!filename)
-    {
-      /* Get the name of main module */
-      *self_name_buf = 0;
-      GetModuleFileName (NULL, self_name_buf, sizeof (self_name_buf));
-      filename = ext = self_name_buf;
-    }
-  else
-    {
-      ext = strrchr (filename, '.');
-    }
-
-  if (ext)
-    {
-      /* FILENAME already has an extension. */
-      searchname = lt_estrdup (filename);
-    }
-  else
-    {
-      /* Append a `.' to stop Windows from adding an
-         implicit `.dll' extension. */
-      searchname = LT_EGNUNET_malloc (char, 2 + LT_STRLEN (filename));
-      if (searchname)
-        sprintf (searchname, "%s.", filename);
-    }
-  if (!searchname)
-    return 0;
-
-#if __CYGWIN__
-  {
-    char wpath[MAX_PATH];
-    cygwin_conv_to_full_win32_path (searchname, wpath);
-    module = LoadLibrary (wpath);
-  }
-#else
-  module = LoadLibrary (searchname);
-#endif
-  LT_DLGNUNET_free (searchname);
-
-  /* libltdl expects this function to fail if it is unable
-     to physically load the library.  Sadly, LoadLibrary
-     will search the loaded libraries for a match and return
-     one of them if the path search load fails.
-
-     We check whether LoadLibrary is returning a handle to
-     an already loaded module, and simulate failure if we
-     find one. */
-  LT_DLGNUNET_mutex_lock ();
-  cur = handles;
-  while (cur)
-    {
-      if (!cur->module)
-        {
-          cur = 0;
-          break;
-        }
-
-      if (cur->module == module)
-        {
-          break;
-        }
-
-      cur = cur->next;
-    }
-  LT_DLMUTEX_UNLOCK ();
-
-  if (cur || !module)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      module = 0;
-    }
-
-  return module;
-}
-
-static int
-sys_wll_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (FreeLibrary (module) == 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_wll_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = GetProcAddress (module, symbol);
-
-  if (!address)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_wll = {
-  0, sys_wll_open, sys_wll_close, sys_wll_sym, 0, 0
-};
-
-#endif /* __WINDOWS__ */
-
-
-
-
-/* --- LOAD_ADD_ON() INTERFACE LOADER --- */
-
-
-#ifdef __BEOS__
-
-/* dynamic linking for BeOS */
-
-#include <kernel/image.h>
-
-static lt_module
-sys_bedl_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  image_id image = 0;
-
-  if (filename)
-    {
-      image = load_add_on (filename);
-    }
-  else
-    {
-      image_info info;
-      int32 cookie = 0;
-      if (get_next_image_info (0, &cookie, &info) == B_OK)
-        image = load_add_on (info.name);
-    }
-
-  if (image <= 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      image = 0;
-    }
-
-  return (lt_module) image;
-}
-
-static int
-sys_bedl_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (unload_add_on ((image_id) module) != B_OK)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_bedl_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = 0;
-  image_id image = (image_id) module;
-
-  if (get_image_symbol (image, symbol, B_SYMBOL_TYPE_ANY, address) != B_OK)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-      address = 0;
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_bedl = {
-  0, sys_bedl_open, sys_bedl_close, sys_bedl_sym, 0, 0
-};
-
-#endif /* __BEOS__ */
-
-
-
-
-/* --- DLD_LINK() INTERFACE LOADER --- */
-
-
-#if HAVE_DLD
-
-/* dynamic linking with dld */
-
-#if HAVE_DLD_H
-#include <dld.h>
-#endif
-
-static lt_module
-sys_dld_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_module module = strdup (filename);
-
-  if (dld_link (filename) != 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-      LT_DLGNUNET_free (module);
-      module = 0;
-    }
-
-  return module;
-}
-
-static int
-sys_dld_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int errors = 0;
-
-  if (dld_unlink_by_file ((char *) (module), 1) != 0)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
-      ++errors;
-    }
-  else
-    {
-      LT_DLGNUNET_free (module);
-    }
-
-  return errors;
-}
-
-static lt_ptr
-sys_dld_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = dld_get_func (symbol);
-
-  if (!address)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-    }
-
-  return address;
-}
-
-static struct lt_user_dlloader sys_dld = {
-  0, sys_dld_open, sys_dld_close, sys_dld_sym, 0, 0
-};
-
-#endif /* HAVE_DLD */
-
-/* --- DYLD() MACOSX/DARWIN INTERFACE LOADER --- */
-#if HAVE_DYLD
-
-
-#if HAVE_MACH_O_DYLD_H
-#if !defined(__APPLE_CC__) && !defined(__MWERKS__) && !defined(__private_extern__)
-/* Is this correct? Does it still function properly? */
-#define __private_extern__ extern
-#endif
-# include <mach-o/dyld.h>
-#endif
-#include <mach-o/getsect.h>
-
-/* We have to put some stuff here that isn't in older dyld.h files */
-#ifndef ENUM_DYLD_BOOL
-# define ENUM_DYLD_BOOL
-# undef FALSE
-# undef TRUE
-enum DYLD_BOOL
-{
-  FALSE,
-  TRUE
-};
-#endif
-#ifndef LC_REQ_DYLD
-# define LC_REQ_DYLD 0x80000000
-#endif
-#ifndef LC_LOAD_WEAK_DYLIB
-# define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
-#endif
-static const struct mach_header *(*ltdl_NSAddImage) (const char *image_name,
-                                                     unsigned long options) =
-  0;
-static NSSymbol (*ltdl_NSLookupSymbolInImage) (const struct mach_header *
-                                               image, const char *symbolName,
-                                               unsigned long options) = 0;
-static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage) (const struct
-                                                            mach_header *
-                                                            image,
-                                                            const char
-                                                            *symbolName) = 0;
-static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
-
-#ifndef NSADDIMAGE_OPTION_NONE
-#define NSADDIMAGE_OPTION_NONE                          0x0
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ON_ERROR
-#define NSADDIMAGE_OPTION_RETURN_ON_ERROR               0x1
-#endif
-#ifndef NSADDIMAGE_OPTION_WITH_SEARCHING
-#define NSADDIMAGE_OPTION_WITH_SEARCHING                0x2
-#endif
-#ifndef NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
-#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED         0x4
-#endif
-#ifndef NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME
-#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME 0x8
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND            0x0
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW        0x1
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY      0x2
-#endif
-#ifndef NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
-#endif
-
-
-static const char *
-lt_int_dyld_error (othererror)
-     char *othererror;
-{
-/* return the dyld error string, or the passed in error string if none */
-  NSLinkEditErrors ler;
-  int lerno;
-  const char *errstr;
-  const char *file;
-  NSLinkEditError (&ler, &lerno, &file, &errstr);
-  if (!errstr || !strlen (errstr))
-    errstr = othererror;
-  return errstr;
-}
-
-static const struct mach_header *
-lt_int_dyld_get_mach_header_from_nsmodule (module)
-     NSModule module;
-{
-/* There should probably be an apple dyld api for this */
-  int i = _dyld_image_count ();
-  int j;
-  const char *modname = NSNameOfModule (module);
-  const struct mach_header *mh = NULL;
-  if (!modname)
-    return NULL;
-  for (j = 0; j < i; j++)
-    {
-      if (!strcmp (_dyld_get_image_name (j), modname))
-        {
-          mh = _dyld_get_image_header (j);
-          break;
-        }
-    }
-  return mh;
-}
-
-static const char *
-lt_int_dyld_lib_install_name (mh)
-     const struct mach_header *mh;
-{
-/* NSAddImage is also used to get the loaded image, but it only works if the lib
-   is installed, for uninstalled libs we need to check the install_names against
-   each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
-   different lib was loaded as a result
-*/
-  int j;
-  struct load_command *lc;
-  unsigned long offset = sizeof (struct mach_header);
-  const char *retStr = NULL;
-  for (j = 0; j < mh->ncmds; j++)
-    {
-      lc = (struct load_command *) (((unsigned long) mh) + offset);
-      if (LC_ID_DYLIB == lc->cmd)
-        {
-          retStr =
-            (char *) (((struct dylib_command *) lc)->dylib.name.offset +
-                      (unsigned long) lc);
-        }
-      offset += lc->cmdsize;
-    }
-  return retStr;
-}
-
-static const struct mach_header *
-lt_int_dyld_match_loaded_lib_by_install_name (const char *name)
-{
-  int i = _dyld_image_count ();
-  int j;
-  const struct mach_header *mh = NULL;
-  const char *id = NULL;
-  for (j = 0; j < i; j++)
-    {
-      id = lt_int_dyld_lib_install_name (_dyld_get_image_header (j));
-      if ((id) && (!strcmp (id, name)))
-        {
-          mh = _dyld_get_image_header (j);
-          break;
-        }
-    }
-  return mh;
-}
-
-static NSSymbol
-lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh)
-     const char *symbol;
-     const struct mach_header *mh;
-{
-  /* Safe to assume our mh is good */
-  int j;
-  struct load_command *lc;
-  unsigned long offset = sizeof (struct mach_header);
-  NSSymbol retSym = 0;
-  const struct mach_header *mh1;
-  if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined (symbol))
-    {
-      for (j = 0; j < mh->ncmds; j++)
-        {
-          lc = (struct load_command *) (((unsigned long) mh) + offset);
-          if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
-            {
-              mh1 =
-                lt_int_dyld_match_loaded_lib_by_install_name ((char
-                                                               *) (((struct
-                                                                     dylib_command
-                                                                     *) lc)->
-                                                                   dylib.name.
-                                                                   offset +
-                                                                   (unsigned
-                                                                    long)
-                                                                   lc));
-              if (!mh1)
-                {
-                  /* Maybe NSAddImage can find it */
-                  mh1 =
-                    ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
-                                               dylib.name.offset +
-                                               (unsigned long) lc),
-                                     NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED
-                                     +
-                                     NSADDIMAGE_OPTION_WITH_SEARCHING +
-                                     NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-                }
-              if (mh1)
-                {
-                  retSym = ltdl_NSLookupSymbolInImage (mh1,
-                                                       symbol,
-                                                       NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-                                                       |
-                                                       NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-                  if (retSym)
-                    break;
-                }
-            }
-          offset += lc->cmdsize;
-        }
-    }
-  return retSym;
-}
-
-static int
-sys_dyld_init ()
-{
-  int retCode = 0;
-  int err = 0;
-  if (!_dyld_present ())
-    {
-      retCode = 1;
-    }
-  else
-    {
-      err =
-        _dyld_func_lookup ("__dyld_NSAddImage",
-                           (unsigned long *) &ltdl_NSAddImage);
-      err =
-        _dyld_func_lookup ("__dyld_NSLookupSymbolInImage",
-                           (unsigned long *) &ltdl_NSLookupSymbolInImage);
-      err =
-        _dyld_func_lookup ("__dyld_NSIsSymbolNameDefinedInImage",
-                           (unsigned long *)
-                           &ltdl_NSIsSymbolNameDefinedInImage);
-      err =
-        _dyld_func_lookup ("__dyld_NSMakePrivateModulePublic",
-                           (unsigned long *) &ltdl_NSMakePrivateModulePublic);
-    }
-  return retCode;
-}
-
-static lt_module
-sys_dyld_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_module module = 0;
-  NSObjectFileImage ofi = 0;
-  NSObjectFileImageReturnCode ofirc;
-
-  if (!filename)
-    return (lt_module) - 1;
-  ofirc = NSCreateObjectFileImageFromFile (filename, &ofi);
-  switch (ofirc)
-    {
-    case NSObjectFileImageSuccess:
-      module = NSLinkModule (ofi, filename,
-                             NSLINKMODULE_OPTION_RETURN_ON_ERROR
-                             | NSLINKMODULE_OPTION_PRIVATE
-                             | NSLINKMODULE_OPTION_BINDNOW);
-      NSDestroyObjectFileImage (ofi);
-      if (module)
-        ltdl_NSMakePrivateModulePublic (module);
-      break;
-    case NSObjectFileImageInappropriateFile:
-      if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
-        {
-          module =
-            (lt_module) ltdl_NSAddImage (filename,
-                                         NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-          break;
-        }
-    default:
-      LT_DLMUTEX_SETERROR (lt_int_dyld_error (LT_DLSTRERROR (CANNOT_OPEN)));
-      return 0;
-    }
-  if (!module)
-    LT_DLMUTEX_SETERROR (lt_int_dyld_error (LT_DLSTRERROR (CANNOT_OPEN)));
-  return module;
-}
-
-static int
-sys_dyld_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  int retCode = 0;
-  int flags = 0;
-  if (module == (lt_module) - 1)
-    return 0;
-#ifdef __BIG_ENDIAN__
-  if (((struct mach_header *) module)->magic == MH_MAGIC)
-#else
-  if (((struct mach_header *) module)->magic == MH_CIGAM)
-#endif
-    {
-      LT_DLMUTEX_SETERROR ("Can not close a dylib");
-      retCode = 1;
-    }
-  else
-    {
-#if 1
-/* Currently, if a module contains c++ static destructors and it is unloaded, we
-   get a segfault in atexit(), due to compiler and dynamic loader differences of
-   opinion, this works around that.
-*/
-      if ((const struct section *) NULL !=
-          getsectbynamefromheader (lt_int_dyld_get_mach_header_from_nsmodule
-                                   (module), "__DATA", "__mod_term_func"))
-        {
-          flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
-        }
-#endif
-#ifdef __ppc__
-      flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
-#endif
-      if (!NSUnLinkModule (module, flags))
-        {
-          retCode = 1;
-          LT_DLMUTEX_SETERROR (lt_int_dyld_error
-                               (LT_DLSTRERROR (CANNOT_CLOSE)));
-        }
-    }
-
-  return retCode;
-}
-
-static lt_ptr
-sys_dyld_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_ptr address = 0;
-  NSSymbol *nssym = 0;
-  void *unused;
-  const struct mach_header *mh = NULL;
-  char saveError[256] = "Symbol not found";
-  if (module == (lt_module) - 1)
-    {
-      _dyld_lookup_and_bind (symbol, (unsigned long *) &address, &unused);
-      return address;
-    }
-#ifdef __BIG_ENDIAN__
-  if (((struct mach_header *) module)->magic == MH_MAGIC)
-#else
-  if (((struct mach_header *) module)->magic == MH_CIGAM)
-#endif
-    {
-      if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
-        {
-          mh = module;
-          if (ltdl_NSIsSymbolNameDefinedInImage
-              ((struct mach_header *) module, symbol))
-            {
-              nssym =
-                ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
-                                            symbol,
-                                            NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-                                            |
-                                            NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
-            }
-        }
-
-    }
-  else
-    {
-      nssym = NSLookupSymbolInModule (module, symbol);
-    }
-  if (!nssym)
-    {
-      strncpy (saveError,
-               lt_int_dyld_error (LT_DLSTRERROR (SYMBOL_NOT_FOUND)), 255);
-      saveError[255] = 0;
-      if (!mh)
-        mh = lt_int_dyld_get_mach_header_from_nsmodule (module);
-      nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh);
-    }
-  if (!nssym)
-    {
-      LT_DLMUTEX_SETERROR (saveError);
-      return NULL;
-    }
-  return NSAddressOfSymbol (nssym);
-}
-
-static struct lt_user_dlloader sys_dyld =
-  { "_", sys_dyld_open, sys_dyld_close, sys_dyld_sym, 0, 0 };
-
-
-#endif /* HAVE_DYLD */
-
-
-/* --- DLPREOPEN() INTERFACE LOADER --- */
-
-
-/* emulate dynamic linking using preloaded_symbols */
-
-typedef struct lt_dlsymlists_t
-{
-  struct lt_dlsymlists_t *next;
-  const lt_dlsymlist *syms;
-} lt_dlsymlists_t;
-
-static const lt_dlsymlist *default_preloaded_symbols = 0;
-static lt_dlsymlists_t *preloaded_symbols = 0;
-
-static int
-presym_init (loader_data)
-     lt_user_data loader_data;
-{
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  preloaded_symbols = 0;
-  if (default_preloaded_symbols)
-    {
-      errors = lt_dlpreload (default_preloaded_symbols);
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-static int
-presym_free_symlists ()
-{
-  lt_dlsymlists_t *lists;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  lists = preloaded_symbols;
-  while (lists)
-    {
-      lt_dlsymlists_t *tmp = lists;
-
-      lists = lists->next;
-      LT_DLGNUNET_free (tmp);
-    }
-  preloaded_symbols = 0;
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return 0;
-}
-
-static int
-presym_exit (loader_data)
-     lt_user_data loader_data;
-{
-  presym_free_symlists ();
-  return 0;
-}
-
-static int
-presym_add_symlist (preloaded)
-     const lt_dlsymlist *preloaded;
-{
-  lt_dlsymlists_t *tmp;
-  lt_dlsymlists_t *lists;
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  lists = preloaded_symbols;
-  while (lists)
-    {
-      if (lists->syms == preloaded)
-        {
-          goto done;
-        }
-      lists = lists->next;
-    }
-
-  tmp = LT_EGNUNET_malloc (lt_dlsymlists_t, 1);
-  if (tmp)
-    {
-      memset (tmp, 0, sizeof (lt_dlsymlists_t));
-      tmp->syms = preloaded;
-      tmp->next = preloaded_symbols;
-      preloaded_symbols = tmp;
-    }
-  else
-    {
-      ++errors;
-    }
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-  return errors;
-}
-
-static lt_module
-presym_open (loader_data, filename)
-     lt_user_data loader_data;
-     const char *filename;
-{
-  lt_dlsymlists_t *lists;
-  lt_module module = (lt_module) 0;
-
-  LT_DLGNUNET_mutex_lock ();
-  lists = preloaded_symbols;
-
-  if (!lists)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_SYMBOLS));
-      goto done;
-    }
-
-  /* Can't use NULL as the reflective symbol header, as NULL is
-     used to mark the end of the entire symbol list.  Self-dlpreopened
-     symbols follow this magic number, chosen to be an unlikely
-     clash with a real module name.  */
-  if (!filename)
-    {
-      filename = "@PROGRAM@";
-    }
-
-  while (lists)
-    {
-      const lt_dlsymlist *syms = lists->syms;
-
-      while (syms->name)
-        {
-          if (!syms->address && strcmp (syms->name, filename) == 0)
-            {
-              module = (lt_module) syms;
-              goto done;
-            }
-          ++syms;
-        }
-
-      lists = lists->next;
-    }
-
-  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-  return module;
-}
-
-static int
-presym_close (loader_data, module)
-     lt_user_data loader_data;
-     lt_module module;
-{
-  /* Just to silence gcc -Wall */
-  module = 0;
-  return 0;
-}
-
-static lt_ptr
-presym_sym (loader_data, module, symbol)
-     lt_user_data loader_data;
-     lt_module module;
-     const char *symbol;
-{
-  lt_dlsymlist *syms = (lt_dlsymlist *) module;
-
-  ++syms;
-  while (syms->address)
-    {
-      if (strcmp (syms->name, symbol) == 0)
-        {
-          return syms->address;
-        }
-
-      ++syms;
-    }
-
-  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-
-  return 0;
-}
-
-static struct lt_user_dlloader presym = {
-  0, presym_open, presym_close, presym_sym, presym_exit, 0
-};
-
-
-
-
-
-/* --- DYNAMIC MODULE LOADING --- */
-
-
-/* The type of a function used at each iteration of  foreach_dirinpath().  */
-typedef int foreach_callback_func LT_PARAMS ((char *filename, lt_ptr data1,
-                                              lt_ptr data2));
-
-static int foreach_dirinpath LT_PARAMS ((const char *search_path,
-                                         const char *base_name,
-                                         foreach_callback_func * func,
-                                         lt_ptr data1, lt_ptr data2));
-
-static int find_file_callback LT_PARAMS ((char *filename, lt_ptr data,
-                                          lt_ptr ignored));
-static int find_handle_callback LT_PARAMS ((char *filename, lt_ptr data,
-                                            lt_ptr ignored));
-static int foreachfile_callback LT_PARAMS ((char *filename, lt_ptr data1,
-                                            lt_ptr data2));
-
-
-static int canonicalize_path LT_PARAMS ((const char *path,
-                                         char **pcanonical));
-static int argzize_path LT_PARAMS ((const char *path,
-                                    char **pargz, size_t * pargz_len));
-static FILE *find_file LT_PARAMS ((const char *search_path,
-                                   const char *base_name, char **pdir));
-static lt_dlhandle *find_handle LT_PARAMS ((const char *search_path,
-                                            const char *base_name,
-                                            lt_dlhandle * handle));
-static int find_module LT_PARAMS ((lt_dlhandle * handle,
-                                   const char *dir,
-                                   const char *libdir,
-                                   const char *dlname,
-                                   const char *old_name, int installed));
-static int free_vars LT_PARAMS ((char *dlname, char *oldname,
-                                 char *libdir, char *deplibs));
-static int load_deplibs LT_PARAMS ((lt_dlhandle handle, char *deplibs));
-static int trim LT_PARAMS ((char **dest, const char *str));
-static int try_dlopen LT_PARAMS ((lt_dlhandle * handle,
-                                  const char *filename));
-static int tryall_dlopen LT_PARAMS ((lt_dlhandle * handle,
-                                     const char *filename));
-static int unload_deplibs LT_PARAMS ((lt_dlhandle handle));
-static int lt_argz_insert LT_PARAMS ((char **pargz,
-                                      size_t * pargz_len,
-                                      char *before, const char *entry));
-static int lt_argz_insertinorder LT_PARAMS ((char **pargz,
-                                             size_t * pargz_len,
-                                             const char *entry));
-static int lt_argz_insertdir LT_PARAMS ((char **pargz,
-                                         size_t * pargz_len,
-                                         const char *dirnam,
-                                         struct dirent * dp));
-static int lt_dlpath_insertdir LT_PARAMS ((char **ppath,
-                                           char *before, const char *dir));
-static int list_files_by_dir LT_PARAMS ((const char *dirnam,
-                                         char **pargz, size_t * pargz_len));
-static int file_not_found LT_PARAMS ((void));
-
-static char *user_search_path = 0;
-static lt_dlloader *loaders = 0;
-static lt_dlhandle handles = 0;
-static int initialized = 0;
-
-/* Initialize libltdl. */
-int
-lt_dlinit ()
-{
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  /* Initialize only at first call. */
-  if (++initialized == 1)
-    {
-      handles = 0;
-      user_search_path = 0;     /* empty search path */
-
-#if HAVE_LIBDL
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen");
-#endif
-#if HAVE_SHL_LOAD
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_shl, "dlopen");
-#endif
-#ifdef __WINDOWS__
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_wll, "dlopen");
-#endif
-#ifdef __BEOS__
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_bedl, "dlopen");
-#endif
-#if HAVE_DLD
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld");
-#endif
-#if HAVE_DYLD
-      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
-      errors += sys_dyld_init ();
-#endif
-      errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload");
-
-      if (presym_init (presym.dlloader_data))
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
-          ++errors;
-        }
-      else if (errors != 0)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
-          ++errors;
-        }
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-int
-lt_dlpreload (preloaded)
-     const lt_dlsymlist *preloaded;
-{
-  int errors = 0;
-
-  if (preloaded)
-    {
-      errors = presym_add_symlist (preloaded);
-    }
-  else
-    {
-      presym_free_symlists ();
-
-      LT_DLGNUNET_mutex_lock ();
-      if (default_preloaded_symbols)
-        {
-          errors = lt_dlpreload (default_preloaded_symbols);
-        }
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  return errors;
-}
-
-int
-lt_dlpreload_default (preloaded)
-     const lt_dlsymlist *preloaded;
-{
-  LT_DLGNUNET_mutex_lock ();
-  default_preloaded_symbols = preloaded;
-  LT_DLMUTEX_UNLOCK ();
-  return 0;
-}
-
-int
-lt_dlexit ()
-{
-  /* shut down libltdl */
-  lt_dlloader *loader;
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-  loader = loaders;
-
-  if (!initialized)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SHUTDOWN));
-      ++errors;
-      goto done;
-    }
-
-  /* shut down only at last call. */
-  if (--initialized == 0)
-    {
-      int level;
-
-      while (handles && LT_DLIS_RESIDENT (handles))
-        {
-          handles = handles->next;
-        }
-
-      /* close all modules */
-      for (level = 1; handles; ++level)
-        {
-          lt_dlhandle cur = handles;
-          int saw_nonresident = 0;
-
-          while (cur)
-            {
-              lt_dlhandle tmp = cur;
-              cur = cur->next;
-              if (!LT_DLIS_RESIDENT (tmp))
-                saw_nonresident = 1;
-              if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
-                {
-                  if (lt_dlclose (tmp))
-                    {
-                      ++errors;
-                    }
-                }
-            }
-          /* done if only resident modules are left */
-          if (!saw_nonresident)
-            break;
-        }
-
-      /* close all loaders */
-      while (loader)
-        {
-          lt_dlloader *next = loader->next;
-          lt_user_data data = loader->dlloader_data;
-          if (loader->dlloader_exit && loader->dlloader_exit (data))
-            {
-              ++errors;
-            }
-
-          LT_DLMEM_REASSIGN (loader, next);
-        }
-      loaders = 0;
-    }
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-  return errors;
-}
-
-static int
-tryall_dlopen (handle, filename)
-     lt_dlhandle *handle;
-     const char *filename;
-{
-  lt_dlhandle cur;
-  lt_dlloader *loader;
-  const char *saved_error;
-  int errors = 0;
-
-  LT_DLMUTEX_GETERROR (saved_error);
-  LT_DLGNUNET_mutex_lock ();
-
-  cur = handles;
-  loader = loaders;
-
-  /* check whether the module was already opened */
-  while (cur)
-    {
-      /* try to dlopen the program itself? */
-      if (!cur->info.filename && !filename)
-        {
-          break;
-        }
-
-      if (cur->info.filename && filename
-          && strcmp (cur->info.filename, filename) == 0)
-        {
-          break;
-        }
-
-      cur = cur->next;
-    }
-
-  if (cur)
-    {
-      ++cur->info.ref_count;
-      *handle = cur;
-      goto done;
-    }
-
-  cur = *handle;
-  if (filename)
-    {
-      /* Comment out the check of file permissions using access.
-         This call seems to always return -1 with error EACCES.
-       */
-      /* We need to catch missing file errors early so that
-         file_not_found() can detect what happened.
-         if (access (filename, R_OK) != 0)
-         {
-         LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-         ++errors;
-         goto done;
-         } */
-
-      cur->info.filename = lt_estrdup (filename);
-      if (!cur->info.filename)
-        {
-          ++errors;
-          goto done;
-        }
-    }
-  else
-    {
-      cur->info.filename = 0;
-    }
-
-  while (loader)
-    {
-      lt_user_data data = loader->dlloader_data;
-
-      cur->module = loader->module_open (data, filename);
-
-      if (cur->module != 0)
-        {
-          break;
-        }
-      loader = loader->next;
-    }
-
-  if (!loader)
-    {
-      LT_DLGNUNET_free (cur->info.filename);
-      ++errors;
-      goto done;
-    }
-
-  cur->loader = loader;
-  LT_DLMUTEX_SETERROR (saved_error);
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-static int
-tryall_dlopen_module (handle, prefix, dirname, dlname)
-     lt_dlhandle *handle;
-     const char *prefix;
-     const char *dirname;
-     const char *dlname;
-{
-  int error = 0;
-  char *filename = 0;
-  size_t filename_len = 0;
-  size_t dirname_len = LT_STRLEN (dirname);
-
-  assert (handle);
-  assert (dirname);
-  assert (dlname);
-#ifdef LT_DIRSEP_CHAR
-  /* Only canonicalized names (i.e. with DIRSEP chars already converted)
-     should make it into this function:  */
-  assert (strchr (dirname, LT_DIRSEP_CHAR) == 0);
-#endif
-
-  if (dirname_len > 0)
-    if (dirname[dirname_len - 1] == '/')
-      --dirname_len;
-  filename_len = dirname_len + 1 + LT_STRLEN (dlname);
-
-  /* Allocate memory, and combine DIRNAME and MODULENAME into it.
-     The PREFIX (if any) is handled below.  */
-  filename = LT_EGNUNET_malloc (char, dirname_len + 1 + filename_len + 1);
-  if (!filename)
-    return 1;
-
-  sprintf (filename, "%.*s/%s", (int) dirname_len, dirname, dlname);
-
-  /* Now that we have combined DIRNAME and MODULENAME, if there is
-     also a PREFIX to contend with, simply recurse with the arguments
-     shuffled.  Otherwise, attempt to open FILENAME as a module.  */
-  if (prefix)
-    {
-      error += tryall_dlopen_module (handle,
-                                     (const char *) 0, prefix, filename);
-    }
-  else if (tryall_dlopen (handle, filename) != 0)
-    {
-      ++error;
-    }
-
-  LT_DLGNUNET_free (filename);
-  return error;
-}
-
-static int
-find_module (handle, dir, libdir, dlname, old_name, installed)
-     lt_dlhandle *handle;
-     const char *dir;
-     const char *libdir;
-     const char *dlname;
-     const char *old_name;
-     int installed;
-{
-  /* Try to open the old library first; if it was dlpreopened,
-     we want the preopened version of it, even if a dlopenable
-     module is available.  */
-  if (old_name && tryall_dlopen (handle, old_name) == 0)
-    {
-      return 0;
-    }
-
-  /* Try to open the dynamic library.  */
-  if (dlname)
-    {
-      /* try to open the installed module */
-      if (installed && libdir)
-        {
-          if (tryall_dlopen_module (handle,
-                                    (const char *) 0, libdir, dlname) == 0)
-            return 0;
-        }
-
-      /* try to open the not-installed module */
-      if (!installed)
-        {
-          if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
-            return 0;
-        }
-
-      /* maybe it was moved to another directory */
-      {
-        if (tryall_dlopen_module (handle, (const char *) 0, dir, dlname) == 0)
-          return 0;
-      }
-    }
-
-  return 1;
-}
-
-
-static int
-canonicalize_path (path, pcanonical)
-     const char *path;
-     char **pcanonical;
-{
-  char *canonical = 0;
-
-  assert (path && *path);
-  assert (pcanonical);
-
-  canonical = LT_EGNUNET_malloc (char, 1 + LT_STRLEN (path));
-  if (!canonical)
-    return 1;
-
-  {
-    size_t dest = 0;
-    size_t src;
-    for (src = 0; path[src] != LT_EOS_CHAR; ++src)
-      {
-        /* Path separators are not copied to the beginning or end of
-           the destination, or if another separator would follow
-           immediately.  */
-        if (path[src] == LT_PATHSEP_CHAR)
-          {
-            if ((dest == 0)
-                || (path[1 + src] == LT_PATHSEP_CHAR)
-                || (path[1 + src] == LT_EOS_CHAR))
-              continue;
-          }
-
-        /* Anything other than a directory separator is copied verbatim.  */
-        if ((path[src] != '/')
-#ifdef LT_DIRSEP_CHAR
-            && (path[src] != LT_DIRSEP_CHAR)
-#endif
-          )
-          {
-            canonical[dest++] = path[src];
-          }
-        /* Directory separators are converted and copied only if they are
-           not at the end of a path -- i.e. before a path separator or
-           NULL terminator.  */
-        else if ((path[1 + src] != LT_PATHSEP_CHAR)
-                 && (path[1 + src] != LT_EOS_CHAR)
-#ifdef LT_DIRSEP_CHAR
-                 && (path[1 + src] != LT_DIRSEP_CHAR)
-#endif
-                 && (path[1 + src] != '/'))
-          {
-            canonical[dest++] = '/';
-          }
-      }
-
-    /* Add an end-of-string marker at the end.  */
-    canonical[dest] = LT_EOS_CHAR;
-  }
-
-  /* Assign new value.  */
-  *pcanonical = canonical;
-
-  return 0;
-}
-
-static int
-argzize_path (path, pargz, pargz_len)
-     const char *path;
-     char **pargz;
-     size_t *pargz_len;
-{
-  error_t error;
-
-  assert (path);
-  assert (pargz);
-  assert (pargz_len);
-
-  if ((error = argz_create_sep (path, LT_PATHSEP_CHAR, pargz, pargz_len)))
-    {
-      switch (error)
-        {
-        case ENOMEM:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-          break;
-        default:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
-          break;
-        }
-
-      return 1;
-    }
-
-  return 0;
-}
-
-/* Repeatedly call FUNC with each LT_PATHSEP_CHAR delimited element
-   of SEARCH_PATH and references to DATA1 and DATA2, until FUNC returns
-   non-zero or all elements are exhausted.  If BASE_NAME is non-NULL,
-   it is appended to each SEARCH_PATH element before FUNC is called.  */
-static int
-foreach_dirinpath (search_path, base_name, func, data1, data2)
-     const char *search_path;
-     const char *base_name;
-     foreach_callback_func *func;
-     lt_ptr data1;
-     lt_ptr data2;
-{
-  int result = 0;
-  int filenamesize = 0;
-  size_t lenbase = LT_STRLEN (base_name);
-  size_t argz_len = 0;
-  char *argz = 0;
-  char *filename = 0;
-  char *canonical = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  if (!search_path || !*search_path)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-      goto cleanup;
-    }
-
-  if (canonicalize_path (search_path, &canonical) != 0)
-    goto cleanup;
-
-  if (argzize_path (canonical, &argz, &argz_len) != 0)
-    goto cleanup;
-
-  {
-    char *dir_name = 0;
-    while ((dir_name = argz_next (argz, argz_len, dir_name)))
-      {
-        size_t lendir = LT_STRLEN (dir_name);
-
-        if (lendir + 1 + lenbase >= filenamesize)
-          {
-            LT_DLGNUNET_free (filename);
-            filenamesize = lendir + 1 + lenbase + 1;    /* "/d" + '/' + "f" + '\0' */
-            filename = LT_EGNUNET_malloc (char, filenamesize);
-            if (!filename)
-              goto cleanup;
-          }
-
-        assert (filenamesize > lendir);
-        strcpy (filename, dir_name);
-
-        if (base_name && *base_name)
-          {
-            if (filename[lendir - 1] != '/')
-              filename[lendir++] = '/';
-            strcpy (filename + lendir, base_name);
-          }
-
-        if ((result = (*func) (filename, data1, data2)))
-          {
-            break;
-          }
-      }
-  }
-
-cleanup:
-  LT_DLGNUNET_free (argz);
-  LT_DLGNUNET_free (canonical);
-  LT_DLGNUNET_free (filename);
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-/* If FILEPATH can be opened, store the name of the directory component
-   in DATA1, and the opened FILE* structure address in DATA2.  Otherwise
-   DATA1 is unchanged, but DATA2 is set to a pointer to NULL.  */
-static int
-find_file_callback (filename, data1, data2)
-     char *filename;
-     lt_ptr data1;
-     lt_ptr data2;
-{
-  char **pdir = (char **) data1;
-  FILE **pfile = (FILE **) data2;
-  int is_done = 0;
-
-  assert (filename && *filename);
-  assert (pdir);
-  assert (pfile);
-
-  if ((*pfile = fopen (filename, LT_READTEXT_MODE)))
-    {
-      char *dirend = strrchr (filename, '/');
-
-      if (dirend > filename)
-        *dirend = LT_EOS_CHAR;
-
-      LT_DLGNUNET_free (*pdir);
-      *pdir = lt_estrdup (filename);
-      is_done = (*pdir == 0) ? -1 : 1;
-    }
-
-  return is_done;
-}
-
-static FILE *
-find_file (search_path, base_name, pdir)
-     const char *search_path;
-     const char *base_name;
-     char **pdir;
-{
-  FILE *file = 0;
-
-  foreach_dirinpath (search_path, base_name, find_file_callback, pdir, &file);
-
-  return file;
-}
-
-static int
-find_handle_callback (filename, data, ignored)
-     char *filename;
-     lt_ptr data;
-     lt_ptr ignored;
-{
-  lt_dlhandle *handle = (lt_dlhandle *) data;
-  int notfound = access (filename, R_OK);
-
-  /* Bail out if file cannot be read...  */
-  if (notfound)
-    return 0;
-
-  /* Try to dlopen the file, but do not continue searching in any
-     case.  */
-  if (tryall_dlopen (handle, filename) != 0)
-    *handle = 0;
-
-  return 1;
-}
-
-/* If HANDLE was found return it, otherwise return 0.  If HANDLE was
-   found but could not be opened, *HANDLE will be set to 0.  */
-static lt_dlhandle *
-find_handle (search_path, base_name, handle)
-     const char *search_path;
-     const char *base_name;
-     lt_dlhandle *handle;
-{
-  if (!search_path)
-    return 0;
-
-  if (!foreach_dirinpath (search_path, base_name, find_handle_callback,
-                          handle, 0))
-    return 0;
-
-  return handle;
-}
-
-static int
-load_deplibs (handle, deplibs)
-     lt_dlhandle handle;
-     char *deplibs;
-{
-#if LTDL_DLOPEN_DEPLIBS
-  char *p, *save_search_path = 0;
-  int depcount = 0;
-  int i;
-  char **names = 0;
-#endif
-  int errors = 0;
-
-  handle->depcount = 0;
-
-#if LTDL_DLOPEN_DEPLIBS
-  if (!deplibs)
-    {
-      return errors;
-    }
-  ++errors;
-
-  LT_DLGNUNET_mutex_lock ();
-  if (user_search_path)
-    {
-      save_search_path = lt_estrdup (user_search_path);
-      if (!save_search_path)
-        goto cleanup;
-    }
-
-  /* extract search paths and count deplibs */
-  p = deplibs;
-  while (*p)
-    {
-      if (!isspace ((int) *p))
-        {
-          char *end = p + 1;
-          while (*end && !isspace ((int) *end))
-            {
-              ++end;
-            }
-
-          if (strncmp (p, "-L", 2) == 0 || strncmp (p, "-R", 2) == 0)
-            {
-              char save = *end;
-              *end = 0;         /* set a temporary string terminator */
-              if (lt_dladdsearchdir (p + 2))
-                {
-                  goto cleanup;
-                }
-              *end = save;
-            }
-          else
-            {
-              ++depcount;
-            }
-
-          p = end;
-        }
-      else
-        {
-          ++p;
-        }
-    }
-
-  /* restore the old search path */
-  LT_DLGNUNET_free (user_search_path);
-  user_search_path = save_search_path;
-
-  LT_DLMUTEX_UNLOCK ();
-
-  if (!depcount)
-    {
-      errors = 0;
-      goto cleanup;
-    }
-
-  names = LT_EGNUNET_malloc (char *, depcount * sizeof (char *));
-  if (!names)
-    goto cleanup;
-
-  /* now only extract the actual deplibs */
-  depcount = 0;
-  p = deplibs;
-  while (*p)
-    {
-      if (isspace ((int) *p))
-        {
-          ++p;
-        }
-      else
-        {
-          char *end = p + 1;
-          while (*end && !isspace ((int) *end))
-            {
-              ++end;
-            }
-
-          if (strncmp (p, "-L", 2) != 0 && strncmp (p, "-R", 2) != 0)
-            {
-              char *name;
-              char save = *end;
-              *end = 0;         /* set a temporary string terminator */
-              if (strncmp (p, "-l", 2) == 0)
-                {
-                  size_t name_len = 3 + /* "lib" */ LT_STRLEN (p + 2);
-                  name = LT_EGNUNET_malloc (char, 1 + name_len);
-                  if (name)
-                    sprintf (name, "lib%s", p + 2);
-                }
-              else
-                name = lt_estrdup (p);
-
-              if (!name)
-                goto cleanup_names;
-
-              names[depcount++] = name;
-              *end = save;
-            }
-          p = end;
-        }
-    }
-
-  /* load the deplibs (in reverse order)
-     At this stage, don't worry if the deplibs do not load correctly,
-     they may already be statically linked into the loading application
-     for instance.  There will be a more enlightening error message
-     later on if the loaded module cannot resolve all of its symbols.  */
-  if (depcount)
-    {
-      int j = 0;
-
-      handle->deplibs =
-        (lt_dlhandle *) LT_EGNUNET_malloc (lt_dlhandle *, depcount);
-      if (!handle->deplibs)
-        goto cleanup;
-
-      for (i = 0; i < depcount; ++i)
-        {
-          handle->deplibs[j] = lt_dlopenext (names[depcount - 1 - i]);
-          if (handle->deplibs[j])
-            {
-              ++j;
-            }
-        }
-
-      handle->depcount = j;     /* Number of successfully loaded deplibs */
-      errors = 0;
-    }
-
-cleanup_names:
-  for (i = 0; i < depcount; ++i)
-    {
-      LT_DLGNUNET_free (names[i]);
-    }
-
-cleanup:
-  LT_DLGNUNET_free (names);
-#endif
-
-  return errors;
-}
-
-static int
-unload_deplibs (handle)
-     lt_dlhandle handle;
-{
-  int i;
-  int errors = 0;
-
-  if (handle->depcount)
-    {
-      for (i = 0; i < handle->depcount; ++i)
-        {
-          if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
-            {
-              errors += lt_dlclose (handle->deplibs[i]);
-            }
-        }
-    }
-
-  return errors;
-}
-
-static int
-trim (dest, str)
-     char **dest;
-     const char *str;
-{
-  /* remove the leading and trailing "'" from str
-     and store the result in dest */
-  const char *end = strrchr (str, '\'');
-  size_t len = LT_STRLEN (str);
-  char *tmp;
-
-  LT_DLGNUNET_free (*dest);
-
-  if (len > 3 && str[0] == '\'')
-    {
-      tmp = LT_EGNUNET_malloc (char, end - str);
-      if (!tmp)
-        return 1;
-
-      strncpy (tmp, &str[1], (end - str) - 1);
-      tmp[len - 3] = LT_EOS_CHAR;
-      *dest = tmp;
-    }
-  else
-    {
-      *dest = 0;
-    }
-
-  return 0;
-}
-
-static int
-free_vars (dlname, oldname, libdir, deplibs)
-     char *dlname;
-     char *oldname;
-     char *libdir;
-     char *deplibs;
-{
-  LT_DLGNUNET_free (dlname);
-  LT_DLGNUNET_free (oldname);
-  LT_DLGNUNET_free (libdir);
-  LT_DLGNUNET_free (deplibs);
-
-  return 0;
-}
-
-static int
-try_dlopen (phandle, filename)
-     lt_dlhandle *phandle;
-     const char *filename;
-{
-  const char *ext = 0;
-  const char *saved_error = 0;
-  char *canonical = 0;
-  char *base_name = 0;
-  char *dir = 0;
-  char *name = 0;
-  int errors = 0;
-  lt_dlhandle newhandle;
-
-  assert (phandle);
-  assert (*phandle == 0);
-
-  LT_DLMUTEX_GETERROR (saved_error);
-
-  /* dlopen self? */
-  if (!filename)
-    {
-      *phandle =
-        (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
-      if (*phandle == 0)
-        return 1;
-
-      memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
-      newhandle = *phandle;
-
-      /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
-      LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
-
-      if (tryall_dlopen (&newhandle, 0) != 0)
-        {
-          LT_DLGNUNET_free (*phandle);
-          return 1;
-        }
-
-      goto register_handle;
-    }
-
-  assert (filename && *filename);
-
-  /* Doing this immediately allows internal functions to safely
-     assume only canonicalized paths are passed.  */
-  if (canonicalize_path (filename, &canonical) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  /* If the canonical module name is a path (relative or absolute)
-     then split it into a directory part and a name part.  */
-  base_name = strrchr (canonical, '/');
-  if (base_name)
-    {
-      size_t dirlen = (1 + base_name) - canonical;
-
-      dir = LT_EGNUNET_malloc (char, 1 + dirlen);
-      if (!dir)
-        {
-          ++errors;
-          goto cleanup;
-        }
-
-      strncpy (dir, canonical, dirlen);
-      dir[dirlen] = LT_EOS_CHAR;
-
-      ++base_name;
-    }
-  else
-    base_name = canonical;
-
-  assert (base_name && *base_name);
-
-  /* Check whether we are opening a libtool module (.la extension).  */
-  ext = strrchr (base_name, '.');
-  if (ext && strcmp (ext, archive_ext) == 0)
-    {
-      /* this seems to be a libtool module */
-      FILE *file = 0;
-      char *dlname = 0;
-      char *old_name = 0;
-      char *libdir = 0;
-      char *deplibs = 0;
-      char *line = 0;
-      size_t line_len;
-
-      /* if we can't find the installed flag, it is probably an
-         installed libtool archive, produced with an old version
-         of libtool */
-      int installed = 1;
-
-      /* extract the module name from the file name */
-      name = LT_EGNUNET_malloc (char, ext - base_name + 1);
-      if (!name)
-        {
-          ++errors;
-          goto cleanup;
-        }
-
-      /* canonicalize the module name */
-      {
-        size_t i;
-        for (i = 0; i < ext - base_name; ++i)
-          {
-            if (isalnum ((int) (base_name[i])))
-              {
-                name[i] = base_name[i];
-              }
-            else
-              {
-                name[i] = '_';
-              }
-          }
-        name[ext - base_name] = LT_EOS_CHAR;
-      }
-
-      /* Now try to open the .la file.  If there is no directory name
-         component, try to find it first in user_search_path and then other
-         prescribed paths.  Otherwise (or in any case if the module was not
-         yet found) try opening just the module name as passed.  */
-      if (!dir)
-        {
-          const char *search_path;
-
-          LT_DLGNUNET_mutex_lock ();
-          search_path = user_search_path;
-          if (search_path)
-            file = find_file (user_search_path, base_name, &dir);
-          LT_DLMUTEX_UNLOCK ();
-
-          if (!file)
-            {
-              search_path = getenv (LTDL_SEARCHPATH_VAR);
-              if (search_path)
-                file = find_file (search_path, base_name, &dir);
-            }
-
-#ifdef LTDL_SHLIBPATH_VAR
-          if (!file)
-            {
-              search_path = getenv (LTDL_SHLIBPATH_VAR);
-              if (search_path)
-                file = find_file (search_path, base_name, &dir);
-            }
-#endif
-#ifdef LTDL_SYSSEARCHPATH
-          if (!file && sys_search_path)
-            {
-              file = find_file (sys_search_path, base_name, &dir);
-            }
-#endif
-        }
-      if (!file)
-        {
-          file = fopen (filename, LT_READTEXT_MODE);
-        }
-
-      /* If we didn't find the file by now, it really isn't there.  Set
-         the status flag, and bail out.  */
-      if (!file)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-          ++errors;
-          goto cleanup;
-        }
-
-      line_len = LT_FILENAME_MAX;
-      line = LT_EGNUNET_malloc (char, line_len);
-      if (!line)
-        {
-          fclose (file);
-          ++errors;
-          goto cleanup;
-        }
-
-      /* read the .la file */
-      while (!feof (file))
-        {
-          if (!fgets (line, (int) line_len, file))
-            {
-              break;
-            }
-
-          /* Handle the case where we occasionally need to read a line
-             that is longer than the initial buffer size.  */
-          while ((line[LT_STRLEN (line) - 1] != '\n') && (!feof (file)))
-            {
-              line = LT_DLREALLOC (char, line, line_len * 2);
-              if (!fgets (&line[line_len - 1], (int) line_len + 1, file))
-                {
-                  break;
-                }
-              line_len *= 2;
-            }
-
-          if (line[0] == '\n' || line[0] == '#')
-            {
-              continue;
-            }
-
-#undef  STR_DLNAME
-#define STR_DLNAME      "dlname="
-          if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
-            {
-              errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
-            }
-
-#undef  STR_OLD_LIBRARY
-#define STR_OLD_LIBRARY "old_library="
-          else if (strncmp (line, STR_OLD_LIBRARY,
-                            sizeof (STR_OLD_LIBRARY) - 1) == 0)
-            {
-              errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
-            }
-#undef  STR_LIBDIR
-#define STR_LIBDIR      "libdir="
-          else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
-            {
-              errors += trim (&libdir, &line[sizeof (STR_LIBDIR) - 1]);
-            }
-
-#undef  STR_DL_DEPLIBS
-#define STR_DL_DEPLIBS  "dependency_libs="
-          else if (strncmp (line, STR_DL_DEPLIBS,
-                            sizeof (STR_DL_DEPLIBS) - 1) == 0)
-            {
-              errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
-            }
-          else if (strcmp (line, "installed=yes\n") == 0)
-            {
-              installed = 1;
-            }
-          else if (strcmp (line, "installed=no\n") == 0)
-            {
-              installed = 0;
-            }
-
-#undef  STR_LIBRARY_NAMES
-#define STR_LIBRARY_NAMES "library_names="
-          else if (!dlname && strncmp (line, STR_LIBRARY_NAMES,
-                                       sizeof (STR_LIBRARY_NAMES) - 1) == 0)
-            {
-              char *last_libname;
-              errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
-              if (!errors
-                  && dlname && (last_libname = strrchr (dlname, ' ')) != 0)
-                {
-                  last_libname = lt_estrdup (last_libname + 1);
-                  if (!last_libname)
-                    {
-                      ++errors;
-                      goto cleanup;
-                    }
-                  LT_DLMEM_REASSIGN (dlname, last_libname);
-                }
-            }
-
-          if (errors)
-            break;
-        }
-
-      fclose (file);
-      LT_DLGNUNET_free (line);
-
-      /* allocate the handle */
-      *phandle =
-        (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
-      if (*phandle == 0)
-        ++errors;
-
-      if (errors)
-        {
-          free_vars (dlname, old_name, libdir, deplibs);
-          LT_DLGNUNET_free (*phandle);
-          goto cleanup;
-        }
-
-      assert (*phandle);
-
-      memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
-      if (load_deplibs (*phandle, deplibs) == 0)
-        {
-          newhandle = *phandle;
-          /* find_module may replace newhandle */
-          if (find_module
-              (&newhandle, dir, libdir, dlname, old_name, installed))
-            {
-              unload_deplibs (*phandle);
-              ++errors;
-            }
-        }
-      else
-        {
-          ++errors;
-        }
-
-      free_vars (dlname, old_name, libdir, deplibs);
-      if (errors)
-        {
-          LT_DLGNUNET_free (*phandle);
-          goto cleanup;
-        }
-
-      if (*phandle != newhandle)
-        {
-          unload_deplibs (*phandle);
-        }
-    }
-  else
-    {
-      /* not a libtool module */
-      *phandle =
-        (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
-      if (*phandle == 0)
-        {
-          ++errors;
-          goto cleanup;
-        }
-
-      memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
-      newhandle = *phandle;
-
-      /* If the module has no directory name component, try to find it
-         first in user_search_path and then other prescribed paths.
-         Otherwise (or in any case if the module was not yet found) try
-         opening just the module name as passed.  */
-      if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
-                   && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
-                                    &newhandle)
-#ifdef LTDL_SHLIBPATH_VAR
-                   && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
-                                    &newhandle)
-#endif
-#ifdef LTDL_SYSSEARCHPATH
-                   && !find_handle (sys_search_path, base_name, &newhandle)
-#endif
-           )))
-        {
-          if (tryall_dlopen (&newhandle, filename) != 0)
-            {
-              newhandle = NULL;
-            }
-        }
-
-      if (!newhandle)
-        {
-          LT_DLGNUNET_free (*phandle);
-          ++errors;
-          goto cleanup;
-        }
-    }
-
-register_handle:
-  LT_DLMEM_REASSIGN (*phandle, newhandle);
-
-  if ((*phandle)->info.ref_count == 0)
-    {
-      (*phandle)->info.ref_count = 1;
-      LT_DLMEM_REASSIGN ((*phandle)->info.name, name);
-
-      LT_DLGNUNET_mutex_lock ();
-      (*phandle)->next = handles;
-      handles = *phandle;
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  LT_DLMUTEX_SETERROR (saved_error);
-
-cleanup:
-  LT_DLGNUNET_free (dir);
-  LT_DLGNUNET_free (name);
-  LT_DLGNUNET_free (canonical);
-
-  return errors;
-}
-
-lt_dlhandle
-lt_dlopen (filename)
-     const char *filename;
-{
-  lt_dlhandle handle = 0;
-
-  /* Just incase we missed a code path in try_dlopen() that reports
-     an error, but forgets to reset handle... */
-  if (try_dlopen (&handle, filename) != 0)
-    return 0;
-
-  return handle;
-}
-
-/* If the last error messge store was `FILE_NOT_FOUND', then return
-   non-zero.  */
-static int
-file_not_found ()
-{
-  const char *error = 0;
-
-  LT_DLMUTEX_GETERROR (error);
-  if (error == LT_DLSTRERROR (FILE_NOT_FOUND))
-    return 1;
-
-  return 0;
-}
-
-/* If FILENAME has an ARCHIVE_EXT or SHLIB_EXT extension, try to
-   open the FILENAME as passed.  Otherwise try appending ARCHIVE_EXT,
-   and if a file is still not found try again with SHLIB_EXT appended
-   instead.  */
-lt_dlhandle
-lt_dlopenext (filename)
-     const char *filename;
-{
-  lt_dlhandle handle = 0;
-  char *tmp = 0;
-  char *ext = 0;
-  size_t len;
-  int errors = 0;
-
-  if (!filename)
-    {
-      return lt_dlopen (filename);
-    }
-
-  assert (filename);
-
-  len = LT_STRLEN (filename);
-  ext = strrchr (filename, '.');
-
-  /* If FILENAME already bears a suitable extension, there is no need
-     to try appending additional extensions.  */
-  if (ext && ((strcmp (ext, archive_ext) == 0)
-#ifdef LTDL_SHLIB_EXT
-              || (strcmp (ext, shlib_ext) == 0)
-#endif
-      ))
-    {
-      return lt_dlopen (filename);
-    }
-
-  /* First try appending ARCHIVE_EXT.  */
-  tmp = LT_EGNUNET_malloc (char, len + LT_STRLEN (archive_ext) + 1);
-  if (!tmp)
-    return 0;
-
-  strcpy (tmp, filename);
-  strcat (tmp, archive_ext);
-  errors = try_dlopen (&handle, tmp);
-
-  /* If we found FILENAME, stop searching -- whether we were able to
-     load the file as a module or not.  If the file exists but loading
-     failed, it is better to return an error message here than to
-     report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
-     in the module search path.  */
-  if (handle || ((errors > 0) && !file_not_found ()))
-    {
-      LT_DLGNUNET_free (tmp);
-      return handle;
-    }
-
-#ifdef LTDL_SHLIB_EXT
-  /* Try appending SHLIB_EXT.   */
-  if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext))
-    {
-      LT_DLGNUNET_free (tmp);
-      tmp = LT_EGNUNET_malloc (char, len + LT_STRLEN (shlib_ext) + 1);
-      if (!tmp)
-        return 0;
-
-      strcpy (tmp, filename);
-    }
-  else
-    {
-      tmp[len] = LT_EOS_CHAR;
-    }
-
-  strcat (tmp, shlib_ext);
-  errors = try_dlopen (&handle, tmp);
-
-  /* As before, if the file was found but loading failed, return now
-     with the current error message.  */
-  if (handle || ((errors > 0) && !file_not_found ()))
-    {
-      LT_DLGNUNET_free (tmp);
-      return handle;
-    }
-#endif
-
-  /* Still here?  Then we really did fail to locate any of the file
-     names we tried.  */
-  LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-  LT_DLGNUNET_free (tmp);
-  return 0;
-}
-
-
-static int
-lt_argz_insert (pargz, pargz_len, before, entry)
-     char **pargz;
-     size_t *pargz_len;
-     char *before;
-     const char *entry;
-{
-  error_t error;
-
-  if ((error = argz_insert (pargz, pargz_len, before, entry)))
-    {
-      switch (error)
-        {
-        case ENOMEM:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-          break;
-        default:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
-          break;
-        }
-      return 1;
-    }
-
-  return 0;
-}
-
-static int
-lt_argz_insertinorder (pargz, pargz_len, entry)
-     char **pargz;
-     size_t *pargz_len;
-     const char *entry;
-{
-  char *before = 0;
-
-  assert (pargz);
-  assert (pargz_len);
-  assert (entry && *entry);
-
-  if (*pargz)
-    while ((before = argz_next (*pargz, *pargz_len, before)))
-      {
-        int cmp = strcmp (entry, before);
-
-        if (cmp < 0)
-          break;
-        if (cmp == 0)
-          return 0;             /* No duplicates! */
-      }
-
-  return lt_argz_insert (pargz, pargz_len, before, entry);
-}
-
-static int
-lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
-     char **pargz;
-     size_t *pargz_len;
-     const char *dirnam;
-     struct dirent *dp;
-{
-  char *buf = 0;
-  size_t buf_len = 0;
-  char *end = 0;
-  size_t end_offset = 0;
-  size_t dir_len = 0;
-  int errors = 0;
-
-  assert (pargz);
-  assert (pargz_len);
-  assert (dp);
-
-  dir_len = LT_STRLEN (dirnam);
-  end = dp->d_name + LT_D_NAMLEN (dp);
-
-  /* Ignore version numbers.  */
-  {
-    char *p;
-    for (p = end; p - 1 > dp->d_name; --p)
-      if (strchr (".0123456789", p[-1]) == 0)
-        break;
-
-    if (*p == '.')
-      end = p;
-  }
-
-  /* Ignore filename extension.  */
-  {
-    char *p;
-    for (p = end - 1; p > dp->d_name; --p)
-      if (*p == '.')
-        {
-          end = p;
-          break;
-        }
-  }
-
-  /* Prepend the directory name.  */
-  end_offset = end - dp->d_name;
-  buf_len = dir_len + 1 + end_offset;
-  buf = LT_EGNUNET_malloc (char, 1 + buf_len);
-  if (!buf)
-    return ++errors;
-
-  assert (buf);
-
-  strcpy (buf, dirnam);
-  strcat (buf, "/");
-  strncat (buf, dp->d_name, end_offset);
-  buf[buf_len] = LT_EOS_CHAR;
-
-  /* Try to insert (in order) into ARGZ/ARGZ_LEN.  */
-  if (lt_argz_insertinorder (pargz, pargz_len, buf) != 0)
-    ++errors;
-
-  LT_DLGNUNET_free (buf);
-
-  return errors;
-}
-
-static int
-list_files_by_dir (dirnam, pargz, pargz_len)
-     const char *dirnam;
-     char **pargz;
-     size_t *pargz_len;
-{
-  DIR *dirp = 0;
-  int errors = 0;
-
-  assert (dirnam && *dirnam);
-  assert (pargz);
-  assert (pargz_len);
-  assert (dirnam[LT_STRLEN (dirnam) - 1] != '/');
-
-  dirp = opendir (dirnam);
-  if (dirp)
-    {
-      struct dirent *dp = 0;
-
-      while ((dp = readdir (dirp)))
-        if (dp->d_name[0] != '.')
-          if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp))
-            {
-              ++errors;
-              break;
-            }
-
-      closedir (dirp);
-    }
-  else
-    ++errors;
-
-  return errors;
-}
-
-
-/* If there are any files in DIRNAME, call the function passed in
-   DATA1 (with the name of each file and DATA2 as arguments).  */
-static int
-foreachfile_callback (dirname, data1, data2)
-     char *dirname;
-     lt_ptr data1;
-     lt_ptr data2;
-{
-  int (*func) LT_PARAMS ((const char *filename, lt_ptr data))
-    = (int (*)LT_PARAMS ((const char *filename, lt_ptr data))) data1;
-
-  int is_done = 0;
-  char *argz = 0;
-  size_t argz_len = 0;
-
-  if (list_files_by_dir (dirname, &argz, &argz_len) != 0)
-    goto cleanup;
-  if (!argz)
-    goto cleanup;
-
-  {
-    char *filename = 0;
-    while ((filename = argz_next (argz, argz_len, filename)))
-      if ((is_done = (*func) (filename, data2)))
-        break;
-  }
-
-cleanup:
-  LT_DLGNUNET_free (argz);
-
-  return is_done;
-}
-
-
-/* Call FUNC for each unique extensionless file in SEARCH_PATH, along
-   with DATA.  The filenames passed to FUNC would be suitable for
-   passing to lt_dlopenext.  The extensions are stripped so that
-   individual modules do not generate several entries (e.g. libfoo.la,
-   libfoo.so, libfoo.so.1, libfoo.so.1.0.0).  If SEARCH_PATH is NULL,
-   then the same directories that lt_dlopen would search are examined.  */
-int
-lt_dlforeachfile (search_path, func, data)
-     const char *search_path;
-     int (*func) LT_PARAMS ((const char *filename, lt_ptr data));
-     lt_ptr data;
-{
-  int is_done = 0;
-
-  if (search_path)
-    {
-      /* If a specific path was passed, search only the directories
-         listed in it.  */
-      is_done = foreach_dirinpath (search_path, 0,
-                                   foreachfile_callback, func, data);
-    }
-  else
-    {
-      /* Otherwise search the default paths.  */
-      is_done = foreach_dirinpath (user_search_path, 0,
-                                   foreachfile_callback, func, data);
-      if (!is_done)
-        {
-          is_done = foreach_dirinpath (getenv ("LTDL_LIBRARY_PATH"), 0,
-                                       foreachfile_callback, func, data);
-        }
-
-#ifdef LTDL_SHLIBPATH_VAR
-      if (!is_done)
-        {
-          is_done = foreach_dirinpath (getenv (LTDL_SHLIBPATH_VAR), 0,
-                                       foreachfile_callback, func, data);
-        }
-#endif
-#ifdef LTDL_SYSSEARCHPATH
-      if (!is_done)
-        {
-          is_done = foreach_dirinpath (getenv (LTDL_SYSSEARCHPATH), 0,
-                                       foreachfile_callback, func, data);
-        }
-#endif
-    }
-
-  return is_done;
-}
-
-int
-lt_dlclose (handle)
-     lt_dlhandle handle;
-{
-  lt_dlhandle cur, last;
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  /* check whether the handle is valid */
-  last = cur = handles;
-  while (cur && handle != cur)
-    {
-      last = cur;
-      cur = cur->next;
-    }
-
-  if (!cur)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      ++errors;
-      goto done;
-    }
-
-  handle->info.ref_count--;
-
-  /* Note that even with resident modules, we must track the ref_count
-     correctly incase the user decides to reset the residency flag
-     later (even though the API makes no provision for that at the
-     moment).  */
-  if (handle->info.ref_count <= 0 && !LT_DLIS_RESIDENT (handle))
-    {
-      lt_user_data data = handle->loader->dlloader_data;
-
-      if (handle != handles)
-        {
-          last->next = handle->next;
-        }
-      else
-        {
-          handles = handle->next;
-        }
-
-      errors += handle->loader->module_close (data, handle->module);
-      errors += unload_deplibs (handle);
-
-      /* It is up to the callers to free the data itself.  */
-      LT_DLGNUNET_free (handle->caller_data);
-
-      LT_DLGNUNET_free (handle->info.filename);
-      LT_DLGNUNET_free (handle->info.name);
-      LT_DLGNUNET_free (handle);
-
-      goto done;
-    }
-
-  if (LT_DLIS_RESIDENT (handle))
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CLOSE_RESIDENT_MODULE));
-      ++errors;
-    }
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-lt_ptr
-lt_dlsym (handle, symbol)
-     lt_dlhandle handle;
-     const char *symbol;
-{
-  size_t lensym;
-  char lsym[LT_SYMBOL_LENGTH];
-  char *sym;
-  lt_ptr address;
-  lt_user_data data;
-
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      return 0;
-    }
-
-  if (!symbol)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-      return 0;
-    }
-
-  lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->loader->sym_prefix)
-    + LT_STRLEN (handle->info.name);
-
-  if (lensym + LT_SYMBOL_OVERHEAD < LT_SYMBOL_LENGTH)
-    {
-      sym = lsym;
-    }
-  else
-    {
-      sym = LT_EGNUNET_malloc (char, lensym + LT_SYMBOL_OVERHEAD + 1);
-      if (!sym)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
-          return 0;
-        }
-    }
-
-  data = handle->loader->dlloader_data;
-  if (handle->info.name)
-    {
-      const char *saved_error;
-
-      LT_DLMUTEX_GETERROR (saved_error);
-
-      /* this is a libtool module */
-      if (handle->loader->sym_prefix)
-        {
-          strcpy (sym, handle->loader->sym_prefix);
-          strcat (sym, handle->info.name);
-        }
-      else
-        {
-          strcpy (sym, handle->info.name);
-        }
-
-      strcat (sym, "_LTX_");
-      strcat (sym, symbol);
-
-      /* try "modulename_LTX_symbol" */
-      address = handle->loader->find_sym (data, handle->module, sym);
-      if (address)
-        {
-          if (sym != lsym)
-            {
-              LT_DLGNUNET_free (sym);
-            }
-          return address;
-        }
-      LT_DLMUTEX_SETERROR (saved_error);
-    }
-
-  /* otherwise try "symbol" */
-  if (handle->loader->sym_prefix)
-    {
-      strcpy (sym, handle->loader->sym_prefix);
-      strcat (sym, symbol);
-    }
-  else
-    {
-      strcpy (sym, symbol);
-    }
-
-  address = handle->loader->find_sym (data, handle->module, sym);
-  if (sym != lsym)
-    {
-      LT_DLGNUNET_free (sym);
-    }
-
-  return address;
-}
-
-const char *
-lt_dlerror ()
-{
-  const char *error;
-
-  LT_DLMUTEX_GETERROR (error);
-  LT_DLMUTEX_SETERROR (0);
-
-  return error ? error : NULL;
-}
-
-static int
-lt_dlpath_insertdir (ppath, before, dir)
-     char **ppath;
-     char *before;
-     const char *dir;
-{
-  int errors = 0;
-  char *canonical = 0;
-  char *argz = 0;
-  size_t argz_len = 0;
-
-  assert (ppath);
-  assert (dir && *dir);
-
-  if (canonicalize_path (dir, &canonical) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  assert (canonical && *canonical);
-
-  /* If *PPATH is empty, set it to DIR.  */
-  if (*ppath == 0)
-    {
-      assert (!before);         /* BEFORE cannot be set without PPATH.  */
-      assert (dir);             /* Without DIR, don't call this function!  */
-
-      *ppath = lt_estrdup (dir);
-      if (*ppath == 0)
-        ++errors;
-
-      return errors;
-    }
-
-  assert (ppath && *ppath);
-
-  if (argzize_path (*ppath, &argz, &argz_len) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  /* Convert BEFORE into an equivalent offset into ARGZ.  This only works
-     if *PPATH is already canonicalized, and hence does not change length
-     with respect to ARGZ.  We canonicalize each entry as it is added to
-     the search path, and don't call this function with (uncanonicalized)
-     user paths, so this is a fair assumption.  */
-  if (before)
-    {
-      assert (*ppath <= before);
-      assert (before - *ppath <= strlen (*ppath));
-
-      before = before - *ppath + argz;
-    }
-
-  if (lt_argz_insert (&argz, &argz_len, before, dir) != 0)
-    {
-      ++errors;
-      goto cleanup;
-    }
-
-  argz_stringify (argz, argz_len, LT_PATHSEP_CHAR);
-  LT_DLMEM_REASSIGN (*ppath, argz);
-
-cleanup:
-  LT_DLGNUNET_free (canonical);
-  LT_DLGNUNET_free (argz);
-
-  return errors;
-}
-
-int
-lt_dladdsearchdir (search_dir)
-     const char *search_dir;
-{
-  int errors = 0;
-
-  if (search_dir && *search_dir)
-    {
-      LT_DLGNUNET_mutex_lock ();
-      if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
-        ++errors;
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  return errors;
-}
-
-int
-lt_dlinsertsearchdir (before, search_dir)
-     const char *before;
-     const char *search_dir;
-{
-  int errors = 0;
-
-  if (before)
-    {
-      LT_DLGNUNET_mutex_lock ();
-      if ((before < user_search_path)
-          || (before >= user_search_path + LT_STRLEN (user_search_path)))
-        {
-          LT_DLMUTEX_UNLOCK ();
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
-          return 1;
-        }
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  if (search_dir && *search_dir)
-    {
-      LT_DLGNUNET_mutex_lock ();
-      if (lt_dlpath_insertdir (&user_search_path,
-                               (char *) before, search_dir) != 0)
-        {
-          ++errors;
-        }
-      LT_DLMUTEX_UNLOCK ();
-    }
-
-  return errors;
-}
-
-int
-lt_dlsetsearchpath (search_path)
-     const char *search_path;
-{
-  int errors = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-  LT_DLGNUNET_free (user_search_path);
-  LT_DLMUTEX_UNLOCK ();
-
-  if (!search_path || !LT_STRLEN (search_path))
-    {
-      return errors;
-    }
-
-  LT_DLGNUNET_mutex_lock ();
-  if (canonicalize_path (search_path, &user_search_path) != 0)
-    ++errors;
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-const char *
-lt_dlgetsearchpath ()
-{
-  const char *saved_path;
-
-  LT_DLGNUNET_mutex_lock ();
-  saved_path = user_search_path;
-  LT_DLMUTEX_UNLOCK ();
-
-  return saved_path;
-}
-
-int
-lt_dlmakeresident (handle)
-     lt_dlhandle handle;
-{
-  int errors = 0;
-
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      ++errors;
-    }
-  else
-    {
-      LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
-    }
-
-  return errors;
-}
-
-int
-lt_dlisresident (handle)
-     lt_dlhandle handle;
-{
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      return -1;
-    }
-
-  return LT_DLIS_RESIDENT (handle);
-}
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-const lt_dlinfo *
-lt_dlgetinfo (handle)
-     lt_dlhandle handle;
-{
-  if (!handle)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-      return 0;
-    }
-
-  return &(handle->info);
-}
-
-lt_dlhandle
-lt_dlhandle_next (place)
-     lt_dlhandle place;
-{
-  return place ? place->next : handles;
-}
-
-int
-lt_dlforeach (func, data)
-     int (*func) LT_PARAMS ((lt_dlhandle handle, lt_ptr data));
-     lt_ptr data;
-{
-  int errors = 0;
-  lt_dlhandle cur;
-
-  LT_DLGNUNET_mutex_lock ();
-
-  cur = handles;
-  while (cur)
-    {
-      lt_dlhandle tmp = cur;
-
-      cur = cur->next;
-      if ((*func) (tmp, data))
-        {
-          ++errors;
-          break;
-        }
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-lt_dlcaller_id
-lt_dlcaller_register ()
-{
-  static lt_dlcaller_id last_caller_id = 0;
-  int result;
-
-  LT_DLGNUNET_mutex_lock ();
-  result = ++last_caller_id;
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-lt_ptr
-lt_dlcaller_set_data (key, handle, data)
-     lt_dlcaller_id key;
-     lt_dlhandle handle;
-     lt_ptr data;
-{
-  int n_elements = 0;
-  lt_ptr stale = (lt_ptr) 0;
-  int i;
-
-  /* This needs to be locked so that the caller data can be updated
-     simultaneously by different threads.  */
-  LT_DLGNUNET_mutex_lock ();
-
-  if (handle->caller_data)
-    while (handle->caller_data[n_elements].key)
-      ++n_elements;
-
-  for (i = 0; i < n_elements; ++i)
-    {
-      if (handle->caller_data[i].key == key)
-        {
-          stale = handle->caller_data[i].data;
-          break;
-        }
-    }
-
-  /* Ensure that there is enough room in this handle's caller_data
-     array to accept a new element (and an empty end marker).  */
-  if (i == n_elements)
-    {
-      lt_caller_data *temp
-        = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2 + n_elements);
-
-      if (!temp)
-        {
-          stale = 0;
-          goto done;
-        }
-
-      handle->caller_data = temp;
-
-      /* We only need this if we needed to allocate a new caller_data.  */
-      handle->caller_data[i].key = key;
-      handle->caller_data[1 + i].key = 0;
-    }
-
-  handle->caller_data[i].data = data;
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return stale;
-}
-
-lt_ptr
-lt_dlcaller_get_data (key, handle)
-     lt_dlcaller_id key;
-     lt_dlhandle handle;
-{
-  lt_ptr result = (lt_ptr) 0;
-
-  /* This needs to be locked so that the caller data isn't updated by
-     another thread part way through this function.  */
-  LT_DLGNUNET_mutex_lock ();
-
-  /* Locate the index of the element with a matching KEY.  */
-  {
-    int i;
-    for (i = 0; handle->caller_data[i].key; ++i)
-      {
-        if (handle->caller_data[i].key == key)
-          {
-            result = handle->caller_data[i].data;
-            break;
-          }
-      }
-  }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return result;
-}
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-int
-lt_dlloader_add (place, dlloader, loader_name)
-     lt_dlloader *place;
-     const struct lt_user_dlloader *dlloader;
-     const char *loader_name;
-{
-  int errors = 0;
-  lt_dlloader *node = 0, *ptr = 0;
-
-  if ((dlloader == 0)           /* diagnose null parameters */
-      || (dlloader->module_open == 0)
-      || (dlloader->module_close == 0) || (dlloader->find_sym == 0))
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-      return 1;
-    }
-
-  /* Create a new dlloader node with copies of the user callbacks.  */
-  node = LT_EGNUNET_malloc (lt_dlloader, 1);
-  if (!node)
-    return 1;
-
-  node->next = 0;
-  node->loader_name = loader_name;
-  node->sym_prefix = dlloader->sym_prefix;
-  node->dlloader_exit = dlloader->dlloader_exit;
-  node->module_open = dlloader->module_open;
-  node->module_close = dlloader->module_close;
-  node->find_sym = dlloader->find_sym;
-  node->dlloader_data = dlloader->dlloader_data;
-
-  LT_DLGNUNET_mutex_lock ();
-  if (!loaders)
-    {
-      /* If there are no loaders, NODE becomes the list! */
-      loaders = node;
-    }
-  else if (!place)
-    {
-      /* If PLACE is not set, add NODE to the end of the
-         LOADERS list. */
-      for (ptr = loaders; ptr->next; ptr = ptr->next)
-        {
-           /*NOWORK*/;
-        }
-
-      ptr->next = node;
-    }
-  else if (loaders == place)
-    {
-      /* If PLACE is the first loader, NODE goes first. */
-      node->next = place;
-      loaders = node;
-    }
-  else
-    {
-      /* Find the node immediately preceding PLACE. */
-      for (ptr = loaders; ptr->next != place; ptr = ptr->next)
-        {
-           /*NOWORK*/;
-        }
-
-      if (ptr->next != place)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-          ++errors;
-        }
-      else
-        {
-          /* Insert NODE between PTR and PLACE. */
-          node->next = place;
-          ptr->next = node;
-        }
-    }
-
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-int
-lt_dlloader_remove (loader_name)
-     const char *loader_name;
-{
-  lt_dlloader *place = lt_dlloader_find (loader_name);
-  lt_dlhandle handle;
-  int errors = 0;
-
-  if (!place)
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-      return 1;
-    }
-
-  LT_DLGNUNET_mutex_lock ();
-
-  /* Fail if there are any open modules which use this loader. */
-  for (handle = handles; handle; handle = handle->next)
-    {
-      if (handle->loader == place)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
-          ++errors;
-          goto done;
-        }
-    }
-
-  if (place == loaders)
-    {
-      /* PLACE is the first loader in the list. */
-      loaders = loaders->next;
-    }
-  else
-    {
-      /* Find the loader before the one being removed. */
-      lt_dlloader *prev;
-      for (prev = loaders; prev->next; prev = prev->next)
-        {
-          if (!strcmp (prev->next->loader_name, loader_name))
-            {
-              break;
-            }
-        }
-
-      place = prev->next;
-      prev->next = prev->next->next;
-    }
-
-  if (place->dlloader_exit)
-    {
-      errors = place->dlloader_exit (place->dlloader_data);
-    }
-
-  LT_DLGNUNET_free (place);
-
-done:
-  LT_DLMUTEX_UNLOCK ();
-
-  return errors;
-}
-
-lt_dlloader *
-lt_dlloader_next (place)
-     lt_dlloader *place;
-{
-  lt_dlloader *next;
-
-  LT_DLGNUNET_mutex_lock ();
-  next = place ? place->next : loaders;
-  LT_DLMUTEX_UNLOCK ();
-
-  return next;
-}
-
-const char *
-lt_dlloader_name (place)
-     lt_dlloader *place;
-{
-  const char *name = 0;
-
-  if (place)
-    {
-      LT_DLGNUNET_mutex_lock ();
-      name = place ? place->loader_name : 0;
-      LT_DLMUTEX_UNLOCK ();
-    }
-  else
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-    }
-
-  return name;
-}
-
-lt_user_data *
-lt_dlloader_data (place)
-     lt_dlloader *place;
-{
-  lt_user_data *data = 0;
-
-  if (place)
-    {
-      LT_DLGNUNET_mutex_lock ();
-      data = place ? &(place->dlloader_data) : 0;
-      LT_DLMUTEX_UNLOCK ();
-    }
-  else
-    {
-      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-    }
-
-  return data;
-}
-
-lt_dlloader *
-lt_dlloader_find (loader_name)
-     const char *loader_name;
-{
-  lt_dlloader *place = 0;
-
-  LT_DLGNUNET_mutex_lock ();
-  for (place = loaders; place; place = place->next)
-    {
-      if (strcmp (place->loader_name, loader_name) == 0)
-        {
-          break;
-        }
-    }
-  LT_DLMUTEX_UNLOCK ();
-
-  return place;
-}
diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
deleted file mode 100644
index b64b5b89..00000000
--- a/libltdl/ltdl.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/* ltdl.h -- generic dlopen functions
-   Copyright (C) 1998-2000 Free Software Foundation, Inc.
-   Originally by Thomas Tanner <tanner@ffii.org>
-   This file is part of GNU Libtool.
-
-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 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-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., 59 Temple Place, Suite 330, Boston, MA
-02111-1307  USA
-*/
-
-/* Only include this header file once. */
-#ifndef LTDL_H
-#define LTDL_H 1
-
-#include <sys/types.h>          /* for size_t declaration */
-
-
-/* --- MACROS FOR PORTABILITY --- */
-
-
-/* Saves on those hard to debug '\0' typos....  */
-#define LT_EOS_CHAR     '\0'
-
-/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
-   so that C++ compilers don't mangle their names.  Use LTDL_END_C_DECLS at
-   the end of C declarations. */
-#ifdef __cplusplus
-# define LT_BEGIN_C_DECLS       extern "C" {
-# define LT_END_C_DECLS         }
-#else
-# define LT_BEGIN_C_DECLS       /* empty */
-# define LT_END_C_DECLS         /* empty */
-#endif
-
-LT_BEGIN_C_DECLS
-/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
-   that don't understand ANSI C prototypes still work, and ANSI C
-   compilers can issue warnings about type mismatches.  */
-#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
-# define LT_PARAMS(protos)      protos
-# define lt_ptr         void*
-#else
-# define LT_PARAMS(protos)      ()
-# define lt_ptr         char*
-#endif
-/* LT_STMT_START/END are used to create macros which expand to a
-   a single compound statement in a portable way.  */
-#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#  define LT_STMT_START        (void)(
-#  define LT_STMT_END          )
-#else
-#  if (defined (sun) || defined (__sun__))
-#    define LT_STMT_START      if (1)
-#    define LT_STMT_END        else (void)0
-#  else
-#    define LT_STMT_START      do
-#    define LT_STMT_END        while (0)
-#  endif
-#endif
-/* LT_CONC creates a new concatenated symbol for the compiler
-   in a portable way.  */
-#if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
-#  define LT_CONC(s,t)  s##t
-#else
-#  define LT_CONC(s,t)  s/**/t
-#endif
-/* LT_STRLEN can be used safely on NULL pointers.  */
-#define LT_STRLEN(s)    (((s) && (s)[0]) ? strlen (s) : 0)
-/* --- WINDOWS SUPPORT --- */
-/* Canonicalise Windows and Cygwin recognition macros.  */
-#ifdef __CYGWIN32__
-#  ifndef __CYGWIN__
-#    define __CYGWIN__ __CYGWIN32__
-#  endif
-#endif
-#if defined(_WIN32) || defined(WIN32)
-#  ifndef __WINDOWS__
-#    ifdef _WIN32
-#      define __WINDOWS__ _WIN32
-#    else
-#      ifdef WIN32
-#        define __WINDOWS__ WIN32
-#      endif
-#    endif
-#  endif
-#endif
-#ifdef __WINDOWS__
-#  ifndef __CYGWIN__
-/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
-   separator when it is set. */
-#    define LT_DIRSEP_CHAR      '\\'
-#    define LT_PATHSEP_CHAR     ';'
-#  endif
-#endif
-#ifndef LT_PATHSEP_CHAR
-#  define LT_PATHSEP_CHAR       ':'
-#endif
-/* DLL building support on win32 hosts;  mostly to workaround their
-   ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-#  ifdef __WINDOWS__
-#    ifdef DLL_EXPORT           /* defined by libtool (if required) */
-#      define LT_SCOPE  __declspec(dllexport)
-#    endif
-#    ifdef LIBLTDL_DLL_IMPORT   /* define if linking with this dll */
-#      define LT_SCOPE  extern __declspec(dllimport)
-#    endif
-#  endif
-#  ifndef LT_SCOPE              /* static linking or !__WINDOWS__ */
-#    define LT_SCOPE    extern
-#  endif
-#endif
-#if defined(_MSC_VER)           /* Visual Studio */
-#  define R_OK 4
-#endif
-/* --- DYNAMIC MODULE LOADING API --- */
-typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module.  */
-
-/* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE int lt_dlinit LT_PARAMS ((void));
-LT_SCOPE int lt_dlexit LT_PARAMS ((void));
-
-/* Module search path manipulation.  */
-LT_SCOPE int lt_dladdsearchdir LT_PARAMS ((const char *search_dir));
-LT_SCOPE int lt_dlinsertsearchdir LT_PARAMS ((const char *before,
-                                              const char *search_dir));
-LT_SCOPE int lt_dlsetsearchpath LT_PARAMS ((const char *search_path));
-LT_SCOPE const char *lt_dlgetsearchpath LT_PARAMS ((void));
-LT_SCOPE int lt_dlforeachfile LT_PARAMS ((const char *search_path,
-                                          int (*func) (const char *filename,
-                                                       lt_ptr data),
-                                          lt_ptr data));
-
-/* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE lt_dlhandle lt_dlopen LT_PARAMS ((const char *filename));
-LT_SCOPE lt_dlhandle lt_dlopenext LT_PARAMS ((const char *filename));
-LT_SCOPE lt_ptr lt_dlsym LT_PARAMS ((lt_dlhandle handle, const char *name));
-LT_SCOPE const char *lt_dlerror LT_PARAMS ((void));
-LT_SCOPE int lt_dlclose LT_PARAMS ((lt_dlhandle handle));
-
-/* Module residency management. */
-LT_SCOPE int lt_dlmakeresident LT_PARAMS ((lt_dlhandle handle));
-LT_SCOPE int lt_dlisresident LT_PARAMS ((lt_dlhandle handle));
-
-
-
-
-/* --- GNUNET_Mutex LOCKING --- */
-
-
-typedef void lt_dlmutex_lock LT_PARAMS ((void));
-typedef void lt_dlmutex_unlock LT_PARAMS ((void));
-typedef void lt_dlmutex_seterror LT_PARAMS ((const char *errmsg));
-typedef const char *lt_dlmutex_geterror LT_PARAMS ((void));
-
-LT_SCOPE int lt_dlmutex_register LT_PARAMS ((lt_dlmutex_lock * lock,
-                                             lt_dlmutex_unlock * unlock,
-                                             lt_dlmutex_seterror * seterror,
-                                             lt_dlmutex_geterror * geterror));
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* By default, the realloc function pointer is set to our internal
-   realloc implementation which iself uses lt_dlmalloc and lt_dlfree.
-   libltdl relies on a featureful realloc, but if you are sure yours
-   has the right semantics then you can assign it directly.  Generally,
-   it is safe to assign just a malloc() and a free() function.  */
-LT_SCOPE
-lt_ptr (*lt_dlmalloc)
-LT_PARAMS ((size_t size));
-     LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS ((lt_ptr ptr, size_t size));
-     LT_SCOPE void (*lt_dlfree) LT_PARAMS ((lt_ptr ptr));
-
-
-
-
-/* --- PRELOADED MODULE SUPPORT --- */
-
-
-/* A preopened symbol. Arrays of this type comprise the exported
-   symbols for a dlpreopened module. */
-     typedef struct
-     {
-       const char *name;
-       lt_ptr address;
-     } lt_dlsymlist;
-
-     LT_SCOPE int lt_dlpreload LT_PARAMS ((const lt_dlsymlist * preloaded));
-     LT_SCOPE int lt_dlpreload_default
-       LT_PARAMS ((const lt_dlsymlist * preloaded));
-
-#define LTDL_SET_PRELOADED_SYMBOLS()            LT_STMT_START{  \
-        extern const lt_dlsymlist lt_preloaded_symbols[];               \
-        lt_dlpreload_default(lt_preloaded_symbols);                     \
-                                                }LT_STMT_END
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-
-/* Read only information pertaining to a loaded module. */
-     typedef struct
-     {
-       char *filename;          /* file name */
-       char *name;              /* module name */
-       int ref_count;           /* number of times lt_dlopened minus
-                                   number of times lt_dlclosed. */
-     } lt_dlinfo;
-
-     LT_SCOPE const lt_dlinfo *lt_dlgetinfo LT_PARAMS ((lt_dlhandle handle));
-     LT_SCOPE lt_dlhandle lt_dlhandle_next LT_PARAMS ((lt_dlhandle place));
-     LT_SCOPE int lt_dlforeach
-       LT_PARAMS ((int (*func) (lt_dlhandle handle, lt_ptr data),
-                   lt_ptr data));
-
-/* Associating user data with loaded modules. */
-     typedef unsigned lt_dlcaller_id;
-
-     LT_SCOPE lt_dlcaller_id lt_dlcaller_register LT_PARAMS ((void));
-     LT_SCOPE lt_ptr lt_dlcaller_set_data LT_PARAMS ((lt_dlcaller_id key,
-                                                      lt_dlhandle handle,
-                                                      lt_ptr data));
-     LT_SCOPE lt_ptr lt_dlcaller_get_data LT_PARAMS ((lt_dlcaller_id key,
-                                                      lt_dlhandle handle));
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-     typedef struct lt_dlloader lt_dlloader;
-     typedef lt_ptr lt_user_data;
-     typedef lt_ptr lt_module;
-
-/* Function pointer types for creating user defined module loaders. */
-     typedef lt_module lt_module_open LT_PARAMS ((lt_user_data loader_data,
-                                                  const char *filename));
-     typedef int lt_module_close LT_PARAMS ((lt_user_data loader_data,
-                                             lt_module handle));
-     typedef lt_ptr lt_find_sym LT_PARAMS ((lt_user_data loader_data,
-                                            lt_module handle,
-                                            const char *symbol));
-     typedef int lt_dlloader_exit LT_PARAMS ((lt_user_data loader_data));
-
-     struct lt_user_dlloader
-     {
-       const char *sym_prefix;
-       lt_module_open *module_open;
-       lt_module_close *module_close;
-       lt_find_sym *find_sym;
-       lt_dlloader_exit *dlloader_exit;
-       lt_user_data dlloader_data;
-     };
-
-     LT_SCOPE lt_dlloader *lt_dlloader_next LT_PARAMS ((lt_dlloader * place));
-     LT_SCOPE lt_dlloader *lt_dlloader_find
-       LT_PARAMS ((const char *loader_name));
-     LT_SCOPE const char *lt_dlloader_name LT_PARAMS ((lt_dlloader * place));
-     LT_SCOPE lt_user_data *lt_dlloader_data
-       LT_PARAMS ((lt_dlloader * place));
-     LT_SCOPE int lt_dlloader_add
-       LT_PARAMS ((lt_dlloader * place,
-                   const struct lt_user_dlloader * dlloader,
-                   const char *loader_name));
-     LT_SCOPE int lt_dlloader_remove LT_PARAMS ((const char *loader_name));
-
-
-
-/* --- ERROR MESSAGE HANDLING --- */
-
-
-/* Defining error strings alongside their symbolic names in a macro in
-   this way allows us to expand the macro in different contexts with
-   confidence that the enumeration of symbolic names will map correctly
-   onto the table of error strings.  */
-#define lt_dlerror_table                                                \
-    LT_ERROR(UNKNOWN,               "unknown error")                    \
-    LT_ERROR(DLOPEN_NOT_SUPPORTED,  "dlopen support not available")     \
-    LT_ERROR(INVALID_LOADER,        "invalid loader")                   \
-    LT_ERROR(INIT_LOADER,           "loader initialization failed")     \
-    LT_ERROR(REMOVE_LOADER,         "loader removal failed")            \
-    LT_ERROR(FILE_NOT_FOUND,        "file not found")                   \
-    LT_ERROR(DEPLIB_NOT_FOUND,      "dependency library not found")     \
-    LT_ERROR(NO_SYMBOLS,            "no symbols defined")               \
-    LT_ERROR(CANNOT_OPEN,           "can't open the module")            \
-    LT_ERROR(CANNOT_CLOSE,          "can't close the module")           \
-    LT_ERROR(SYMBOL_NOT_FOUND,      "symbol not found")                 \
-    LT_ERROR(NO_MEMORY,             "not enough memory")                \
-    LT_ERROR(INVALID_HANDLE,        "invalid module handle")            \
-    LT_ERROR(BUFFER_OVERFLOW,       "internal buffer overflow")         \
-    LT_ERROR(INVALID_ERRORCODE,     "invalid errorcode")                \
-    LT_ERROR(SHUTDOWN,              "library already shutdown")         \
-    LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module")      \
-    LT_ERROR(INVALID_MUTEX_ARGS,    "invalid mutex handler registration") \
-    LT_ERROR(INVALID_POSITION,      "invalid search path insert position")
-
-/* Enumerate the symbolic error names. */
-     enum
-     {
-#define LT_ERROR(name, diagnostic)      LT_CONC(LT_ERROR_, name),
-       lt_dlerror_table
-#undef LT_ERROR
-       LT_ERROR_MAX
-     };
-
-/* These functions are only useful from inside custom module loaders. */
-     LT_SCOPE int lt_dladderror LT_PARAMS ((const char *diagnostic));
-     LT_SCOPE int lt_dlseterror LT_PARAMS ((int errorcode));
-
-
-
-
-/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
-
-
-#ifdef LT_NON_POSIX_NAMESPACE
-#  define lt_ptr_t              lt_ptr
-#  define lt_module_t           lt_module
-#  define lt_module_open_t      lt_module_open
-#  define lt_module_close_t     lt_module_close
-#  define lt_find_sym_t         lt_find_sym
-#  define lt_dlloader_exit_t    lt_dlloader_exit
-#  define lt_dlloader_t         lt_dlloader
-#  define lt_dlloader_data_t    lt_user_data
-#endif
-
-LT_END_C_DECLS
-#endif /* !LTDL_H */
diff --git a/ltmain.sh b/ltmain.sh
index b2f25d99..0bf38482 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-2"
+VERSION="1.5.26 Debian 1.5.26-4"
 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).