menuselect: Remove mxml from menuselect (Patch 2)

This is the second patch that adds menuselect to Asterisk trunk. The previous
commit (r418832) added menuselect along with mxml; this patch removes mxml
completely from Menuselect.

A subsequent patch will switch menuselect over to using libxml2, and make
libxml2 a required dependency for Asterisk.

ASTERISK-20703


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418833 65c4cc65-6c06-0410-ace0-fbb531ad65f3

21 files changed, 0 insertions, 13761 deletions

diff --git a/menuselect/mxml/ANNOUNCEMENT b/menuselect/mxml/ANNOUNCEMENT
deleted file mode 100644
index 7b49102d8..000000000
--- a/menuselect/mxml/ANNOUNCEMENT
+++ /dev/null
@@ -1,5 +0,0 @@
-Mini-XML 2.2.2 is now available for download from:
-
-    http://www.easysw.com/~mike/mxml/software.php
-
-Mini-XML 2.2.2 fixes a bug in the reading of custom data nodes.
diff --git a/menuselect/mxml/CHANGES b/menuselect/mxml/CHANGES
deleted file mode 100644
index fd92104fd..000000000
--- a/menuselect/mxml/CHANGES
+++ /dev/null
@@ -1,213 +0,0 @@
-CHANGES - 05/19/2005
---------------------
-
-CHANGES IN Mini-XML 2.2.2
-
-	- mxmlLoad*() did not treat custom data as opaque, so
-	  whitespace characters would be lost.
-
-
-CHANGES IN Mini-XML 2.2.1
-
-	- mxmlLoadFd(), mxmlLoadFile(), and mxmlLoadString() now
-	  correctly return NULL on error (STR #21)
-	- mxmlNewInteger(), mxmlNewOpaque(), mxmlNewReal(),
-	  mxmlNewText(), and mxmlNewTextf() incorrectly required
-	  a parent node (STR #22)
-	- Fixed an XML output bug in mxmldoc.
-	- The "make install" target now uses the install command
-	  to set the proper permissions on UNIX/Linux/OSX.
-	- Fixed a MingW/Cygwin compilation problem (STR #18)
-
-
-CHANGES IN Mini-XML 2.2
-
-	- Added shared library support (STR #17)
-	- mxmlLoad*() now returns an error when an XML stream
-	  contains illegal control characters (STR #10)
-	- mxmlLoad*() now returns an error when an element
-	  contains two attributes with the same name in
-	  conformance with the XML spec (STR #16)
-	- Added support for CDATA (STR #14, STR #15)
-	- Updated comment and processing instruction handling -
-	  no entity support per XML specification.
-	- Added checking for invalid comment termination ("--->"
-	  is not allowed)
-
-
-CHANGES IN Mini-XML 2.1
-
-	- Added support for custom data nodes (STR #6)
-	- Now treat UTF-8 sequences which are longer than
-	  necessary as an error (STR #4)
-	- Fixed entity number support (STR #8)
-	- Fixed mxmlLoadString() bug with UTF-8 (STR #7)
-	- Fixed entity lookup bug (STR #5)
-	- Added mxmlLoadFd() and mxmlSaveFd() functions.
-	- Fixed multi-word UTF-16 handling.
-
-
-CHANGES IN Mini-XML 2.0
-
-	- New programmers manual.
-	- Added Visual C++ project files for Microsoft Windows
-	  users.
-	- Added optimizations to mxmldoc, mxmlSaveFile(), and
-	  mxmlIndexNew() (STR #2)
-	- mxmlEntityAddCallback() now returns an integer status
-	  (STR #2)
-	- Added UTF-16 support (input only; all output is UTF-8)
-	- Added index functions to build a searchable index of
-	  XML nodes.
-	- Added character entity callback interface to support
-	  additional character entities beyond those defined in
-	  the XHTML specification.
-	- Added support for XHTML character entities.
-	- The mxmldoc utility now produces XML output which
-	  conforms to an updated XML schema, described in the file
-	  "doc/mxmldoc.xsd".
-	- Changed the whitespace callback interface to return
-	  strings instead of a single character, allowing for
-	  greater control over the formatting of XML files
-	  written using Mini-XML.  THIS CHANGE WILL REQUIRE
-	  CHANGES TO YOUR 1.x CODE IF YOU USE WHITESPACE
-	  CALLBACKS.
-	- The mxmldoc utility is now capable of documenting C++
-	  classes, functions, and structures, and correctly
-	  handles C++ comments.
-	- Added new modular tests for mxmldoc.
-	- Updated the mxmldoc output to be more compatible with
-	  embedding in manuals produced with HTMLDOC.
-	- The makefile incorrectly included a "/" separator
-	  between the destination path and install path.  This
-	  caused problems when building and installing with
-	  MingW.
-
-
-CHANGES IN Mini-XML 1.3
-
-	- Fixes for mxmldoc.
-	- Added support for reading standard HTML entity names.
-	- mxmlLoadString/File() did not decode character
-	  entities in element names, attribute names, or
-	  attribute values.
-	- mxmlLoadString/File() would crash when loading non-
-	  conformant XML data under an existing parent (top)
-	  node.
-	- Fixed several bugs in the mxmldoc utility.
-	- Added new error callback function to catch a variety
-	  of errors and log them to someplace other than stderr.
-	- The mxmlElementSetAttr() function now allows for NULL
-	  attribute values.
-	- The load and save functions now properly handle quoted
-	  element and attribute name strings properly, e.g. for
-	  !DOCTYPE declarations.
-
-
-CHANGES IN Mini-XML 1.2
-
-	- Added new "set" methods to set the value of a node.
-	- Added new formatted text methods mxmlNewTextf() and
-	  mxmlSetTextf() to create/set a text node value using
-	  printf-style formats.
-	- Added new standard callbacks for use with the mxmlLoad
-	  functions.
-	- Updated the HTML documentation to include examples of
-	  the walk and load function output.
-	- Added --with/without-ansi configure option to control
-	  the strdup() function check.
-	- Added --with/without-snprintf configure option to
-	  control the snprintf() and vsnprintf() function
-	  checks.
-
-
-CHANGES IN Mini-XML 1.1.2
-
-	- The mxml(3) man page wasn't updated for the string
-	  functions.
-	- mxmlSaveString() returned the wrong number of
-	  characters.
-	- mxml_add_char() updated the buffer pointer in the
-	  wrong place.
-
-
-CHANGES IN Mini-XML 1.1.1
-
-	- The private mxml_add_ch() function did not update the
-	  start-of-buffer pointer which could cause a crash when
-	  using mxmlSaveString().
-	- The private mxml_write_ws() function called putc()
-	  instead of using the proper callback which could cause
-	  a crash when using mxmlSaveString().
-	- Added a mxmlSaveAllocString() convenience function for
-	  saving an XML node tree to an allocated string.
-
-
-CHANGES IN Mini-XML 1.1
-
-	- The mxmlLoadFile() function now uses dynamically
-	  allocated string buffers for element names, attribute
-	  names, and attribute values.  Previously they were
-	  capped at 16383, 255, and 255 bytes, respectively.
-	- Added a new mxmlLoadString() function for loading an
-	  XML node tree from a string.
-	- Added a new mxmlSaveString() function for saving an
-	  XML node tree to a string.
-	- Add emulation of strdup() if the local platform does
-	  not provide the function.
-
-
-CHANGES IN Mini-XML 1.0
-
-	- The mxmldoc program now handles function arguments,
-	  structures, unions, enumerations, classes, and
-	  typedefs properly.
-	- Documentation provided via mxmldoc and more in-line
-	  comments in the code.
-	- Added man pages and packaging files.
-
-
-CHANGES IN Mini-XML 0.93
-
-	- New mxmldoc example program that is also used to
-	  create and update code documentation using XML and
-	  produce HTML reference pages.
-	- Added mxmlAdd() and mxmlRemove() functions to add and
-	  remove nodes from a tree.  This provides more
-	  flexibility over where the nodes are inserted and
-	  allows nodes to be moved within the tree as needed.
-	- mxmlLoadFile() now correctly handles comments.
-	- mxmlLoadFile() now supports the required "gt", "quot",
-	  and "nbsp" character entities.
-	- mxmlSaveFile() now uses newlines as whitespace
-	  when valid to do so.
-	- mxmlFindElement() now also takes attribute name and
-	  attribute value string arguments to limit the search
-	  to specific elements with attributes and/or values.
-	  NULL pointers can be used as "wildcards".
-	- Added uninstall target to makefile, and auto-reconfig
-	  if Makefile.in or configure.in are changed.
-	- mxmlFindElement(), mxmlWalkNext(), and mxmlWalkPrev()
-	  now all provide "descend" arguments to control whether
-	  they descend into child nodes in the tree.
-	- Fixed some whitespace issues in mxmlLoadFile().
-	- Fixed Unicode output and whitespace issues in
-	  mxmlSaveFile().
-	- mxmlSaveFile() now supports a whitespace callback to
-	  provide more human-readable XML output under program
-	  control.
-
-
-CHANGES IN Mini-XML 0.92
-
-	- mxmlSaveFile() didn't return a value on success.
-
-
-CHANGES IN Mini-XML 0.91
-
-	- mxmlWalkNext() would go into an infinite loop.
-
-
-CHANGES IN Mini-XML 0.9
-
-	- Initial public release.
diff --git a/menuselect/mxml/COPYING b/menuselect/mxml/COPYING
deleted file mode 100644
index 43433c494..000000000
--- a/menuselect/mxml/COPYING
+++ /dev/null
@@ -1,482 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-			 Version 2, June 1991
-
-	  Copyright (C) 1991 Free Software Foundation, Inc.
-       59 Temple Place, Suite 330, Boston, MA  02111-1307  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 library GPL.  It is
-   numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			       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 Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, 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 or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the 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 a program 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.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  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, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-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 compile 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) 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.
-
-    c) 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.
-
-    d) 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 source code 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 to
-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 Library 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
-
-     Appendix: 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 Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 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
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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/menuselect/mxml/Makefile.in b/menuselect/mxml/Makefile.in
deleted file mode 100644
index 51b785288..000000000
--- a/menuselect/mxml/Makefile.in
+++ /dev/null
@@ -1,342 +0,0 @@
-#
-# "$Id$"
-#
-# Makefile for Mini-XML, a small XML-like file parsing library.
-#
-# Copyright 2003-2005 by Michael Sweet.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-#
-# Compiler tools definitions...
-#
-
-AR		=	@AR@
-ARFLAGS		=	@ARFLAGS@
-CC		=	@CC@
-CFLAGS		=	$(OPTIM) @CFLAGS@ @CPPFLAGS@
-CP		=	@CP@
-DSO		=	@DSO@
-DSOFLAGS	=	@DSOFLAGS@
-LDFLAGS		=	$(OPTIM) @LDFLAGS@
-INSTALL		=	@INSTALL@
-LIBMXML		=	@LIBMXML@
-LN		=	@LN@ -s
-MKDIR		=	@MKDIR@
-OPTIM		=	@OPTIM@
-RANLIB		=	@RANLIB@
-RM		=	@RM@ -f
-SHELL		=	/bin/sh
-
-
-#
-# Configured directories...
-#
-
-prefix		=	@prefix@
-exec_prefix	=	@exec_prefix@
-bindir		=	@bindir@
-includedir	=	@includedir@
-libdir		=	@libdir@
-mandir		=	@mandir@
-docdir		=	@docdir@
-datarootdir =	@datarootdir@
-BUILDROOT	=	$(DSTROOT)
-
-
-#
-# Install commands...
-#
-
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
-INSTALL_DATA	=	$(INSTALL) -m 644
-INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
-INSTALL_MAN	=	$(INSTALL) -m 644
-INSTALL_SCRIPT	=	$(INSTALL) -m 755
-
-
-#
-# Rules...
-#
-
-.SUFFIXES:	.0 .1 .3 .c .man .o
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-.man.0 .man.1 .man.3:
-	$(RM) $@
-	$(NROFF) -man $< >$@
-
-
-#
-# Targets...
-#
-
-DOCFILES	=	doc/mxml.html doc/mxmldoc.xsd \
-			README COPYING CHANGES
-PUBLIBOBJS	=	mxml-attr.o mxml-entity.o mxml-file.o mxml-index.o \
-			mxml-node.o mxml-search.o mxml-set.o
-LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
-OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
-TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml
-
-
-#
-# Make everything...
-#
-
-all:		Makefile configure config.h $(TARGETS)
-
-
-#
-# Clean everything...
-#
-
-clean:
-	$(RM) $(OBJS) $(TARGETS)
-	$(RM) mxmldoc-static libmxml.a
-	$(RM) *.bck *.bak
-	$(RM) config.cache config.log config.status config.h
-	$(RM) -r autom4te*.cache
-
-distclean: clean
-	$(RM) mxml.list Makefile
-
-#
-# Install everything...
-#
-
-install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
-	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
-	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
-	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
-	for file in $(DOCFILES); do \
-		$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
-	done
-	$(INSTALL_DIR) $(BUILDROOT)$(includedir)
-	$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
-	$(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/cat1
-	$(INSTALL_MAN) doc/mxmldoc.$(CAT1EXT) $(BUILDROOT)$(mandir)/cat1/mxmldoc.$(CAT1EXT)
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/cat3
-	$(INSTALL_MAN) doc/mxml.$(CAT3EXT) $(BUILDROOT)$(mandir)/cat3/mxml.$(CAT3EXT)
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
-	$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.$(MAN1EXT)
-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
-	$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.$(MAN3EXT)
-
-install-libmxml.a:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
-
-install-libmxml.so.1.0:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.so.1.0 $(BUILDROOT)$(libdir)
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so
-	$(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
-	$(LN) libmxml.so.1.0 $(BUILDROOT)$(libdir)/libmxml.so.1
-
-install-libmxml.sl.1:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.sl.1 $(BUILDROOT)$(libdir)
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so
-	$(LN) libmxml.sl.1 $(BUILDROOT)$(libdir)/libmxml.sl
-
-install-libmxml.1.dylib:
-	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
-	$(INSTALL_LIB) libmxml.1.dylib $(BUILDROOT)$(libdir)
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.dylib
-	$(LN) libmxml.1.dylib $(BUILDROOT)$(libdir)/libmxml.dylib
-
-
-#
-# Uninstall everything...
-#
-
-uninstall: uninstall-$(LIBMXML) uninstall-libmxml.a
-	$(RM) $(BUILDROOT)$(bindir)/mxmldoc
-	$(RM) -r $(BUILDROOT)$(docdir)
-	$(RM) $(BUILDROOT)$(includedir)/mxml.h
-	$(RM) $(BUILDROOT)$(libdir)/pkgconfig/mxml.pc
-	$(RM) $(BUILDROOT)$(mandir)/cat1/mxmldoc.$(CAT1EXT)
-	$(RM) $(BUILDROOT)$(mandir)/cat3/mxml.$(CAT3EXT)
-	$(RM) $(BUILDROOT)$(mandir)/man1/mxmldoc.$(MAN1EXT)
-	$(RM) $(BUILDROOT)$(mandir)/man3/mxml.$(MAN3EXT)
-
-uninstall-libmxml.a:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.a
-
-uninstall-libmxml.so.1.0:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1.0
-
-uninstall-libmxml.sl.1:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.sl
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.sl.1
-
-uninstall-libmxml.1.dylib:
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.dylib
-	$(RM) $(BUILDROOT)$(libdir)/libmxml.1.dylib
-
-
-#
-# Make packages using EPM (http://www.easysw.com/epm/)
-#
-
-epm:	all
-	epm --output-dir dist -v -f native mxml
-	epm --output-dir dist -v -f portable mxml
-
-
-#
-# autoconf stuff...
-#
-
-Makefile:	Makefile.in
-	if test -f config.status; then \
-		./config.status --recheck; \
-		./config.status; \
-	else \
-		./configure; \
-	fi
-	touch config.h
-
-
-config.h:	configure config.h.in
-	if test -f config.status; then \
-		./config.status --recheck; \
-		./config.status; \
-	else \
-		./configure; \
-	fi
-	touch config.h
-
-
-#
-# libmxml.a
-#
-
-libmxml.a:	$(LIBOBJS)
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-$(LIBOBJS):	mxml.h
-
-
-#
-# libmxml.so.1.0
-#
-
-libmxml.so.1.0:	$(LIBOBJS)
-	$(DSO) $(DSOFLAGS) -o libmxml.so.1.0 $(LIBOBJS)
-	$(RM) libmxml.so libmxml.so.1
-	$(LN) libmxml.so.1.0 libmxml.so
-	$(LN) libmxml.so.1.0 libmxml.so.1
-
-
-#
-# libmxml.sl.1
-#
-
-libmxml.sl.1:	$(LIBOBJS)
-	$(DSO) $(DSOFLAGS) -o libmxml.sl.1 $(LIBOBJS)
-	$(RM) libmxml.sl libmxml.sl.1
-	$(LN) libmxml.sl.1 libmxml.sl
-
-
-#
-# libmxml.1.dylib
-#
-
-libmxml.1.dylib:	$(LIBOBJS)
-	$(DSO) $(DSOFLAGS) -o libmxml.1.dylib \
-		-install_name $(libdir)/libmxml.dylib \
-		-current_version 1.0.0 \
-		-compatibility_version 1.0.0 \
-		$(LIBOBJS)
-	$(RM) libmxml.dylib libmxml.1.dylib
-	$(LN) libmxml.1.dylib libmxml.dylib
-
-
-#
-# mxmldoc
-#
-
-mxmldoc:	$(LIBMXML) mxmldoc.o
-	$(CC) $(LDFLAGS) -o $@ mxmldoc.o -L. -lmxml
-
-mxmldoc-static:	libmxml.a mxmldoc.o
-	$(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a
-
-mxmldoc.o:	mxml.h
-
-
-#
-# testmxml
-#
-
-testmxml:	libmxml.a testmxml.o
-	$(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a
-	@echo Testing library...
-	./testmxml test.xml >temp1.xml 2>temp1s.xml
-	./testmxml temp1.xml >temp2.xml 2>temp2s.xml
-	@if cmp temp1.xml temp2.xml; then \
-		echo Stdio file test passed!; \
-		$(RM) temp2.xml temp2s.xml; \
-	else \
-		echo Stdio file test failed!; \
-	fi
-	@if cmp temp1.xml temp1s.xml; then \
-		echo String test passed!; \
-		$(RM) temp1.xml temp1s.xml; \
-	else \
-		echo String test failed!; \
-	fi
-	@if cmp test.xml test.xmlfd; then \
-		echo File descriptor test passed!; \
-		$(RM) test.xmlfd; \
-	else \
-		echo File descriptor test failed!; \
-	fi
-
-testmxml.o:	mxml.h
-
-
-#
-# mxml.xml
-#
-
-mxml.xml:	mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
-	$(RM) mxml.xml
-	./mxmldoc-static mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
-
-valgrind:	mxmldoc-static
-	$(RM) valgrind.xml
-	valgrind --tool=memcheck --leak-check=yes ./mxmldoc-static \
-		valgrind.xml mxml.h $(PUBLIBOBJS:.o=.c) \
-		>valgrind.html 2>valgrind.out
-
-
-#
-# All object files depend on the makefile...
-#
-
-$(OBJS):	Makefile config.h
-
-
-#
-# End of "$Id$".
-#
diff --git a/menuselect/mxml/README b/menuselect/mxml/README
deleted file mode 100644
index 31a026649..000000000
--- a/menuselect/mxml/README
+++ /dev/null
@@ -1,204 +0,0 @@
-README - 05/19/2005
--------------------
-
-
-INTRODUCTION
-
-    This README file describes the Mini-XML library version
-    2.2.2.
-
-    Mini-XML is a small XML parsing library that you can use to
-    read XML and XML-like data files in your application without
-    requiring large non-standard libraries.  Mini-XML only
-    requires an ANSI C compatible compiler (GCC works, as do
-    most vendors' ANSI C compilers) and a "make" program.
-
-    Mini-XML provides the following functionality:
-
-	- Reading of UTF-8 and UTF-16 and writing of UTF-8
-	  encoded XML files and strings.
-	- Data is stored in a linked-list tree structure,
-	  preserving the XML data hierarchy.
-	- Supports arbitrary element names, attributes, and
-	  attribute values with no preset limits, just available
-	  memory.
-	- Supports integer, real, opaque ("cdata"), and text
-	  data types in "leaf" nodes.
-	- Functions for creating and managing trees of data.
-	- "Find" and "walk" functions for easily locating and
-	  navigating trees of data.
-
-    Mini-XML doesn't do validation or other types of processing
-    on the data based upon schema files or other sources of
-    definition information.
-
-
-BUILDING Mini-XML
-
-    Mini-XML comes with an autoconf-based configure script; just
-    type the following command to get things going:
-
-        ./configure
-
-    The default install prefix is /usr/local, which can be
-    overridden using the --prefix option:
-
-        ./configure --prefix=/foo
-
-    Other configure options can be found using the --help
-    option:
-
-        ./configure --help
-
-    Once you have configured the software, type "make" to do the
-    build and run the test program to verify that things are
-    working, as follows:
-
-        make
-
-    If you are using Mini-XML under Microsoft Windows with
-    Visual C++, use the included project files in the "vcnet"
-    subdirectory to build the library instead.
-
-
-INSTALLING Mini-XML
-
-    The "install" target will install Mini-XML in the lib and
-    include directories:
-
-        make install
-
-    Once you have installed it, use the "-lmxml" option to link
-    your application against it.
-
-
-DOCUMENTATION
-
-    The documentation is available in the "doc" subdirectory in
-    the files "mxml.html" (HTML) and "mxml.pdf" (PDF). You can
-    also look at the "testmxml.c" and "mxmldoc.c" source files
-    for examples of using Mini-XML.
-
-    Mini-XML provides a single header file which you include:
-
-        #include <mxml.h>
-
-    Nodes are defined by the "mxml_node_t" structure; the "type"
-    member defines the node type (element, integer, opaque,
-    real, or text) which determines which value you want to look
-    at in the "value" union.  New nodes can be created using the
-    "mxmlNewElement()", "mxmlNewInteger()", "mxmlNewOpaque()",
-    "mxmlNewReal()", and "mxmlNewText()" functions.  Only
-    elements can have child nodes, and the top node must be an
-    element, usually "?xml".
-
-    You load an XML file using the "mxmlLoadFile()" function:
-
-        FILE *fp;
-        mxml_node_t *tree;
-
-	fp = fopen("filename.xml", "r");
-	tree = mxmlLoadFile(NULL, fp, MXML_NO_CALLBACK);
-	fclose(fp);
-
-    Similarly, you save an XML file using the "mxmlSaveFile()"
-    function:
-
-        FILE *fp;
-        mxml_node_t *tree;
-
-	fp = fopen("filename.xml", "w");
-	mxmlSaveFile(tree, fp, MXML_NO_CALLBACK);
-	fclose(fp);
-
-    The "mxmlLoadString()", "mxmlSaveAllocString()", and
-    "mxmlSaveString()" functions load XML node trees from and
-    save XML node trees to strings:
-
-        char buffer[8192];
-	char *ptr;
-	mxml_node_t *tree;
-
-        ...
-	tree = mxmlLoadString(NULL, buffer, MXML_NO_CALLBACK);
-
-        ...
-        mxmlSaveString(tree, buffer, sizeof(buffer), MXML_NO_CALLBACK);
-
-        ...
-	ptr = mxmlSaveAllocString(tree, MXML_NO_CALLBACK);
-
-    You can find a named element/node using the
-    "mxmlFindElement()" function:
-
-        mxml_node_t *node = mxmlFindElement(tree, tree, "name", "attr",
-	                                    "value", MXML_DESCEND);
-
-    The "name", "attr", and "value" arguments can be passed as
-    NULL to act as wildcards, e.g.:
-
-        /* Find the first "a" element */
-        node = mxmlFindElement(tree, tree, "a", NULL, NULL, MXML_DESCEND);
-
-        /* Find the first "a" element with "href" attribute */
-        node = mxmlFindElement(tree, tree, "a", "href", NULL, MXML_DESCEND);
-
-        /* Find the first "a" element with "href" to a URL */
-        node = mxmlFindElement(tree, tree, "a", "href",
-	                       "http://www.easysw.com/~mike/mxml/",
-			       MXML_DESCEND);
-
-        /* Find the first element with a "src" attribute*/
-        node = mxmlFindElement(tree, tree, NULL, "src", NULL, MXML_DESCEND);
-
-        /* Find the first element with a "src" = "foo.jpg" */
-        node = mxmlFindElement(tree, tree, NULL, "src", "foo.jpg",
-	                       MXML_DESCEND);
-
-    You can also iterate with the same function:
-
-        mxml_node_t *node;
-
-	for (node = mxmlFindElement(tree, tree, "name", NULL, NULL,
-	                            MXML_DESCEND);
-	     node != NULL;
-	     node = mxmlFindElement(node, tree, "name", NULL, NULL,
-	                            MXML_DESCEND))
-        {
-	  ... do something ...
-	}
-
-    Finally, once you are done with the XML data, use the
-    "mxmlDelete()" function to recursively free the memory that
-    is used for a particular node or the entire tree:
-
-        mxmlDelete(tree);
-
-
-GETTING HELP AND REPORTING PROBLEMS
-
-    You can email me at "mxml@easysw.com" to report problems
-    and/or ask for help.  Just don't expect an instant response,
-    as I get a *lot* of email...
-
-
-LEGAL STUFF
-
-    The Mini-XML library is Copyright 2003-2005 by Michael Sweet.
-
-    This library is free software; you can redistribute it
-    and/or modify it under the terms of the GNU Library General
-    Public License as published by the Free Software Foundation;
-    either version 2 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 Library General Public License for
-    more details.
-
-    You should have received a copy of the GNU Library General
-    Public License along with this library; if not, write to the
-    Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-    02139, USA.
diff --git a/menuselect/mxml/config.h.in b/menuselect/mxml/config.h.in
deleted file mode 100644
index 4507e581b..000000000
--- a/menuselect/mxml/config.h.in
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * "$Id$"
- *
- * Configuration file for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
-
-
-/*
- * Version number...
- */
-
-#define MXML_VERSION	""
-
-
-/*
- * Do we have the vsnprintf() function?
- */
-
-#undef HAVE_VSNPRINTF
-
-
-/*
- * Do we have the strXXX() functions?
- */
-
-#undef HAVE_STRDUP
-
-
-/*
- * Define prototypes for string functions as needed...
- */
-
-#  ifndef HAVE_STRDUP
-extern char	*mxml_strdup(const char *);
-#    define strdup mxml_strdup
-#  endif /* !HAVE_STRDUP */
-
-extern char	*mxml_strdupf(const char *, va_list);
-
-#  ifndef HAVE_VSNPRINTF
-extern int	mxml_vsnprintf(char *, size_t, const char *, va_list);
-#    define vsnprintf mxml_vsnprintf
-#  endif /* !HAVE_VSNPRINTF */
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/configure b/menuselect/mxml/configure
deleted file mode 100755
index f460c44be..000000000
--- a/menuselect/mxml/configure
+++ /dev/null
@@ -1,5702 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="mxml.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='LTLIBOBJS
-LIBOBJS
-PC_LIBS
-PC_CFLAGS
-PICFLAG
-LIBMXML
-DSOFLAGS
-DSO
-PTHREAD_LIBS
-PTHREAD_FLAGS
-EGREP
-GREP
-CPP
-ARFLAGS
-RM
-MKDIR
-LN
-CP
-AR
-RANLIB
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-ac_ct_CXX
-CXXFLAGS
-CXX
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-CFLAGS
-CC
-ARCHFLAGS
-OPTIM
-LDFLAGS
-VERSION
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_ansi
-with_archflags
-enable_debug
-with_docdir
-with_vsnprintf
-enable_threads
-enable_shared
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CXX
-CXXFLAGS
-CCC
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug          turn on debugging, default=no
-  --enable-threads        enable multi-threading support
-  --enable-shared         turn on shared libraries, default=no
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-ansi             set full ANSI C mode, default=no
-  --with-archflags        set additional architecture flags, default=none
-  --with-docdir           set directory for documentation, default=${prefix}/share/doc/mxml
-  --with-vsnprintf        use vsnprintf emulation functions, default=auto
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to the package provider.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.65
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_compile
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-VERSION=2.2.2
-
-cat >>confdefs.h <<_ACEOF
-#define MXML_VERSION "Mini-XML v$VERSION"
-_ACEOF
-
-
-CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-LDFLAGS="${LDFLAGS:=}"
-
-OPTIM=""
-
-
-
-# Check whether --with-ansi was given.
-if test "${with_ansi+set}" = set; then :
-  withval=$with_ansi; use_ansi="$withval"
-else
-  use_ansi="no"
-fi
-
-
-
-# Check whether --with-archflags was given.
-if test "${with_archflags+set}" = set; then :
-  withval=$with_archflags; ARCHFLAGS="$withval"
-else
-  ARCHFLAGS=""
-fi
-
-
-
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then
- 	OPTIM="-g"
-fi
-fi
-
-
-
-# Check whether --with-docdir was given.
-if test "${with_docdir+set}" = set; then :
-  withval=$with_docdir; docdir="$withval"
-else
-  docdir="NONE"
-fi
-
-
-
-
-
-# Check whether --with-vsnprintf was given.
-if test "${with_vsnprintf+set}" = set; then :
-  withval=$with_vsnprintf; use_vsnprintf="$withval"
-else
-  use_vsnprintf="no"
-fi
-
-
-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
-if test x$uname = xIRIX64; then
-	uname="IRIX"
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-if test "$INSTALL" = "$ac_install_sh"; then
-	# Use full path to install-sh script...
-	INSTALL="`pwd`/install-sh -c"
-fi
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-for ac_prog in ar gar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $AR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_AR="$AR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-AR=$ac_cv_path_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AR" && break
-done
-
-# Extract the first word of "cp", so it can be a program name with args.
-set dummy cp; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $CP in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_CP="$CP" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-CP=$ac_cv_path_CP
-if test -n "$CP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
-$as_echo "$CP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "ln", so it can be a program name with args.
-set dummy ln; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LN+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LN="$LN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-LN=$ac_cv_path_LN
-if test -n "$LN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
-$as_echo "$LN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "mkdir", so it can be a program name with args.
-set dummy mkdir; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MKDIR+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MKDIR in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MKDIR=$ac_cv_path_MKDIR
-if test -n "$MKDIR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
-$as_echo "$MKDIR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RM+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RM in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RM="$RM" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RM=$ac_cv_path_RM
-if test -n "$RM"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z $AR ; then
-	as_fn_error "'ar' binary is mandatory.  Please either install the 'ar' binary or provide the path to configure with --with-ar=/path/to/ar" "$LINENO" 5
-fi
-
-case "$uname" in
-        Darwin* | *BSD*)
-                ARFLAGS="-rcv"
-                ;;
-        *)
-                ARFLAGS="crvs"
-                ;;
-esac
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-
-if test "x$use_ansi" != xyes; then
-	for ac_func in strdup
-do :
-  ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STRDUP 1
-_ACEOF
-
-fi
-done
-
-fi
-
-if test "x$use_vsnprintf" != xyes; then
-	for ac_func in snprintf vsnprintf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
-$as_echo_n "checking for long long int... " >&6; }
-if test "${ac_cv_c_long_long+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$GCC" = yes; then
-		ac_cv_c_long_long=yes
-	else
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-long long int i;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_long_long=yes
-else
-  ac_cv_c_long_long=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-	fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_long_long" >&5
-$as_echo "$ac_cv_c_long_long" >&6; }
-
-if test $ac_cv_c_long_long = yes; then
-	$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
-
-fi
-
-# Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads;
-fi
-
-
-have_pthread=no
-PTHREAD_FLAGS=""
-PTHREAD_LIBS=""
-
-if test "x$enable_threads" != xno; then
-	ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
-  $as_echo "#define HAVE_PTHREAD_H 1" >>confdefs.h
-
-fi
-
-
-
-	if test x$ac_cv_header_pthread_h = xyes; then
-				for flag in -lpthreads -lpthread -pthread; do
-        		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create using $flag" >&5
-$as_echo_n "checking for pthread_create using $flag... " >&6; }
-			SAVELIBS="$LIBS"
-			LIBS="$flag $LIBS"
-        		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-pthread_create(0, 0, 0, 0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  have_pthread=yes
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread" >&5
-$as_echo "$have_pthread" >&6; }
-			LIBS="$SAVELIBS"
-
-			if test $have_pthread = yes; then
-				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-				PTHREAD_LIBS="$flag"
-
-				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
-				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
-					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
-				fi
-				break
-			fi
-		done
-	fi
-fi
-
-
-
-
-DSO="${DSO:=:}"
-DSOFLAGS="${DSOFLAGS:=}"
-
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared;
-fi
-
-
-if test x$enable_shared = xyes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library support" >&5
-$as_echo_n "checking for shared library support... " >&6; }
-	PICFLAG=1
-
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,libmxml.so.1 -G -R\$(libdir) \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -R\$(libdir)"
-                	;;
-
-		HP-UX*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.sl.1"
-			DSO="ld"
-			DSOFLAGS="$DSOFLAGS -b -z +h libmxml.sl.1 +s +b \$(libdir)"
-			LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
-			;;
-
-		IRIX)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)"
-			;;
-
-		OSF1* | Linux | GNU)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
-                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-			;;
-
-		*BSD*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
-                        ;;
-
-		Darwin*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			LIBMXML="libmxml.1.dylib"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
-			;;
-
-		*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: shared libraries not supported on this platform." >&5
-$as_echo "$as_me: WARNING: shared libraries not supported on this platform." >&2;}
-			PICFLAG=0
-			LIBMXML="libmxml.a"
-			;;
-	esac
-else
-	PICFLAG=0
-	LIBMXML="libmxml.a"
-fi
-
-
-
-
-
-
-if test -n "$GCC"; then
-	CFLAGS="-Wall $CFLAGS"
-
-	if test "x$OPTIM" = x; then
-		OPTIM="-Os -g"
-	fi
-
-	if test "x$use_ansi" = xyes; then
-		CFLAGS="-ansi -pedantic $CFLAGS"
-	fi
-
-	if test $PICFLAG = 1 -a $uname != AIX; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-else
-	case $uname in
-		HP-UX*)
-			CFLAGS="-Ae $CFLAGS"
-
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			OPTIM="+DAportable $OPTIM"
-
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-			;;
-
-		UNIX_SVR* | SunOS*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-
-		*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-			;;
-	esac
-fi
-
-if test "$prefix" = "NONE"; then
-	prefix="/usr/local"
-fi
-
-if test "$exec_prefix" = "NONE"; then
-	exec_prefix="$prefix"
-fi
-
-if test "$docdir" = "NONE"; then
-	docdir="$datadir/doc/mxml"
-fi
-
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"; then
-	case "$uname" in
-        	*BSD* | Darwin* | Linux*)
-        		# BSD, Darwin (MacOS X), and Linux
-        		mandir="/usr/share/man"
-        		;;
-        	IRIX*)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		;;
-        	*)
-        		# All others
-        		mandir="/usr/man"
-        		;;
-	esac
-fi
-
-if test "$includedir" != /usr/include; then
-	PC_CFLAGS="-I$includedir"
-else
-	PC_CFLAGS=""
-fi
-
-if test "$libdir" != /usr/lib; then
-	PC_LIBS="-L$libdir -lmxml"
-else
-	PC_LIBS="-lmxml"
-fi
-
-
-
-
-ac_config_files="$ac_config_files Makefile mxml.list mxml.pc"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-  fi
-  $as_echo "$as_me: error: $1" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.65,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2009 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "mxml.list") CONFIG_FILES="$CONFIG_FILES mxml.list" ;;
-    "mxml.pc") CONFIG_FILES="$CONFIG_FILES mxml.pc" ;;
-
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
-  fi
- ;;
-
-
-  esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
diff --git a/menuselect/mxml/configure.in b/menuselect/mxml/configure.in
deleted file mode 100644
index 8b8437e71..000000000
--- a/menuselect/mxml/configure.in
+++ /dev/null
@@ -1,343 +0,0 @@
-dnl
-dnl "$Id$"
-dnl
-dnl Configuration script for Mini-XML, a small XML-like file parsing library.
-dnl
-dnl Copyright 2003-2009 by Michael Sweet.
-dnl
-dnl This program is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Library General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2, or (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-
-dnl Specify a source file from the distribution...
-AC_INIT(mxml.h)
-
-dnl Set the name of the config header file...
-AC_CONFIG_HEADER(config.h)
-
-dnl Version number...
-VERSION=2.2.2
-AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(MXML_VERSION, "Mini-XML v$VERSION")
-
-dnl Clear default debugging options and set normal optimization by
-dnl default unless the user asks for debugging specifically.
-CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-LDFLAGS="${LDFLAGS:=}"
-AC_SUBST(LDFLAGS)
-OPTIM=""
-AC_SUBST(OPTIM)
-
-AC_ARG_WITH(ansi, [  --with-ansi             set full ANSI C mode, default=no],
-	use_ansi="$withval",
-	use_ansi="no")
-
-AC_ARG_WITH(archflags, [  --with-archflags        set additional architecture flags, default=none],
-	ARCHFLAGS="$withval",
-	ARCHFLAGS="")
-AC_SUBST(ARCHFLAGS)
-
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging, default=no],
-if eval "test x$enable_debug = xyes"; then
- 	OPTIM="-g"
-fi)
-
-AC_ARG_WITH(docdir, [  --with-docdir           set directory for documentation, default=${prefix}/share/doc/mxml],
-	docdir="$withval",
-	docdir="NONE")
-
-AC_SUBST(docdir)
-
-AC_ARG_WITH(vsnprintf, [  --with-vsnprintf        use vsnprintf emulation functions, default=auto],
-	use_vsnprintf="$withval",
-	use_vsnprintf="no")
-
-dnl Get the operating system and version number...
-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
-if test x$uname = xIRIX64; then
-	uname="IRIX"
-fi
-
-dnl Checks for programs...
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_INSTALL
-if test "$INSTALL" = "$ac_install_sh"; then
-	# Use full path to install-sh script...
-	INSTALL="`pwd`/install-sh -c"
-fi
-AC_PROG_RANLIB
-AC_PATH_PROGS(AR,ar gar)
-AC_PATH_PROG(CP,cp)
-AC_PATH_PROG(LN,ln)
-AC_PATH_PROG(MKDIR,mkdir)
-AC_PATH_PROG(RM,rm)
-if test -z $AR ; then
-	AC_MSG_ERROR('ar' binary is mandatory.  Please either install the 'ar' binary or provide the path to configure with --with-ar=/path/to/ar)
-fi
-
-dnl Flags for "ar" command...
-case "$uname" in
-        Darwin* | *BSD*)
-                ARFLAGS="-rcv"
-                ;;
-        *)
-                ARFLAGS="crvs"
-                ;;
-esac
-
-AC_SUBST(ARFLAGS)
-
-dnl Inline functions...
-AC_C_INLINE
-
-dnl Checks for string functions.
-if test "x$use_ansi" != xyes; then
-	AC_CHECK_FUNCS(strdup)
-fi
-
-if test "x$use_vsnprintf" != xyes; then
-	AC_CHECK_FUNCS(snprintf vsnprintf)
-fi
-
-dnl Check for "long long" support...
-AC_CACHE_CHECK(for long long int, ac_cv_c_long_long,
-	[if test "$GCC" = yes; then
-		ac_cv_c_long_long=yes
-	else
-		AC_TRY_COMPILE(,[long long int i;],
-			ac_cv_c_long_long=yes,
-			ac_cv_c_long_long=no)
-	fi])
-
-if test $ac_cv_c_long_long = yes; then
-	AC_DEFINE(HAVE_LONG_LONG)
-fi
-
-dnl Threading support
-AC_ARG_ENABLE(threads, [  --enable-threads        enable multi-threading support])
-
-have_pthread=no
-PTHREAD_FLAGS=""
-PTHREAD_LIBS=""
-
-if test "x$enable_threads" != xno; then
-	AC_CHECK_HEADER(pthread.h, AC_DEFINE(HAVE_PTHREAD_H))
-
-	if test x$ac_cv_header_pthread_h = xyes; then
-		dnl Check various threading options for the platforms we support
-		for flag in -lpthreads -lpthread -pthread; do
-        		AC_MSG_CHECKING([for pthread_create using $flag])
-			SAVELIBS="$LIBS"
-			LIBS="$flag $LIBS"
-        		AC_TRY_LINK([#include <pthread.h>],
-				[pthread_create(0, 0, 0, 0);],
-        			have_pthread=yes)
-        		AC_MSG_RESULT([$have_pthread])
-			LIBS="$SAVELIBS"
-
-			if test $have_pthread = yes; then
-				PTHREAD_FLAGS="-D_THREAD_SAFE -D_REENTRANT"
-				PTHREAD_LIBS="$flag"
-
-				# Solaris requires -D_POSIX_PTHREAD_SEMANTICS to
-				# be POSIX-compliant... :(
-				if test $uname = SunOS; then
-					PTHREAD_FLAGS="$PTHREAD_FLAGS -D_POSIX_PTHREAD_SEMANTICS"
-				fi
-				break
-			fi
-		done
-	fi
-fi
-
-AC_SUBST(PTHREAD_FLAGS)
-AC_SUBST(PTHREAD_LIBS)
-
-dnl Shared library support...
-DSO="${DSO:=:}"
-DSOFLAGS="${DSOFLAGS:=}"
-
-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=no])
-
-if test x$enable_shared = xyes; then
-	AC_MSG_CHECKING(for shared library support)
-	PICFLAG=1
-
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h,libmxml.so.1 -G -R\$(libdir) \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -R\$(libdir)"
-                	;;
-
-		HP-UX*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.sl.1"
-			DSO="ld"
-			DSOFLAGS="$DSOFLAGS -b -z +h libmxml.sl.1 +s +b \$(libdir)"
-			LDFLAGS="$LDFLAGS -Wl,+s,+b,\$(libdir)"
-			;;
-
-		IRIX)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)"
-			;;
-
-		OSF1* | Linux | GNU)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)"
-                        LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)"
-			;;
-
-		*BSD*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.so.1.4"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
-			LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
-                        ;;
-
-		Darwin*)
-			AC_MSG_RESULT(yes)
-			LIBMXML="libmxml.1.dylib"
-			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS \$(RC_CFLAGS) -dynamiclib -lc"
-			;;
-
-		*)
-			AC_MSG_RESULT(no)
-			AC_MSG_WARN(shared libraries not supported on this platform.)
-			PICFLAG=0
-			LIBMXML="libmxml.a"
-			;;
-	esac
-else
-	PICFLAG=0
-	LIBMXML="libmxml.a"
-fi
-
-AC_SUBST(DSO)
-AC_SUBST(DSOFLAGS)
-AC_SUBST(LIBMXML)
-AC_SUBST(PICFLAG)
-
-dnl Add -Wall for GCC...
-if test -n "$GCC"; then
-	CFLAGS="-Wall $CFLAGS"
-
-	if test "x$OPTIM" = x; then
-		OPTIM="-Os -g"
-	fi
-
-	if test "x$use_ansi" = xyes; then
-		CFLAGS="-ansi -pedantic $CFLAGS"
-	fi
-
-	if test $PICFLAG = 1 -a $uname != AIX; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-else
-	case $uname in
-		HP-UX*)
-			CFLAGS="-Ae $CFLAGS"
-
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			OPTIM="+DAportable $OPTIM"
-
-			if test $PICFLAG = 1; then
-				OPTIM="+z $OPTIM"
-			fi
-			;;
-
-		UNIX_SVR* | SunOS*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-
-		*)
-			if test "x$OPTIM" = x; then
-				OPTIM="-O"
-			fi
-			;;
-	esac
-fi
-
-dnl Fix "prefix" variable if it hasn't been specified...
-if test "$prefix" = "NONE"; then
-	prefix="/usr/local"
-fi
-
-dnl Fix "exec_prefix" variable if it hasn't been specified...
-if test "$exec_prefix" = "NONE"; then
-	exec_prefix="$prefix"
-fi
-
-dnl Fix "docdir" variable if it hasn't been specified...
-if test "$docdir" = "NONE"; then
-	docdir="$datadir/doc/mxml"
-fi
-
-dnl Fix "mandir" variable if it hasn't been specified...
-if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"; then
-	case "$uname" in
-        	*BSD* | Darwin* | Linux*)
-        		# BSD, Darwin (MacOS X), and Linux
-        		mandir="/usr/share/man"
-        		;;
-        	IRIX*)
-        		# SGI IRIX
-        		mandir="/usr/share/catman/u_man"
-        		;;
-        	*)
-        		# All others
-        		mandir="/usr/man"
-        		;;
-	esac
-fi
-
-dnl pkg-config stuff...
-if test "$includedir" != /usr/include; then
-	PC_CFLAGS="-I$includedir"
-else
-	PC_CFLAGS=""
-fi
-
-if test "$libdir" != /usr/lib; then
-	PC_LIBS="-L$libdir -lmxml"
-else
-	PC_LIBS="-lmxml"
-fi
-
-AC_SUBST(PC_CFLAGS)
-AC_SUBST(PC_LIBS)
-
-dnl Output the makefile, etc...
-AC_OUTPUT(Makefile mxml.list mxml.pc)
-
-dnl
-dnl End of "$Id$".
-dnl
diff --git a/menuselect/mxml/install-sh b/menuselect/mxml/install-sh
deleted file mode 100755
index 398a88e14..000000000
--- a/menuselect/mxml/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/menuselect/mxml/mxml-attr.c b/menuselect/mxml/mxml-attr.c
deleted file mode 100644
index bf643cb6c..000000000
--- a/menuselect/mxml/mxml-attr.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * "$Id$"
- *
- * Attribute support code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlElementGetAttr() - Get an attribute.
- *   mxmlElementSetAttr() - Set an attribute.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * 'mxmlElementGetAttr()' - Get an attribute.
- *
- * This function returns NULL if the node is not an element or the
- * named attribute does not exist.
- */
-
-const char *				/* O - Attribute value or NULL */
-mxmlElementGetAttr(mxml_node_t *node,	/* I - Element node */
-                   const char  *name)	/* I - Name of attribute */
-{
-  int	i;				/* Looping var */
-  mxml_attr_t	*attr;			/* Cirrent attribute */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlElementGetAttr(node=%p, name=\"%s\")\n",
-          node, name ? name : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_ELEMENT || !name)
-    return (NULL);
-
- /*
-  * Look for the attribute...
-  */
-
-  for (i = node->value.element.num_attrs, attr = node->value.element.attrs;
-       i > 0;
-       i --, attr ++)
-    if (!strcmp(attr->name, name))
-      return (attr->value);
-
- /*
-  * Didn't find attribute, so return NULL...
-  */
-
-  return (NULL);
-}
-
-
-/*
- * 'mxmlElementSetAttr()' - Set an attribute.
- *
- * If the named attribute already exists, the value of the attribute
- * is replaced by the new string value. The string value is copied
- * into the element node. This function does nothing if the node is
- * not an element.
- */
-
-void
-mxmlElementSetAttr(mxml_node_t *node,	/* I - Element node */
-                   const char  *name,	/* I - Name of attribute */
-                   const char  *value)	/* I - Attribute value */
-{
-  int		i;			/* Looping var */
-  mxml_attr_t	*attr;			/* New attribute */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlElementSetAttr(node=%p, name=\"%s\", value=\"%s\")\n",
-          node, name ? name : "(null)", value ? value : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_ELEMENT || !name)
-    return;
-
- /*
-  * Look for the attribute...
-  */
-
-  for (i = node->value.element.num_attrs, attr = node->value.element.attrs;
-       i > 0;
-       i --, attr ++)
-    if (!strcmp(attr->name, name))
-    {
-     /*
-      * Replace the attribute value and return...
-      */
-
-      if (attr->value)
-        free(attr->value);
-
-      if (value)
-      {
-	if ((attr->value = strdup(value)) == NULL)
-	  mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
-                     name, node->value.element.name);
-      }
-      else
-        attr->value = NULL;
-
-      return;
-    }
-
- /*
-  * Attribute not found, so add a new one...
-  */
-
-  if (node->value.element.num_attrs == 0)
-    attr = malloc(sizeof(mxml_attr_t));
-  else
-    attr = realloc(node->value.element.attrs,
-                   (node->value.element.num_attrs + 1) * sizeof(mxml_attr_t));
-
-  if (!attr)
-  {
-    mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
-               name, node->value.element.name);
-    return;
-  }
-
-  node->value.element.attrs = attr;
-  attr += node->value.element.num_attrs;
-
-  attr->name = strdup(name);
-  if (value)
-    attr->value = strdup(value);
-  else
-    attr->value = NULL;
-
-  if (!attr->name || (!attr->value && value))
-  {
-    if (attr->name)
-      free(attr->name);
-
-    if (attr->value)
-      free(attr->value);
-
-    mxml_error("Unable to allocate memory for attribute '%s' in element %s!",
-               name, node->value.element.name);
-
-    return;
-  }
-    
-  node->value.element.num_attrs ++;
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-entity.c b/menuselect/mxml/mxml-entity.c
deleted file mode 100644
index cebc35b65..000000000
--- a/menuselect/mxml/mxml-entity.c
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * "$Id$"
- *
- * Character entity support code for Mini-XML, a small XML-like
- * file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlEntityAddCallback()    - Add a callback to convert entities to
- *                                Unicode.
- *   mxmlEntityGetName()        - Get the name that corresponds to the
- *                                character value.
- *   mxmlEntityGetValue()       - Get the character corresponding to a named
- *                                entity.
- *   mxmlEntityRemoveCallback() - Remove a callback.
- *   default_callback()         - Lookup standard (X)HTML entities.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Local functions...
- */
-
-static int	default_callback(const char *name);
-
-
-/*
- * Callback array...
- */
-
-static int	num_callbacks = 1;
-static int	(*callbacks[100])(const char *name) =
-		{
-		  default_callback
-		};
-
-
-/*
- * 'mxmlEntityAddCallback()' - Add a callback to convert entities to Unicode.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlEntityAddCallback(int (*cb)(const char *name))
-					/* I - Callback function to add */
-{
-  if (num_callbacks < (int)(sizeof(callbacks) / sizeof(callbacks[0])))
-  {
-    callbacks[num_callbacks] = cb;
-    num_callbacks ++;
-
-    return (0);
-  }
-  else
-  {
-    mxml_error("Unable to add entity callback!");
-
-    return (-1);
-  }
-}
-
-
-/*
- * 'mxmlEntityGetName()' - Get the name that corresponds to the character value.
- *
- * If val does not need to be represented by a named entity, NULL is returned.
- */
-
-const char *				/* O - Entity name or NULL */
-mxmlEntityGetName(int val)		/* I - Character value */
-{
-  switch (val)
-  {
-    case '&' :
-        return ("amp");
-
-    case '<' :
-        return ("lt");
-
-    case '>' :
-        return ("gt");
-
-    case '\"' :
-        return ("quot");
-
-    default :
-        return (NULL);
-  }
-}
-
-
-/*
- * 'mxmlEntityGetValue()' - Get the character corresponding to a named entity.
- *
- * The entity name can also be a numeric constant. -1 is returned if the
- * name is not known.
- */
-
-int					/* O - Character value or -1 on error */
-mxmlEntityGetValue(const char *name)	/* I - Entity name */
-{
-  int	i;				/* Looping var */
-  int	ch;				/* Character value */
-
-
-  for (i = 0; i < num_callbacks; i ++)
-    if ((ch = (callbacks[i])(name)) >= 0)
-      return (ch);
-
-  return (-1);
-}
-
-
-/*
- * 'mxmlEntityRemoveCallback()' - Remove a callback.
- */
-
-void
-mxmlEntityRemoveCallback(int (*cb)(const char *name))
-					/* I - Callback function to remove */
-{
-  int	i;				/* Looping var */
-
-
-  for (i = 0; i < num_callbacks; i ++)
-    if (cb == callbacks[i])
-    {
-     /*
-      * Remove the callback...
-      */
-
-      num_callbacks --;
-
-      if (i < num_callbacks)
-        memmove(callbacks + i, callbacks + i + 1,
-	        (num_callbacks - i) * sizeof(callbacks[0]));
-
-      return;
-    }
-}
-
-
-/*
- * 'default_callback()' - Lookup standard (X)HTML entities.
- */
-
-static int				/* O - Unicode value or -1 */
-default_callback(const char *name)	/* I - Entity name */
-{
-  int	diff,				/* Difference between names */
-	current,			/* Current entity in search */
-	first,				/* First entity in search */
-	last;				/* Last entity in search */
-  static const struct
-  {
-    const char	*name;			/* Entity name */
-    int		val;			/* Character value */
-  }	entities[] =
-  {
-    { "AElig",		198 },
-    { "Aacute",		193 },
-    { "Acirc",		194 },
-    { "Agrave",		192 },
-    { "Alpha",		913 },
-    { "Aring",		197 },
-    { "Atilde",		195 },
-    { "Auml",		196 },
-    { "Beta",		914 },
-    { "Ccedil",		199 },
-    { "Chi",		935 },
-    { "Dagger",		8225 },
-    { "Delta",		916 },
-    { "Dstrok",		208 },
-    { "ETH",		208 },
-    { "Eacute",		201 },
-    { "Ecirc",		202 },
-    { "Egrave",		200 },
-    { "Epsilon",	917 },
-    { "Eta",		919 },
-    { "Euml",		203 },
-    { "Gamma",		915 },
-    { "Iacute",		205 },
-    { "Icirc",		206 },
-    { "Igrave",		204 },
-    { "Iota",		921 },
-    { "Iuml",		207 },
-    { "Kappa",		922 },
-    { "Lambda",		923 },
-    { "Mu",		924 },
-    { "Ntilde",		209 },
-    { "Nu",		925 },
-    { "OElig",		338 },
-    { "Oacute",		211 },
-    { "Ocirc",		212 },
-    { "Ograve",		210 },
-    { "Omega",		937 },
-    { "Omicron",	927 },
-    { "Oslash",		216 },
-    { "Otilde",		213 },
-    { "Ouml",		214 },
-    { "Phi",		934 },
-    { "Pi",		928 },
-    { "Prime",		8243 },
-    { "Psi",		936 },
-    { "Rho",		929 },
-    { "Scaron",		352 },
-    { "Sigma",		931 },
-    { "THORN",		222 },
-    { "Tau",		932 },
-    { "Theta",		920 },
-    { "Uacute",		218 },
-    { "Ucirc",		219 },
-    { "Ugrave",		217 },
-    { "Upsilon",	933 },
-    { "Uuml",		220 },
-    { "Xi",		926 },
-    { "Yacute",		221 },
-    { "Yuml",		376 },
-    { "Zeta",		918 },
-    { "aacute",		225 },
-    { "acirc",		226 },
-    { "acute",		180 },
-    { "aelig",		230 },
-    { "agrave",		224 },
-    { "alefsym",	8501 },
-    { "alpha",		945 },
-    { "amp",		'&' },
-    { "and",		8743 },
-    { "ang",		8736 },
-    { "aring",		229 },
-    { "asymp",		8776 },
-    { "atilde",		227 },
-    { "auml",		228 },
-    { "bdquo",		8222 },
-    { "beta",		946 },
-    { "brkbar",		166 },
-    { "brvbar",		166 },
-    { "bull",		8226 },
-    { "cap",		8745 },
-    { "ccedil",		231 },
-    { "cedil",		184 },
-    { "cent",		162 },
-    { "chi",		967 },
-    { "circ",		710 },
-    { "clubs",		9827 },
-    { "cong",		8773 },
-    { "copy",		169 },
-    { "crarr",		8629 },
-    { "cup",		8746 },
-    { "curren",		164 },
-    { "dArr",		8659 },
-    { "dagger",		8224 },
-    { "darr",		8595 },
-    { "deg",		176 },
-    { "delta",		948 },
-    { "diams",		9830 },
-    { "die",		168 },
-    { "divide",		247 },
-    { "eacute",		233 },
-    { "ecirc",		234 },
-    { "egrave",		232 },
-    { "empty",		8709 },
-    { "emsp",		8195 },
-    { "ensp",		8194 },
-    { "epsilon",	949 },
-    { "equiv",		8801 },
-    { "eta",		951 },
-    { "eth",		240 },
-    { "euml",		235 },
-    { "euro",		8364 },
-    { "exist",		8707 },
-    { "fnof",		402 },
-    { "forall",		8704 },
-    { "frac12",		189 },
-    { "frac14",		188 },
-    { "frac34",		190 },
-    { "frasl",		8260 },
-    { "gamma",		947 },
-    { "ge",		8805 },
-    { "gt",		'>' },
-    { "hArr",		8660 },
-    { "harr",		8596 },
-    { "hearts",		9829 },
-    { "hellip",		8230 },
-    { "hibar",		175 },
-    { "iacute",		237 },
-    { "icirc",		238 },
-    { "iexcl",		161 },
-    { "igrave",		236 },
-    { "image",		8465 },
-    { "infin",		8734 },
-    { "int",		8747 },
-    { "iota",		953 },
-    { "iquest",		191 },
-    { "isin",		8712 },
-    { "iuml",		239 },
-    { "kappa",		954 },
-    { "lArr",		8656 },
-    { "lambda",		955 },
-    { "lang",		9001 },
-    { "laquo",		171 },
-    { "larr",		8592 },
-    { "lceil",		8968 },
-    { "ldquo",		8220 },
-    { "le",		8804 },
-    { "lfloor",		8970 },
-    { "lowast",		8727 },
-    { "loz",		9674 },
-    { "lrm",		8206 },
-    { "lsaquo",		8249 },
-    { "lsquo",		8216 },
-    { "lt",		'<' },
-    { "macr",		175 },
-    { "mdash",		8212 },
-    { "micro",		181 },
-    { "middot",		183 },
-    { "minus",		8722 },
-    { "mu",		956 },
-    { "nabla",		8711 },
-    { "nbsp",		160 },
-    { "ndash",		8211 },
-    { "ne",		8800 },
-    { "ni",		8715 },
-    { "not",		172 },
-    { "notin",		8713 },
-    { "nsub",		8836 },
-    { "ntilde",		241 },
-    { "nu",		957 },
-    { "oacute",		243 },
-    { "ocirc",		244 },
-    { "oelig",		339 },
-    { "ograve",		242 },
-    { "oline",		8254 },
-    { "omega",		969 },
-    { "omicron",	959 },
-    { "oplus",		8853 },
-    { "or",		8744 },
-    { "ordf",		170 },
-    { "ordm",		186 },
-    { "oslash",		248 },
-    { "otilde",		245 },
-    { "otimes",		8855 },
-    { "ouml",		246 },
-    { "para",		182 },
-    { "part",		8706 },
-    { "permil",		8240 },
-    { "perp",		8869 },
-    { "phi",		966 },
-    { "pi",		960 },
-    { "piv",		982 },
-    { "plusmn",		177 },
-    { "pound",		163 },
-    { "prime",		8242 },
-    { "prod",		8719 },
-    { "prop",		8733 },
-    { "psi",		968 },
-    { "quot",		'\"' },
-    { "rArr",		8658 },
-    { "radic",		8730 },
-    { "rang",		9002 },
-    { "raquo",		187 },
-    { "rarr",		8594 },
-    { "rceil",		8969 },
-    { "rdquo",		8221 },
-    { "real",		8476 },
-    { "reg",		174 },
-    { "rfloor",		8971 },
-    { "rho",		961 },
-    { "rlm",		8207 },
-    { "rsaquo",		8250 },
-    { "rsquo",		8217 },
-    { "sbquo",		8218 },
-    { "scaron",		353 },
-    { "sdot",		8901 },
-    { "sect",		167 },
-    { "shy",		173 },
-    { "sigma",		963 },
-    { "sigmaf",		962 },
-    { "sim",		8764 },
-    { "spades",		9824 },
-    { "sub",		8834 },
-    { "sube",		8838 },
-    { "sum",		8721 },
-    { "sup",		8835 },
-    { "sup1",		185 },
-    { "sup2",		178 },
-    { "sup3",		179 },
-    { "supe",		8839 },
-    { "szlig",		223 },
-    { "tau",		964 },
-    { "there4",		8756 },
-    { "theta",		952 },
-    { "thetasym",	977 },
-    { "thinsp",		8201 },
-    { "thorn",		254 },
-    { "tilde",		732 },
-    { "times",		215 },
-    { "trade",		8482 },
-    { "uArr",		8657 },
-    { "uacute",		250 },
-    { "uarr",		8593 },
-    { "ucirc",		251 },
-    { "ugrave",		249 },
-    { "uml",		168 },
-    { "upsih",		978 },
-    { "upsilon",	965 },
-    { "uuml",		252 },
-    { "weierp",		8472 },
-    { "xi",		958 },
-    { "yacute",		253 },
-    { "yen",		165 },
-    { "yuml",		255 },
-    { "zeta",		950 },
-    { "zwj",		8205 },
-    { "zwnj",		8204 }
-  };
-
-
- /*
-  * Do a binary search for the named entity...
-  */
-
-  first = 0;
-  last  = (int)(sizeof(entities) / sizeof(entities[0]) - 1);
-
-  while ((last - first) > 1)
-  {
-    current = (first + last) / 2;
-
-    if ((diff = strcmp(name, entities[current].name)) == 0)
-      return (entities[current].val);
-    else if (diff < 0)
-      last = current;
-    else
-      first = current;
-  }
-
- /*
-  * If we get here, there is a small chance that there is still
-  * a match; check first and last...
-  */
-
-  if (!strcmp(name, entities[first].name))
-    return (entities[first].val);
-  else if (!strcmp(name, entities[last].name))
-    return (entities[last].val);
-  else
-    return (-1);
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-file.c b/menuselect/mxml/mxml-file.c
deleted file mode 100644
index d5a913252..000000000
--- a/menuselect/mxml/mxml-file.c
+++ /dev/null
@@ -1,2844 +0,0 @@
-/*
- * "$Id$"
- *
- * File loading code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlLoadFd()            - Load a file descriptor into an XML node tree.
- *   mxmlLoadFile()          - Load a file into an XML node tree.
- *   mxmlLoadString()        - Load a string into an XML node tree.
- *   mxmlSaveAllocString()   - Save an XML node tree to an allocated string.
- *   mxmlSaveFd()            - Save an XML tree to a file descriptor.
- *   mxmlSaveFile()          - Save an XML tree to a file.
- *   mxmlSaveString()        - Save an XML node tree to a string.
- *   mxmlSetCustomHandlers() - Set the handling functions for custom data.
- *   mxmlSetErrorCallback()  - Set the error message callback.
- *   mxml_add_char()         - Add a character to a buffer, expanding as needed.
- *   mxml_fd_getc()          - Read a character from a file descriptor.
- *   mxml_fd_putc()          - Write a character to a file descriptor.
- *   mxml_fd_read()          - Read a buffer of data from a file descriptor.
- *   mxml_fd_write()         - Write a buffer of data to a file descriptor.
- *   mxml_file_getc()        - Get a character from a file.
- *   mxml_file_putc()        - Write a character to a file.
- *   mxml_get_entity()       - Get the character corresponding to an entity...
- *   mxml_load_data()        - Load data into an XML node tree.
- *   mxml_parse_element()    - Parse an element for any attributes...
- *   mxml_string_getc()      - Get a character from a string.
- *   mxml_string_putc()      - Write a character to a string.
- *   mxml_write_name()       - Write a name string.
- *   mxml_write_node()       - Save an XML node to a file.
- *   mxml_write_string()     - Write a string, escaping & and < as needed.
- *   mxml_write_ws()         - Do whitespace callback...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-#ifdef WIN32
-#  include <io.h>
-#else
-#  include <unistd.h>
-#endif /* WIN32 */
-
-
-/*
- * Character encoding...
- */
-
-#define ENCODE_UTF8	0		/* UTF-8 */
-#define ENCODE_UTF16BE	1		/* UTF-16 Big-Endian */
-#define ENCODE_UTF16LE	2		/* UTF-16 Little-Endian */
-
-
-/*
- * Macro to test for a bad XML character...
- */
-
-#define mxml_bad_char(ch) ((ch) < ' ' && (ch) != '\n' && (ch) != '\r' && (ch) != '\t')
-
-
-/*
- * Structures...
- */
-
-typedef struct mxml_fdbuf_s		/**** File descriptor buffer (@private) ****/
-{
-  int		fd;			/* File descriptor */
-  unsigned char	*current,		/* Current position in buffer */
-		*end,			/* End of buffer */
-		buffer[8192];		/* Character buffer */
-} mxml_fdbuf_t;
-
-
-/*
- * Global error handler...
- */
-
-extern void	(*mxml_error_cb)(const char *);
-
-
-/*
- * Custom data handlers...
- */
-
-static mxml_custom_load_cb_t	mxml_custom_load_cb = NULL;
-static mxml_custom_save_cb_t	mxml_custom_save_cb = NULL;
-
-
-/*
- * Local functions...
- */
-
-static int		mxml_add_char(int ch, char **ptr, char **buffer,
-			              int *bufsize);
-static int		mxml_fd_getc(void *p, int *encoding);
-static int		mxml_fd_putc(int ch, void *p);
-static int		mxml_fd_read(mxml_fdbuf_t *buf);
-static int		mxml_fd_write(mxml_fdbuf_t *buf);
-static int		mxml_file_getc(void *p, int *encoding);
-static int		mxml_file_putc(int ch, void *p);
-static int		mxml_get_entity(mxml_node_t *parent, void *p,
-			                int *encoding,
-					int (*getc_cb)(void *, int *));
-static mxml_node_t	*mxml_load_data(mxml_node_t *top, void *p,
-			                mxml_type_t (*cb)(mxml_node_t *),
-			                int (*getc_cb)(void *, int *));
-static int		mxml_parse_element(mxml_node_t *node, void *p,
-			                   int *encoding,
-					   int (*getc_cb)(void *, int *));
-static int		mxml_string_getc(void *p, int *encoding);
-static int		mxml_string_putc(int ch, void *p);
-static int		mxml_write_name(const char *s, void *p,
-					int (*putc_cb)(int, void *));
-static int		mxml_write_node(mxml_node_t *node, void *p,
-			                const char *(*cb)(mxml_node_t *, int),
-					int col,
-					int (*putc_cb)(int, void *));
-static int		mxml_write_string(const char *s, void *p,
-					  int (*putc_cb)(int, void *));
-static int		mxml_write_ws(mxml_node_t *node, void *p, 
-			              const char *(*cb)(mxml_node_t *, int), int ws,
-				      int col, int (*putc_cb)(int, void *));
-
-
-/*
- * 'mxmlLoadFd()' - Load a file descriptor into an XML node tree.
- *
- * The nodes in the specified file are added to the specified top node.
- * If no top node is provided, the XML file MUST be well-formed with a
- * single parent node like <?xml> for the entire file. The callback
- * function returns the value type that should be used for child nodes.
- * If MXML_NO_CALLBACK is specified then all child nodes will be either
- * MXML_ELEMENT or MXML_TEXT nodes.
- *
- * The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
- * MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
- * child nodes of the specified type.
- */
-
-mxml_node_t *				/* O - First node or NULL if the file could not be read. */
-mxmlLoadFd(mxml_node_t *top,		/* I - Top node */
-           int         fd,		/* I - File descriptor to read from */
-           mxml_type_t (*cb)(mxml_node_t *node))
-					/* I - Callback function or MXML_NO_CALLBACK */
-{
-  mxml_fdbuf_t	buf;			/* File descriptor buffer */
-
-
- /*
-  * Initialize the file descriptor buffer...
-  */
-
-  buf.fd      = fd;
-  buf.current = buf.buffer;
-  buf.end     = buf.buffer;
-
- /*
-  * Read the XML data...
-  */
-
-  return (mxml_load_data(top, &buf, cb, mxml_fd_getc));
-}
-
-
-/*
- * 'mxmlLoadFile()' - Load a file into an XML node tree.
- *
- * The nodes in the specified file are added to the specified top node.
- * If no top node is provided, the XML file MUST be well-formed with a
- * single parent node like <?xml> for the entire file. The callback
- * function returns the value type that should be used for child nodes.
- * If MXML_NO_CALLBACK is specified then all child nodes will be either
- * MXML_ELEMENT or MXML_TEXT nodes.
- *
- * The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
- * MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
- * child nodes of the specified type.
- */
-
-mxml_node_t *				/* O - First node or NULL if the file could not be read. */
-mxmlLoadFile(mxml_node_t *top,		/* I - Top node */
-             FILE        *fp,		/* I - File to read from */
-             mxml_type_t (*cb)(mxml_node_t *node))
-					/* I - Callback function or MXML_NO_CALLBACK */
-{
- /*
-  * Read the XML data...
-  */
-
-  return (mxml_load_data(top, fp, cb, mxml_file_getc));
-}
-
-
-/*
- * 'mxmlLoadString()' - Load a string into an XML node tree.
- *
- * The nodes in the specified string are added to the specified top node.
- * If no top node is provided, the XML string MUST be well-formed with a
- * single parent node like <?xml> for the entire string. The callback
- * function returns the value type that should be used for child nodes.
- * If MXML_NO_CALLBACK is specified then all child nodes will be either
- * MXML_ELEMENT or MXML_TEXT nodes.
- *
- * The constants MXML_INTEGER_CALLBACK, MXML_OPAQUE_CALLBACK,
- * MXML_REAL_CALLBACK, and MXML_TEXT_CALLBACK are defined for loading
- * child nodes of the specified type.
- */
-
-mxml_node_t *				/* O - First node or NULL if the string has errors. */
-mxmlLoadString(mxml_node_t *top,	/* I - Top node */
-               const char  *s,		/* I - String to load */
-               mxml_type_t (*cb)(mxml_node_t *node))
-					/* I - Callback function or MXML_NO_CALLBACK */
-{
- /*
-  * Read the XML data...
-  */
-
-  return (mxml_load_data(top, &s, cb, mxml_string_getc));
-}
-
-
-/*
- * 'mxmlSaveAllocString()' - Save an XML node tree to an allocated string.
- *
- * This function returns a pointer to a string containing the textual
- * representation of the XML node tree.  The string should be freed
- * using the free() function when you are done with it.  NULL is returned
- * if the node would produce an empty string or if the string cannot be
- * allocated.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-char *					/* O - Allocated string or NULL */
-mxmlSaveAllocString(mxml_node_t *node,	/* I - Node to write */
-                    const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int	bytes;				/* Required bytes */
-  char	buffer[8192];			/* Temporary buffer */
-  char	*s;				/* Allocated string */
-
-
- /*
-  * Write the node to the temporary buffer...
-  */
-
-  bytes = mxmlSaveString(node, buffer, sizeof(buffer), cb);
-
-  if (bytes <= 0)
-    return (NULL);
-
-  if (bytes < (int)(sizeof(buffer) - 1))
-  {
-   /*
-    * Node fit inside the buffer, so just duplicate that string and
-    * return...
-    */
-
-    return (strdup(buffer));
-  }
-
- /*
-  * Allocate a buffer of the required size and save the node to the
-  * new buffer...
-  */
-
-  if ((s = malloc(bytes + 1)) == NULL)
-    return (NULL);
-
-  mxmlSaveString(node, s, bytes + 1, cb);
-
- /*
-  * Return the allocated string...
-  */
-
-  return (s);
-}
-
-
-/*
- * 'mxmlSaveFd()' - Save an XML tree to a file descriptor.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-int					/* O - 0 on success, -1 on error. */
-mxmlSaveFd(mxml_node_t *node,		/* I - Node to write */
-           int         fd,		/* I - File descriptor to write to */
-	   const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int		col;			/* Final column */
-  mxml_fdbuf_t	buf;			/* File descriptor buffer */
-
-
- /*
-  * Initialize the file descriptor buffer...
-  */
-
-  buf.fd      = fd;
-  buf.current = buf.buffer;
-  buf.end     = buf.buffer + sizeof(buf.buffer) - 4;
-
- /*
-  * Write the node...
-  */
-
-  if ((col = mxml_write_node(node, &buf, cb, 0, mxml_fd_putc)) < 0)
-    return (-1);
-
-  if (col > 0)
-    if (mxml_fd_putc('\n', &buf) < 0)
-      return (-1);
-
- /*
-  * Flush and return...
-  */
-
-  return (mxml_fd_write(&buf));
-}
-
-
-/*
- * 'mxmlSaveFile()' - Save an XML tree to a file.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-int					/* O - 0 on success, -1 on error. */
-mxmlSaveFile(mxml_node_t *node,		/* I - Node to write */
-             FILE        *fp,		/* I - File to write to */
-	     const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int	col;				/* Final column */
-
-
- /*
-  * Write the node...
-  */
-
-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc)) < 0)
-    return (-1);
-
-  if (col > 0)
-    if (putc('\n', fp) < 0)
-      return (-1);
-
- /*
-  * Return 0 (success)...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSaveString()' - Save an XML node tree to a string.
- *
- * This function returns the total number of bytes that would be
- * required for the string but only copies (bufsize - 1) characters
- * into the specified buffer.
- *
- * The callback argument specifies a function that returns a whitespace
- * string or NULL before and after each element. If MXML_NO_CALLBACK
- * is specified, whitespace will only be added before MXML_TEXT nodes
- * with leading whitespace and before attribute names inside opening
- * element tags.
- */
-
-int					/* O - Size of string */
-mxmlSaveString(mxml_node_t *node,	/* I - Node to write */
-               char        *buffer,	/* I - String buffer */
-               int         bufsize,	/* I - Size of string buffer */
-               const char  *(*cb)(mxml_node_t *node, int ws))
-					/* I - Whitespace callback or MXML_NO_CALLBACK */
-{
-  int	col;				/* Final column */
-  char	*ptr[2];			/* Pointers for putc_cb */
-
-
- /*
-  * Write the node...
-  */
-
-  ptr[0] = buffer;
-  ptr[1] = buffer + bufsize;
-
-  if ((col = mxml_write_node(node, ptr, cb, 0, mxml_string_putc)) < 0)
-    return (-1);
-
-  if (col > 0)
-    mxml_string_putc('\n', ptr);
-
- /*
-  * Nul-terminate the buffer...
-  */
-
-  if (ptr[0] >= ptr[1])
-    buffer[bufsize - 1] = '\0';
-  else
-    ptr[0][0] = '\0';
-
- /*
-  * Return the number of characters...
-  */
-
-  return (ptr[0] - buffer);
-}
-
-
-/*
- * 'mxmlSetCustomHandlers()' - Set the handling functions for custom data.
- *
- * The load function accepts a node pointer and a data string and must
- * return 0 on success and non-zero on error.
- *
- * The save function accepts a node pointer and must return a malloc'd
- * string on success and NULL on error.
- * 
- */
-
-void
-mxmlSetCustomHandlers(mxml_custom_load_cb_t load,
-					/* I - Load function */
-                      mxml_custom_save_cb_t save)
-					/* I - Save function */
-{
-  mxml_custom_load_cb = load;
-  mxml_custom_save_cb = save;
-}
-
-
-/*
- * 'mxmlSetErrorCallback()' - Set the error message callback.
- */
-
-void
-mxmlSetErrorCallback(void (*cb)(const char *))
-					/* I - Error callback function */
-{
-  mxml_error_cb = cb;
-}
-
-
-/*
- * 'mxml_add_char()' - Add a character to a buffer, expanding as needed.
- */
-
-static int				/* O  - 0 on success, -1 on error */
-mxml_add_char(int  ch,			/* I  - Character to add */
-              char **bufptr,		/* IO - Current position in buffer */
-	      char **buffer,		/* IO - Current buffer */
-	      int  *bufsize)		/* IO - Current buffer size */
-{
-  char	*newbuffer;			/* New buffer value */
-
-
-  if (*bufptr >= (*buffer + *bufsize - 4))
-  {
-   /*
-    * Increase the size of the buffer...
-    */
-
-    if (*bufsize < 1024)
-      (*bufsize) *= 2;
-    else
-      (*bufsize) += 1024;
-
-    if ((newbuffer = realloc(*buffer, *bufsize)) == NULL)
-    {
-      free(*buffer);
-
-      mxml_error("Unable to expand string buffer to %d bytes!", *bufsize);
-
-      return (-1);
-    }
-
-    *bufptr = newbuffer + (*bufptr - *buffer);
-    *buffer = newbuffer;
-  }
-
-  if (ch < 0x80)
-  {
-   /*
-    * Single byte ASCII...
-    */
-
-    *(*bufptr)++ = ch;
-  }
-  else if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8...
-    */
-
-    *(*bufptr)++ = 0xc0 | (ch >> 6);
-    *(*bufptr)++ = 0x80 | (ch & 0x3f);
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8...
-    */
-
-    *(*bufptr)++ = 0xe0 | (ch >> 12);
-    *(*bufptr)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(*bufptr)++ = 0x80 | (ch & 0x3f);
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8...
-    */
-
-    *(*bufptr)++ = 0xf0 | (ch >> 18);
-    *(*bufptr)++ = 0x80 | ((ch >> 12) & 0x3f);
-    *(*bufptr)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(*bufptr)++ = 0x80 | (ch & 0x3f);
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_fd_getc()' - Read a character from a file descriptor.
- */
-
-static int				/* O  - Character or EOF */
-mxml_fd_getc(void *p,			/* I  - File descriptor buffer */
-             int  *encoding)		/* IO - Encoding */
-{
-  mxml_fdbuf_t	*buf;			/* File descriptor buffer */
-  int		ch,			/* Current character */
-		temp;			/* Temporary character */
-
-
- /*
-  * Grab the next character in the buffer...
-  */
-
-  buf = (mxml_fdbuf_t *)p;
-
-  if (buf->current >= buf->end)
-    if (mxml_fd_read(buf) < 0)
-      return (EOF);
-
-  ch = *(buf->current)++;
-
-  switch (*encoding)
-  {
-    case ENCODE_UTF8 :
-       /*
-	* Got a UTF-8 character; convert UTF-8 to Unicode and return...
-	*/
-
-	if (!(ch & 0x80))
-	{
-#if DEBUG > 1
-          printf("mxml_fd_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-
-	  return (ch);
-        }
-	else if (ch == 0xfe)
-	{
-	 /*
-	  * UTF-16 big-endian BOM?
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  ch = *(buf->current)++;
-          
-	  if (ch != 0xff)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16BE;
-
-	  return (mxml_fd_getc(p, encoding));
-	}
-	else if (ch == 0xff)
-	{
-	 /*
-	  * UTF-16 little-endian BOM?
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  ch = *(buf->current)++;
-          
-	  if (ch != 0xfe)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16LE;
-
-	  return (mxml_fd_getc(p, encoding));
-	}
-	else if ((ch & 0xe0) == 0xc0)
-	{
-	 /*
-	  * Two-byte value...
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x1f) << 6) | (temp & 0x3f);
-
-	  if (ch < 0x80)
-	    return (EOF);
-	}
-	else if ((ch & 0xf0) == 0xe0)
-	{
-	 /*
-	  * Three-byte value...
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x0f) << 6) | (temp & 0x3f);
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x800)
-	    return (EOF);
-	}
-	else if ((ch & 0xf8) == 0xf0)
-	{
-	 /*
-	  * Four-byte value...
-	  */
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x07) << 6) | (temp & 0x3f);
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  if ((temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x10000)
-	    return (EOF);
-	}
-	else
-	  return (EOF);
-	break;
-
-    case ENCODE_UTF16BE :
-       /*
-        * Read UTF-16 big-endian char...
-	*/
-
-	if (buf->current >= buf->end)
-	  if (mxml_fd_read(buf) < 0)
-	    return (EOF);
-
-	temp = *(buf->current)++;
-
-	ch = (ch << 8) | temp;
-
-	if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  lch = *(buf->current)++;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  lch = (lch << 8) | temp;
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-
-    case ENCODE_UTF16LE :
-       /*
-        * Read UTF-16 little-endian char...
-	*/
-
-	if (buf->current >= buf->end)
-	  if (mxml_fd_read(buf) < 0)
-	    return (EOF);
-
-	temp = *(buf->current)++;
-
-	ch |= (temp << 8);
-
-        if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  lch = *(buf->current)++;
-
-	  if (buf->current >= buf->end)
-	    if (mxml_fd_read(buf) < 0)
-	      return (EOF);
-
-	  temp = *(buf->current)++;
-
-	  lch |= (temp << 8);
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-  }
-
-#if DEBUG > 1
-  printf("mxml_fd_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-  return (ch);
-}
-
-
-/*
- * 'mxml_fd_putc()' - Write a character to a file descriptor.
- */
-
-static int				/* O - 0 on success, -1 on error */
-mxml_fd_putc(int  ch,			/* I - Character */
-             void *p)			/* I - File descriptor buffer */
-{
-  mxml_fdbuf_t	*buf;			/* File descriptor buffer */
-
-
- /*
-  * Flush the write buffer as needed - note above that "end" still leaves
-  * 4 characters at the end so that we can avoid a lot of extra tests...
-  */
-
-  buf = (mxml_fdbuf_t *)p;
-
-  if (buf->current >= buf->end)
-    if (mxml_fd_write(buf) < 0)
-      return (-1);
-
-  if (ch < 0x80)
-  {
-   /*
-    * Write ASCII character directly...
-    */
-
-    *(buf->current)++ = ch;
-  }
-  else if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8 character...
-    */
-
-    *(buf->current)++ = 0xc0 | (ch >> 6);
-    *(buf->current)++ = 0x80 | (ch & 0x3f);
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8 character...
-    */
-
-    *(buf->current)++ = 0xe0 | (ch >> 12);
-    *(buf->current)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(buf->current)++ = 0x80 | (ch & 0x3f);
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8 character...
-    */
-
-    *(buf->current)++ = 0xf0 | (ch >> 18);
-    *(buf->current)++ = 0x80 | ((ch >> 12) & 0x3f);
-    *(buf->current)++ = 0x80 | ((ch >> 6) & 0x3f);
-    *(buf->current)++ = 0x80 | (ch & 0x3f);
-  }
-
- /*
-  * Return successfully...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'mxml_fd_read()' - Read a buffer of data from a file descriptor.
- */
-
-static int				/* O - 0 on success, -1 on error */
-mxml_fd_read(mxml_fdbuf_t *buf)		/* I - File descriptor buffer */
-{
-  int	bytes;				/* Bytes read... */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!buf)
-    return (-1);
-
- /*
-  * Read from the file descriptor...
-  */
-
-  while ((bytes = read(buf->fd, buf->buffer, sizeof(buf->buffer))) < 0)
-    if (errno != EAGAIN && errno != EINTR)
-      return (-1);
-
-  if (bytes == 0)
-    return (-1);
-
- /*
-  * Update the pointers and return success...
-  */
-
-  buf->current = buf->buffer;
-  buf->end     = buf->buffer + bytes;
-
-  return (0);
-}
-
-
-/*
- * 'mxml_fd_write()' - Write a buffer of data to a file descriptor.
- */
-
-static int				/* O - 0 on success, -1 on error */
-mxml_fd_write(mxml_fdbuf_t *buf)	/* I - File descriptor buffer */
-{
-  int		bytes;			/* Bytes written */
-  unsigned char	*ptr;			/* Pointer into buffer */
-
-
- /*
-  * Range check...
-  */
-
-  if (!buf)
-    return (-1);
-
- /*
-  * Return 0 if there is nothing to write...
-  */
-
-  if (buf->current == buf->buffer)
-    return (0);
-
- /*
-  * Loop until we have written everything...
-  */
-
-  for (ptr = buf->buffer; ptr < buf->current; ptr += bytes)
-    if ((bytes = write(buf->fd, ptr, buf->current - ptr)) < 0)
-      return (-1);
-
- /*
-  * All done, reset pointers and return success...
-  */
-
-  buf->current = buf->buffer;
-
-  return (0);
-}
-
-
-/*
- * 'mxml_file_getc()' - Get a character from a file.
- */
-
-static int				/* O  - Character or EOF */
-mxml_file_getc(void *p,			/* I  - Pointer to file */
-               int  *encoding)		/* IO - Encoding */
-{
-  int	ch,				/* Character from file */
-	temp;				/* Temporary character */
-  FILE	*fp;				/* Pointer to file */
-
-
- /*
-  * Read a character from the file and see if it is EOF or ASCII...
-  */
-
-  fp = (FILE *)p;
-  ch = getc(fp);
-
-  if (ch == EOF)
-    return (EOF);
-
-  switch (*encoding)
-  {
-    case ENCODE_UTF8 :
-       /*
-	* Got a UTF-8 character; convert UTF-8 to Unicode and return...
-	*/
-
-	if (!(ch & 0x80))
-	{
-	  if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-
-#if DEBUG > 1
-          printf("mxml_file_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  return (ch);
-        }
-	else if (ch == 0xfe)
-	{
-	 /*
-	  * UTF-16 big-endian BOM?
-	  */
-
-          ch = getc(fp);
-	  if (ch != 0xff)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16BE;
-
-	  return (mxml_file_getc(p, encoding));
-	}
-	else if (ch == 0xff)
-	{
-	 /*
-	  * UTF-16 little-endian BOM?
-	  */
-
-          ch = getc(fp);
-	  if (ch != 0xfe)
-	    return (EOF);
-
-	  *encoding = ENCODE_UTF16LE;
-
-	  return (mxml_file_getc(p, encoding));
-	}
-	else if ((ch & 0xe0) == 0xc0)
-	{
-	 /*
-	  * Two-byte value...
-	  */
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x1f) << 6) | (temp & 0x3f);
-
-	  if (ch < 0x80)
-	    return (EOF);
-	}
-	else if ((ch & 0xf0) == 0xe0)
-	{
-	 /*
-	  * Three-byte value...
-	  */
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x0f) << 6) | (temp & 0x3f);
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x800)
-	    return (EOF);
-	}
-	else if ((ch & 0xf8) == 0xf0)
-	{
-	 /*
-	  * Four-byte value...
-	  */
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = ((ch & 0x07) << 6) | (temp & 0x3f);
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if ((temp = getc(fp)) == EOF || (temp & 0xc0) != 0x80)
-	    return (EOF);
-
-	  ch = (ch << 6) | (temp & 0x3f);
-
-	  if (ch < 0x10000)
-	    return (EOF);
-	}
-	else
-	  return (EOF);
-	break;
-
-    case ENCODE_UTF16BE :
-       /*
-        * Read UTF-16 big-endian char...
-	*/
-
-	ch = (ch << 8) | getc(fp);
-
-	if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch = (getc(fp) << 8) | getc(fp);
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-
-    case ENCODE_UTF16LE :
-       /*
-        * Read UTF-16 little-endian char...
-	*/
-
-	ch |= (getc(fp) << 8);
-
-        if (mxml_bad_char(ch))
-	{
-	  mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	     ch);
-	  return (EOF);
-	}
-        else if (ch >= 0xd800 && ch <= 0xdbff)
-	{
-	 /*
-	  * Multi-word UTF-16 char...
-	  */
-
-          int lch = getc(fp) | (getc(fp) << 8);
-
-          if (lch < 0xdc00 || lch >= 0xdfff)
-	    return (EOF);
-
-          ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	}
-	break;
-  }
-
-#if DEBUG > 1
-  printf("mxml_file_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-  return (ch);
-}
-
-
-/*
- * 'mxml_file_putc()' - Write a character to a file.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_file_putc(int  ch,			/* I - Character to write */
-               void *p)			/* I - Pointer to file */
-{
-  char	buffer[4],			/* Buffer for character */
-	*bufptr;			/* Pointer into buffer */
-  int	buflen;				/* Number of bytes to write */
-
-
-  if (ch < 0x80)
-    return (putc(ch, (FILE *)p) == EOF ? -1 : 0);
-
-  bufptr = buffer;
-
-  if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8 character...
-    */
-
-    *bufptr++ = 0xc0 | (ch >> 6);
-    *bufptr++ = 0x80 | (ch & 0x3f);
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8 character...
-    */
-
-    *bufptr++ = 0xe0 | (ch >> 12);
-    *bufptr++ = 0x80 | ((ch >> 6) & 0x3f);
-    *bufptr++ = 0x80 | (ch & 0x3f);
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8 character...
-    */
-
-    *bufptr++ = 0xf0 | (ch >> 18);
-    *bufptr++ = 0x80 | ((ch >> 12) & 0x3f);
-    *bufptr++ = 0x80 | ((ch >> 6) & 0x3f);
-    *bufptr++ = 0x80 | (ch & 0x3f);
-  }
-
-  buflen = bufptr - buffer;
-
-  return (fwrite(buffer, 1, buflen, (FILE *)p) < buflen ? -1 : 0);
-}
-
-
-/*
- * 'mxml_get_entity()' - Get the character corresponding to an entity...
- */
-
-static int				/* O  - Character value or EOF on error */
-mxml_get_entity(mxml_node_t *parent,	/* I  - Parent node */
-		void        *p,		/* I  - Pointer to source */
-		int         *encoding,	/* IO - Character encoding */
-                int         (*getc_cb)(void *, int *))
-					/* I  - Get character function */
-{
-  int	ch;				/* Current character */
-  char	entity[64],			/* Entity string */
-	*entptr;			/* Pointer into entity */
-
-
-  entptr = entity;
-
-  while ((ch = (*getc_cb)(p, encoding)) != EOF)
-    if (ch > 126 || (!isalnum(ch) && ch != '#'))
-      break;
-    else if (entptr < (entity + sizeof(entity) - 1))
-      *entptr++ = ch;
-    else
-    {
-      mxml_error("Entity name too long under parent <%s>!",
-	         parent ? parent->value.element.name : "null");
-      break;
-    }
-
-  *entptr = '\0';
-
-  if (ch != ';')
-  {
-    mxml_error("Character entity \"%s\" not terminated under parent <%s>!",
-	       entity, parent ? parent->value.element.name : "null");
-    return (EOF);
-  }
-
-  if (entity[0] == '#')
-  {
-    if (entity[1] == 'x')
-      ch = strtol(entity + 2, NULL, 16);
-    else
-      ch = strtol(entity + 1, NULL, 10);
-  }
-  else if ((ch = mxmlEntityGetValue(entity)) < 0)
-    mxml_error("Entity name \"%s;\" not supported under parent <%s>!",
-	       entity, parent ? parent->value.element.name : "null");
-
-  if (mxml_bad_char(ch))
-  {
-    mxml_error("Bad control character 0x%02x under parent <%s> not allowed by XML standard!",
-               ch, parent ? parent->value.element.name : "null");
-    return (EOF);
-  }
-
-  return (ch);
-}
-
-
-/*
- * 'mxml_load_data()' - Load data into an XML node tree.
- */
-
-static mxml_node_t *			/* O - First node or NULL if the file could not be read. */
-mxml_load_data(mxml_node_t *top,	/* I - Top node */
-               void        *p,		/* I - Pointer to data */
-               mxml_type_t (*cb)(mxml_node_t *),
-					/* I - Callback function or MXML_NO_CALLBACK */
-               int         (*getc_cb)(void *, int *))
-					/* I - Read function */
-{
-  mxml_node_t	*node,			/* Current node */
-		*first,			/* First node added */
-		*parent;		/* Current parent node */
-  int		ch,			/* Character from file */
-		whitespace;		/* Non-zero if whitespace seen */
-  char		*buffer,		/* String buffer */
-		*bufptr;		/* Pointer into buffer */
-  int		bufsize;		/* Size of buffer */
-  mxml_type_t	type;			/* Current node type */
-  int		encoding;		/* Character encoding */
-  static const char * const types[] =	/* Type strings... */
-		{
-		  "MXML_ELEMENT",	/* XML element with attributes */
-		  "MXML_INTEGER",	/* Integer value */
-		  "MXML_OPAQUE",	/* Opaque string */
-		  "MXML_REAL",		/* Real value */
-		  "MXML_TEXT",		/* Text fragment */
-		  "MXML_CUSTOM"		/* Custom data */
-		};
-
-
- /*
-  * Read elements and other nodes from the file...
-  */
-
-  if ((buffer = malloc(64)) == NULL)
-  {
-    mxml_error("Unable to allocate string buffer!");
-    return (NULL);
-  }
-
-  bufsize    = 64;
-  bufptr     = buffer;
-  parent     = top;
-  first      = NULL;
-  whitespace = 0;
-  encoding   = ENCODE_UTF8;
-
-  if (cb && parent)
-    type = (*cb)(parent);
-  else
-    type = MXML_TEXT;
-
-  while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-  {
-    if ((ch == '<' ||
-         (isspace(ch) && type != MXML_OPAQUE && type != MXML_CUSTOM)) &&
-        bufptr > buffer)
-    {
-     /*
-      * Add a new value node...
-      */
-
-      *bufptr = '\0';
-
-      switch (type)
-      {
-	case MXML_INTEGER :
-            node = mxmlNewInteger(parent, strtol(buffer, &bufptr, 0));
-	    break;
-
-	case MXML_OPAQUE :
-            node = mxmlNewOpaque(parent, buffer);
-	    break;
-
-	case MXML_REAL :
-            node = mxmlNewReal(parent, strtod(buffer, &bufptr));
-	    break;
-
-	case MXML_TEXT :
-            node = mxmlNewText(parent, whitespace, buffer);
-	    break;
-
-	case MXML_CUSTOM :
-	    if (mxml_custom_load_cb)
-	    {
-	     /*
-	      * Use the callback to fill in the custom data...
-	      */
-
-              node = mxmlNewCustom(parent, NULL, NULL);
-
-	      if ((*mxml_custom_load_cb)(node, buffer))
-	      {
-	        mxml_error("Bad custom value '%s' in parent <%s>!",
-		           buffer, parent ? parent->value.element.name : "null");
-		mxmlDelete(node);
-		node = NULL;
-	      }
-	      break;
-	    }
-
-        default : /* Should never happen... */
-	    node = NULL;
-	    break;
-      }	  
-
-      if (*bufptr)
-      {
-       /*
-        * Bad integer/real number value...
-	*/
-
-        mxml_error("Bad %s value '%s' in parent <%s>!",
-	           type == MXML_INTEGER ? "integer" : "real", buffer,
-		   parent ? parent->value.element.name : "null");
-	break;
-      }
-
-      bufptr     = buffer;
-      whitespace = isspace(ch) && type == MXML_TEXT;
-
-      if (!node)
-      {
-       /*
-	* Print error and return...
-	*/
-
-	mxml_error("Unable to add value node of type %s to parent <%s>!",
-	           types[type], parent ? parent->value.element.name : "null");
-	goto error;
-      }
-
-      if (!first)
-        first = node;
-    }
-    else if (isspace(ch) && type == MXML_TEXT)
-      whitespace = 1;
-
-   /*
-    * Add lone whitespace node if we have an element and existing
-    * whitespace...
-    */
-
-    if (ch == '<' && whitespace && type == MXML_TEXT)
-    {
-      mxmlNewText(parent, whitespace, "");
-      whitespace = 0;
-    }
-
-    if (ch == '<')
-    {
-     /*
-      * Start of open/close tag...
-      */
-
-      bufptr = buffer;
-
-      while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-        if (isspace(ch) || ch == '>' || (ch == '/' && bufptr > buffer))
-	  break;
-	else if (ch == '&')
-	{
-	  if ((ch = mxml_get_entity(parent, p, &encoding, getc_cb)) == EOF)
-	    goto error;
-
-	  if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-	else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	  goto error;
-	else if (((bufptr - buffer) == 1 && buffer[0] == '?') ||
-	         ((bufptr - buffer) == 3 && !strncmp(buffer, "!--", 3)) ||
-	         ((bufptr - buffer) == 8 && !strncmp(buffer, "![CDATA[", 8)))
-	  break;
-
-      *bufptr = '\0';
-
-      if (!strcmp(buffer, "!--"))
-      {
-       /*
-        * Gather rest of comment...
-	*/
-
-	while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-	{
-	  if (ch == '>' && bufptr > (buffer + 4) &&
-	      bufptr[-3] != '-' && bufptr[-2] == '-' && bufptr[-1] == '-')
-	    break;
-	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-
-       /*
-        * Error out if we didn't get the whole comment...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in comment node!");
-	  goto error;
-	}
-
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	if (!mxmlNewElement(parent, buffer))
-	{
-	 /*
-	  * Just print error for now...
-	  */
-
-	  mxml_error("Unable to add comment node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  break;
-	}
-      }
-      else if (!strcmp(buffer, "![CDATA["))
-      {
-       /*
-        * Gather CDATA section...
-	*/
-
-	while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-	{
-	  if (ch == '>' && !strncmp(bufptr - 2, "]]", 2))
-	    break;
-	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-
-       /*
-        * Error out if we didn't get the whole comment...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in CDATA node!");
-	  goto error;
-	}
-
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	if (!mxmlNewElement(parent, buffer))
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Unable to add CDATA node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-      }
-      else if (buffer[0] == '?')
-      {
-       /*
-        * Gather rest of processing instruction...
-	*/
-
-	while ((ch = (*getc_cb)(p, &encoding)) != EOF)
-	{
-	  if (ch == '>' && bufptr > buffer && bufptr[-1] == '?')
-	    break;
-	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	    goto error;
-	}
-
-       /*
-        * Error out if we didn't get the whole processing instruction...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in processing instruction node!");
-	  goto error;
-	}
-
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	if (!(parent = mxmlNewElement(parent, buffer)))
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Unable to add processing instruction node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-
-	if (cb)
-	  type = (*cb)(parent);
-      }
-      else if (buffer[0] == '!')
-      {
-       /*
-        * Gather rest of declaration...
-	*/
-
-	do
-	{
-	  if (ch == '>')
-	    break;
-	  else
-	  {
-            if (ch == '&')
-	      if ((ch = mxml_get_entity(parent, p, &encoding, getc_cb)) == EOF)
-		goto error;
-
-	    if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	      goto error;
-	  }
-	}
-        while ((ch = (*getc_cb)(p, &encoding)) != EOF);
-
-       /*
-        * Error out if we didn't get the whole declaration...
-	*/
-
-        if (ch != '>')
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Early EOF in declaration node!");
-	  goto error;
-	}
-
-       /*
-        * Otherwise add this as an element under the current parent...
-	*/
-
-	*bufptr = '\0';
-
-	node = mxmlNewElement(parent, buffer);
-	if (!node)
-	{
-	 /*
-	  * Print error and return...
-	  */
-
-	  mxml_error("Unable to add declaration node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-
-       /*
-	* Descend into this node, setting the value type as needed...
-	*/
-
-	parent = node;
-
-	if (cb)
-	  type = (*cb)(parent);
-      }
-      else if (buffer[0] == '/')
-      {
-       /*
-        * Handle close tag...
-	*/
-
-        if (!parent || strcmp(buffer + 1, parent->value.element.name))
-	{
-	 /*
-	  * Close tag doesn't match tree; print an error for now...
-	  */
-
-	  mxml_error("Mismatched close tag <%s> under parent <%s>!",
-	             buffer, parent->value.element.name);
-          goto error;
-	}
-
-       /*
-        * Keep reading until we see >...
-	*/
-
-        while (ch != '>' && ch != EOF)
-	  ch = (*getc_cb)(p, &encoding);
-
-       /*
-	* Ascend into the parent and set the value type as needed...
-	*/
-
-	parent = parent->parent;
-
-	if (cb && parent)
-	  type = (*cb)(parent);
-      }
-      else
-      {
-       /*
-        * Handle open tag...
-	*/
-
-        node = mxmlNewElement(parent, buffer);
-
-	if (!node)
-	{
-	 /*
-	  * Just print error for now...
-	  */
-
-	  mxml_error("Unable to add element node to parent <%s>!",
-	             parent ? parent->value.element.name : "null");
-	  goto error;
-	}
-
-        if (isspace(ch))
-          ch = mxml_parse_element(node, p, &encoding, getc_cb);
-        else if (ch == '/')
-	{
-	  if ((ch = (*getc_cb)(p, &encoding)) != '>')
-	  {
-	    mxml_error("Expected > but got '%c' instead for element <%s/>!",
-	               ch, buffer);
-            goto error;
-	  }
-
-	  ch = '/';
-	}
-
-	if (ch == EOF)
-	  break;
-
-        if (ch != '/')
-	{
-	 /*
-	  * Descend into this node, setting the value type as needed...
-	  */
-
-	  parent = node;
-
-	  if (cb && parent)
-	    type = (*cb)(parent);
-	}
-      }
-
-      bufptr  = buffer;
-    }
-    else if (ch == '&')
-    {
-     /*
-      * Add character entity to current buffer...
-      */
-
-      if ((ch = mxml_get_entity(parent, p, &encoding, getc_cb)) == EOF)
-	goto error;
-
-      if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	goto error;
-    }
-    else if (type == MXML_OPAQUE || type == MXML_CUSTOM || !isspace(ch))
-    {
-     /*
-      * Add character to current buffer...
-      */
-
-      if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
-	goto error;
-    }
-  }
-
- /*
-  * Free the string buffer - we don't need it anymore...
-  */
-
-  free(buffer);
-
- /*
-  * Find the top element and return it...
-  */
-
-  if (parent)
-  {
-    while (parent->parent != top && parent->parent)
-      parent = parent->parent;
-  }
-
-  return (parent);
-
- /*
-  * Common error return...
-  */
-
-error:
-
-  mxmlDelete(first);
-
-  free(buffer);
-
-  return (NULL);
-}
-
-
-/*
- * 'mxml_parse_element()' - Parse an element for any attributes...
- */
-
-static int				/* O  - Terminating character */
-mxml_parse_element(mxml_node_t *node,	/* I  - Element node */
-                   void        *p,	/* I  - Data to read from */
-		   int         *encoding,
-					/* IO - Encoding */
-                   int         (*getc_cb)(void *, int *))
-					/* I  - Data callback */
-{
-  int	ch,				/* Current character in file */
-	quote;				/* Quoting character */
-  char	*name,				/* Attribute name */
-	*value,				/* Attribute value */
-	*ptr;				/* Pointer into name/value */
-  int	namesize,			/* Size of name string */
-	valsize;			/* Size of value string */
-
-
-
-
- /*
-  * Initialize the name and value buffers...
-  */
-
-  if ((name = malloc(64)) == NULL)
-  {
-    mxml_error("Unable to allocate memory for name!");
-    return (EOF);
-  }
-
-  namesize = 64;
-
-  if ((value = malloc(64)) == NULL)
-  {
-    free(name);
-    mxml_error("Unable to allocate memory for value!");
-    return (EOF);
-  }
-
-  valsize = 64;
-
- /*
-  * Loop until we hit a >, /, ?, or EOF...
-  */
-
-  while ((ch = (*getc_cb)(p, encoding)) != EOF)
-  {
-#if DEBUG > 1
-    fprintf(stderr, "parse_element: ch='%c'\n", ch);
-#endif /* DEBUG > 1 */
-
-   /*
-    * Skip leading whitespace...
-    */
-
-    if (isspace(ch))
-      continue;
-
-   /*
-    * Stop at /, ?, or >...
-    */
-
-    if (ch == '/' || ch == '?')
-    {
-     /*
-      * Grab the > character and print an error if it isn't there...
-      */
-
-      quote = (*getc_cb)(p, encoding);
-
-      if (quote != '>')
-      {
-        mxml_error("Expected '>' after '%c' for element %s, but got '%c'!",
-	           ch, node->value.element.name, quote);
-        ch = EOF;
-      }
-
-      break;
-    }
-    else if (ch == '>')
-      break;
-
-   /*
-    * Read the attribute name...
-    */
-
-    name[0] = ch;
-    ptr     = name + 1;
-
-    if (ch == '\"' || ch == '\'')
-    {
-     /*
-      * Name is in quotes, so get a quoted string...
-      */
-
-      quote = ch;
-
-      while ((ch = (*getc_cb)(p, encoding)) != EOF)
-      {
-        if (ch == '&')
-	  if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	    goto error;
-
-	if (mxml_add_char(ch, &ptr, &name, &namesize))
-	  goto error;
-
-	if (ch == quote)
-          break;
-      }
-    }
-    else
-    {
-     /*
-      * Grab an normal, non-quoted name...
-      */
-
-      while ((ch = (*getc_cb)(p, encoding)) != EOF)
-	if (isspace(ch) || ch == '=' || ch == '/' || ch == '>' || ch == '?')
-          break;
-	else
-	{
-          if (ch == '&')
-	    if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	      goto error;
-
-	  if (mxml_add_char(ch, &ptr, &name, &namesize))
-	    goto error;
-	}
-    }
-
-    *ptr = '\0';
-
-    if (mxmlElementGetAttr(node, name))
-      goto error;
-
-    if (ch == '=')
-    {
-     /*
-      * Read the attribute value...
-      */
-
-      if ((ch = (*getc_cb)(p, encoding)) == EOF)
-      {
-        mxml_error("Missing value for attribute '%s' in element %s!",
-	           name, node->value.element.name);
-        free(value);
-        return (EOF);
-      }
-
-      if (ch == '\'' || ch == '\"')
-      {
-       /*
-        * Read quoted value...
-	*/
-
-        quote = ch;
-	ptr   = value;
-
-        while ((ch = (*getc_cb)(p, encoding)) != EOF)
-	  if (ch == quote)
-	    break;
-	  else
-	  {
-	    if (ch == '&')
-	      if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	        goto error;
-	      
-	    if (mxml_add_char(ch, &ptr, &value, &valsize))
-	      goto error;
-	  }
-
-        *ptr = '\0';
-      }
-      else
-      {
-       /*
-        * Read unquoted value...
-	*/
-
-	value[0] = ch;
-	ptr      = value + 1;
-
-	while ((ch = (*getc_cb)(p, encoding)) != EOF)
-	  if (isspace(ch) || ch == '=' || ch == '/' || ch == '>')
-            break;
-	  else
-	  {
-	    if (ch == '&')
-	      if ((ch = mxml_get_entity(node, p, encoding, getc_cb)) == EOF)
-	        goto error;
-	      
-	    if (mxml_add_char(ch, &ptr, &value, &valsize))
-	      goto error;
-	  }
-
-        *ptr = '\0';
-      }
-
-     /*
-      * Set the attribute with the given string value...
-      */
-
-      mxmlElementSetAttr(node, name, value);
-    }
-    else
-    {
-     /*
-      * Set the attribute with a NULL value...
-      */
-
-      mxmlElementSetAttr(node, name, NULL);
-    }
-
-   /*
-    * Check the end character...
-    */
-
-    if (ch == '/' || ch == '?')
-    {
-     /*
-      * Grab the > character and print an error if it isn't there...
-      */
-
-      quote = (*getc_cb)(p, encoding);
-
-      if (quote != '>')
-      {
-        mxml_error("Expected '>' after '%c' for element %s, but got '%c'!",
-	           ch, node->value.element.name, quote);
-        ch = EOF;
-      }
-
-      break;
-    }
-    else if (ch == '>')
-      break;
-  }
-
- /*
-  * Free the name and value buffers and return...
-  */
-
-  free(name);
-  free(value);
-
-  return (ch);
-
- /*
-  * Common error return point...
-  */
-
-error:
-
-  free(name);
-  free(value);
-
-  return (EOF);
-}
-
-
-/*
- * 'mxml_string_getc()' - Get a character from a string.
- */
-
-static int				/* O  - Character or EOF */
-mxml_string_getc(void *p,		/* I  - Pointer to file */
-                 int  *encoding)	/* IO - Encoding */
-{
-  int		ch;			/* Character */
-  const char	**s;			/* Pointer to string pointer */
-
-
-  s = (const char **)p;
-
-  if ((ch = (*s)[0] & 255) != 0 || *encoding == ENCODE_UTF16LE)
-  {
-   /*
-    * Got character; convert UTF-8 to integer and return...
-    */
-
-    (*s)++;
-
-    switch (*encoding)
-    {
-      case ENCODE_UTF8 :
-	  if (!(ch & 0x80))
-	  {
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    if (mxml_bad_char(ch))
-	    {
-	      mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        		 ch);
-	      return (EOF);
-	    }
-
-	    return (ch);
-          }
-	  else if (ch == 0xfe)
-	  {
-	   /*
-	    * UTF-16 big-endian BOM?
-	    */
-
-            if (((*s)[0] & 255) != 0xff)
-	      return (EOF);
-
-	    *encoding = ENCODE_UTF16BE;
-	    (*s)++;
-
-	    return (mxml_string_getc(p, encoding));
-	  }
-	  else if (ch == 0xff)
-	  {
-	   /*
-	    * UTF-16 little-endian BOM?
-	    */
-
-            if (((*s)[0] & 255) != 0xfe)
-	      return (EOF);
-
-	    *encoding = ENCODE_UTF16LE;
-	    (*s)++;
-
-	    return (mxml_string_getc(p, encoding));
-	  }
-	  else if ((ch & 0xe0) == 0xc0)
-	  {
-	   /*
-	    * Two-byte value...
-	    */
-
-	    if (((*s)[0] & 0xc0) != 0x80)
-              return (EOF);
-
-	    ch = ((ch & 0x1f) << 6) | ((*s)[0] & 0x3f);
-
-	    (*s)++;
-
-	    if (ch < 0x80)
-	      return (EOF);
-
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    return (ch);
-	  }
-	  else if ((ch & 0xf0) == 0xe0)
-	  {
-	   /*
-	    * Three-byte value...
-	    */
-
-	    if (((*s)[0] & 0xc0) != 0x80 ||
-        	((*s)[1] & 0xc0) != 0x80)
-              return (EOF);
-
-	    ch = ((((ch & 0x0f) << 6) | ((*s)[0] & 0x3f)) << 6) | ((*s)[1] & 0x3f);
-
-	    (*s) += 2;
-
-	    if (ch < 0x800)
-	      return (EOF);
-
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    return (ch);
-	  }
-	  else if ((ch & 0xf8) == 0xf0)
-	  {
-	   /*
-	    * Four-byte value...
-	    */
-
-	    if (((*s)[0] & 0xc0) != 0x80 ||
-        	((*s)[1] & 0xc0) != 0x80 ||
-        	((*s)[2] & 0xc0) != 0x80)
-              return (EOF);
-
-	    ch = ((((((ch & 0x07) << 6) | ((*s)[0] & 0x3f)) << 6) |
-        	   ((*s)[1] & 0x3f)) << 6) | ((*s)[2] & 0x3f);
-
-	    (*s) += 3;
-
-	    if (ch < 0x10000)
-	      return (EOF);
-
-#if DEBUG > 1
-            printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	    return (ch);
-	  }
-	  else
-	    return (EOF);
-
-      case ENCODE_UTF16BE :
-	 /*
-          * Read UTF-16 big-endian char...
-	  */
-
-	  ch = (ch << 8) | ((*s)[0] & 255);
-	  (*s) ++;
-
-          if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-          else if (ch >= 0xd800 && ch <= 0xdbff)
-	  {
-	   /*
-	    * Multi-word UTF-16 char...
-	    */
-
-            int lch;			/* Lower word */
-
-
-            if (!(*s)[0])
-	      return (EOF);
-
-            lch = (((*s)[0] & 255) << 8) | ((*s)[1] & 255);
-	    (*s) += 2;
-
-            if (lch < 0xdc00 || lch >= 0xdfff)
-	      return (EOF);
-
-            ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	  }
-
-#if DEBUG > 1
-          printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  return (ch);
-
-      case ENCODE_UTF16LE :
-	 /*
-          * Read UTF-16 little-endian char...
-	  */
-
-	  ch = ch | (((*s)[0] & 255) << 8);
-
-	  if (!ch)
-	  {
-	    (*s) --;
-	    return (EOF);
-	  }
-
-	  (*s) ++;
-
-          if (mxml_bad_char(ch))
-	  {
-	    mxml_error("Bad control character 0x%02x not allowed by XML standard!",
-        	       ch);
-	    return (EOF);
-	  }
-          else if (ch >= 0xd800 && ch <= 0xdbff)
-	  {
-	   /*
-	    * Multi-word UTF-16 char...
-	    */
-
-            int lch;			/* Lower word */
-
-
-            if (!(*s)[1])
-	      return (EOF);
-
-            lch = (((*s)[1] & 255) << 8) | ((*s)[0] & 255);
-	    (*s) += 2;
-
-            if (lch < 0xdc00 || lch >= 0xdfff)
-	      return (EOF);
-
-            ch = (((ch & 0x3ff) << 10) | (lch & 0x3ff)) + 0x10000;
-	  }
-
-#if DEBUG > 1
-          printf("mxml_string_getc: %c (0x%04x)\n", ch < ' ' ? '.' : ch, ch);
-#endif /* DEBUG > 1 */
-
-	  return (ch);
-    }
-  }
-
-  return (EOF);
-}
-
-
-/*
- * 'mxml_string_putc()' - Write a character to a string.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_string_putc(int  ch,		/* I - Character to write */
-                 void *p)		/* I - Pointer to string pointers */
-{
-  char	**pp;				/* Pointer to string pointers */
-
-
-  pp = (char **)p;
-
-  if (ch < 0x80)
-  {
-   /*
-    * Plain ASCII doesn't need special encoding...
-    */
-
-    if (pp[0] < pp[1])
-      pp[0][0] = ch;
-
-    pp[0] ++;
-  }
-  else if (ch < 0x800)
-  {
-   /*
-    * Two-byte UTF-8 character...
-    */
-
-    if ((pp[0] + 1) < pp[1])
-    {
-      pp[0][0] = 0xc0 | (ch >> 6);
-      pp[0][1] = 0x80 | (ch & 0x3f);
-    }
-
-    pp[0] += 2;
-  }
-  else if (ch < 0x10000)
-  {
-   /*
-    * Three-byte UTF-8 character...
-    */
-
-    if ((pp[0] + 2) < pp[1])
-    {
-      pp[0][0] = 0xe0 | (ch >> 12);
-      pp[0][1] = 0x80 | ((ch >> 6) & 0x3f);
-      pp[0][2] = 0x80 | (ch & 0x3f);
-    }
-
-    pp[0] += 3;
-  }
-  else
-  {
-   /*
-    * Four-byte UTF-8 character...
-    */
-
-    if ((pp[0] + 2) < pp[1])
-    {
-      pp[0][0] = 0xf0 | (ch >> 18);
-      pp[0][1] = 0x80 | ((ch >> 12) & 0x3f);
-      pp[0][2] = 0x80 | ((ch >> 6) & 0x3f);
-      pp[0][3] = 0x80 | (ch & 0x3f);
-    }
-
-    pp[0] += 4;
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_write_name()' - Write a name string.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_write_name(const char *s,		/* I - Name to write */
-                void       *p,		/* I - Write pointer */
-		int        (*putc_cb)(int, void *))
-					/* I - Write callback */
-{
-  char		quote;			/* Quote character */
-  const char	*name;			/* Entity name */
-
-
-  if (*s == '\"' || *s == '\'')
-  {
-   /*
-    * Write a quoted name string...
-    */
-
-    if ((*putc_cb)(*s, p) < 0)
-      return (-1);
-
-    quote = *s++;
-
-    while (*s && *s != quote)
-    {
-      if ((name = mxmlEntityGetName(*s)) != NULL)
-      {
-	if ((*putc_cb)('&', p) < 0)
-          return (-1);
-
-        while (*name)
-	{
-	  if ((*putc_cb)(*name, p) < 0)
-            return (-1);
-
-          name ++;
-	}
-
-	if ((*putc_cb)(';', p) < 0)
-          return (-1);
-      }
-      else if ((*putc_cb)(*s, p) < 0)
-	return (-1);
-
-      s ++;
-    }
-
-   /*
-    * Write the end quote...
-    */
-
-    if ((*putc_cb)(quote, p) < 0)
-      return (-1);
-  }
-  else
-  {
-   /*
-    * Write a non-quoted name string...
-    */
-
-    while (*s)
-    {
-      if ((*putc_cb)(*s, p) < 0)
-	return (-1);
-
-      s ++;
-    }
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_write_node()' - Save an XML node to a file.
- */
-
-static int				/* O - Column or -1 on error */
-mxml_write_node(mxml_node_t *node,	/* I - Node to write */
-                void        *p,		/* I - File to write to */
-	        const char  *(*cb)(mxml_node_t *, int),
-					/* I - Whitespace callback */
-		int         col,	/* I - Current column */
-		int         (*putc_cb)(int, void *))
-{
-  int		i,			/* Looping var */
-		width;			/* Width of attr + value */
-  mxml_attr_t	*attr;			/* Current attribute */
-  char		s[255];			/* Temporary string */
-
-
-  while (node != NULL)
-  {
-   /*
-    * Print the node value...
-    */
-
-    switch (node->type)
-    {
-      case MXML_ELEMENT :
-          col = mxml_write_ws(node, p, cb, MXML_WS_BEFORE_OPEN, col, putc_cb);
-
-          if ((*putc_cb)('<', p) < 0)
-	    return (-1);
-          if (node->value.element.name[0] == '?' ||
-	      !strncmp(node->value.element.name, "!--", 3) ||
-	      !strncmp(node->value.element.name, "![CDATA[", 8))
-          {
-	   /*
-	    * Comments, CDATA, and processing instructions do not
-	    * use character entities.
-	    */
-
-	    const char	*ptr;		/* Pointer into name */
-
-
-	    for (ptr = node->value.element.name; *ptr; ptr ++)
-	      if ((*putc_cb)(*ptr, p) < 0)
-	        return (-1);
-
-           /*
-	    * Prefer a newline for whitespace after ?xml...
-	    */
-
-            if (!strncmp(node->value.element.name, "?xml", 4))
-              col = MXML_WRAP;
-	  }
-	  else if (mxml_write_name(node->value.element.name, p, putc_cb) < 0)
-	    return (-1);
-
-          col += strlen(node->value.element.name) + 1;
-
-	  for (i = node->value.element.num_attrs, attr = node->value.element.attrs;
-	       i > 0;
-	       i --, attr ++)
-	  {
-	    width = strlen(attr->name);
-
-	    if (attr->value)
-	      width += strlen(attr->value) + 3;
-
-	    if ((col + width) > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else
-	    {
-	      if ((*putc_cb)(' ', p) < 0)
-	        return (-1);
-
-	      col ++;
-	    }
-
-            if (mxml_write_name(attr->name, p, putc_cb) < 0)
-	      return (-1);
-
-	    if (attr->value)
-	    {
-              if ((*putc_cb)('=', p) < 0)
-		return (-1);
-              if ((*putc_cb)('\"', p) < 0)
-		return (-1);
-	      if (mxml_write_string(attr->value, p, putc_cb) < 0)
-		return (-1);
-              if ((*putc_cb)('\"', p) < 0)
-		return (-1);
-            }
-
-            col += width;
-	  }
-
-	  if (node->child)
-	  {
-           /*
-	    * Write children...
-	    */
-
-	    if ((*putc_cb)('>', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-
-            col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_OPEN, col, putc_cb);
-
-	    if ((col = mxml_write_node(node->child, p, cb, col, putc_cb)) < 0)
-	      return (-1);
-
-           /*
-	    * The ? and ! elements are special-cases and have no end tags...
-	    */
-
-            if (node->value.element.name[0] != '!' &&
-	        node->value.element.name[0] != '?')
-	    {
-              col = mxml_write_ws(node, p, cb, MXML_WS_BEFORE_CLOSE, col, putc_cb);
-
-              if ((*putc_cb)('<', p) < 0)
-		return (-1);
-              if ((*putc_cb)('/', p) < 0)
-		return (-1);
-              if (mxml_write_string(node->value.element.name, p, putc_cb) < 0)
-		return (-1);
-              if ((*putc_cb)('>', p) < 0)
-		return (-1);
-
-              col += strlen(node->value.element.name) + 3;
-
-              col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_CLOSE, col, putc_cb);
-	    }
-	  }
-	  else if (node->value.element.name[0] == '!' ||
-	           node->value.element.name[0] == '?')
-	  {
-           /*
-	    * The ? and ! elements are special-cases...
-	    */
-
-	    if ((*putc_cb)('>', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-
-            col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_OPEN, col, putc_cb);
-          }
-	  else
-	  {
-            if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-            if ((*putc_cb)('/', p) < 0)
-	      return (-1);
-            if ((*putc_cb)('>', p) < 0)
-	      return (-1);
-
-	    col += 3;
-
-            col = mxml_write_ws(node, p, cb, MXML_WS_AFTER_OPEN, col, putc_cb);
-	  }
-          break;
-
-      case MXML_INTEGER :
-	  if (node->prev)
-	  {
-	    if (col > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-          }
-
-          sprintf(s, "%d", node->value.integer);
-	  if (mxml_write_string(s, p, putc_cb) < 0)
-	    return (-1);
-
-	  col += strlen(s);
-          break;
-
-      case MXML_OPAQUE :
-          if (mxml_write_string(node->value.opaque, p, putc_cb) < 0)
-	    return (-1);
-
-          col += strlen(node->value.opaque);
-          break;
-
-      case MXML_REAL :
-	  if (node->prev)
-	  {
-	    if (col > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-          }
-
-          sprintf(s, "%f", node->value.real);
-	  if (mxml_write_string(s, p, putc_cb) < 0)
-	    return (-1);
-
-	  col += strlen(s);
-          break;
-
-      case MXML_TEXT :
-	  if (node->value.text.whitespace && col > 0)
-	  {
-	    if (col > MXML_WRAP)
-	    {
-	      if ((*putc_cb)('\n', p) < 0)
-	        return (-1);
-
-	      col = 0;
-	    }
-	    else if ((*putc_cb)(' ', p) < 0)
-	      return (-1);
-	    else
-	      col ++;
-          }
-
-          if (mxml_write_string(node->value.text.string, p, putc_cb) < 0)
-	    return (-1);
-
-	  col += strlen(node->value.text.string);
-          break;
-
-      case MXML_CUSTOM :
-          if (mxml_custom_save_cb)
-	  {
-	    char	*data;		/* Custom data string */
-	    const char	*newline;	/* Last newline in string */
-
-
-            if ((data = (*mxml_custom_save_cb)(node)) == NULL)
-	      return (-1);
-
-            if (mxml_write_string(data, p, putc_cb) < 0)
-	      return (-1);
-
-            if ((newline = strrchr(data, '\n')) == NULL)
-	      col += strlen(data);
-	    else
-              col = strlen(newline);
-
-            free(data);
-	    break;
-	  }
-
-      default : /* Should never happen */
-          return (-1);
-    }
-
-   /*
-    * Next node...
-    */
-
-    node = node->next;
-  }
-
-  return (col);
-}
-
-
-/*
- * 'mxml_write_string()' - Write a string, escaping & and < as needed.
- */
-
-static int				/* O - 0 on success, -1 on failure */
-mxml_write_string(const char *s,	/* I - String to write */
-                  void       *p,	/* I - Write pointer */
-		  int        (*putc_cb)(int, void *))
-					/* I - Write callback */
-{
-  const char	*name;			/* Entity name, if any */
-
-
-  while (*s)
-  {
-    if ((name = mxmlEntityGetName(*s)) != NULL)
-    {
-      if ((*putc_cb)('&', p) < 0)
-        return (-1);
-
-      while (*name)
-      {
-	if ((*putc_cb)(*name, p) < 0)
-          return (-1);
-        name ++;
-      }
-
-      if ((*putc_cb)(';', p) < 0)
-        return (-1);
-    }
-    else if ((*putc_cb)(*s, p) < 0)
-      return (-1);
-
-    s ++;
-  }
-
-  return (0);
-}
-
-
-/*
- * 'mxml_write_ws()' - Do whitespace callback...
- */
-
-static int				/* O - New column */
-mxml_write_ws(mxml_node_t *node,	/* I - Current node */
-              void        *p,		/* I - Write pointer */
-              const char  *(*cb)(mxml_node_t *, int),
-					/* I - Callback function */
-	      int         ws,		/* I - Where value */
-	      int         col,		/* I - Current column */
-              int         (*putc_cb)(int, void *))
-					/* I - Write callback */
-{
-  const char	*s;			/* Whitespace string */
-
-
-  if (cb && (s = (*cb)(node, ws)) != NULL)
-  {
-    while (*s)
-    {
-      if ((*putc_cb)(*s, p) < 0)
-	return (-1);
-      else if (*s == '\n')
-	col = 0;
-      else if (*s == '\t')
-      {
-	col += MXML_TAB;
-	col = col - (col % MXML_TAB);
-      }
-      else
-	col ++;
-
-      s ++;
-    }
-  }
-
-  return (col);
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-index.c b/menuselect/mxml/mxml-index.c
deleted file mode 100644
index 3c4566f84..000000000
--- a/menuselect/mxml/mxml-index.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * "$Id$"
- *
- * Index support code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlIndexDelete()   - Delete an index.
- *   mxmlIndexEnum()     - Return the next node in the index.
- *   mxmlIndexFind()     - Find the next matching node.
- *   mxmlIndexNew()      - Create a new index.
- *   mxmlIndexReset()    - Reset the enumeration/find pointer in the index and
- *                         return the first node in the index.
- *   index_compare()     - Compare two nodes.
- *   index_find()        - Compare a node with index values.
- *   index_sort()        - Sort the nodes in the index...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Sort functions...
- */
-
-static int	index_compare(mxml_index_t *ind, mxml_node_t *first,
-		              mxml_node_t *second);
-static int	index_find(mxml_index_t *ind, const char *element,
-		           const char *value, mxml_node_t *node);
-static void	index_sort(mxml_index_t *ind, int left, int right);
-
-
-/*
- * 'mxmlIndexDelete()' - Delete an index.
- */
-
-void
-mxmlIndexDelete(mxml_index_t *ind)	/* I - Index to delete */
-{
- /*
-  * Range check input..
-  */
-
-  if (!ind)
-    return;
-
- /*
-  * Free memory...
-  */
-
-  if (ind->attr)
-    free(ind->attr);
-
-  if (ind->alloc_nodes)
-    free(ind->nodes);
-
-  free(ind);
-}
-
-
-/*
- * 'mxmlIndexEnum()' - Return the next node in the index.
- *
- * Nodes are returned in the sorted order of the index.
- */
-
-mxml_node_t *				/* O - Next node or NULL if there is none */
-mxmlIndexEnum(mxml_index_t *ind)	/* I - Index to enumerate */
-{
- /*
-  * Range check input...
-  */
-
-  if (!ind)
-    return (NULL);
-
- /*
-  * Return the next node...
-  */
-
-  if (ind->cur_node < ind->num_nodes)
-    return (ind->nodes[ind->cur_node ++]);
-  else
-    return (NULL);
-}
-
-
-/*
- * 'mxmlIndexFind()' - Find the next matching node.
- *
- * You should call mxmlIndexReset() prior to using this function for
- * the first time with a particular set of "element" and "value"
- * strings. Passing NULL for both "element" and "value" is equivalent
- * to calling mxmlIndexEnum().
- */
-
-mxml_node_t *				/* O - Node or NULL if none found */
-mxmlIndexFind(mxml_index_t *ind,	/* I - Index to search */
-              const char   *element,	/* I - Element name to find, if any */
-	      const char   *value)	/* I - Attribute value, if any */
-{
-  int		diff,			/* Difference between names */
-		current,		/* Current entity in search */
-		first,			/* First entity in search */
-		last;			/* Last entity in search */
-
-
-#ifdef DEBUG
-  printf("mxmlIndexFind(ind=%p, element=\"%s\", value=\"%s\")\n",
-         ind, element ? element : "(null)", value ? value : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!ind || (!ind->attr && value))
-  {
-#ifdef DEBUG
-    puts("    returning NULL...");
-    printf("    ind->attr=\"%s\"\n", ind->attr ? ind->attr : "(null)");
-#endif /* DEBUG */
-
-    return (NULL);
-  }
-
- /*
-  * If both element and value are NULL, just enumerate the nodes in the
-  * index...
-  */
-
-  if (!element && !value)
-    return (mxmlIndexEnum(ind));
-
- /*
-  * If there are no nodes in the index, return NULL...
-  */
-
-  if (!ind->num_nodes)
-  {
-#ifdef DEBUG
-    puts("    returning NULL...");
-    puts("    no nodes!");
-#endif /* DEBUG */
-
-    return (NULL);
-  }
-
- /*
-  * If cur_node == 0, then find the first matching node...
-  */
-
-  if (ind->cur_node == 0)
-  {
-   /*
-    * Find the first node using a modified binary search algorithm...
-    */
-
-    first = 0;
-    last  = ind->num_nodes - 1;
-
-#ifdef DEBUG
-    printf("    find first time, num_nodes=%d...\n", ind->num_nodes);
-#endif /* DEBUG */
-
-    while ((last - first) > 1)
-    {
-      current = (first + last) / 2;
-
-#ifdef DEBUG
-      printf("    first=%d, last=%d, current=%d\n", first, last, current);
-#endif /* DEBUG */
-
-      if ((diff = index_find(ind, element, value, ind->nodes[current])) == 0)
-      {
-       /*
-        * Found a match, move back to find the first...
-	*/
-
-#ifdef DEBUG
-        puts("    match!");
-#endif /* DEBUG */
-
-        while (current > 0 &&
-	       !index_find(ind, element, value, ind->nodes[current - 1]))
-	  current --;
-
-#ifdef DEBUG
-        printf("    returning first match=%d\n", current);
-#endif /* DEBUG */
-
-       /*
-        * Return the first match and save the index to the next...
-	*/
-
-        ind->cur_node = current + 1;
-
-	return (ind->nodes[current]);
-      }
-      else if (diff < 0)
-	last = current;
-      else
-	first = current;
-
-#ifdef DEBUG
-      printf("    diff=%d\n", diff);
-#endif /* DEBUG */
-    }
-
-   /*
-    * If we get this far, then we found exactly 0 or 1 matches...
-    */
-
-    for (current = first; current <= last; current ++)
-      if (!index_find(ind, element, value, ind->nodes[current]))
-      {
-       /*
-	* Found exactly one (or possibly two) match...
-	*/
-
-#ifdef DEBUG
-	printf("    returning only match %d...\n", current);
-#endif /* DEBUG */
-
-	ind->cur_node = current + 1;
-
-	return (ind->nodes[current]);
-      }
-
-   /*
-    * No matches...
-    */
-
-    ind->cur_node = ind->num_nodes;
-
-#ifdef DEBUG
-    puts("    returning NULL...");
-#endif /* DEBUG */
-
-    return (NULL);
-  }
-  else if (ind->cur_node < ind->num_nodes &&
-           !index_find(ind, element, value, ind->nodes[ind->cur_node]))
-  {
-   /*
-    * Return the next matching node...
-    */
-
-#ifdef DEBUG
-    printf("    returning next match %d...\n", ind->cur_node);
-#endif /* DEBUG */
-
-    return (ind->nodes[ind->cur_node ++]);
-  }
-
- /*
-  * If we get this far, then we have no matches...
-  */
-
-  ind->cur_node = ind->num_nodes;
-
-#ifdef DEBUG
-  puts("    returning NULL...");
-#endif /* DEBUG */
-
-  return (NULL);
-}
-
-
-/*
- * 'mxmlIndexNew()' - Create a new index.
- *
- * The index will contain all nodes that contain the named element and/or
- * attribute. If both "element" and "attr" are NULL, then the index will
- * contain a sorted list of the elements in the node tree.  Nodes are
- * sorted by element name and optionally by attribute value if the "attr"
- * argument is not NULL.
- */
-
-mxml_index_t *				/* O - New index */
-mxmlIndexNew(mxml_node_t *node,		/* I - XML node tree */
-             const char  *element,	/* I - Element to index or NULL for all */
-             const char  *attr)		/* I - Attribute to index or NULL for none */
-{
-  mxml_index_t	*ind;			/* New index */
-  mxml_node_t	*current,		/* Current node in index */
-  		**temp;			/* Temporary node pointer array */
-
-
- /*
-  * Range check input...
-  */
-
-#ifdef DEBUG
-  printf("mxmlIndexNew(node=%p, element=\"%s\", attr=\"%s\")\n",
-         node, element ? element : "(null)", attr ? attr : "(null)");
-#endif /* DEBUG */
-
-  if (!node)
-    return (NULL);
-
- /*
-  * Create a new index...
-  */
-
-  if ((ind = calloc(1, sizeof(mxml_index_t))) == NULL)
-  {
-    mxml_error("Unable to allocate %d bytes for index - %s",
-               sizeof(mxml_index_t), strerror(errno));
-    return (NULL);
-  }
-
-  if (attr)
-    ind->attr = strdup(attr);
-
-  if (!element && !attr)
-    current = node;
-  else
-    current = mxmlFindElement(node, node, element, attr, NULL, MXML_DESCEND);
-
-  while (current)
-  {
-    if (ind->num_nodes >= ind->alloc_nodes)
-    {
-      if (!ind->alloc_nodes)
-        temp = malloc(64 * sizeof(mxml_node_t *));
-      else
-        temp = realloc(ind->nodes, (ind->alloc_nodes + 64) * sizeof(mxml_node_t *));
-
-      if (!temp)
-      {
-       /*
-        * Unable to allocate memory for the index, so abort...
-	*/
-
-        mxml_error("Unable to allocate %d bytes for index: %s",
-	           (ind->alloc_nodes + 64) * sizeof(mxml_node_t *),
-		   strerror(errno));
-
-        mxmlIndexDelete(ind);
-	return (NULL);
-      }
-
-      ind->nodes       = temp;
-      ind->alloc_nodes += 64;
-    }
-
-    ind->nodes[ind->num_nodes ++] = current;
-
-    current = mxmlFindElement(current, node, element, attr, NULL, MXML_DESCEND);
-  }
-
- /*
-  * Sort nodes based upon the search criteria...
-  */
-
-#ifdef DEBUG
-  {
-    int i;				/* Looping var */
-
-
-    printf("%d node(s) in index.\n\n", ind->num_nodes);
-
-    if (attr)
-    {
-      printf("Node      Address   Element         %s\n", attr);
-      puts("--------  --------  --------------  ------------------------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %-14.14s  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name,
-	       mxmlElementGetAttr(ind->nodes[i], attr));
-    }
-    else
-    {
-      puts("Node      Address   Element");
-      puts("--------  --------  --------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name);
-    }
-
-    putchar('\n');
-  }
-#endif /* DEBUG */
-
-  if (ind->num_nodes > 1)
-    index_sort(ind, 0, ind->num_nodes - 1);
-
-#ifdef DEBUG
-  {
-    int i;				/* Looping var */
-
-
-    puts("After sorting:\n");
-
-    if (attr)
-    {
-      printf("Node      Address   Element         %s\n", attr);
-      puts("--------  --------  --------------  ------------------------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %-14.14s  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name,
-	       mxmlElementGetAttr(ind->nodes[i], attr));
-    }
-    else
-    {
-      puts("Node      Address   Element");
-      puts("--------  --------  --------------");
-
-      for (i = 0; i < ind->num_nodes; i ++)
-	printf("%8d  %-8p  %s\n", i, ind->nodes[i],
-	       ind->nodes[i]->value.element.name);
-    }
-
-    putchar('\n');
-  }
-#endif /* DEBUG */
-
- /*
-  * Return the new index...
-  */
-
-  return (ind);
-}
-
-
-/*
- * 'mxmlIndexReset()' - Reset the enumeration/find pointer in the index and
- *                      return the first node in the index.
- *
- * This function should be called prior to using mxmlIndexEnum() or
- * mxmlIndexFind() for the first time.
- */
-
-mxml_node_t *				/* O - First node or NULL if there is none */
-mxmlIndexReset(mxml_index_t *ind)	/* I - Index to reset */
-{
-#ifdef DEBUG
-  printf("mxmlIndexReset(ind=%p)\n", ind);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!ind)
-    return (NULL);
-
- /*
-  * Set the index to the first element...
-  */
-
-  ind->cur_node = 0;
-
- /*
-  * Return the first node...
-  */
-
-  if (ind->num_nodes)
-    return (ind->nodes[0]);
-  else
-    return (NULL);
-}
-
-
-/*
- * 'index_compare()' - Compare two nodes.
- */
-
-static int				/* O - Result of comparison */
-index_compare(mxml_index_t *ind,	/* I - Index */
-              mxml_node_t  *first,	/* I - First node */
-              mxml_node_t  *second)	/* I - Second node */
-{
-  int	diff;				/* Difference */
-
-
- /*
-  * Check the element name...
-  */
-
-  if ((diff = strcmp(first->value.element.name,
-                     second->value.element.name)) != 0)
-    return (diff);
-
- /*
-  * Check the attribute value...
-  */
-
-  if (ind->attr)
-  {
-    if ((diff = strcmp(mxmlElementGetAttr(first, ind->attr),
-                       mxmlElementGetAttr(second, ind->attr))) != 0)
-      return (diff);
-  }
-
- /*
-  * No difference, return 0...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'index_find()' - Compare a node with index values.
- */
-
-static int				/* O - Result of comparison */
-index_find(mxml_index_t *ind,		/* I - Index */
-           const char   *element,	/* I - Element name or NULL */
-	   const char   *value,		/* I - Attribute value or NULL */
-           mxml_node_t  *node)		/* I - Node */
-{
-  int	diff;				/* Difference */
-
-
- /*
-  * Check the element name...
-  */
-
-  if (element)
-  {
-    if ((diff = strcmp(element, node->value.element.name)) != 0)
-      return (diff);
-  }
-
- /*
-  * Check the attribute value...
-  */
-
-  if (value)
-  {
-    if ((diff = strcmp(value, mxmlElementGetAttr(node, ind->attr))) != 0)
-      return (diff);
-  }
-
- /*
-  * No difference, return 0...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'index_sort()' - Sort the nodes in the index...
- *
- * This function implements the classic quicksort algorithm...
- */
-
-static void
-index_sort(mxml_index_t *ind,		/* I - Index to sort */
-           int          left,		/* I - Left node in partition */
-	   int          right)		/* I - Right node in partition */
-{
-  mxml_node_t	*pivot,			/* Pivot node */
-		*temp;			/* Swap node */
-  int		templ,			/* Temporary left node */
-		tempr;			/* Temporary right node */
-
-
- /*
-  * Loop until we have sorted all the way to the right...
-  */
-
-  do
-  {
-   /*
-    * Sort the pivot in the current partition...
-    */
-
-    pivot = ind->nodes[left];
-
-    for (templ = left, tempr = right; templ < tempr;)
-    {
-     /*
-      * Move left while left node <= pivot node...
-      */
-
-      while ((templ < right) &&
-             index_compare(ind, ind->nodes[templ], pivot) <= 0)
-	templ ++;
-
-     /*
-      * Move right while right node > pivot node...
-      */
-
-      while ((tempr > left) &&
-             index_compare(ind, ind->nodes[tempr], pivot) > 0)
-	tempr --;
-
-     /*
-      * Swap nodes if needed...
-      */
-
-      if (templ < tempr)
-      {
-	temp              = ind->nodes[templ];
-	ind->nodes[templ] = ind->nodes[tempr];
-	ind->nodes[tempr] = temp;
-      }
-    }
-
-   /*
-    * When we get here, the right (tempr) node is the new position for the
-    * pivot node...
-    */
-
-    if (index_compare(ind, pivot, ind->nodes[tempr]) > 0)
-    {
-      ind->nodes[left]  = ind->nodes[tempr];
-      ind->nodes[tempr] = pivot;
-    }
-
-   /*
-    * Recursively sort the left partition as needed...
-    */
-
-    if (left < (tempr - 1))
-      index_sort(ind, left, tempr - 1);
-  }
-  while (right > (left = tempr + 1));
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-node.c b/menuselect/mxml/mxml-node.c
deleted file mode 100644
index 713c2aa94..000000000
--- a/menuselect/mxml/mxml-node.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * "$Id$"
- *
- * Node support code for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlAdd()        - Add a node to a tree.
- *   mxmlDelete()     - Delete a node and all of its children.
- *   mxmlNewElement() - Create a new element node.
- *   mxmlNewInteger() - Create a new integer node.
- *   mxmlNewOpaque()  - Create a new opaque string.
- *   mxmlNewReal()    - Create a new real number node.
- *   mxmlNewText()    - Create a new text fragment node.
- *   mxmlNewTextf()   - Create a new formatted text fragment node.
- *   mxmlRemove()     - Remove a node from its parent.
- *   mxml_new()       - Create a new node.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Local functions...
- */
-
-static mxml_node_t	*mxml_new(mxml_node_t *parent, mxml_type_t type);
-
-
-/*
- * 'mxmlAdd()' - Add a node to a tree.
- *
- * Adds the specified node to the parent. If the child argument is not
- * NULL, puts the new node before or after the specified child depending
- * on the value of the where argument. If the child argument is NULL,
- * puts the new node at the beginning of the child list (MXML_ADD_BEFORE)
- * or at the end of the child list (MXML_ADD_AFTER). The constant
- * MXML_ADD_TO_PARENT can be used to specify a NULL child pointer.
- */
-
-void
-mxmlAdd(mxml_node_t *parent,		/* I - Parent node */
-        int         where,		/* I - Where to add, MXML_ADD_BEFORE or MXML_ADD_AFTER */
-        mxml_node_t *child,		/* I - Child node for where or MXML_ADD_TO_PARENT */
-	mxml_node_t *node)		/* I - Node to add */
-{
-#ifdef DEBUG
-  fprintf(stderr, "mxmlAdd(parent=%p, where=%d, child=%p, node=%p)\n", parent,
-          where, child, node);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!parent || !node)
-    return;
-
-#if DEBUG > 1
-  fprintf(stderr, "    BEFORE: node->parent=%p\n", node->parent);
-  if (parent)
-  {
-    fprintf(stderr, "    BEFORE: parent->child=%p\n", parent->child);
-    fprintf(stderr, "    BEFORE: parent->last_child=%p\n", parent->last_child);
-    fprintf(stderr, "    BEFORE: parent->prev=%p\n", parent->prev);
-    fprintf(stderr, "    BEFORE: parent->next=%p\n", parent->next);
-  }
-#endif /* DEBUG > 1 */
-
- /*
-  * Remove the node from any existing parent...
-  */
-
-  if (node->parent)
-    mxmlRemove(node);
-
- /*
-  * Reset pointers...
-  */
-
-  node->parent = parent;
-
-  switch (where)
-  {
-    case MXML_ADD_BEFORE :
-        if (!child || child == parent->child || child->parent != parent)
-	{
-	 /*
-	  * Insert as first node under parent...
-	  */
-
-	  node->next = parent->child;
-
-	  if (parent->child)
-	    parent->child->prev = node;
-	  else
-	    parent->last_child = node;
-
-	  parent->child = node;
-	}
-	else
-	{
-	 /*
-	  * Insert node before this child...
-	  */
-
-	  node->next = child;
-	  node->prev = child->prev;
-
-	  if (child->prev)
-	    child->prev->next = node;
-	  else
-	    parent->child = node;
-
-	  child->prev = node;
-	}
-        break;
-
-    case MXML_ADD_AFTER :
-        if (!child || child == parent->last_child || child->parent != parent)
-	{
-	 /*
-	  * Insert as last node under parent...
-	  */
-
-	  node->parent = parent;
-	  node->prev   = parent->last_child;
-
-	  if (parent->last_child)
-	    parent->last_child->next = node;
-	  else
-	    parent->child = node;
-
-	  parent->last_child = node;
-        }
-	else
-	{
-	 /*
-	  * Insert node after this child...
-	  */
-
-	  node->prev = child;
-	  node->next = child->next;
-
-	  if (child->next)
-	    child->next->prev = node;
-	  else
-	    parent->last_child = node;
-
-	  child->next = node;
-	}
-        break;
-  }
-
-#if DEBUG > 1
-  fprintf(stderr, "    AFTER: node->parent=%p\n", node->parent);
-  if (parent)
-  {
-    fprintf(stderr, "    AFTER: parent->child=%p\n", parent->child);
-    fprintf(stderr, "    AFTER: parent->last_child=%p\n", parent->last_child);
-    fprintf(stderr, "    AFTER: parent->prev=%p\n", parent->prev);
-    fprintf(stderr, "    AFTER: parent->next=%p\n", parent->next);
-  }
-#endif /* DEBUG > 1 */
-}
-
-
-/*
- * 'mxmlDelete()' - Delete a node and all of its children.
- *
- * If the specified node has a parent, this function first removes the
- * node from its parent using the mxmlRemove() function.
- */
-
-void
-mxmlDelete(mxml_node_t *node)		/* I - Node to delete */
-{
-  int	i;				/* Looping var */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlDelete(node=%p)\n", node);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node)
-    return;
-
- /*
-  * Remove the node from its parent, if any...
-  */
-
-  mxmlRemove(node);
-
- /*
-  * Delete children...
-  */
-
-  while (node->child)
-    mxmlDelete(node->child);
-
- /*
-  * Now delete any node data...
-  */
-
-  switch (node->type)
-  {
-    case MXML_ELEMENT :
-        if (node->value.element.name)
-	  free(node->value.element.name);
-
-	if (node->value.element.num_attrs)
-	{
-	  for (i = 0; i < node->value.element.num_attrs; i ++)
-	  {
-	    if (node->value.element.attrs[i].name)
-	      free(node->value.element.attrs[i].name);
-	    if (node->value.element.attrs[i].value)
-	      free(node->value.element.attrs[i].value);
-	  }
-
-          free(node->value.element.attrs);
-	}
-        break;
-    case MXML_INTEGER :
-       /* Nothing to do */
-        break;
-    case MXML_OPAQUE :
-        if (node->value.opaque)
-	  free(node->value.opaque);
-        break;
-    case MXML_REAL :
-       /* Nothing to do */
-        break;
-    case MXML_TEXT :
-        if (node->value.text.string)
-	  free(node->value.text.string);
-        break;
-    case MXML_CUSTOM :
-        if (node->value.custom.data &&
-	    node->value.custom.destroy)
-	  (*(node->value.custom.destroy))(node->value.custom.data);
-	break;
-  }
-
- /*
-  * Free this node...
-  */
-
-  free(node);
-}
-
-
-/*
- * 'mxmlNewCustom()' - Create a new custom data node.
- *
- * The new custom node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * element node has no parent. NULL can be passed when the data in the
- * node is not dynamically allocated or is separately managed.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewCustom(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-              void        *data,	/* I - Pointer to data */
-	      void        (*destroy)(void *))
-					/* I - Function to destroy data */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewCustom(parent=%p, data=%p, destroy=%p)\n", parent,
-          data, destroy);
-#endif /* DEBUG */
-
- /*
-  * Create the node and set the value...
-  */
-
-  if ((node = mxml_new(parent, MXML_CUSTOM)) != NULL)
-  {
-    node->value.custom.data    = data;
-    node->value.custom.destroy = destroy;
-  }
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewElement()' - Create a new element node.
- *
- * The new element node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * element node has no parent.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewElement(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-               const char  *name)	/* I - Name of element */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewElement(parent=%p, name=\"%s\")\n", parent,
-          name ? name : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!name)
-    return (NULL);
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_ELEMENT)) != NULL)
-    node->value.element.name = strdup(name);
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewInteger()' - Create a new integer node.
- *
- * The new integer node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * integer node has no parent.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewInteger(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-               int         integer)	/* I - Integer value */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewInteger(parent=%p, integer=%d)\n", parent, integer);
-#endif /* DEBUG */
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_INTEGER)) != NULL)
-    node->value.integer = integer;
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewOpaque()' - Create a new opaque string.
- *
- * The new opaque node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * opaque node has no parent. The opaque string must be nul-terminated and
- * is copied into the new node.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewOpaque(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-              const char  *opaque)	/* I - Opaque string */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewOpaque(parent=%p, opaque=\"%s\")\n", parent,
-          opaque ? opaque : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!opaque)
-    return (NULL);
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_OPAQUE)) != NULL)
-    node->value.opaque = strdup(opaque);
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewReal()' - Create a new real number node.
- *
- * The new real number node is added to the end of the specified parent's
- * child list. The constant MXML_NO_PARENT can be used to specify that
- * the new real number node has no parent.
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewReal(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-            double      real)		/* I - Real number value */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewReal(parent=%p, real=%g)\n", parent, real);
-#endif /* DEBUG */
-
- /*
-  * Create the node and set the element name...
-  */
-
-  if ((node = mxml_new(parent, MXML_REAL)) != NULL)
-    node->value.real = real;
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewText()' - Create a new text fragment node.
- *
- * The new text node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * text node has no parent. The whitespace parameter is used to specify
- * whether leading whitespace is present before the node. The text
- * string must be nul-terminated and is copied into the new node.  
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewText(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-            int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-	    const char  *string)	/* I - String */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewText(parent=%p, whitespace=%d, string=\"%s\")\n",
-          parent, whitespace, string ? string : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!string)
-    return (NULL);
-
- /*
-  * Create the node and set the text value...
-  */
-
-  if ((node = mxml_new(parent, MXML_TEXT)) != NULL)
-  {
-    node->value.text.whitespace = whitespace;
-    node->value.text.string     = strdup(string);
-  }
-
-  return (node);
-}
-
-
-/*
- * 'mxmlNewTextf()' - Create a new formatted text fragment node.
- *
- * The new text node is added to the end of the specified parent's child
- * list. The constant MXML_NO_PARENT can be used to specify that the new
- * text node has no parent. The whitespace parameter is used to specify
- * whether leading whitespace is present before the node. The format
- * string must be nul-terminated and is formatted into the new node.  
- */
-
-mxml_node_t *				/* O - New node */
-mxmlNewTextf(mxml_node_t *parent,	/* I - Parent node or MXML_NO_PARENT */
-             int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-	     const char  *format,	/* I - Printf-style frmat string */
-	     ...)			/* I - Additional args as needed */
-{
-  mxml_node_t	*node;			/* New node */
-  va_list	ap;			/* Pointer to arguments */
-
-
-#ifdef DEBUG
-  fprintf(stderr, "mxmlNewTextf(parent=%p, whitespace=%d, format=\"%s\", ...)\n",
-          parent, whitespace, format ? format : "(null)");
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!format)
-    return (NULL);
-
- /*
-  * Create the node and set the text value...
-  */
-
-  if ((node = mxml_new(parent, MXML_TEXT)) != NULL)
-  {
-    va_start(ap, format);
-
-    node->value.text.whitespace = whitespace;
-    node->value.text.string     = mxml_strdupf(format, ap);
-
-    va_end(ap);
-  }
-
-  return (node);
-}
-
-
-/*
- * 'mxmlRemove()' - Remove a node from its parent.
- *
- * Does not free memory used by the node - use mxmlDelete() for that.
- * This function does nothing if the node has no parent.
- */
-
-void
-mxmlRemove(mxml_node_t *node)		/* I - Node to remove */
-{
-#ifdef DEBUG
-  fprintf(stderr, "mxmlRemove(node=%p)\n", node);
-#endif /* DEBUG */
-
- /*
-  * Range check input...
-  */
-
-  if (!node || !node->parent)
-    return;
-
- /*
-  * Remove from parent...
-  */
-
-#if DEBUG > 1
-  fprintf(stderr, "    BEFORE: node->parent=%p\n", node->parent);
-  if (node->parent)
-  {
-    fprintf(stderr, "    BEFORE: node->parent->child=%p\n", node->parent->child);
-    fprintf(stderr, "    BEFORE: node->parent->last_child=%p\n", node->parent->last_child);
-  }
-  fprintf(stderr, "    BEFORE: node->child=%p\n", node->child);
-  fprintf(stderr, "    BEFORE: node->last_child=%p\n", node->last_child);
-  fprintf(stderr, "    BEFORE: node->prev=%p\n", node->prev);
-  fprintf(stderr, "    BEFORE: node->next=%p\n", node->next);
-#endif /* DEBUG > 1 */
-
-  if (node->prev)
-    node->prev->next = node->next;
-  else
-    node->parent->child = node->next;
-
-  if (node->next)
-    node->next->prev = node->prev;
-  else
-    node->parent->last_child = node->prev;
-
-  node->parent = NULL;
-  node->prev   = NULL;
-  node->next   = NULL;
-
-#if DEBUG > 1
-  fprintf(stderr, "    AFTER: node->parent=%p\n", node->parent);
-  if (node->parent)
-  {
-    fprintf(stderr, "    AFTER: node->parent->child=%p\n", node->parent->child);
-    fprintf(stderr, "    AFTER: node->parent->last_child=%p\n", node->parent->last_child);
-  }
-  fprintf(stderr, "    AFTER: node->child=%p\n", node->child);
-  fprintf(stderr, "    AFTER: node->last_child=%p\n", node->last_child);
-  fprintf(stderr, "    AFTER: node->prev=%p\n", node->prev);
-  fprintf(stderr, "    AFTER: node->next=%p\n", node->next);
-#endif /* DEBUG > 1 */
-}
-
-
-/*
- * 'mxml_new()' - Create a new node.
- */
-
-static mxml_node_t *			/* O - New node */
-mxml_new(mxml_node_t *parent,		/* I - Parent node */
-         mxml_type_t type)		/* I - Node type */
-{
-  mxml_node_t	*node;			/* New node */
-
-
-#if DEBUG > 1
-  fprintf(stderr, "mxml_new(parent=%p, type=%d)\n", parent, type);
-#endif /* DEBUG > 1 */
-
- /*
-  * Allocate memory for the node...
-  */
-
-  if ((node = calloc(1, sizeof(mxml_node_t))) == NULL)
-  {
-#if DEBUG > 1
-    fputs("    returning NULL\n", stderr);
-#endif /* DEBUG > 1 */
-
-    return (NULL);
-  }
-
-#if DEBUG > 1
-  fprintf(stderr, "    returning %p\n", node);
-#endif /* DEBUG > 1 */
-
- /*
-  * Set the node type...
-  */
-
-  node->type = type;
-
- /*
-  * Add to the parent if present...
-  */
-
-  if (parent)
-    mxmlAdd(parent, MXML_ADD_AFTER, MXML_ADD_TO_PARENT, node);
-
- /*
-  * Return the new node...
-  */
-
-  return (node);
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-private.c b/menuselect/mxml/mxml-private.c
deleted file mode 100644
index d78484b08..000000000
--- a/menuselect/mxml/mxml-private.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * "$Id$"
- *
- * Private functions for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxml_error()      - Display an error message.
- *   mxml_integer_cb() - Default callback for integer values.
- *   mxml_opaque_cb()  - Default callback for opaque values.
- *   mxml_real_cb()    - Default callback for real number values.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * Error callback function...
- */
-
-void	(*mxml_error_cb)(const char *) = NULL;
-
-
-/*
- * 'mxml_error()' - Display an error message.
- */
-
-void
-mxml_error(const char *format,		/* I - Printf-style format string */
-           ...)				/* I - Additional arguments as needed */
-{
-  va_list	ap;			/* Pointer to arguments */
-  char		*s;			/* Message string */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!format)
-    return;
-
- /*
-  * Format the error message string...
-  */
-
-  va_start(ap, format);
-
-  s = mxml_strdupf(format, ap);
-
-  va_end(ap);
-
- /*
-  * And then display the error message...
-  */
-
-  if (mxml_error_cb)
-    (*mxml_error_cb)(s);
-  else
-    fprintf(stderr, "mxml: %s\n", s);
-
- /*
-  * Free the string...
-  */
-
-  free(s);
-}
-
-
-/*
- * 'mxml_integer_cb()' - Default callback for integer values.
- */
-
-mxml_type_t				/* O - Node type */
-mxml_integer_cb(mxml_node_t *node)	/* I - Current node */
-{
-  (void)node;
-
-  return (MXML_INTEGER);
-}
-
-
-/*
- * 'mxml_opaque_cb()' - Default callback for opaque values.
- */
-
-mxml_type_t				/* O - Node type */
-mxml_opaque_cb(mxml_node_t *node)	/* I - Current node */
-{
-  (void)node;
-
-  return (MXML_OPAQUE);
-}
-
-
-/*
- * 'mxml_real_cb()' - Default callback for real number values.
- */
-
-mxml_type_t				/* O - Node type */
-mxml_real_cb(mxml_node_t *node)		/* I - Current node */
-{
-  (void)node;
-
-  return (MXML_REAL);
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-search.c b/menuselect/mxml/mxml-search.c
deleted file mode 100644
index 41f5cec24..000000000
--- a/menuselect/mxml/mxml-search.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * "$Id$"
- *
- * Search/navigation functions for Mini-XML, a small XML-like file
- * parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlFindElement() - Find the named element.
- *   mxmlWalkNext()    - Walk to the next logical node in the tree.
- *   mxmlWalkPrev()    - Walk to the previous logical node in the tree.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * 'mxmlFindElement()' - Find the named element.
- *
- * The search is constrained by the name, attribute name, and value; any
- * NULL names or values are treated as wildcards, so different kinds of
- * searches can be implemented by looking for all elements of a given name
- * or all elements with a specific attribute. The descend argument determines
- * whether the search descends into child nodes; normally you will use
- * MXML_DESCEND_FIRST for the initial search and MXML_NO_DESCEND to find
- * additional direct descendents of the node. The top node argument
- * constrains the search to a particular node's children.
- */
-
-mxml_node_t *				/* O - Element node or NULL */
-mxmlFindElement(mxml_node_t *node,	/* I - Current node */
-                mxml_node_t *top,	/* I - Top node */
-                const char  *name,	/* I - Element name or NULL for any */
-		const char  *attr,	/* I - Attribute name, or NULL for none */
-		const char  *value,	/* I - Attribute value, or NULL for any */
-		int         descend)	/* I - Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST */
-{
-  const char	*temp;			/* Current attribute value */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!node || !top || (!attr && value))
-    return (NULL);
-
- /*
-  * Start with the next node...
-  */
-
-  node = mxmlWalkNext(node, top, descend);
-
- /*
-  * Loop until we find a matching element...
-  */
-
-  while (node != NULL)
-  {
-   /*
-    * See if this node matches...
-    */
-
-    if (node->type == MXML_ELEMENT &&
-        node->value.element.name &&
-	(!name || !strcmp(node->value.element.name, name)))
-    {
-     /*
-      * See if we need to check for an attribute...
-      */
-
-      if (!attr)
-        return (node);			/* No attribute search, return it... */
-
-     /*
-      * Check for the attribute...
-      */
-
-      if ((temp = mxmlElementGetAttr(node, attr)) != NULL)
-      {
-       /*
-        * OK, we have the attribute, does it match?
-	*/
-
-	if (!value || !strcmp(value, temp))
-	  return (node);		/* Yes, return it... */
-      }
-    }
-
-   /*
-    * No match, move on to the next node...
-    */
-
-    if (descend == MXML_DESCEND)
-      node = mxmlWalkNext(node, top, MXML_DESCEND);
-    else
-      node = node->next;
-  }
-
-  return (NULL);
-}
-
-
-/*
- * 'mxmlWalkNext()' - Walk to the next logical node in the tree.
- *
- * The descend argument controls whether the first child is considered
- * to be the next node. The top node argument constrains the walk to
- * the node's children.
- */
-
-mxml_node_t *				/* O - Next node or NULL */
-mxmlWalkNext(mxml_node_t *node,		/* I - Current node */
-             mxml_node_t *top,		/* I - Top node */
-             int         descend)	/* I - Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST */
-{
-  if (!node)
-    return (NULL);
-  else if (node->child && descend)
-    return (node->child);
-  else if (node->next)
-    return (node->next);
-  else if (node->parent && node->parent != top)
-  {
-    node = node->parent;
-
-    while (!node->next)
-      if (node->parent == top || !node->parent)
-        return (NULL);
-      else
-        node = node->parent;
-
-    return (node->next);
-  }
-  else
-    return (NULL);
-}
-
-
-/*
- * 'mxmlWalkPrev()' - Walk to the previous logical node in the tree.
- *
- * The descend argument controls whether the previous node's last child
- * is considered to be the previous node. The top node argument constrains
- * the walk to the node's children.
- */
-
-mxml_node_t *				/* O - Previous node or NULL */
-mxmlWalkPrev(mxml_node_t *node,		/* I - Current node */
-             mxml_node_t *top,		/* I - Top node */
-             int         descend)	/* I - Descend into tree - MXML_DESCEND, MXML_NO_DESCEND, or MXML_DESCEND_FIRST */
-{
-  if (!node)
-    return (NULL);
-  else if (node->prev)
-  {
-    if (node->prev->last_child && descend)
-    {
-     /*
-      * Find the last child under the previous node...
-      */
-
-      node = node->prev->last_child;
-
-      while (node->last_child)
-        node = node->last_child;
-
-      return (node);
-    }
-    else
-      return (node->prev);
-  }
-  else if (node->parent != top)
-    return (node->parent);
-  else
-    return (NULL);
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-set.c b/menuselect/mxml/mxml-set.c
deleted file mode 100644
index f36f38fb2..000000000
--- a/menuselect/mxml/mxml-set.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * "$Id$"
- *
- * Node set functions for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxmlSetElement() - Set the name of an element node.
- *   mxmlSetInteger() - Set the value of an integer node.
- *   mxmlSetOpaque()  - Set the value of an opaque node.
- *   mxmlSetReal()    - Set the value of a real number node.
- *   mxmlSetText()    - Set the value of a text node.
- *   mxmlSetTextf()   - Set the value of a text node to a formatted string.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-#include "mxml.h"
-
-
-/*
- * 'mxmlSetCustom()' - Set the data and destructor of a custom data node.
- *
- * The node is not changed if it is not a custom node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetCustom(mxml_node_t *node,	/* I - Node to set */
-              void        *data,	/* I - New data pointer */
-	      void        (*destroy)(void *))
-					/* I - New destructor function */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_CUSTOM)
-    return (-1);
-
- /*
-  * Free any old element value and set the new value...
-  */
-
-  if (node->value.custom.data && node->value.custom.destroy)
-    (*(node->value.custom.destroy))(node->value.custom.data);
-
-  node->value.custom.data    = data;
-  node->value.custom.destroy = destroy;
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetElement()' - Set the name of an element node.
- *
- * The node is not changed if it is not an element node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetElement(mxml_node_t *node,	/* I - Node to set */
-               const char  *name)	/* I - New name string */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_ELEMENT || !name)
-    return (-1);
-
- /*
-  * Free any old element value and set the new value...
-  */
-
-  if (node->value.element.name)
-    free(node->value.element.name);
-
-  node->value.element.name = strdup(name);
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetInteger()' - Set the value of an integer node.
- *
- * The node is not changed if it is not an integer node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetInteger(mxml_node_t *node,	/* I - Node to set */
-               int         integer)	/* I - Integer value */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_INTEGER)
-    return (-1);
-
- /*
-  * Set the new value and return...
-  */
-
-  node->value.integer = integer;
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetOpaque()' - Set the value of an opaque node.
- *
- * The node is not changed if it is not an opaque node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetOpaque(mxml_node_t *node,	/* I - Node to set */
-              const char  *opaque)	/* I - Opaque string */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_OPAQUE || !opaque)
-    return (-1);
-
- /*
-  * Free any old opaque value and set the new value...
-  */
-
-  if (node->value.opaque)
-    free(node->value.opaque);
-
-  node->value.opaque = strdup(opaque);
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetReal()' - Set the value of a real number node.
- *
- * The node is not changed if it is not a real number node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetReal(mxml_node_t *node,		/* I - Node to set */
-            double      real)		/* I - Real number value */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_REAL)
-    return (-1);
-
- /*
-  * Set the new value and return...
-  */
-
-  node->value.real = real;
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetText()' - Set the value of a text node.
- *
- * The node is not changed if it is not a text node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetText(mxml_node_t *node,		/* I - Node to set */
-            int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-	    const char  *string)	/* I - String */
-{
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_TEXT || !string)
-    return (-1);
-
- /*
-  * Free any old string value and set the new value...
-  */
-
-  if (node->value.text.string)
-    free(node->value.text.string);
-
-  node->value.text.whitespace = whitespace;
-  node->value.text.string     = strdup(string);
-
-  return (0);
-}
-
-
-/*
- * 'mxmlSetTextf()' - Set the value of a text node to a formatted string.
- *
- * The node is not changed if it is not a text node.
- */
-
-int					/* O - 0 on success, -1 on failure */
-mxmlSetTextf(mxml_node_t *node,		/* I - Node to set */
-             int         whitespace,	/* I - 1 = leading whitespace, 0 = no whitespace */
-             const char  *format,	/* I - Printf-style format string */
-	     ...)			/* I - Additional arguments as needed */
-{
-  va_list	ap;			/* Pointer to arguments */
-
-
- /*
-  * Range check input...
-  */
-
-  if (!node || node->type != MXML_TEXT || !format)
-    return (-1);
-
- /*
-  * Free any old string value and set the new value...
-  */
-
-  if (node->value.text.string)
-    free(node->value.text.string);
-
-  va_start(ap, format);
-
-  node->value.text.whitespace = whitespace;
-  node->value.text.string     = mxml_strdupf(format, ap);
-
-  va_end(ap);
-
-  return (0);
-}
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml-string.c b/menuselect/mxml/mxml-string.c
deleted file mode 100644
index 9c2f9b20b..000000000
--- a/menuselect/mxml/mxml-string.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * "$Id$"
- *
- * String functions for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Contents:
- *
- *   mxml_strdup()    - Duplicate a string.
- *   mxml_strdupf()   - Format and duplicate a string.
- *   mxml_vsnprintf() - Format a string into a fixed size buffer.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include "config.h"
-
-
-/*
- * 'mxml_strdup()' - Duplicate a string.
- */
-
-#ifndef HAVE_STRDUP
-char 	*				/* O - New string pointer */
-mxml_strdup(const char *s)		/* I - String to duplicate */
-{
-  char	*t;				/* New string pointer */
-
-
-  if (s == NULL)
-    return (NULL);
-
-  if ((t = malloc(strlen(s) + 1)) == NULL)
-    return (NULL);
-
-  return (strcpy(t, s));
-}
-#endif /* !HAVE_STRDUP */
-
-
-/*
- * 'mxml_strdupf()' - Format and duplicate a string.
- */
-
-char *					/* O - New string pointer */
-mxml_strdupf(const char *format,	/* I - Printf-style format string */
-             va_list    ap)		/* I - Pointer to additional arguments */
-{
-  int	bytes;				/* Number of bytes required */
-  char	*buffer,			/* String buffer */
-	temp[256];			/* Small buffer for first vsnprintf */
-
-
- /*
-  * First format with a tiny buffer; this will tell us how many bytes are
-  * needed...
-  */
-
-  bytes = vsnprintf(temp, sizeof(temp), format, ap);
-
-  if (bytes < sizeof(temp))
-  {
-   /*
-    * Hey, the formatted string fits in the tiny buffer, so just dup that...
-    */
-
-    return (strdup(temp));
-  }
-
- /*
-  * Allocate memory for the whole thing and reformat to the new, larger
-  * buffer...
-  */
-
-  if ((buffer = calloc(1, bytes + 1)) != NULL)
-    vsnprintf(buffer, bytes + 1, format, ap);
-
- /*
-  * Return the new string...
-  */
-
-  return (buffer);
-}
-
-
-#ifndef HAVE_VSNPRINTF
-/*
- * 'mxml_vsnprintf()' - Format a string into a fixed size buffer.
- */
-
-int					/* O - Number of bytes formatted */
-mxml_vsnprintf(char       *buffer,	/* O - Output buffer */
-               size_t     bufsize,	/* O - Size of output buffer */
-	       const char *format,	/* I - Printf-style format string */
-	       va_list    ap)		/* I - Pointer to additional arguments */
-{
-  char		*bufptr,		/* Pointer to position in buffer */
-		*bufend,		/* Pointer to end of buffer */
-		sign,			/* Sign of format width */
-		size,			/* Size character (h, l, L) */
-		type;			/* Format type character */
-  const char	*bufformat;		/* Start of format */
-  int		width,			/* Width of field */
-		prec;			/* Number of characters of precision */
-  char		tformat[100],		/* Temporary format string for sprintf() */
-		temp[1024];		/* Buffer for formatted numbers */
-  char		*s;			/* Pointer to string */
-  int		slen;			/* Length of string */
-  int		bytes;			/* Total number of bytes needed */
-
-
- /*
-  * Loop through the format string, formatting as needed...
-  */
-
-  bufptr = buffer;
-  bufend = buffer + bufsize - 1;
-  bytes  = 0;
-
-  while (*format)
-  {
-    if (*format == '%')
-    {
-      bufformat = format;
-      format ++;
-
-      if (*format == '%')
-      {
-        *bufptr++ = *format++;
-	continue;
-      }
-      else if (strchr(" -+#\'", *format))
-        sign = *format++;
-      else
-        sign = 0;
-
-      width = 0;
-      while (isdigit(*format))
-        width = width * 10 + *format++ - '0';
-
-      if (*format == '.')
-      {
-        format ++;
-	prec = 0;
-
-	while (isdigit(*format))
-          prec = prec * 10 + *format++ - '0';
-      }
-      else
-        prec = -1;
-
-      if (*format == 'l' && format[1] == 'l')
-      {
-        size = 'L';
-	format += 2;
-      }
-      else if (*format == 'h' || *format == 'l' || *format == 'L')
-        size = *format++;
-
-      if (!*format)
-        break;
-
-      type = *format++;
-
-      switch (type)
-      {
-	case 'E' : /* Floating point formats */
-	case 'G' :
-	case 'e' :
-	case 'f' :
-	case 'g' :
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, double));
-
-            bytes += strlen(temp);
-
-            if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-
-        case 'B' : /* Integer formats */
-	case 'X' :
-	case 'b' :
-        case 'd' :
-	case 'i' :
-	case 'o' :
-	case 'u' :
-	case 'x' :
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, int));
-
-            bytes += strlen(temp);
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-	    
-	case 'p' : /* Pointer value */
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, void *));
-
-            bytes += strlen(temp);
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-
-        case 'c' : /* Character or character array */
-	    bytes += width;
-
-	    if (bufptr)
-	    {
-	      if (width <= 1)
-		*bufptr++ = va_arg(ap, int);
-	      else
-	      {
-		if ((bufptr + width) > bufend)
-	          width = bufend - bufptr;
-
-		memcpy(bufptr, va_arg(ap, char *), width);
-		bufptr += width;
-	      }
-	    }
-	    break;
-
-	case 's' : /* String */
-	    if ((s = va_arg(ap, char *)) == NULL)
-	      s = "(null)";
-
-	    slen = strlen(s);
-	    if (slen > width && prec != width)
-	      width = slen;
-
-            bytes += width;
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + width) > bufend)
-		width = bufend - bufptr;
-
-              if (slen > width)
-		slen = width;
-
-	      if (sign == '-')
-	      {
-		strncpy(bufptr, s, slen);
-		memset(bufptr + slen, ' ', width - slen);
-	      }
-	      else
-	      {
-		memset(bufptr, ' ', width - slen);
-		strncpy(bufptr + width - slen, s, slen);
-	      }
-
-	      bufptr += width;
-	    }
-	    break;
-
-	case 'n' : /* Output number of chars so far */
-	    if ((format - bufformat + 1) > sizeof(tformat) ||
-	        (width + 2) > sizeof(temp))
-	      break;
-
-	    strncpy(tformat, bufformat, format - bufformat);
-	    tformat[format - bufformat] = '\0';
-
-	    sprintf(temp, tformat, va_arg(ap, int));
-
-            bytes += strlen(temp);
-
-	    if (bufptr)
-	    {
-	      if ((bufptr + strlen(temp)) > bufend)
-	      {
-		strncpy(bufptr, temp, bufend - bufptr);
-		bufptr = bufend;
-		break;
-	      }
-	      else
-	      {
-		strcpy(bufptr, temp);
-		bufptr += strlen(temp);
-	      }
-	    }
-	    break;
-      }
-    }
-    else
-    {
-      bytes ++;
-
-      if (bufptr && bufptr < bufend)
-	*bufptr++ = *format++;
-    }
-  }
-
- /*
-  * Nul-terminate the string and return the number of characters needed.
-  */
-
-  *bufptr = '\0';
-
-  return (bytes);
-}
-#endif /* !HAVE_VSNPRINTF */
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml.h b/menuselect/mxml/mxml.h
deleted file mode 100644
index 3bbc6d32e..000000000
--- a/menuselect/mxml/mxml.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * "$Id$"
- *
- * Header file for Mini-XML, a small XML-like file parsing library.
- *
- * Copyright 2003-2005 by Michael Sweet.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-/*
- * Prevent multiple inclusion...
- */
-
-#ifndef _mxml_h_
-#  define _mxml_h_
-
-/*
- * Include necessary headers...
- */
-
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <string.h>
-#  include <ctype.h>
-#  include <errno.h>
-
-
-/*
- * Constants...
- */
-
-#  define MXML_WRAP		72	/* Wrap XML output at this column position */
-#  define MXML_TAB		8	/* Tabs every N columns */
-
-#  define MXML_NO_CALLBACK	0	/* Don't use a type callback */
-#  define MXML_INTEGER_CALLBACK	mxml_integer_cb
-					/* Treat all data as integers */
-#  define MXML_OPAQUE_CALLBACK	mxml_opaque_cb
-					/* Treat all data as opaque */
-#  define MXML_REAL_CALLBACK	mxml_real_cb
-					/* Treat all data as real numbers */
-#  define MXML_TEXT_CALLBACK	0	/* Treat all data as text */
-
-#  define MXML_NO_PARENT	0	/* No parent for the node */
-
-#  define MXML_DESCEND		1	/* Descend when finding/walking */
-#  define MXML_NO_DESCEND	0	/* Don't descend when finding/walking */
-#  define MXML_DESCEND_FIRST	-1	/* Descend for first find */
-
-#  define MXML_WS_BEFORE_OPEN	0	/* Callback for before open tag */
-#  define MXML_WS_AFTER_OPEN	1	/* Callback for after open tag */
-#  define MXML_WS_BEFORE_CLOSE	2	/* Callback for before close tag */
-#  define MXML_WS_AFTER_CLOSE	3	/* Callback for after close tag */
-
-#  define MXML_ADD_BEFORE	0	/* Add node before specified node */
-#  define MXML_ADD_AFTER	1	/* Add node after specified node */
-#  define MXML_ADD_TO_PARENT	NULL	/* Add node relative to parent */
-
-
-/*
- * Data types...
- */
-
-typedef enum mxml_type_e		/**** The XML node type. ****/
-{
-  MXML_ELEMENT,				/* XML element with attributes */
-  MXML_INTEGER,				/* Integer value */
-  MXML_OPAQUE,				/* Opaque string */
-  MXML_REAL,				/* Real value */
-  MXML_TEXT,				/* Text fragment */
-  MXML_CUSTOM				/* Custom data */
-} mxml_type_t;
-
-typedef struct mxml_attr_s		/**** An XML element attribute value. ****/
-{
-  char			*name;		/* Attribute name */
-  char			*value;		/* Attribute value */
-} mxml_attr_t;
-
-typedef struct mxml_value_s		/**** An XML element value. ****/
-{
-  char			*name;		/* Name of element */
-  int			num_attrs;	/* Number of attributes */
-  mxml_attr_t		*attrs;		/* Attributes */
-} mxml_element_t;
-
-typedef struct mxml_text_s		/**** An XML text value. ****/
-{
-  int			whitespace;	/* Leading whitespace? */
-  char			*string;	/* Fragment string */
-} mxml_text_t;
-
-typedef struct mxml_custom_s		/**** An XML custom value. ****/
-{
-  void			*data;		/* Pointer to (allocated) custom data */
-  void			(*destroy)(void *);
-					/* Pointer to destructor function */
-} mxml_custom_t;
-
-typedef union mxml_value_u		/**** An XML node value. ****/
-{
-  mxml_element_t	element;	/* Element */
-  int			integer;	/* Integer number */
-  char			*opaque;	/* Opaque string */
-  double		real;		/* Real number */
-  mxml_text_t		text;		/* Text fragment */
-  mxml_custom_t		custom;		/* Custom data */
-} mxml_value_t;
-
-typedef struct mxml_node_s		/**** An XML node. ****/
-{
-  mxml_type_t		type;		/* Node type */
-  struct mxml_node_s	*next;		/* Next node under same parent */
-  struct mxml_node_s	*prev;		/* Previous node under same parent */
-  struct mxml_node_s	*parent;	/* Parent node */
-  struct mxml_node_s	*child;		/* First child node */
-  struct mxml_node_s	*last_child;	/* Last child node */
-  mxml_value_t		value;		/* Node value */
-} mxml_node_t;
-
-typedef struct mxml_index_s		/**** An XML node index. ****/
-{
-  char			*attr;		/* Attribute used for indexing or NULL */
-  int			num_nodes;	/* Number of nodes in index */
-  int			alloc_nodes;	/* Allocated nodes in index */
-  int			cur_node;	/* Current node */
-  mxml_node_t		**nodes;	/* Node array */
-} mxml_index_t;
-
-typedef int (*mxml_custom_load_cb_t)(mxml_node_t *, const char *);
-					/**** Custom data load callback function ****/
-
-typedef char *(*mxml_custom_save_cb_t)(mxml_node_t *);  
-					/**** Custom data save callback function ****/
-
-
-/*
- * C++ support...
- */
-
-#  ifdef __cplusplus
-extern "C" {
-#  endif /* __cplusplus */
-
-/*
- * Prototypes...
- */
-
-extern void		mxmlAdd(mxml_node_t *parent, int where,
-			        mxml_node_t *child, mxml_node_t *node);
-extern void		mxmlDelete(mxml_node_t *node);
-extern const char	*mxmlElementGetAttr(mxml_node_t *node, const char *name);
-extern void		mxmlElementSetAttr(mxml_node_t *node, const char *name,
-			                   const char *value);
-extern int		mxmlEntityAddCallback(int (*cb)(const char *name));
-extern const char	*mxmlEntityGetName(int val);
-extern int		mxmlEntityGetValue(const char *name);
-extern void		mxmlEntityRemoveCallback(int (*cb)(const char *name));
-extern mxml_node_t	*mxmlFindElement(mxml_node_t *node, mxml_node_t *top,
-			                 const char *name, const char *attr,
-					 const char *value, int descend);
-extern void		mxmlIndexDelete(mxml_index_t *ind);
-extern mxml_node_t	*mxmlIndexEnum(mxml_index_t *ind);
-extern mxml_node_t	*mxmlIndexFind(mxml_index_t *ind,
-			               const char *element,
-			               const char *value);
-extern mxml_index_t	*mxmlIndexNew(mxml_node_t *node, const char *element,
-			              const char *attr);
-extern mxml_node_t	*mxmlIndexReset(mxml_index_t *ind);
-extern mxml_node_t	*mxmlLoadFd(mxml_node_t *top, int fd,
-			            mxml_type_t (*cb)(mxml_node_t *));
-extern mxml_node_t	*mxmlLoadFile(mxml_node_t *top, FILE *fp,
-			              mxml_type_t (*cb)(mxml_node_t *));
-extern mxml_node_t	*mxmlLoadString(mxml_node_t *top, const char *s,
-			                mxml_type_t (*cb)(mxml_node_t *));
-extern mxml_node_t	*mxmlNewCustom(mxml_node_t *parent, void *data,
-			               void (*destroy)(void *));
-extern mxml_node_t	*mxmlNewElement(mxml_node_t *parent, const char *name);
-extern mxml_node_t	*mxmlNewInteger(mxml_node_t *parent, int integer);
-extern mxml_node_t	*mxmlNewOpaque(mxml_node_t *parent, const char *opaque);
-extern mxml_node_t	*mxmlNewReal(mxml_node_t *parent, double real);
-extern mxml_node_t	*mxmlNewText(mxml_node_t *parent, int whitespace,
-			             const char *string);
-extern mxml_node_t	*mxmlNewTextf(mxml_node_t *parent, int whitespace,
-			              const char *format, ...)
-#    ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 3, 4)))
-#    endif /* __GNUC__ */
-;
-extern void		mxmlRemove(mxml_node_t *node);
-extern char		*mxmlSaveAllocString(mxml_node_t *node,
-			        	     const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSaveFd(mxml_node_t *node, int fd,
-			           const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSaveFile(mxml_node_t *node, FILE *fp,
-			             const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSaveString(mxml_node_t *node, char *buffer,
-			               int bufsize,
-			               const char *(*cb)(mxml_node_t *, int));
-extern int		mxmlSetCustom(mxml_node_t *node, void *data,
-			              void (*destroy)(void *));
-extern void		mxmlSetCustomHandlers(mxml_custom_load_cb_t load,
-			                      mxml_custom_save_cb_t save);
-extern int		mxmlSetElement(mxml_node_t *node, const char *name);
-extern void		mxmlSetErrorCallback(void (*cb)(const char *));
-extern int		mxmlSetInteger(mxml_node_t *node, int integer);
-extern int		mxmlSetOpaque(mxml_node_t *node, const char *opaque);
-extern int		mxmlSetReal(mxml_node_t *node, double real);
-extern int		mxmlSetText(mxml_node_t *node, int whitespace,
-			            const char *string);
-extern int		mxmlSetTextf(mxml_node_t *node, int whitespace,
-			             const char *format, ...)
-#    ifdef __GNUC__
-__attribute__ ((__format__ (__printf__, 3, 4)))
-#    endif /* __GNUC__ */
-;
-extern mxml_node_t	*mxmlWalkNext(mxml_node_t *node, mxml_node_t *top,
-			              int descend);
-extern mxml_node_t	*mxmlWalkPrev(mxml_node_t *node, mxml_node_t *top,
-			              int descend);
-
-
-/*
- * Private functions...
- */
-
-extern void		mxml_error(const char *format, ...);
-extern mxml_type_t	mxml_integer_cb(mxml_node_t *node);
-extern mxml_type_t	mxml_opaque_cb(mxml_node_t *node);
-extern mxml_type_t	mxml_real_cb(mxml_node_t *node);
-
-
-/*
- * C++ support...
- */
-
-#  ifdef __cplusplus
-}
-#  endif /* __cplusplus */
-#endif /* !_mxml_h_ */
-
-
-/*
- * End of "$Id$".
- */
diff --git a/menuselect/mxml/mxml.list.in b/menuselect/mxml/mxml.list.in
deleted file mode 100644
index 0369eb3ff..000000000
--- a/menuselect/mxml/mxml.list.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# "$Id$"
-#
-# EPM software list file for Mini-XML, a small XML library.
-#
-# Copyright 2003-2005 by Michael Sweet.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-
-# Directories...
-$prefix=@prefix@
-$exec_prefix=@exec_prefix@
-$bindir=@bindir@
-$docdir=@docdir@
-$includedir=@includedir@
-$libdir=@libdir@
-$mandir=@mandir@
-$srcdir=@srcdir@
-$datarootdir=@datarootdir@
-
-$PICFLAG=@PICFLAG@
-
-# Product information
-%product mxml
-%copyright 2003-2005 by Michael Sweet
-%vendor Michael Sweet
-%license ${srcdir}/COPYING
-%readme ${srcdir}/README
-%version @VERSION@
-
-%description <<EOF
-Mini-XML is a small XML parsing library that you can use to read
-XML and XML-like data files in your application without
-requiring large non-standard libraries.  Mini-XML provides the
-following functionality:
-
-    - Reading of UTF-8 and UTF-16 and writing of UTF-8 encoded
-      XML files and strings.
-    - Data is stored in a linked-list tree structure, preserving
-      the XML data hierarchy.
-    - Supports arbitrary element names, attributes, and
-      attribute values with no preset limits, just available
-      memory.
-    - Supports integer, real, opaque ("cdata"), and text data
-      types in "leaf" nodes.
-    - Functions for creating and managing trees of data.
-    - "Find" and "walk" functions for easily locating and
-      navigating trees of data.
-
-Mini-XML doesn't do validation or other types of processing on
-the data based upon schema files or other sources of definition
-information, nor does it support character entities other than
-those required by the XML specification.
-EOF
-
-# Manpage extensions...
-$CAT1EXT=@CAT1EXT@
-$CAT3EXT=@CAT3EXT@
-$MAN1EXT=@MAN1EXT@
-$MAN3EXT=@MAN3EXT@
-
-# Executables
-f 0555 root sys ${bindir}/mxmldoc mxmldoc
-
-# Header files
-f 0444 root sys ${includedir}/mxml.h mxml.h
-
-# Libraries
-%if $PICFLAG
-%system hpux
-f 0555 root sys ${libdir}/libmxml.sl.1 libmxml.sl.1
-l 0555 root sys ${libdir}/libmxml.sl libmxml.sl.1
-
-%system dylib
-f 0555 root sys ${libdir}/libmxml.1.dylib libmxml.1.dylib
-l 0555 root sys ${libdir}/libmxml.dylib libmxml.1.dylib
-
-%system freebsd irix linux netbsd openbsd solaris tru64
-f 0555 root sys ${libdir}/libmxml.so.1.0 libmxml.so.1.0
-l 0555 root sys ${libdir}/libmxml.sl.1 libmxml.sl.1.0
-l 0555 root sys ${libdir}/libmxml.sl libmxml.sl.1.0
-
-%system all
-%endif
-
-f 0444 root sys ${libdir}/libmxml.a libmxml.a
-
-# pkg-config info
-f 0444 root sys $(libdir)/pkgconfig/mxml.pc mxml.pc
-
-# Documentation
-f 0444 root sys ${docdir}/README $srcdir/README
-f 0444 root sys ${docdir}/COPYING $srcdir/COPYING
-f 0444 root sys ${docdir}/CHANGES $srcdir/CHANGES
-f 0444 root sys ${docdir}/mxml.html $srcdir/doc/mxml.html
-f 0444 root sys ${docdir}/mxml.pdf $srcdir/doc/mxml.pdf
-
-# Man pages
-f 0444 root sys ${mandir}/cat1/mxmldoc.$CAT1EXT $srcdir/mxmldoc.$CAT1EXT
-f 0444 root sys ${mandir}/man1/mxmldoc.$MAN1EXT $srcdir/mxmldoc.man
-f 0444 root sys ${mandir}/cat3/mxml.$CAT3EXT $srcdir/mxml.$CAT3EXT
-f 0444 root sys ${mandir}/man3/mxml.$MAN3EXT $srcdir/mxml.man
-
-#
-# End of "$Id$".
-#
diff --git a/menuselect/mxml/mxml.pc.in b/menuselect/mxml/mxml.pc.in
deleted file mode 100644
index 81f3bf549..000000000
--- a/menuselect/mxml/mxml.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Mini-XML
-Description: Lightweight XML support library
-Version: @VERSION@
-Libs: @PC_LIBS@
-Cflags: @PC_CFLAGS@