45 files changed, 6360 insertions, 11459 deletions

diff --git a/tools/mhmake/CMakeLists.txt b/tools/mhmake/CMakeLists.txt
index 8af73f6db..887dc2601 100644
--- a/tools/mhmake/CMakeLists.txt
+++ b/tools/mhmake/CMakeLists.txt
@@ -8,10 +8,10 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
 
 PROJECT(${PROGRAM_NAME})
 
-SET( CMAKE_CXX_FLAGS_DEBUG "-D _DEBUG")
+SET( CMAKE_CXX_FLAGS_DEBUG "-g -D _DEBUG")
 
 ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mhmakelexer.cpp
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mhmakelexer.cpp ${CMAKE_CURRENT_BINARY_DIR}/FlexLexer.h
    COMMAND flex++ -S${CMAKE_CURRENT_SOURCE_DIR}/src/flex.skl -o${CMAKE_CURRENT_BINARY_DIR}/mhmakelexer.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakelexer.l
    COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/mhmakelexer.cpp  ${CMAKE_CURRENT_BINARY_DIR}/temp1234.456
    COMMAND echo '\#include \"stdafx.h\"' > ${CMAKE_CURRENT_BINARY_DIR}/mhmakelexer.cpp
@@ -19,16 +19,17 @@ ADD_CUSTOM_COMMAND(
    COMMAND rm ${CMAKE_CURRENT_BINARY_DIR}/temp1234.456
    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/src/flexlexer.h ${CMAKE_CURRENT_BINARY_DIR}/FlexLexer.h
 
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakelexer.l ${CMAKE_CURRENT_SOURCE_DIR}/src/flex.skl ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.h
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakelexer.l ${CMAKE_CURRENT_SOURCE_DIR}/src/flex.skl ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.hpp ${CMAKE_CURRENT_SOURCE_DIR}/src/flexlexer.h
 )
 ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.cpp ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.h
-   COMMAND bison++ -d -S${CMAKE_CURRENT_SOURCE_DIR}/src/bison.cc -H${CMAKE_CURRENT_SOURCE_DIR}/src/bison.h -h${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.h -otemp1234.456 ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakeparser.y
+   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.cpp ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.hpp ${CMAKE_CURRENT_BINARY_DIR}/location.hh  ${CMAKE_CURRENT_BINARY_DIR}/position.hh  ${CMAKE_CURRENT_BINARY_DIR}/stack.hh
+   COMMAND BISON_PKGDATADIR=${CMAKE_CURRENT_SOURCE_DIR}/src/bisondata bison -d -ra -S${CMAKE_CURRENT_SOURCE_DIR}/src/bisondata/lalr1.cc -o${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakeparser.y
+   COMMAND mv ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.cpp temp1234.456
    COMMAND echo '\#include \"stdafx.h\"' > ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.cpp
    COMMAND cat temp1234.456 >> ${CMAKE_CURRENT_BINARY_DIR}/mhmakeparser.cpp
    COMMAND rm temp1234.456
 
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakeparser.y
+   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/mhmakeparser.y ${CMAKE_CURRENT_SOURCE_DIR}/src/bisondata/lalr1.cc
 )
 INCLUDE_DIRECTORIES(src ${CMAKE_CURRENT_BINARY_DIR})
 LINK_LIBRARIES(/usr/lib/libpopt.a)
diff --git a/tools/mhmake/COPYING b/tools/mhmake/COPYING
deleted file mode 100644
index 818433ecc..000000000
--- a/tools/mhmake/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE

-                       Version 3, 29 June 2007

-

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>

- Everyone is permitted to copy and distribute verbatim copies

- of this license document, but changing it is not allowed.

-

-                            Preamble

-

-  The GNU General Public License is a free, copyleft license for

-software and other kinds of works.

-

-  The licenses for most software and other practical works are designed

-to take away your freedom to share and change the works.  By contrast,

-the GNU General Public License is intended to guarantee your freedom to

-share and change all versions of a program--to make sure it remains free

-software for all its users.  We, the Free Software Foundation, use the

-GNU General Public License for most of our software; it applies also to

-any other work released this way by its authors.  You can apply it to

-your programs, 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

-them 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 prevent others from denying you

-these rights or asking you to surrender the rights.  Therefore, you have

-certain responsibilities if you distribute copies of the software, or if

-you modify it: responsibilities to respect the freedom of others.

-

-  For example, if you distribute copies of such a program, whether

-gratis or for a fee, you must pass on to the recipients the same

-freedoms that you received.  You must make sure that they, too, receive

-or can get the source code.  And you must show them these terms so they

-know their rights.

-

-  Developers that use the GNU GPL protect your rights with two steps:

-(1) assert copyright on the software, and (2) offer you this License

-giving you legal permission to copy, distribute and/or modify it.

-

-  For the developers' and authors' protection, the GPL clearly explains

-that there is no warranty for this free software.  For both users' and

-authors' sake, the GPL requires that modified versions be marked as

-changed, so that their problems will not be attributed erroneously to

-authors of previous versions.

-

-  Some devices are designed to deny users access to install or run

-modified versions of the software inside them, although the manufacturer

-can do so.  This is fundamentally incompatible with the aim of

-protecting users' freedom to change the software.  The systematic

-pattern of such abuse occurs in the area of products for individuals to

-use, which is precisely where it is most unacceptable.  Therefore, we

-have designed this version of the GPL to prohibit the practice for those

-products.  If such problems arise substantially in other domains, we

-stand ready to extend this provision to those domains in future versions

-of the GPL, as needed to protect the freedom of users.

-

-  Finally, every program is threatened constantly by software patents.

-States should not allow patents to restrict development and use of

-software on general-purpose computers, but in those that do, we wish to

-avoid the special danger that patents applied to a free program could

-make it effectively proprietary.  To prevent this, the GPL assures that

-patents cannot be used to render the program non-free.

-

-  The precise terms and conditions for copying, distribution and

-modification follow.

-

-                       TERMS AND CONDITIONS

-

-  0. Definitions.

-

-  "This License" refers to version 3 of the GNU General Public License.

-

-  "Copyright" also means copyright-like laws that apply to other kinds of

-works, such as semiconductor masks.

-

-  "The Program" refers to any copyrightable work licensed under this

-License.  Each licensee is addressed as "you".  "Licensees" and

-"recipients" may be individuals or organizations.

-

-  To "modify" a work means to copy from or adapt all or part of the work

-in a fashion requiring copyright permission, other than the making of an

-exact copy.  The resulting work is called a "modified version" of the

-earlier work or a work "based on" the earlier work.

-

-  A "covered work" means either the unmodified Program or a work based

-on the Program.

-

-  To "propagate" a work means to do anything with it that, without

-permission, would make you directly or secondarily liable for

-infringement under applicable copyright law, except executing it on a

-computer or modifying a private copy.  Propagation includes copying,

-distribution (with or without modification), making available to the

-public, and in some countries other activities as well.

-

-  To "convey" a work means any kind of propagation that enables other

-parties to make or receive copies.  Mere interaction with a user through

-a computer network, with no transfer of a copy, is not conveying.

-

-  An interactive user interface displays "Appropriate Legal Notices"

-to the extent that it includes a convenient and prominently visible

-feature that (1) displays an appropriate copyright notice, and (2)

-tells the user that there is no warranty for the work (except to the

-extent that warranties are provided), that licensees may convey the

-work under this License, and how to view a copy of this License.  If

-the interface presents a list of user commands or options, such as a

-menu, a prominent item in the list meets this criterion.

-

-  1. Source Code.

-

-  The "source code" for a work means the preferred form of the work

-for making modifications to it.  "Object code" means any non-source

-form of a work.

-

-  A "Standard Interface" means an interface that either is an official

-standard defined by a recognized standards body, or, in the case of

-interfaces specified for a particular programming language, one that

-is widely used among developers working in that language.

-

-  The "System Libraries" of an executable work include anything, other

-than the work as a whole, that (a) is included in the normal form of

-packaging a Major Component, but which is not part of that Major

-Component, and (b) serves only to enable use of the work with that

-Major Component, or to implement a Standard Interface for which an

-implementation is available to the public in source code form.  A

-"Major Component", in this context, means a major essential component

-(kernel, window system, and so on) of the specific operating system

-(if any) on which the executable work runs, or a compiler used to

-produce the work, or an object code interpreter used to run it.

-

-  The "Corresponding Source" for a work in object code form means all

-the source code needed to generate, install, and (for an executable

-work) run the object code and to modify the work, including scripts to

-control those activities.  However, it does not include the work's

-System Libraries, or general-purpose tools or generally available free

-programs which are used unmodified in performing those activities but

-which are not part of the work.  For example, Corresponding Source

-includes interface definition files associated with source files for

-the work, and the source code for shared libraries and dynamically

-linked subprograms that the work is specifically designed to require,

-such as by intimate data communication or control flow between those

-subprograms and other parts of the work.

-

-  The Corresponding Source need not include anything that users

-can regenerate automatically from other parts of the Corresponding

-Source.

-

-  The Corresponding Source for a work in source code form is that

-same work.

-

-  2. Basic Permissions.

-

-  All rights granted under this License are granted for the term of

-copyright on the Program, and are irrevocable provided the stated

-conditions are met.  This License explicitly affirms your unlimited

-permission to run the unmodified Program.  The output from running a

-covered work is covered by this License only if the output, given its

-content, constitutes a covered work.  This License acknowledges your

-rights of fair use or other equivalent, as provided by copyright law.

-

-  You may make, run and propagate covered works that you do not

-convey, without conditions so long as your license otherwise remains

-in force.  You may convey covered works to others for the sole purpose

-of having them make modifications exclusively for you, or provide you

-with facilities for running those works, provided that you comply with

-the terms of this License in conveying all material for which you do

-not control copyright.  Those thus making or running the covered works

-for you must do so exclusively on your behalf, under your direction

-and control, on terms that prohibit them from making any copies of

-your copyrighted material outside their relationship with you.

-

-  Conveying under any other circumstances is permitted solely under

-the conditions stated below.  Sublicensing is not allowed; section 10

-makes it unnecessary.

-

-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-

-  No covered work shall be deemed part of an effective technological

-measure under any applicable law fulfilling obligations under article

-11 of the WIPO copyright treaty adopted on 20 December 1996, or

-similar laws prohibiting or restricting circumvention of such

-measures.

-

-  When you convey a covered work, you waive any legal power to forbid

-circumvention of technological measures to the extent such circumvention

-is effected by exercising rights under this License with respect to

-the covered work, and you disclaim any intention to limit operation or

-modification of the work as a means of enforcing, against the work's

-users, your or third parties' legal rights to forbid circumvention of

-technological measures.

-

-  4. Conveying Verbatim Copies.

-

-  You may convey verbatim copies of the Program's source code as you

-receive it, in any medium, provided that you conspicuously and

-appropriately publish on each copy an appropriate copyright notice;

-keep intact all notices stating that this License and any

-non-permissive terms added in accord with section 7 apply to the code;

-keep intact all notices of the absence of any warranty; and give all

-recipients a copy of this License along with the Program.

-

-  You may charge any price or no price for each copy that you convey,

-and you may offer support or warranty protection for a fee.

-

-  5. Conveying Modified Source Versions.

-

-  You may convey a work based on the Program, or the modifications to

-produce it from the Program, in the form of source code under the

-terms of section 4, provided that you also meet all of these conditions:

-

-    a) The work must carry prominent notices stating that you modified

-    it, and giving a relevant date.

-

-    b) The work must carry prominent notices stating that it is

-    released under this License and any conditions added under section

-    7.  This requirement modifies the requirement in section 4 to

-    "keep intact all notices".

-

-    c) You must license the entire work, as a whole, under this

-    License to anyone who comes into possession of a copy.  This

-    License will therefore apply, along with any applicable section 7

-    additional terms, to the whole of the work, and all its parts,

-    regardless of how they are packaged.  This License gives no

-    permission to license the work in any other way, but it does not

-    invalidate such permission if you have separately received it.

-

-    d) If the work has interactive user interfaces, each must display

-    Appropriate Legal Notices; however, if the Program has interactive

-    interfaces that do not display Appropriate Legal Notices, your

-    work need not make them do so.

-

-  A compilation of a covered work with other separate and independent

-works, which are not by their nature extensions of the covered work,

-and which are not combined with it such as to form a larger program,

-in or on a volume of a storage or distribution medium, is called an

-"aggregate" if the compilation and its resulting copyright are not

-used to limit the access or legal rights of the compilation's users

-beyond what the individual works permit.  Inclusion of a covered work

-in an aggregate does not cause this License to apply to the other

-parts of the aggregate.

-

-  6. Conveying Non-Source Forms.

-

-  You may convey a covered work in object code form under the terms

-of sections 4 and 5, provided that you also convey the

-machine-readable Corresponding Source under the terms of this License,

-in one of these ways:

-

-    a) Convey the object code in, or embodied in, a physical product

-    (including a physical distribution medium), accompanied by the

-    Corresponding Source fixed on a durable physical medium

-    customarily used for software interchange.

-

-    b) Convey the object code in, or embodied in, a physical product

-    (including a physical distribution medium), accompanied by a

-    written offer, valid for at least three years and valid for as

-    long as you offer spare parts or customer support for that product

-    model, to give anyone who possesses the object code either (1) a

-    copy of the Corresponding Source for all the software in the

-    product that is covered by this License, on a durable physical

-    medium customarily used for software interchange, for a price no

-    more than your reasonable cost of physically performing this

-    conveying of source, or (2) access to copy the

-    Corresponding Source from a network server at no charge.

-

-    c) Convey individual copies of the object code with a copy of the

-    written offer to provide the Corresponding Source.  This

-    alternative is allowed only occasionally and noncommercially, and

-    only if you received the object code with such an offer, in accord

-    with subsection 6b.

-

-    d) Convey the object code by offering access from a designated

-    place (gratis or for a charge), and offer equivalent access to the

-    Corresponding Source in the same way through the same place at no

-    further charge.  You need not require recipients to copy the

-    Corresponding Source along with the object code.  If the place to

-    copy the object code is a network server, the Corresponding Source

-    may be on a different server (operated by you or a third party)

-    that supports equivalent copying facilities, provided you maintain

-    clear directions next to the object code saying where to find the

-    Corresponding Source.  Regardless of what server hosts the

-    Corresponding Source, you remain obligated to ensure that it is

-    available for as long as needed to satisfy these requirements.

-

-    e) Convey the object code using peer-to-peer transmission, provided

-    you inform other peers where the object code and Corresponding

-    Source of the work are being offered to the general public at no

-    charge under subsection 6d.

-

-  A separable portion of the object code, whose source code is excluded

-from the Corresponding Source as a System Library, need not be

-included in conveying the object code work.

-

-  A "User Product" is either (1) a "consumer product", which means any

-tangible personal property which is normally used for personal, family,

-or household purposes, or (2) anything designed or sold for incorporation

-into a dwelling.  In determining whether a product is a consumer product,

-doubtful cases shall be resolved in favor of coverage.  For a particular

-product received by a particular user, "normally used" refers to a

-typical or common use of that class of product, regardless of the status

-of the particular user or of the way in which the particular user

-actually uses, or expects or is expected to use, the product.  A product

-is a consumer product regardless of whether the product has substantial

-commercial, industrial or non-consumer uses, unless such uses represent

-the only significant mode of use of the product.

-

-  "Installation Information" for a User Product means any methods,

-procedures, authorization keys, or other information required to install

-and execute modified versions of a covered work in that User Product from

-a modified version of its Corresponding Source.  The information must

-suffice to ensure that the continued functioning of the modified object

-code is in no case prevented or interfered with solely because

-modification has been made.

-

-  If you convey an object code work under this section in, or with, or

-specifically for use in, a User Product, and the conveying occurs as

-part of a transaction in which the right of possession and use of the

-User Product is transferred to the recipient in perpetuity or for a

-fixed term (regardless of how the transaction is characterized), the

-Corresponding Source conveyed under this section must be accompanied

-by the Installation Information.  But this requirement does not apply

-if neither you nor any third party retains the ability to install

-modified object code on the User Product (for example, the work has

-been installed in ROM).

-

-  The requirement to provide Installation Information does not include a

-requirement to continue to provide support service, warranty, or updates

-for a work that has been modified or installed by the recipient, or for

-the User Product in which it has been modified or installed.  Access to a

-network may be denied when the modification itself materially and

-adversely affects the operation of the network or violates the rules and

-protocols for communication across the network.

-

-  Corresponding Source conveyed, and Installation Information provided,

-in accord with this section must be in a format that is publicly

-documented (and with an implementation available to the public in

-source code form), and must require no special password or key for

-unpacking, reading or copying.

-

-  7. Additional Terms.

-

-  "Additional permissions" are terms that supplement the terms of this

-License by making exceptions from one or more of its conditions.

-Additional permissions that are applicable to the entire Program shall

-be treated as though they were included in this License, to the extent

-that they are valid under applicable law.  If additional permissions

-apply only to part of the Program, that part may be used separately

-under those permissions, but the entire Program remains governed by

-this License without regard to the additional permissions.

-

-  When you convey a copy of a covered work, you may at your option

-remove any additional permissions from that copy, or from any part of

-it.  (Additional permissions may be written to require their own

-removal in certain cases when you modify the work.)  You may place

-additional permissions on material, added by you to a covered work,

-for which you have or can give appropriate copyright permission.

-

-  Notwithstanding any other provision of this License, for material you

-add to a covered work, you may (if authorized by the copyright holders of

-that material) supplement the terms of this License with terms:

-

-    a) Disclaiming warranty or limiting liability differently from the

-    terms of sections 15 and 16 of this License; or

-

-    b) Requiring preservation of specified reasonable legal notices or

-    author attributions in that material or in the Appropriate Legal

-    Notices displayed by works containing it; or

-

-    c) Prohibiting misrepresentation of the origin of that material, or

-    requiring that modified versions of such material be marked in

-    reasonable ways as different from the original version; or

-

-    d) Limiting the use for publicity purposes of names of licensors or

-    authors of the material; or

-

-    e) Declining to grant rights under trademark law for use of some

-    trade names, trademarks, or service marks; or

-

-    f) Requiring indemnification of licensors and authors of that

-    material by anyone who conveys the material (or modified versions of

-    it) with contractual assumptions of liability to the recipient, for

-    any liability that these contractual assumptions directly impose on

-    those licensors and authors.

-

-  All other non-permissive additional terms are considered "further

-restrictions" within the meaning of section 10.  If the Program as you

-received it, or any part of it, contains a notice stating that it is

-governed by this License along with a term that is a further

-restriction, you may remove that term.  If a license document contains

-a further restriction but permits relicensing or conveying under this

-License, you may add to a covered work material governed by the terms

-of that license document, provided that the further restriction does

-not survive such relicensing or conveying.

-

-  If you add terms to a covered work in accord with this section, you

-must place, in the relevant source files, a statement of the

-additional terms that apply to those files, or a notice indicating

-where to find the applicable terms.

-

-  Additional terms, permissive or non-permissive, may be stated in the

-form of a separately written license, or stated as exceptions;

-the above requirements apply either way.

-

-  8. Termination.

-

-  You may not propagate or modify a covered work except as expressly

-provided under this License.  Any attempt otherwise to propagate or

-modify it is void, and will automatically terminate your rights under

-this License (including any patent licenses granted under the third

-paragraph of section 11).

-

-  However, if you cease all violation of this License, then your

-license from a particular copyright holder is reinstated (a)

-provisionally, unless and until the copyright holder explicitly and

-finally terminates your license, and (b) permanently, if the copyright

-holder fails to notify you of the violation by some reasonable means

-prior to 60 days after the cessation.

-

-  Moreover, your license from a particular copyright holder is

-reinstated permanently if the copyright holder notifies you of the

-violation by some reasonable means, this is the first time you have

-received notice of violation of this License (for any work) from that

-copyright holder, and you cure the violation prior to 30 days after

-your receipt of the notice.

-

-  Termination of your rights under this section does not terminate the

-licenses of parties who have received copies or rights from you under

-this License.  If your rights have been terminated and not permanently

-reinstated, you do not qualify to receive new licenses for the same

-material under section 10.

-

-  9. Acceptance Not Required for Having Copies.

-

-  You are not required to accept this License in order to receive or

-run a copy of the Program.  Ancillary propagation of a covered work

-occurring solely as a consequence of using peer-to-peer transmission

-to receive a copy likewise does not require acceptance.  However,

-nothing other than this License grants you permission to propagate or

-modify any covered work.  These actions infringe copyright if you do

-not accept this License.  Therefore, by modifying or propagating a

-covered work, you indicate your acceptance of this License to do so.

-

-  10. Automatic Licensing of Downstream Recipients.

-

-  Each time you convey a covered work, the recipient automatically

-receives a license from the original licensors, to run, modify and

-propagate that work, subject to this License.  You are not responsible

-for enforcing compliance by third parties with this License.

-

-  An "entity transaction" is a transaction transferring control of an

-organization, or substantially all assets of one, or subdividing an

-organization, or merging organizations.  If propagation of a covered

-work results from an entity transaction, each party to that

-transaction who receives a copy of the work also receives whatever

-licenses to the work the party's predecessor in interest had or could

-give under the previous paragraph, plus a right to possession of the

-Corresponding Source of the work from the predecessor in interest, if

-the predecessor has it or can get it with reasonable efforts.

-

-  You may not impose any further restrictions on the exercise of the

-rights granted or affirmed under this License.  For example, you may

-not impose a license fee, royalty, or other charge for exercise of

-rights granted under this License, and you may not initiate litigation

-(including a cross-claim or counterclaim in a lawsuit) alleging that

-any patent claim is infringed by making, using, selling, offering for

-sale, or importing the Program or any portion of it.

-

-  11. Patents.

-

-  A "contributor" is a copyright holder who authorizes use under this

-License of the Program or a work on which the Program is based.  The

-work thus licensed is called the contributor's "contributor version".

-

-  A contributor's "essential patent claims" are all patent claims

-owned or controlled by the contributor, whether already acquired or

-hereafter acquired, that would be infringed by some manner, permitted

-by this License, of making, using, or selling its contributor version,

-but do not include claims that would be infringed only as a

-consequence of further modification of the contributor version.  For

-purposes of this definition, "control" includes the right to grant

-patent sublicenses in a manner consistent with the requirements of

-this License.

-

-  Each contributor grants you a non-exclusive, worldwide, royalty-free

-patent license under the contributor's essential patent claims, to

-make, use, sell, offer for sale, import and otherwise run, modify and

-propagate the contents of its contributor version.

-

-  In the following three paragraphs, a "patent license" is any express

-agreement or commitment, however denominated, not to enforce a patent

-(such as an express permission to practice a patent or covenant not to

-sue for patent infringement).  To "grant" such a patent license to a

-party means to make such an agreement or commitment not to enforce a

-patent against the party.

-

-  If you convey a covered work, knowingly relying on a patent license,

-and the Corresponding Source of the work is not available for anyone

-to copy, free of charge and under the terms of this License, through a

-publicly available network server or other readily accessible means,

-then you must either (1) cause the Corresponding Source to be so

-available, or (2) arrange to deprive yourself of the benefit of the

-patent license for this particular work, or (3) arrange, in a manner

-consistent with the requirements of this License, to extend the patent

-license to downstream recipients.  "Knowingly relying" means you have

-actual knowledge that, but for the patent license, your conveying the

-covered work in a country, or your recipient's use of the covered work

-in a country, would infringe one or more identifiable patents in that

-country that you have reason to believe are valid.

-

-  If, pursuant to or in connection with a single transaction or

-arrangement, you convey, or propagate by procuring conveyance of, a

-covered work, and grant a patent license to some of the parties

-receiving the covered work authorizing them to use, propagate, modify

-or convey a specific copy of the covered work, then the patent license

-you grant is automatically extended to all recipients of the covered

-work and works based on it.

-

-  A patent license is "discriminatory" if it does not include within

-the scope of its coverage, prohibits the exercise of, or is

-conditioned on the non-exercise of one or more of the rights that are

-specifically granted under this License.  You may not convey a covered

-work if you are a party to an arrangement with a third party that is

-in the business of distributing software, under which you make payment

-to the third party based on the extent of your activity of conveying

-the work, and under which the third party grants, to any of the

-parties who would receive the covered work from you, a discriminatory

-patent license (a) in connection with copies of the covered work

-conveyed by you (or copies made from those copies), or (b) primarily

-for and in connection with specific products or compilations that

-contain the covered work, unless you entered into that arrangement,

-or that patent license was granted, prior to 28 March 2007.

-

-  Nothing in this License shall be construed as excluding or limiting

-any implied license or other defenses to infringement that may

-otherwise be available to you under applicable patent law.

-

-  12. No Surrender of Others' Freedom.

-

-  If 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 convey a

-covered work so as to satisfy simultaneously your obligations under this

-License and any other pertinent obligations, then as a consequence you may

-not convey it at all.  For example, if you agree to terms that obligate you

-to collect a royalty for further conveying from those to whom you convey

-the Program, the only way you could satisfy both those terms and this

-License would be to refrain entirely from conveying the Program.

-

-  13. Use with the GNU Affero General Public License.

-

-  Notwithstanding any other provision of this License, you have

-permission to link or combine any covered work with a work licensed

-under version 3 of the GNU Affero General Public License into a single

-combined work, and to convey the resulting work.  The terms of this

-License will continue to apply to the part which is the covered work,

-but the special requirements of the GNU Affero General Public License,

-section 13, concerning interaction through a network will apply to the

-combination as such.

-

-  14. Revised Versions of this License.

-

-  The Free Software Foundation may publish revised and/or new versions of

-the GNU 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

-Program specifies that a certain numbered version of the GNU General

-Public License "or any later version" applies to it, you have the

-option of following the terms and conditions either of that numbered

-version or of any later version published by the Free Software

-Foundation.  If the Program does not specify a version number of the

-GNU General Public License, you may choose any version ever published

-by the Free Software Foundation.

-

-  If the Program specifies that a proxy can decide which future

-versions of the GNU General Public License can be used, that proxy's

-public statement of acceptance of a version permanently authorizes you

-to choose that version for the Program.

-

-  Later license versions may give you additional or different

-permissions.  However, no additional obligations are imposed on any

-author or copyright holder as a result of your choosing to follow a

-later version.

-

-  15. Disclaimer of Warranty.

-

-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY

-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT

-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM

-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF

-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-

-  16. Limitation of Liability.

-

-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING

-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS

-THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),

-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF

-SUCH DAMAGES.

-

-  17. Interpretation of Sections 15 and 16.

-

-  If the disclaimer of warranty and limitation of liability provided

-above cannot be given local legal effect according to their terms,

-reviewing courts shall apply local law that most closely approximates

-an absolute waiver of all civil liability in connection with the

-Program, unless a warranty or assumption of liability accompanies a

-copy of the Program in return for a fee.

-

-                     END OF TERMS AND CONDITIONS

-

-            How to Apply These Terms to Your New Programs

-

-  If you develop a new program, and you want it to be of the greatest

-possible use to the public, the best way to achieve this is to make it

-free software which everyone can redistribute and change under these terms.

-

-  To do so, attach the following notices to the program.  It is safest

-to attach them to the start of each source file to most effectively

-state 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 program's name and a brief idea of what it does.>

-    Copyright (C) <year>  <name of author>

-

-    This program is free software: you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation, either version 3 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-

-Also add information on how to contact you by electronic and paper mail.

-

-  If the program does terminal interaction, make it output a short

-notice like this when it starts in an interactive mode:

-

-    <program>  Copyright (C) <year>  <name of author>

-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.

-    This is free software, and you are welcome to redistribute it

-    under certain conditions; type `show c' for details.

-

-The hypothetical commands `show w' and `show c' should show the appropriate

-parts of the General Public License.  Of course, your program's commands

-might be different; for a GUI interface, you would use an "about box".

-

-  You should also get your employer (if you work as a programmer) or school,

-if any, to sign a "copyright disclaimer" for the program, if necessary.

-For more information on this, and how to apply and follow the GNU GPL, see

-<http://www.gnu.org/licenses/>.

-

-  The GNU General Public License does not permit incorporating your program

-into proprietary programs.  If your program is a subroutine library, you

-may consider it more useful to permit linking proprietary applications with

-the library.  If this is what you want to do, use the GNU Lesser General

-Public License instead of this License.  But first, please read

-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

diff --git a/tools/mhmake/Makefile.am b/tools/mhmake/Makefile.am
deleted file mode 100644
index 02520f201..000000000
--- a/tools/mhmake/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = src
diff --git a/tools/mhmake/Makefile.cvs b/tools/mhmake/Makefile.cvs
deleted file mode 100644
index d16070234..000000000
--- a/tools/mhmake/Makefile.cvs
+++ /dev/null
@@ -1,8 +0,0 @@
-default: all
-
-all:
-	aclocal
-	autoheader
-	automake
-	autoconf
-
diff --git a/tools/mhmake/bison++.exe b/tools/mhmake/bison++.exe
deleted file mode 100644
index a8d48fcfe..000000000
--- a/tools/mhmake/bison++.exe
+++ /dev/null
diff --git a/tools/mhmake/bison.exe b/tools/mhmake/bison.exe
new file mode 100644
index 000000000..a56f1cb36
--- /dev/null
+++ b/tools/mhmake/bison.exe
diff --git a/tools/mhmake/config.sub b/tools/mhmake/config.sub
deleted file mode 100644
index 1dea9b79d..000000000
--- a/tools/mhmake/config.sub
+++ /dev/null
@@ -1,1470 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-09-05'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39 | mipstx39el \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto*)
-		os=-nto-qnx
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/tools/mhmake/configure.in b/tools/mhmake/configure.in
deleted file mode 100644
index ca6a5389b..000000000
--- a/tools/mhmake/configure.in
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_INIT(configure.in)
-
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mhmake, 0.1)
-
-AC_ARG_ENABLE(debug,
-[  --enable-debug    Turn on debugging],
-[case "${enableval}" in
-  yes) debug=true ;;
-  full) debug=true ;;
-  no)  debug=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-esac],[debug=false])
-AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
-
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AC_PROG_CC
-
-AC_OUTPUT(Makefile src/Makefile)
diff --git a/tools/mhmake/depcomp b/tools/mhmake/depcomp
deleted file mode 100644
index 4c20c6c94..000000000
--- a/tools/mhmake/depcomp
+++ /dev/null
@@ -1,441 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-
-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-   if test "$libtool" = yes; then
-      "$@" -Wc,-MD
-   else
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/tools/mhmake/install-sh b/tools/mhmake/install-sh
deleted file mode 100644
index 36f96f3e0..000000000
--- a/tools/mhmake/install-sh
+++ /dev/null
@@ -1,276 +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 "$0: no input file specified" >&2
-	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" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		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 couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $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 remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
-	else
-		:
-	fi
-} &&
-
-# Now rename the file to the real destination.
-
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-	(exit 0); exit
-}
diff --git a/tools/mhmake/libiconv2.dll b/tools/mhmake/libiconv2.dll
new file mode 100644
index 000000000..544dd92f5
--- /dev/null
+++ b/tools/mhmake/libiconv2.dll
diff --git a/tools/mhmake/libintl3.dll b/tools/mhmake/libintl3.dll
new file mode 100644
index 000000000..ec11e6b19
--- /dev/null
+++ b/tools/mhmake/libintl3.dll
diff --git a/tools/mhmake/ltmain.sh b/tools/mhmake/ltmain.sh
deleted file mode 100644
index b36e997fe..000000000
--- a/tools/mhmake/ltmain.sh
+++ /dev/null
@@ -1,6343 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5a
-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
-  ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS=" 	"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-win32_libid () {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*) 
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-# End of Shell function definitions
-#####################################
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
-    done
-    exit 0
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit 0
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_output=
-    arg_mode=normal
-    libobj=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit 1
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static)
-	  build_old_libs=yes
-	  continue
-	  ;;
-
-	-prefer-pic)
-	  pic_mode=yes
-	  continue
-	  ;;
-
-	-prefer-non-pic)
-	  pic_mode=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-      $echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit 0
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    add_flags=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      base_compile="$base_compile $arg"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit 1
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit 1
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit 1
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-freebsd*-gnu*)
-	    # prevent being parsed by the freebsd regexp below
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-freebsd*-gnu*)
-	   # prevent being parsed by the freebsd regexp below
-	   ;;
-	 *-*-openbsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	add_flags="$add_flags $arg"
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit 1
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit 1
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	add_flags="$add_flags $arg"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  if test "$pass" = conv && test "$allow_undefined" = yes; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    #echo "Adding $deplib to \$deplibs"
-	    deplibs="$deplib $deplibs"
-            if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-            fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi # $pass = conv
-
-    
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-    
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"    
-      fi	  
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      eval cmds=\"$extract_expsyms_cmds\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against it, someone
-		    # is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi 
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
-		    [\\/]*)
-		      add_dir="-L$inst_prefix_dir$libdir $add_dir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
-		  [\\/]*)
-		    add_dir="-L$inst_prefix_dir$libdir $add_dir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  #if test -n "$dependency_libs" &&
-	  #   { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-	  #     test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  #fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    # Sure, some shells/systems don't implement the -ef.
-		    # Those will have to live with the warning.
-		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
-		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs, but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		   fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		    path=""
-		  fi
-		  ;;
-		*)
-		path="-L$path"
-		;;
-		esac 
-		
-		;;
-		  -l*)
-		case $host in
-		*-*-darwin*)
-		 # Again, we only want to link against shared libraries
-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		 for tmp in $newlib_search_path ; do
-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
-		       break
-		     fi  
-         done
-         path=""
-		  ;;
-		*) continue ;;
-		esac  		  
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-	
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-freebsd*-gnu*)
-	    # Prevent $arg from being parsed by the freebsd regexp below.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    eval cmds=\"$export_symbols_cmds\"
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*) 
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs" 
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Add all flags from the command line.  We here create a library,
-	# but those flags were only added to compile_command and
-	# finalize_command, which are only used when creating executables.
-	# So do it by hand here.
-	compiler_flags="$compiler_flags $add_flags"
-	# Only add it to commands which use CC, instead of LD, i.e.
-	# only to $compiler_flags
-	#linker_flags="$linker_flags $add_flags"
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval cmds=\"$module_expsym_cmds\"
-	  else
-	    eval cmds=\"$module_cmds\"
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval cmds=\"$archive_expsym_cmds\"
-	else
-	  eval cmds=\"$archive_cmds\"
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadale object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval cmds=\"$archive_expsym_cmds\"
-	  else
-	    eval cmds=\"$archive_cmds\"
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      eval cmds=\"$reload_cmds\"
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit 0
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit 0
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	eval cmds=\"$reload_cmds\"
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
-      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
-      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
-      # This does not apply on AIX for ia64, which uses a SysV linker.
-      case "$host" in
-        ia64-*-aix5*) ;;
-        *-*-aix4* | *-*-aix5*)
-                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
-                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
-      esac
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit 0
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-   
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-  
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char * 
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char * 
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat) 
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode, 
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit 0
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      compiler_flags="$compiler_flags $add_flags"
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
-      else
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done  
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi  
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-        relink_command=
-      fi  
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit 1
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  eval cmds=\"$postinstall_cmds\"
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit 0
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-	      else
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      eval cmds=\"$old_postinstall_cmds\"
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 --finish$current_libdirs'
-    else
-      exit 0
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  eval cmds=\"$finish_cmds\"
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    exit 0
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      eval cmds=\"$postuninstall_cmds\"
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe) 
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit 1
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit 0
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit 0
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/tools/mhmake/makebison.bat b/tools/mhmake/makebison.bat
index 9d46f535a..fa23090e5 100644
--- a/tools/mhmake/makebison.bat
+++ b/tools/mhmake/makebison.bat
@@ -1,4 +1,10 @@
 @echo off

-"bison++" -d -Ssrc/bison.cc -Hsrc/bison.h -h%1/mhmakeparser.h -o%1/mhmakeparser.cpp src\mhmakeParser.y

+setlocal

+

+set M4=.\m4.exe

+set BISON_PKGDATADIR=src/bisondata

+

+bison -d -ra -Ssrc/bisondata/lalr1.cc -o%1/mhmakeparser.cpp src\mhmakeParser.y

 python addstdafxh.py %1\mhmakeparser.cpp

 

+endlocal

diff --git a/tools/mhmake/mhmake.kdevelop b/tools/mhmake/mhmake.kdevelop
deleted file mode 100644
index 003b7032d..000000000
--- a/tools/mhmake/mhmake.kdevelop
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>marha</author>
-    <email>marc@hc-consult.be</email>
-    <version>1.1.12</version>
-    <projectmanagement>KDevAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>C++</keyword>
-      <keyword>Code</keyword>
-    </keywords>
-    <versioncontrol>kdevsubversion</versioncontrol>
-    <ignoreparts/>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <projectname>mhmake</projectname>
-  </general>
-  <kdevautoproject>
-    <general>
-      <activetarget>src/mhmake</activetarget>
-      <useconfiguration>debug</useconfiguration>
-    </general>
-    <run>
-      <mainprogram>/usr/local/bin/mhmake_dbg</mainprogram>
-      <terminal>false</terminal>
-      <directoryradio>custom</directoryradio>
-      <customdirectory>~/cm/tldtp/softdtp/common/</customdirectory>
-      <programargs/>
-      <autocompile>false</autocompile>
-      <envvars>
-        <envvar value="linux" name="BASEAUTOMAK" />
-        <envvar value="LINESIM" name="CONFIG" />
-        <envvar value="~/cm" name="MHMAKECONF" />
-        <envvar value="/bin/bash" name="SHELL" />
-      </envvars>
-    </run>
-    <configurations>
-      <optimized>
-        <builddir>release</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
-        <cxxflags>-O2 -g0</cxxflags>
-        <envvars/>
-        <configargs/>
-        <topsourcedir/>
-        <cppflags>-I. </cppflags>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cflags/>
-        <f77flags/>
-      </optimized>
-      <debug>
-        <configargs>--enable-debug=full</configargs>
-        <builddir>debug</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
-        <cxxflags>-O0 -g3</cxxflags>
-        <envvars/>
-        <topsourcedir/>
-        <cppflags>-I. -D_DEBUG</cppflags>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cflags/>
-        <f77flags/>
-      </debug>
-    </configurations>
-    <make>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-      <abortonerror>true</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-    </make>
-  </kdevautoproject>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.h" name="Header files" />
-      <group pattern="*.cpp;*.c;*.cc" name="Source files" />
-      <group pattern="*.l" name="Lex Files" />
-      <group pattern="*.y" name="Bison Files" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <showvcsfields>false</showvcsfields>
-    </tree>
-  </kdevfileview>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>mhmake.tag</docurl>
-      <usermanualurl/>
-    </projectdoc>
-  </kdevdocumentation>
-  <substmap>
-    <APPNAME>mhmake</APPNAME>
-    <APPNAMELC>mhmake</APPNAMELC>
-    <APPNAMESC>Mhmake</APPNAMESC>
-    <APPNAMEUC>MHMAKE</APPNAMEUC>
-    <AUTHOR>marha</AUTHOR>
-    <EMAIL>marc@hc-consult.be</EMAIL>
-    <LICENSE>Custom</LICENSE>
-    <VERSION>0.1</VERSION>
-    <YEAR>2006</YEAR>
-  </substmap>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevcppsupport>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
-      <completionBoxItemOrder>0</completionBoxItemOrder>
-      <howEvaluationContextMenu>true</howEvaluationContextMenu>
-      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
-      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
-      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
-      <processPrimaryTypes>true</processPrimaryTypes>
-      <processFunctionArguments>false</processFunctionArguments>
-      <preProcessAllHeaders>false</preProcessAllHeaders>
-      <parseMissingHeaders>false</parseMissingHeaders>
-      <resolveIncludePaths>true</resolveIncludePaths>
-      <alwaysParseInBackground>true</alwaysParseInBackground>
-      <usePermanentCaching>true</usePermanentCaching>
-      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
-      <includePaths>.;</includePaths>
-      <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
-      <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
-    </codecompletion>
-    <creategettersetter>
-      <prefixGet/>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>theValue</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <references/>
-    <qt>
-      <used>false</used>
-      <version>3</version>
-      <includestyle>3</includestyle>
-      <root></root>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake>/usr/bin/qmake-qt3</qmake>
-      <designer>/usr/bin/designer</designer>
-      <designerpluginpaths/>
-    </qt>
-  </kdevcppsupport>
-  <kdevdebugger>
-    <general>
-      <programargs/>
-      <gdbpath/>
-      <dbgshell>libtool</dbgshell>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-</kdevelop>
diff --git a/tools/mhmake/mhmake.vcxproj b/tools/mhmake/mhmake.vcxproj
index c5c548c77..913b03d63 100644
--- a/tools/mhmake/mhmake.vcxproj
+++ b/tools/mhmake/mhmake.vcxproj
@@ -193,7 +193,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <CallingConvention>FastCall</CallingConvention>

       <CompileAs>Default</CompileAs>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4267;4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -267,7 +267,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <CompileAs>Default</CompileAs>

-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4267;4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -366,6 +366,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <CallingConvention>FastCall</CallingConvention>

       <CompileAs>Default</CompileAs>

+      <DisableSpecificWarnings>4267;4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -412,14 +413,13 @@
     <ClInclude Include="src\commandqueue.h" />

     <ClInclude Include="src\curdir.h" />

     <ClInclude Include="src\fileinfo.h" />

+    <ClInclude Include="src\flexlexer.h" />

     <ClInclude Include="src\md5.h" />

     <ClInclude Include="src\mhmakefileparser.h" />

     <ClInclude Include="src\refptr.h" />

     <ClInclude Include="src\rule.h" />

     <ClInclude Include="src\stdafx.h" />

     <ClInclude Include="src\util.h" />

-    <ClInclude Include="$(OutDir)\mhmakeparser.h" />

-    <ClInclude Include="src\bison.h" />

   </ItemGroup>

   <ItemGroup>

     <CustomBuild Include="src\mhmakeLexer.l">

diff --git a/tools/mhmake/mhmake.vcxproj.filters b/tools/mhmake/mhmake.vcxproj.filters
index 72f6cf675..77d66e01c 100644
--- a/tools/mhmake/mhmake.vcxproj.filters
+++ b/tools/mhmake/mhmake.vcxproj.filters
@@ -56,11 +56,11 @@
     <ClCompile Include="src\util.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(OutDir)mhmakelexer.cpp">

-      <Filter>Parser Files\Auto</Filter>

+    <ClCompile Include="$(OutDir)\mhmakelexer.cpp">

+      <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="$(OutDir)mhmakeparser.cpp">

-      <Filter>Parser Files\Auto</Filter>

+    <ClCompile Include="$(OutDir)\mhmakeparser.cpp">

+      <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

@@ -91,10 +91,7 @@
     <ClInclude Include="src\util.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\bison.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="$(OutDir)\mhmakeparser.h">

+    <ClInclude Include="src\flexlexer.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

diff --git a/tools/mhmake/missing b/tools/mhmake/missing
deleted file mode 100644
index 6a37006e8..000000000
--- a/tools/mhmake/missing
+++ /dev/null
@@ -1,336 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/tools/mhmake/readme.txt b/tools/mhmake/readme.txt
index bee2372e0..4c0f3558d 100644
--- a/tools/mhmake/readme.txt
+++ b/tools/mhmake/readme.txt
@@ -15,12 +15,13 @@ Release.
   process will be faster. mhmake.exe is more likely to crash when badly

   written makefiles are passed as input.

 

-To build with kdevelop3 on linux

-- Open mhmake.kdevelop and build configurations Debug and Optimized

-- run 'make install' in the deubg and release directories (as root)

-

 To build with kdevelop4 on linux

 - run genkdev4.sh

+

+- run 'make' and 'make install' in the build and build.dbg directories

+

+or

+

 - open mhmake.kdev4 and build configuration build and build.dbg

 - run 'make install' in the build and build.dbg directories (as root)

 

diff --git a/tools/mhmake/src/bison.cc b/tools/mhmake/src/bison.cc
deleted file mode 100644
index 5a203f719..000000000
--- a/tools/mhmake/src/bison.cc
+++ /dev/null
@@ -1,1025 +0,0 @@
-/*  This file is part of mhmake.

- *

- *  Copyright (C) 2001-2010 marha@sourceforge.net

- *

- *  Mhmake is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  (at your option) any later version.

- *

- *  Mhmake is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with Mhmake.  If not, see <http://www.gnu.org/licenses/>.

-*/

-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */

-/* Skeleton output parser for bison,

-   Copyright (C) 1984, 1989, 1990 Bob Corbett and Richard Stallman

-

-   This program is free software; you can redistribute it and/or modify

-   it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 1, or (at your option)

-   any later version.

-

-   This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-   GNU General Public License for more details.

-

-   You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software

-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */

-

-/* HEADER SECTION */

-#if defined( _MSDOS ) || defined(MSDOS) || defined(__MSDOS__)

-#define __MSDOS_AND_ALIKE

-#endif

-#if defined(_WINDOWS) && defined(_MSC_VER)

-#define __HAVE_NO_ALLOCA

-#define __MSDOS_AND_ALIKE

-#endif

-

-#ifndef alloca

-#if defined( __GNUC__)

-#define alloca __builtin_alloca

-

-#elif (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc)  || defined (__sgi)

-#include <alloca.h>

-

-#elif defined (__MSDOS_AND_ALIKE)

-#include <malloc.h>

-#ifndef __TURBOC__

-/* MS C runtime lib */

-#define alloca _alloca

-#endif

-

-#elif defined(_AIX)

-#include <malloc.h>

-#pragma alloca

-

-#elif defined(__hpux)

-#ifdef __cplusplus

-extern "C" {

-void *alloca (unsigned int);

-};

-#else /* not __cplusplus */

-void *alloca ();

-#endif /* not __cplusplus */

-

-#endif /* not _AIX  not MSDOS, or __TURBOC__ or _AIX, not sparc.  */

-#endif /* alloca not defined.  */

-#ifdef c_plusplus

-#ifndef __cplusplus

-#define __cplusplus

-#endif

-#endif

-#ifdef __cplusplus

-#ifndef YY_USE_CLASS

-#define YY_USE_CLASS

-#endif

-#else

-#ifndef __STDC__

-#define const

-#endif

-#endif

-#include <stdio.h>

-#define YYBISON 1

-$/* %{ and %header{ and %union, during decl */

-#define YY_@_BISON 1

-#ifndef YY_@_COMPATIBILITY

-#ifndef YY_USE_CLASS

-#define  YY_@_COMPATIBILITY 1

-#else

-#define  YY_@_COMPATIBILITY 0

-#endif

-#endif

-

-#if YY_@_COMPATIBILITY != 0

-/* backward compatibility */

-#ifdef YYLTYPE

-#ifndef YY_@_LTYPE

-#define YY_@_LTYPE YYLTYPE

-#endif

-#endif

-#ifdef YYSTYPE

-#ifndef YY_@_STYPE

-#define YY_@_STYPE YYSTYPE

-#endif

-#endif

-#ifdef YYDEBUG

-#ifndef YY_@_DEBUG

-#define  YY_@_DEBUG YYDEBUG

-#endif

-#endif

-#ifdef YY_@_STYPE

-#ifndef yystype

-#define yystype YY_@_STYPE

-#endif

-#endif

-/* use goto to be compatible */

-#ifndef YY_@_USE_GOTO

-#define YY_@_USE_GOTO 1

-#endif

-#endif

-

-/* use no goto to be clean in C++ */

-#ifndef YY_@_USE_GOTO

-#define YY_@_USE_GOTO 0

-#endif

-

-#ifndef YY_@_PURE

-$/*  YY_@_PURE */

-#endif

-

-/* section apres lecture def, avant lecture grammaire S2 */

-$/* prefix */

-#ifndef YY_@_DEBUG

-$/* YY_@_DEBUG */

-#endif

-

-

-#ifndef YY_@_LSP_NEEDED

-$ /* YY_@_LSP_NEEDED*/

-#endif

-

-

-

-/* DEFAULT LTYPE*/

-#ifdef YY_@_LSP_NEEDED

-#ifndef YY_@_LTYPE

-typedef struct yyltype

-{

-  int timestamp;

-  int first_line;

-  int first_column;

-  int last_line;

-  int last_column;

-  char *text;

-}

-yyltype;

-

-#define YY_@_LTYPE yyltype

-#endif

-#endif

-/* DEFAULT STYPE*/

-      /* We used to use `unsigned long' as YY_@_STYPE on MSDOS,

-   but it seems better to be consistent.

-   Most programs should declare their own type anyway.  */

-

-#ifndef YY_@_STYPE

-#define YY_@_STYPE int

-#endif

-/* DEFAULT MISCELANEOUS */

-#ifndef YY_@_PARSE

-#define YY_@_PARSE yyparse

-#endif

-#ifndef YY_@_LEX

-#define YY_@_LEX yylex

-#endif

-#ifndef YY_@_LVAL

-#define YY_@_LVAL yylval

-#endif

-#ifndef YY_@_LLOC

-#define YY_@_LLOC yylloc

-#endif

-#ifndef YY_@_CHAR

-#define YY_@_CHAR yychar

-#endif

-#ifndef YY_@_NERRS

-#define YY_@_NERRS yynerrs

-#endif

-#ifndef YY_@_DEBUG_FLAG

-#define YY_@_DEBUG_FLAG yydebug

-#endif

-#ifndef YY_@_ERROR

-#define YY_@_ERROR yyerror

-#endif

-#ifndef YY_@_PARSE_PARAM

-#ifndef __STDC__

-#ifndef __cplusplus

-#ifndef YY_USE_CLASS

-#define YY_@_PARSE_PARAM

-#ifndef YY_@_PARSE_PARAM_DEF

-#define YY_@_PARSE_PARAM_DEF

-#endif

-#endif

-#endif

-#endif

-#ifndef YY_@_PARSE_PARAM

-#define YY_@_PARSE_PARAM void

-#endif

-#endif

-#if YY_@_COMPATIBILITY != 0

-/* backward compatibility */

-#ifdef YY_@_LTYPE

-#ifndef YYLTYPE

-#define YYLTYPE YY_@_LTYPE

-#else

-/* WARNING obsolete !!! user defined YYLTYPE not reported into generated header */

-#endif

-#endif

-#ifndef YYSTYPE

-#define YYSTYPE YY_@_STYPE

-#else

-/* WARNING obsolete !!! user defined YYSTYPE not reported into generated header */

-#endif

-#ifdef YY_@_PURE

-#ifndef YYPURE

-#define YYPURE YY_@_PURE

-#endif

-#endif

-#ifdef YY_@_DEBUG

-#ifndef YYDEBUG

-#define YYDEBUG YY_@_DEBUG

-#endif

-#endif

-#ifndef YY_@_ERROR_VERBOSE

-#ifdef YYERROR_VERBOSE

-#define YY_@_ERROR_VERBOSE YYERROR_VERBOSE

-#endif

-#endif

-#ifndef YY_@_LSP_NEEDED

-#ifdef YYLSP_NEEDED

-#define YY_@_LSP_NEEDED YYLSP_NEEDED

-#endif

-#endif

-#endif

-#ifndef YY_USE_CLASS

-/* TOKEN C */

-$ /* #defines tokens */

-#else

-/* CLASS */

-#ifndef YY_@_CLASS

-#define YY_@_CLASS @

-#endif

-#ifndef YY_@_INHERIT

-#define YY_@_INHERIT

-#endif

-#ifndef YY_@_MEMBERS

-#define YY_@_MEMBERS

-#endif

-#ifndef YY_@_LEX_BODY

-#define YY_@_LEX_BODY

-#endif

-#ifndef YY_@_ERROR_BODY

-#define YY_@_ERROR_BODY

-#endif

-#ifndef YY_@_CONSTRUCTOR_PARAM

-#define YY_@_CONSTRUCTOR_PARAM

-#endif

-#ifndef YY_@_CONSTRUCTOR_CODE

-#define YY_@_CONSTRUCTOR_CODE

-#endif

-#ifndef YY_@_CONSTRUCTOR_INIT

-#define YY_@_CONSTRUCTOR_INIT

-#endif

-/* choose between enum and const */

-#ifndef YY_@_USE_CONST_TOKEN

-#define YY_@_USE_CONST_TOKEN 0

-/* yes enum is more compatible with flex,  */

-/* so by default we use it */

-#endif

-#if YY_@_USE_CONST_TOKEN != 0

-#ifndef YY_@_ENUM_TOKEN

-#define YY_@_ENUM_TOKEN yy_@_enum_token

-#endif

-#endif

-

-class YY_@_CLASS YY_@_INHERIT

-{

-public:

-#if YY_@_USE_CONST_TOKEN != 0

-/* static const int token ... */

-$ /* decl const */

-#else

-enum YY_@_ENUM_TOKEN { YY_@_NULL_TOKEN=0

-$ /* enum token */

-     }; /* end of enum declaration */

-#endif

-public:

- int YY_@_PARSE (YY_@_PARSE_PARAM);

-#ifdef YY_@_PURE

-#else

-#ifdef YY_@_LSP_NEEDED

- YY_@_LTYPE YY_@_LLOC;

-#endif

- int   YY_@_NERRS;

- int    YY_@_CHAR;

-#endif

-#if YY_@_DEBUG != 0

- int YY_@_DEBUG_FLAG;   /*  nonzero means print parse trace     */

-#endif

-public:

- YY_@_CLASS(YY_@_CONSTRUCTOR_PARAM);

-public:

- YY_@_MEMBERS

-};

-/* other declare folow */

-#if YY_@_USE_CONST_TOKEN != 0

-$ /* const YY_@_CLASS::token */

-#endif

-/*apres const  */

-YY_@_CLASS::YY_@_CLASS(YY_@_CONSTRUCTOR_PARAM) YY_@_CONSTRUCTOR_INIT

-{

-#if YY_@_DEBUG != 0

-YY_@_DEBUG_FLAG=0;

-#endif

-YY_@_CONSTRUCTOR_CODE;

-};

-#endif

-$ /* fattrs + tables */

-

-/* parser code folow  */

-

-

-/* This is the parser code that is written into each bison parser

-  when the %semantic_parser declaration is not specified in the grammar.

-  It was written by Richard Stallman by simplifying the hairy parser

-  used when %semantic_parser is specified.  */

-

-/* Note: dollar marks section change

-   the next  is replaced by the list of actions, each action

-   as one case of the switch.  */

-

-#if YY_@_USE_GOTO != 0

-/*

- SUPRESSION OF GOTO : on some C++ compiler (sun c++)

-  the goto is strictly forbidden if any constructor/destructor

-  is used in the whole function (very stupid isn't it ?)

- so goto are to be replaced with a 'while/switch/case construct'

- here are the macro to keep some apparent compatibility

-*/

-#define YYGOTO(lb) {yy_gotostate=lb;continue;}

-#define YYBEGINGOTO  enum yy_labels yy_gotostate=yygotostart; \

-                     for(;;) switch(yy_gotostate) { case yygotostart: {

-#define YYLABEL(lb) } case lb: {

-#define YYENDGOTO } }

-#define YYBEGINDECLARELABEL enum yy_labels {yygotostart

-#define YYDECLARELABEL(lb) ,lb

-#define YYENDDECLARELABEL  };

-#else

-/* macro to keep goto */

-#define YYGOTO(lb) goto lb

-#define YYBEGINGOTO

-#define YYLABEL(lb) lb:

-#define YYENDGOTO

-#define YYBEGINDECLARELABEL

-#define YYDECLARELABEL(lb)

-#define YYENDDECLARELABEL

-#endif

-/* LABEL DECLARATION */

-YYBEGINDECLARELABEL

-  YYDECLARELABEL(yynewstate)

-  YYDECLARELABEL(yybackup)

-/* YYDECLARELABEL(yyresume) */

-  YYDECLARELABEL(yydefault)

-  YYDECLARELABEL(yyreduce)

-  YYDECLARELABEL(yyerrlab)   /* here on detecting error */

-  YYDECLARELABEL(yyerrlab1)   /* here on error raised explicitly by an action */

-  YYDECLARELABEL(yyerrdefault)  /* current state does not do anything special for the error token. */

-  YYDECLARELABEL(yyerrpop)   /* pop the current state because it cannot handle the error token */

-  YYDECLARELABEL(yyerrhandle)

-YYENDDECLARELABEL

-/* ALLOCA SIMULATION */

-/* __HAVE_NO_ALLOCA */

-#ifdef __HAVE_NO_ALLOCA

-int __alloca_free_ptr(char *ptr,char *ref)

-{if(ptr!=ref) free(ptr);

- return 0;}

-

-#define __ALLOCA_alloca(size) malloc(size)

-#define __ALLOCA_free(ptr,ref) __alloca_free_ptr((char *)ptr,(char *)ref)

-

-#ifdef YY_@_LSP_NEEDED

-#define __ALLOCA_return(num) \

-            return( __ALLOCA_free(yyss,yyssa)+\

-        __ALLOCA_free(yyvs,yyvsa)+\

-        __ALLOCA_free(yyls,yylsa)+\

-       (num))

-#else

-#define __ALLOCA_return(num) \

-            return( __ALLOCA_free(yyss,yyssa)+\

-        __ALLOCA_free(yyvs,yyvsa)+\

-       (num))

-#endif

-#else

-#define __ALLOCA_return(num) return(num)

-#define __ALLOCA_alloca(size) alloca(size)

-#define __ALLOCA_free(ptr,ref)

-#endif

-

-/* ENDALLOCA SIMULATION */

-

-#define yyerrok         (yyerrstatus = 0)

-#define yyclearin       (YY_@_CHAR = YYEMPTY)

-#define YYEMPTY         -2

-#define YYEOF           0

-#define YYACCEPT        __ALLOCA_return(0)

-#define YYABORT         __ALLOCA_return(1)

-#define YYERROR         YYGOTO(yyerrlab1)

-/* Like YYERROR except do call yyerror.

-   This remains here temporarily to ease the

-   transition to the new meaning of YYERROR, for GCC.

-   Once GCC version 2 has supplanted version 1, this can go.  */

-#define YYFAIL          YYGOTO(yyerrlab)

-#define YYRECOVERING()  (!!yyerrstatus)

-#define YYBACKUP(token, value) \

-do\

-  if (YY_@_CHAR == YYEMPTY && yylen == 1)\

-  {\

-    YY_@_CHAR = (token), YY_@_LVAL = (value);\

-    yychar1 = YYTRANSLATE (YY_@_CHAR);\

-    YYPOPSTACK;\

-    YYGOTO(yybackup);\

-  }\

-  else\

-    {\

-      YY_@_ERROR ("syntax error: cannot back up"); YYERROR;\

-    }\

-while (0)

-

-#define YYTERROR        1

-#define YYERRCODE       256

-

-#ifndef YY_@_PURE

-/* UNPURE */

-#define YYLEX           YY_@_LEX()

-#ifndef YY_USE_CLASS

-/* If nonreentrant, and not class , generate the variables here */

-int     YY_@_CHAR;                      /*  the lookahead symbol        */

-        /*  lookahead symbol    */

-int YY_@_NERRS;                 /*  number of parse errors so far */

-#ifdef YY_@_LSP_NEEDED

-YY_@_LTYPE YY_@_LLOC;   /*  location data for the lookahead     */

-      /*  symbol                              */

-#endif

-#endif

-

-

-#else

-/* PURE */

-#ifdef YY_@_LSP_NEEDED

-#define YYLEX           YY_@_LEX(&YY_@_LVAL, &YY_@_LLOC)

-#else

-#define YYLEX           YY_@_LEX(&YY_@_LVAL)

-#endif

-#endif

-#ifndef YY_USE_CLASS

-#if YY_@_DEBUG != 0

-int YY_@_DEBUG_FLAG;                    /*  nonzero means print parse trace     */

-/* Since this is uninitialized, it does not stop multiple parsers

-   from coexisting.  */

-#endif

-#endif

-

-

-

-/*  YYINITDEPTH indicates the initial size of the parser's stacks       */

-

-#ifndef YYINITDEPTH

-#define YYINITDEPTH 200

-#endif

-

-/*  YYMAXDEPTH is the maximum size the stacks can grow to

-    (effective only if the built-in stack extension method is used).  */

-

-#if YYMAXDEPTH == 0

-#undef YYMAXDEPTH

-#endif

-

-#ifndef YYMAXDEPTH

-#define YYMAXDEPTH 10000

-#endif

-

-

-#if __GNUC__ > 1                /* GNU C and GNU C++ define this. */

-#define __yy_bcopy(FROM,TO,COUNT)       __builtin_memcpy(TO,FROM,COUNT)

-#else                           /* not GNU C or C++ */

-

-/* This is the most reliable way to avoid incompatibilities

-   in available built-in functions on various systems.  */

-

-#ifdef __cplusplus

-static void __yy_bcopy (char *from, char *to, size_t count)

-#else

-#ifdef __STDC__

-static void __yy_bcopy (char *from, char *to, int count)

-#else

-static void __yy_bcopy (from, to, count)

-     char *from;

-     char *to;

-     int count;

-#endif

-#endif

-{

-  register char *f = from;

-  register char *t = to;

-  register size_t i = count;

-

-  while (i-- > 0)

-    *t++ = *f++;

-}

-#endif

-

-int

-#ifdef YY_USE_CLASS

- YY_@_CLASS::

-#endif

-     YY_@_PARSE(YY_@_PARSE_PARAM)

-#ifndef __STDC__

-#ifndef __cplusplus

-#ifndef YY_USE_CLASS

-/* parameter definition without protypes */

-YY_@_PARSE_PARAM_DEF

-#endif

-#endif

-#endif

-{

-  register int yystate;

-  register int yyn;

-  register short *yyssp;

-  register YY_@_STYPE *yyvsp;

-  int yyerrstatus;      /*  number of tokens to shift before error messages enabled */

-  int yychar1=0;          /*  lookahead token as an internal (translated) token number */

-

-  short yyssa[YYINITDEPTH];     /*  the state stack                     */

-  YY_@_STYPE yyvsa[YYINITDEPTH];        /*  the semantic value stack            */

-

-  short *yyss = yyssa;          /*  refer to the stacks thru separate pointers */

-  YY_@_STYPE *yyvs = yyvsa;     /*  to allow yyoverflow to reallocate them elsewhere */

-

-#ifdef YY_@_LSP_NEEDED

-  YY_@_LTYPE yylsa[YYINITDEPTH];        /*  the location stack                  */

-  YY_@_LTYPE *yyls = yylsa;

-  YY_@_LTYPE *yylsp;

-

-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)

-#else

-#define YYPOPSTACK   (yyvsp--, yyssp--)

-#endif

-

-  int yystacksize = YYINITDEPTH;

-

-#ifdef YY_@_PURE

-  int YY_@_CHAR;

-  YY_@_STYPE YY_@_LVAL;

-  int YY_@_NERRS;

-#ifdef YY_@_LSP_NEEDED

-  YY_@_LTYPE YY_@_LLOC;

-#endif

-#endif

-

-  YY_@_STYPE yyval;             /*  the variable used to return         */

-        /*  semantic values from the action     */

-        /*  routines                            */

-

-  int yylen;

-/* start loop, in which YYGOTO may be used. */

-YYBEGINGOTO

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-    fprintf(stderr, "Starting parse\n");

-#endif

-  yystate = 0;

-  yyerrstatus = 0;

-  YY_@_NERRS = 0;

-  YY_@_CHAR = YYEMPTY;          /* Cause a token to be read.  */

-

-  /* Initialize stack pointers.

-     Waste one element of value and location stack

-     so that they stay on the same level as the state stack.

-     The wasted elements are never initialized.  */

-

-  yyssp = yyss - 1;

-  yyvsp = yyvs;

-#ifdef YY_@_LSP_NEEDED

-  yylsp = yyls;

-#endif

-

-/* Push a new state, which is found in  yystate  .  */

-/* In all cases, when you get here, the value and location stacks

-   have just been pushed. so pushing a state here evens the stacks.  */

-YYLABEL(yynewstate)

-

-  *++yyssp = yystate;

-

-  if (yyssp >= yyss + yystacksize - 1)

-  {

-    /* Give user a chance to reallocate the stack */

-    /* Use copies of these so that the &'s don't force the real ones into memory. */

-    YY_@_STYPE *yyvs1 = yyvs;

-    short *yyss1 = yyss;

-#ifdef YY_@_LSP_NEEDED

-    YY_@_LTYPE *yyls1 = yyls;

-#endif

-

-    /* Get the current used size of the three stacks, in elements.  */

-    size_t size = yyssp - yyss + 1;

-

-#ifdef yyoverflow

-      /* Each stack pointer address is followed by the size of

-    the data in use in that stack, in bytes.  */

-#ifdef YY_@_LSP_NEEDED

-      /* This used to be a conditional around just the two extra args,

-    but that might be undefined if yyoverflow is a macro.  */

-    yyoverflow("parser stack overflow",

-      &yyss1, size * sizeof (*yyssp),

-      &yyvs1, size * sizeof (*yyvsp),

-      &yyls1, size * sizeof (*yylsp),

-      &yystacksize);

-#else

-    yyoverflow("parser stack overflow",

-      &yyss1, size * sizeof (*yyssp),

-      &yyvs1, size * sizeof (*yyvsp),

-      &yystacksize);

-#endif

-

-    yyss = yyss1; yyvs = yyvs1;

-#ifdef YY_@_LSP_NEEDED

-    yyls = yyls1;

-#endif

-#else /* no yyoverflow */

-    /* Extend the stack our own way.  */

-    if (yystacksize >= YYMAXDEPTH)

-    {

-      YY_@_ERROR("parser stack overflow");

-      __ALLOCA_return(2);

-    }

-    yystacksize *= 2;

-    if (yystacksize > YYMAXDEPTH)

-      yystacksize = YYMAXDEPTH;

-    yyss = (short *) __ALLOCA_alloca (yystacksize * sizeof (*yyssp));

-    __yy_bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));

-    __ALLOCA_free(yyss1,yyssa);

-    yyvs = (YY_@_STYPE *) __ALLOCA_alloca (yystacksize * sizeof (*yyvsp));

-    __yy_bcopy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));

-    __ALLOCA_free(yyvs1,yyvsa);

-#ifdef YY_@_LSP_NEEDED

-    yyls = (YY_@_LTYPE *) __ALLOCA_alloca (yystacksize * sizeof (*yylsp));

-    __yy_bcopy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));

-    __ALLOCA_free(yyls1,yylsa);

-#endif

-#endif /* no yyoverflow */

-

-    yyssp = yyss + size - 1;

-    yyvsp = yyvs + size - 1;

-#ifdef YY_@_LSP_NEEDED

-    yylsp = yyls + size - 1;

-#endif

-

-#if YY_@_DEBUG != 0

-    if (YY_@_DEBUG_FLAG)

-      fprintf(stderr, "Stack size increased to %d\n", yystacksize);

-#endif

-

-     if (yyssp >= yyss + yystacksize - 1)

-       YYABORT;

-  }

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-    fprintf(stderr, "Entering state %d\n", yystate);

-#endif

-

-  YYGOTO(yybackup);

-YYLABEL(yybackup)

-

-/* Do appropriate processing given the current state.  */

-/* Read a lookahead token if we need one and don't already have one.  */

-/* YYLABEL(yyresume) */

-

-  /* First try to decide what to do without reference to lookahead token.  */

-

-  yyn = yypact[yystate];

-  if (yyn == YYFLAG)

-    YYGOTO(yydefault);

-

-  /* Not known => get a lookahead token if don't already have one.  */

-

-  /* yychar is either YYEMPTY or YYEOF

-     or a valid token in external form.  */

-

-  if (YY_@_CHAR == YYEMPTY)

-  {

-#if YY_@_DEBUG != 0

-    if (YY_@_DEBUG_FLAG)

-      fprintf(stderr, "Reading a token: ");

-#endif

-    YY_@_CHAR = YYLEX;

-  }

-

-  /* Convert token to internal form (in yychar1) for indexing tables with */

-

-  if (YY_@_CHAR <= 0)           /* This means end of input. */

-  {

-    yychar1 = 0;

-    YY_@_CHAR = YYEOF;                /* Don't call YYLEX any more */

-

-#if YY_@_DEBUG != 0

-    if (YY_@_DEBUG_FLAG)

-      fprintf(stderr, "Now at end of input.\n");

-#endif

-  }

-  else

-  {

-    yychar1 = YYTRANSLATE(YY_@_CHAR);

-

-#if YY_@_DEBUG != 0

-    if (YY_@_DEBUG_FLAG)

-    {

-      fprintf (stderr, "Next token is %d (%s", YY_@_CHAR, yytname[yychar1]);

-      /* Give the individual parser a way to print the precise meaning

-         of a token, for further debugging info.  */

-#ifdef YYPRINT

-      YYPRINT (stderr, YY_@_CHAR, YY_@_LVAL);

-#endif

-      fprintf (stderr, ")\n");

-    }

-#endif

-  }

-

-  yyn += yychar1;

-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)

-    YYGOTO(yydefault);

-

-  yyn = yytable[yyn];

-

-  /* yyn is what to do for this token type in this state.

-     Negative => reduce, -yyn is rule number.

-     Positive => shift, yyn is new state.

-       New state is final state => don't bother to shift,

-       just return success.

-     0, or most negative number => error.  */

-

-  if (yyn < 0)

-  {

-    if (yyn == YYFLAG)

-      YYGOTO(yyerrlab);

-    yyn = -yyn;

-    YYGOTO(yyreduce);

-  }

-  else if (yyn == 0)

-    YYGOTO(yyerrlab);

-

-  if (yyn == YYFINAL)

-    YYACCEPT;

-

-  /* Shift the lookahead token.  */

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-    fprintf(stderr, "Shifting token %d (%s), ", YY_@_CHAR, yytname[yychar1]);

-#endif

-

-  /* Discard the token being shifted unless it is eof.  */

-  if (YY_@_CHAR != YYEOF)

-    YY_@_CHAR = YYEMPTY;

-

-  *++yyvsp = YY_@_LVAL;

-#ifdef YY_@_LSP_NEEDED

-  *++yylsp = YY_@_LLOC;

-#endif

-

-  /* count tokens shifted since error; after three, turn off error status.  */

-  if (yyerrstatus) yyerrstatus--;

-

-  yystate = yyn;

-  YYGOTO(yynewstate);

-

-/* Do the default action for the current state.  */

-YYLABEL(yydefault)

-

-  yyn = yydefact[yystate];

-  if (yyn == 0)

-    YYGOTO(yyerrlab);

-

-/* Do a reduction.  yyn is the number of a rule to reduce with.  */

-YYLABEL(yyreduce)

-  yylen = yyr2[yyn];

-  if (yylen > 0)

-    yyval = yyvsp[1-yylen]; /* implement default value of the action */

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-  {

-    int i;

-

-    fprintf (stderr, "Reducing via rule %d (line %d), ",

-       yyn, yyrline[yyn]);

-

-    /* Print the symbols being reduced, and their result.  */

-    for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)

-      fprintf (stderr, "%s ", yytname[yyrhs[i]]);

-    fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);

-  }

-#endif

-

-$   /* the action file gets copied in in place of this dollarsign  */

-  yyvsp -= yylen;

-  yyssp -= yylen;

-#ifdef YY_@_LSP_NEEDED

-  yylsp -= yylen;

-#endif

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-  {

-    short *ssp1 = yyss - 1;

-    fprintf (stderr, "state stack now");

-    while (ssp1 != yyssp)

-      fprintf (stderr, " %d", *++ssp1);

-      fprintf (stderr, "\n");

-    }

-#endif

-

-    *++yyvsp = yyval;

-

-#ifdef YY_@_LSP_NEEDED

-    yylsp++;

-    if (yylen == 0)

-    {

-      *yylsp= YY_@_LLOC;

-      //yylsp->first_line = YY_@_LLOC.first_line;

-      //yylsp->first_column = YY_@_LLOC.first_column;

-      //yylsp->last_line = (yylsp-1)->last_line;

-      //yylsp->last_column = (yylsp-1)->last_column;

-      //yylsp->text = 0;

-    }

-    else

-    {

-      *yylsp = *(yylsp+yylen-1);

-      //yylsp->last_line = (yylsp+yylen-1)->last_line;

-      //yylsp->last_column = (yylsp+yylen-1)->last_column;

-    }

-#endif

-

-  /* Now "shift" the result of the reduction.

-     Determine what state that goes to,

-     based on the state we popped back to

-     and the rule number reduced by.  */

-

-  yyn = yyr1[yyn];

-

-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;

-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)

-    yystate = yytable[yystate];

-  else

-    yystate = yydefgoto[yyn - YYNTBASE];

-

-  YYGOTO(yynewstate);

-

-YYLABEL(yyerrlab)   /* here on detecting error */

-

-  if (! yyerrstatus)

-    /* If not already recovering from an error, report this error.  */

-  {

-    ++YY_@_NERRS;

-

-#ifdef YY_@_ERROR_VERBOSE

-    yyn = yypact[yystate];

-

-    if (yyn > YYFLAG && yyn < YYLAST)

-    {

-      size_t size = 0;

-      char *msg;

-      int x, count;

-

-      count = 0;

-      /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */

-      for (x = (yyn < 0 ? -yyn : 0);

-        x < (sizeof(yytname) / sizeof(char *)); x++)

-      if (yycheck[x + yyn] == x)

-        size += strlen(yytname[x]) + 15, count++;

-      msg = (char *) malloc(size + 15);

-      if (msg != 0)

-      {

-        strcpy(msg, "parse error");

-

-        if (count < 5)

-        {

-          count = 0;

-          for (x = (yyn < 0 ? -yyn : 0);

-            x < (sizeof(yytname) / sizeof(char *)); x++)

-          if (yycheck[x + yyn] == x)

-          {

-            strcat(msg, count == 0 ? ", expecting `" : " or `");

-            strcat(msg, yytname[x]);

-            strcat(msg, "'");

-            count++;

-          }

-        }

-        YY_@_ERROR(msg);

-        free(msg);

-      }

-      else

-        YY_@_ERROR ("parse error; also virtual memory exceeded");

-    }

-    else

-#endif /* YY_@_ERROR_VERBOSE */

-      YY_@_ERROR("parse error");

-  }

-

-  YYGOTO(yyerrlab1);

-YYLABEL(yyerrlab1)   /* here on error raised explicitly by an action */

-

-  if (yyerrstatus == 3)

-  {

-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */

-

-      /* return failure if at end of input */

-    if (YY_@_CHAR == YYEOF)

-      YYABORT;

-

-#if YY_@_DEBUG != 0

-    if (YY_@_DEBUG_FLAG)

-      fprintf(stderr, "Discarding token %d (%s).\n", YY_@_CHAR, yytname[yychar1]);

-#endif

-

-    YY_@_CHAR = YYEMPTY;

-  }

-

-  /* Else will try to reuse lookahead token

-     after shifting the error token.  */

-

-  yyerrstatus = 3;              /* Each real token shifted decrements this */

-

-  YYGOTO(yyerrhandle);

-

-YYLABEL(yyerrdefault)  /* current state does not do anything special for the error token. */

-

-#if 0

-  /* This is wrong; only states that explicitly want error tokens

-     should shift them.  */

-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/

-  if (yyn) YYGOTO(yydefault);

-#endif

-

-YYLABEL(yyerrpop)   /* pop the current state because it cannot handle the error token */

-

-  if (yyssp == yyss) YYABORT;

-  yyvsp--;

-  yystate = *--yyssp;

-#ifdef YY_@_LSP_NEEDED

-  yylsp--;

-#endif

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-  {

-    short *ssp1 = yyss - 1;

-    fprintf (stderr, "Error: state stack now");

-    while (ssp1 != yyssp)

-      fprintf (stderr, " %d", *++ssp1);

-    fprintf (stderr, "\n");

-  }

-#endif

-

-YYLABEL(yyerrhandle)

-

-  yyn = yypact[yystate];

-  if (yyn == YYFLAG)

-    YYGOTO(yyerrdefault);

-

-  yyn += YYTERROR;

-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)

-    YYGOTO(yyerrdefault);

-

-  yyn = yytable[yyn];

-  if (yyn < 0)

-  {

-    if (yyn == YYFLAG)

-      YYGOTO(yyerrpop);

-    yyn = -yyn;

-    YYGOTO(yyreduce);

-  }

-  else if (yyn == 0)

-    YYGOTO(yyerrpop);

-

-  if (yyn == YYFINAL)

-    YYACCEPT;

-

-#if YY_@_DEBUG != 0

-  if (YY_@_DEBUG_FLAG)

-    fprintf(stderr, "Shifting error token, ");

-#endif

-

-  *++yyvsp = YY_@_LVAL;

-#ifdef YY_@_LSP_NEEDED

-  *++yylsp = YY_@_LLOC;

-#endif

-

-  yystate = yyn;

-  YYGOTO(yynewstate);

-/* end loop, in which YYGOTO may be used. */

-  YYENDGOTO

-}

-

-/* END */

-$ /* section 3 */

-

-/* AFTER END , NEVER READ !!! */

-

diff --git a/tools/mhmake/src/bison.h b/tools/mhmake/src/bison.h
deleted file mode 100644
index 0724ae112..000000000
--- a/tools/mhmake/src/bison.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/*  This file is part of mhmake.

- *

- *  Copyright (C) 2001-2010 marha@sourceforge.net

- *

- *  Mhmake is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, either version 3 of the License, or

- *  (at your option) any later version.

- *

- *  Mhmake is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with Mhmake.  If not, see <http://www.gnu.org/licenses/>.

-*/

-/* before anything */

-#ifdef c_plusplus

-#ifndef __cplusplus

-#define __cplusplus

-#endif

-#endif

-#ifdef __cplusplus

-#ifndef YY_USE_CLASS

-#define YY_USE_CLASS

-#endif

-#else

-#endif

-#include <stdio.h>

-$ /* %{ and %header{ and %union, during decl */

-#ifndef YY_@_COMPATIBILITY

-#ifndef YY_USE_CLASS

-#define  YY_@_COMPATIBILITY 1

-#else

-#define  YY_@_COMPATIBILITY 0

-#endif

-#endif

-

-#if YY_@_COMPATIBILITY != 0

-/* backward compatibility */

-#ifdef YYLTYPE

-#ifndef YY_@_LTYPE

-#define YY_@_LTYPE YYLTYPE

-/* WARNING obsolete !!! user defined YYLTYPE not reported into generated header */

-/* use %define LTYPE */

-#endif

-#endif

-#ifdef YYSTYPE

-#ifndef YY_@_STYPE

-#define YY_@_STYPE YYSTYPE

-/* WARNING obsolete !!! user defined YYSTYPE not reported into generated header */

-/* use %define STYPE */

-#endif

-#endif

-#ifdef YYDEBUG

-#ifndef YY_@_DEBUG

-#define  YY_@_DEBUG YYDEBUG

-/* WARNING obsolete !!! user defined YYDEBUG not reported into generated header */

-/* use %define DEBUG */

-#endif

-#endif

-#ifdef YY_@_STYPE

-#ifndef yystype

-#define yystype YY_@_STYPE

-#endif

-#endif

-/* use goto to be compatible */

-#ifndef YY_@_USE_GOTO

-#define YY_@_USE_GOTO 1

-#endif

-#endif

-

-/* use no goto to be clean in C++ */

-#ifndef YY_@_USE_GOTO

-#define YY_@_USE_GOTO 0

-#endif

-

-#ifndef YY_@_PURE

-$/* YY_@_PURE */

-#endif

-$/* prefix */

-#ifndef YY_@_DEBUG

-$/* YY_@_DEBUG */

-#endif

-#ifndef YY_@_LSP_NEEDED

-$ /* YY_@_LSP_NEEDED*/

-#endif

-/* DEFAULT LTYPE*/

-#ifdef YY_@_LSP_NEEDED

-#ifndef YY_@_LTYPE

-typedef

-  struct yyltype

-  {

-    int timestamp;

-    int first_line;

-    int first_column;

-    int last_line;

-    int last_column;

-    char *text;

-  }

-  yyltype;

-

-#define YY_@_LTYPE yyltype

-#endif

-#endif

-/* DEFAULT STYPE*/

-#ifndef YY_@_STYPE

-#define YY_@_STYPE int

-#endif

-/* DEFAULT MISCELANEOUS */

-#ifndef YY_@_PARSE

-#define YY_@_PARSE yyparse

-#endif

-#ifndef YY_@_LEX

-#define YY_@_LEX yylex

-#endif

-#ifndef YY_@_LVAL

-#define YY_@_LVAL yylval

-#endif

-#ifndef YY_@_LLOC

-#define YY_@_LLOC yylloc

-#endif

-#ifndef YY_@_CHAR

-#define YY_@_CHAR yychar

-#endif

-#ifndef YY_@_NERRS

-#define YY_@_NERRS yynerrs

-#endif

-#ifndef YY_@_DEBUG_FLAG

-#define YY_@_DEBUG_FLAG yydebug

-#endif

-#ifndef YY_@_ERROR

-#define YY_@_ERROR yyerror

-#endif

-

-#ifndef YY_@_PARSE_PARAM

-#ifndef __STDC__

-#ifndef __cplusplus

-#ifndef YY_USE_CLASS

-#define YY_@_PARSE_PARAM

-#ifndef YY_@_PARSE_PARAM_DEF

-#define YY_@_PARSE_PARAM_DEF

-#endif

-#endif

-#endif

-#endif

-#ifndef YY_@_PARSE_PARAM

-#define YY_@_PARSE_PARAM void

-#endif

-#endif

-

-/* TOKEN C */

-#ifndef YY_USE_CLASS

-

-#ifndef YY_@_PURE

-extern YY_@_STYPE YY_@_LVAL;

-#endif

-

-$ /* #defines token */

-/* after #define tokens, before const tokens S5*/

-#else

-#ifndef YY_@_CLASS

-#define YY_@_CLASS @

-#endif

-

-#ifndef YY_@_INHERIT

-#define YY_@_INHERIT

-#endif

-#ifndef YY_@_MEMBERS

-#define YY_@_MEMBERS

-#endif

-#ifndef YY_@_LEX_BODY

-#define YY_@_LEX_BODY

-#endif

-#ifndef YY_@_ERROR_BODY

-#define YY_@_ERROR_BODY

-#endif

-#ifndef YY_@_CONSTRUCTOR_PARAM

-#define YY_@_CONSTRUCTOR_PARAM

-#endif

-/* choose between enum and const */

-#ifndef YY_@_USE_CONST_TOKEN

-#define YY_@_USE_CONST_TOKEN 0

-/* yes enum is more compatible with flex,  */

-/* so by default we use it */

-#endif

-#if YY_@_USE_CONST_TOKEN != 0

-#ifndef YY_@_ENUM_TOKEN

-#define YY_@_ENUM_TOKEN yy_@_enum_token

-#endif

-#endif

-

-class YY_@_CLASS YY_@_INHERIT

-{

-public:

-#if YY_@_USE_CONST_TOKEN != 0

-/* static const int token ... */

-$ /* decl const */

-#else

-enum YY_@_ENUM_TOKEN { YY_@_NULL_TOKEN=0

-$ /* enum token */

-     }; /* end of enum declaration */

-#endif

-public:

- int YY_@_PARSE(YY_@_PARSE_PARAM);

-#ifdef YY_@_PURE

-#else

-#ifdef YY_@_LSP_NEEDED

- YY_@_LTYPE YY_@_LLOC;

-#endif

- int YY_@_NERRS;

- int YY_@_CHAR;

-#endif

-#if YY_@_DEBUG != 0

-public:

- int YY_@_DEBUG_FLAG; /*  nonzero means print parse trace */

-#endif

-public:

- YY_@_CLASS(YY_@_CONSTRUCTOR_PARAM);

-public:

- YY_@_MEMBERS

-};

-/* other declare folow */

-#endif

-

-

-#if YY_@_COMPATIBILITY != 0

-/* backward compatibility */

-#ifndef YYSTYPE

-#define YYSTYPE YY_@_STYPE

-#endif

-

-#ifndef YYLTYPE

-#define YYLTYPE YY_@_LTYPE

-#endif

-#ifndef YYDEBUG

-#ifdef YY_@_DEBUG

-#define YYDEBUG YY_@_DEBUG

-#endif

-#endif

-

-#endif

-/* END */

-$ /* section 3 %header{ */

- /* AFTER END , NEVER READ !!! */

-

-

-

diff --git a/tools/mhmake/src/bisondata/bison.m4 b/tools/mhmake/src/bisondata/bison.m4
new file mode 100644
index 000000000..af7c8f7a7
--- /dev/null
+++ b/tools/mhmake/src/bisondata/bison.m4
@@ -0,0 +1,556 @@
+                                                            -*- Autoconf -*-

+

+# Language-independent M4 Macros for Bison.

+# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,

+# Inc.

+

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+

+## ---------------- ##

+## Identification.  ##

+## ---------------- ##

+

+# b4_copyright(TITLE, YEARS)

+# --------------------------

+m4_define([b4_copyright],

+[b4_comment([A Bison parser, made by GNU Bison b4_version.])

+

+b4_comment([$1

+

+m4_text_wrap([Copyright (C) $2 Free Software Foundation, Inc.], [   ])

+

+This program is free software: you can redistribute it and/or modify

+it under the terms of the GNU General Public License as published by

+the Free Software Foundation, either version 3 of the License, or

+(at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program.  If not, see <http://www.gnu.org/licenses/>.])

+

+b4_comment([As a special exception, you may create a larger work that contains

+part or all of the Bison parser skeleton and distribute that work

+under terms of your choice, so long as that work isn't itself a

+parser generator using the skeleton or a modified version thereof

+as a parser skeleton.  Alternatively, if you modify or redistribute

+the parser skeleton itself, you may (at your option) remove this

+special exception, which will cause the skeleton and the resulting

+Bison output files to be licensed under the GNU General Public

+License without this special exception.

+

+This special exception was added by the Free Software Foundation in

+version 2.2 of Bison.])])

+

+

+## ---------------- ##

+## Error handling.  ##

+## ---------------- ##

+

+# The following error handling macros print error directives that should not

+# become arguments of other macro invocations since they would likely then be

+# mangled.  Thus, they print to stdout directly.

+

+# b4_cat(TEXT)

+# ------------

+# Write TEXT to stdout.  Precede the final newline with an @ so that it's

+# escaped.  For example:

+#

+#   b4_cat([[@complain(invalid input@)]])

+m4_define([b4_cat],

+[m4_syscmd([cat <<'_m4eof'

+]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@

+_m4eof

+])dnl

+m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])])

+

+# b4_error(KIND, FORMAT, [ARG1], [ARG2], ...)

+# -------------------------------------------

+# Write @KIND(FORMAT@,ARG1@,ARG2@,...@) to stdout.

+#

+# For example:

+#

+#   b4_error([[warn]], [[invalid value for `%s': %s]], [[foo]], [[3]])

+m4_define([b4_error],

+[b4_cat([[@]$1[(]$2[]]dnl

+[m4_if([$#], [2], [],

+       [m4_foreach([b4_arg],

+                   m4_dquote(m4_shift(m4_shift($@))),

+                   [[@,]b4_arg])])[@)]])])

+

+# b4_error_at(KIND, START, END, FORMAT, [ARG1], [ARG2], ...)

+# ----------------------------------------------------------

+# Write @KIND_at(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout.

+#

+# For example:

+#

+#   b4_error_at([[complain]], [[input.y:2.3]], [[input.y:5.4]],

+#               [[invalid %s]], [[foo]])

+m4_define([b4_error_at],

+[b4_cat([[@]$1[_at(]$2[@,]$3[@,]$4[]]dnl

+[m4_if([$#], [4], [],

+       [m4_foreach([b4_arg],

+                   m4_dquote(m4_shift(m4_shift(m4_shift(m4_shift($@))))),

+                   [[@,]b4_arg])])[@)]])])

+

+# b4_warn(FORMAT, [ARG1], [ARG2], ...)

+# ------------------------------------

+# Write @warn(FORMAT@,ARG1@,ARG2@,...@) to stdout.

+#

+# For example:

+#

+#   b4_warn([[invalid value for `%s': %s]], [[foo]], [[3]])

+#

+# As a simple test suite, this:

+#

+#   m4_divert(-1)

+#   m4_define([asdf], [ASDF])

+#   m4_define([fsa], [FSA])

+#   m4_define([fdsa], [FDSA])

+#   b4_warn([[[asdf), asdf]]], [[[fsa), fsa]]], [[[fdsa), fdsa]]])

+#   b4_warn([[asdf), asdf]], [[fsa), fsa]], [[fdsa), fdsa]])

+#   b4_warn()

+#   b4_warn(1)

+#   b4_warn(1, 2)

+#

+# Should produce this without newlines:

+#

+#   @warn([asdf), asdf]@,[fsa), fsa]@,[fdsa), fdsa]@)

+#   @warn(asdf), asdf@,fsa), fsa@,fdsa), fdsa@)

+#   @warn(@)

+#   @warn(1@)

+#   @warn(1@,2@)

+m4_define([b4_warn],

+[b4_error([[warn]], $@)])

+

+# b4_warn_at(START, END, FORMAT, [ARG1], [ARG2], ...)

+# ---------------------------------------------------

+# Write @warn(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout.

+#

+# For example:

+#

+#   b4_warn_at([[input.y:2.3]], [[input.y:5.4]], [[invalid %s]], [[foo]])

+m4_define([b4_warn_at],

+[b4_error_at([[warn]], $@)])

+

+# b4_complain(FORMAT, [ARG1], [ARG2], ...)

+# ----------------------------------------

+# Write @complain(FORMAT@,ARG1@,ARG2@,...@) to stdout.

+#

+# See b4_warn example.

+m4_define([b4_complain],

+[b4_error([[complain]], $@)])

+

+# b4_complain_at(START, END, FORMAT, [ARG1], [ARG2], ...)

+# -------------------------------------------------------

+# Write @complain(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout.

+#

+# See b4_warn_at example.

+m4_define([b4_complain_at],

+[b4_error_at([[complain]], $@)])

+

+# b4_fatal(FORMAT, [ARG1], [ARG2], ...)

+# -------------------------------------

+# Write @fatal(FORMAT@,ARG1@,ARG2@,...@) to stdout and exit.

+#

+# See b4_warn example.

+m4_define([b4_fatal],

+[b4_error([[fatal]], $@)dnl

+m4_exit(1)])

+

+# b4_fatal_at(START, END, FORMAT, [ARG1], [ARG2], ...)

+# ----------------------------------------------------

+# Write @fatal(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout and exit.

+#

+# See b4_warn_at example.

+m4_define([b4_fatal_at],

+[b4_error_at([[fatal]], $@)dnl

+m4_exit(1)])

+

+

+## ---------------- ##

+## Default values.  ##

+## ---------------- ##

+

+# m4_define_default([b4_lex_param], [])   dnl breaks other skeletons

+m4_define_default([b4_pre_prologue], [])

+m4_define_default([b4_post_prologue], [])

+m4_define_default([b4_epilogue], [])

+m4_define_default([b4_parse_param], [])

+

+# The initial column and line.

+m4_define_default([b4_location_initial_column], [1])

+m4_define_default([b4_location_initial_line],   [1])

+

+

+## ------------ ##

+## Data Types.  ##

+## ------------ ##

+

+# b4_ints_in(INT1, INT2, LOW, HIGH)

+# ---------------------------------

+# Return 1 iff both INT1 and INT2 are in [LOW, HIGH], 0 otherwise.

+m4_define([b4_ints_in],

+[m4_eval([$3 <= $1 && $1 <= $4 && $3 <= $2 && $2 <= $4])])

+

+

+

+## ------------------ ##

+## Decoding options.  ##

+## ------------------ ##

+

+# b4_flag_if(FLAG, IF-TRUE, IF-FALSE)

+# -----------------------------------

+# Run IF-TRUE if b4_FLAG_flag is 1, IF-FALSE if FLAG is 0, otherwise fail.

+m4_define([b4_flag_if],

+[m4_case(b4_$1_flag,

+         [0], [$3],

+         [1], [$2],

+         [m4_fatal([invalid $1 value: ]$1)])])

+

+

+# b4_define_flag_if(FLAG)

+# -----------------------

+# Define "b4_FLAG_if(IF-TRUE, IF-FALSE)" that depends on the

+# value of the Boolean FLAG.

+m4_define([b4_define_flag_if],

+[_b4_define_flag_if($[1], $[2], [$1])])

+

+# _b4_define_flag_if($1, $2, FLAG)

+# --------------------------------

+# This macro works around the impossibility to define macros

+# inside macros, because issuing `[$1]' is not possible in M4 :(.

+# This sucks hard, GNU M4 should really provide M5 like $$1.

+m4_define([_b4_define_flag_if],

+[m4_if([$1$2], $[1]$[2], [],

+       [m4_fatal([$0: Invalid arguments: $@])])dnl

+m4_define([b4_$3_if],

+          [b4_flag_if([$3], [$1], [$2])])])

+

+

+# b4_FLAG_if(IF-TRUE, IF-FALSE)

+# -----------------------------

+# Expand IF-TRUE, if FLAG is true, IF-FALSE otherwise.

+b4_define_flag_if([defines])            # Whether headers are requested.

+b4_define_flag_if([error_verbose])      # Whether error are verbose.

+b4_define_flag_if([glr])                # Whether a GLR parser is requested.

+b4_define_flag_if([locations])          # Whether locations are tracked.

+b4_define_flag_if([nondeterministic])   # Whether conflicts should be handled.

+b4_define_flag_if([yacc])               # Whether POSIX Yacc is emulated.

+

+

+## ------------------------- ##

+## Assigning token numbers.  ##

+## ------------------------- ##

+

+

+## ----------- ##

+## Synclines.  ##

+## ----------- ##

+

+# b4_basename(NAME)

+# -----------------

+# Similar to POSIX basename; the differences don't matter here.

+# Beware that NAME is not evaluated.

+m4_define([b4_basename],

+[m4_bpatsubst([$1], [^.*/\([^/]+\)/*$], [\1])])

+

+

+# b4_syncline(LINE, FILE)

+# -----------------------

+m4_define([b4_syncline],

+[b4_flag_if([synclines], [

+b4_sync_end([__line__], [b4_basename(m4_quote(__file__))])

+b4_sync_start([$1], [$2])])])

+

+m4_define([b4_sync_end], [b4_comment([Line $1 of $2])])

+m4_define([b4_sync_start], [b4_comment([Line $1 of $2])])

+

+# b4_user_code(USER-CODE)

+# -----------------------

+# Emit code from the user, ending it with synclines.

+m4_define([b4_user_code],

+[$1

+b4_syncline([@oline@], [@ofile@])])

+

+

+# b4_define_user_code(MACRO)

+# --------------------------

+# From b4_MACRO, build b4_user_MACRO that includes the synclines.

+m4_define([b4_define_user_code],

+[m4_define([b4_user_$1],

+[b4_user_code([b4_$1])])])

+

+

+# b4_user_actions

+# b4_user_initial_action

+# b4_user_post_prologue

+# b4_user_pre_prologue

+# b4_user_stype

+# ----------------------

+# Macros that issue user code, ending with synclines.

+b4_define_user_code([actions])

+b4_define_user_code([initial_action])

+b4_define_user_code([post_prologue])

+b4_define_user_code([pre_prologue])

+b4_define_user_code([stype])

+

+

+# b4_check_user_names(WHAT, USER-LIST, BISON-NAMESPACE)

+# --------------------------------------------------------

+# Warn if any name of type WHAT is used by the user (as recorded in USER-LIST)

+# but is not used by Bison (as recorded by macros in the namespace

+# BISON-NAMESPACE).

+#

+# USER-LIST must expand to a list specifying all grammar occurrences of all

+# names of type WHAT.   Each item in the list must be a triplet specifying one

+# occurrence: name, start boundary, and end boundary.  Empty string names are

+# fine.  An empty list is fine.

+#

+# For example, to define b4_foo_user_names to be used for USER-LIST with three

+# name occurrences and with correct quoting:

+#

+#   m4_define([b4_foo_user_names],

+#             [[[[[[bar]], [[parser.y:1.7]], [[parser.y:1.16]]]],

+#               [[[[bar]], [[parser.y:5.7]], [[parser.y:5.16]]]],

+#               [[[[baz]], [[parser.y:8.7]], [[parser.y:8.16]]]]]])

+#

+# The macro BISON-NAMESPACE(bar) must be defined iff the name bar of type WHAT

+# is used by Bison (in the front-end or in the skeleton).  Empty string names

+# are fine, but it would be ugly for Bison to actually use one.

+#

+# For example, to use b4_foo_bison_names for BISON-NAMESPACE and define that

+# the names bar and baz are used by Bison:

+#

+#   m4_define([b4_foo_bison_names(bar)])

+#   m4_define([b4_foo_bison_names(baz)])

+#

+# To invoke b4_check_user_names with TYPE foo, with USER-LIST

+# b4_foo_user_names, with BISON-NAMESPACE b4_foo_bison_names, and with correct

+# quoting:

+#

+#   b4_check_user_names([[foo]], [b4_foo_user_names],

+#                       [[b4_foo_bison_names]])

+m4_define([b4_check_user_names],

+[m4_foreach([b4_occurrence], $2,

+[m4_pushdef([b4_occurrence], b4_occurrence)dnl

+m4_pushdef([b4_user_name], m4_car(b4_occurrence))dnl

+m4_pushdef([b4_start], m4_car(m4_shift(b4_occurrence)))dnl

+m4_pushdef([b4_end], m4_shift(m4_shift(b4_occurrence)))dnl

+m4_ifndef($3[(]m4_quote(b4_user_name)[)],

+          [b4_warn_at([b4_start], [b4_end],

+                      [[%s `%s' is not used]],

+                      [$1], [b4_user_name])])[]dnl

+m4_popdef([b4_occurrence])dnl

+m4_popdef([b4_user_name])dnl

+m4_popdef([b4_start])dnl

+m4_popdef([b4_end])dnl

+])])

+

+# b4_percent_define_get(VARIABLE)

+# -------------------------------

+# Mimic muscle_percent_define_get in ../src/muscle_tab.h exactly.  That is, if

+# the %define variable VARIABLE is defined, emit its value.  Also, record

+# Bison's usage of VARIABLE by defining

+# b4_percent_define_bison_variables(VARIABLE).

+#

+# For example:

+#

+#   b4_percent_define_get([[foo]])

+m4_define([b4_percent_define_get],

+[m4_define([b4_percent_define_bison_variables(]$1[)])dnl

+m4_ifdef([b4_percent_define(]$1[)], [m4_indir([b4_percent_define(]$1[)])])])

+

+# b4_percent_define_get_loc(VARIABLE)

+# -----------------------------------

+# Mimic muscle_percent_define_get_loc in ../src/muscle_tab.h exactly.  That is,

+# if the %define variable VARIABLE is undefined, complain fatally since that's

+# a Bison or skeleton error.  Otherwise, return its definition location in a

+# form approriate for the first two arguments of b4_warn_at, b4_complain_at, or

+# b4_fatal_at.  Don't record this as a Bison usage of VARIABLE as there's no

+# reason to suspect that the user-supplied value has yet influenced the output.

+#

+# For example:

+#

+#   b4_complain_at(b4_percent_define_get_loc([[foo]]), [[invalid foo]])

+m4_define([b4_percent_define_get_loc],

+[m4_ifdef([b4_percent_define_loc(]$1[)],

+          [m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl

+b4_loc[]dnl

+m4_popdef([b4_loc])],

+          [b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_get_loc]], [$1])])])

+

+# b4_percent_define_get_syncline(VARIABLE)

+# ----------------------------------------

+# Mimic muscle_percent_define_get_syncline in ../src/muscle_tab.h exactly.

+# That is, if the %define variable VARIABLE is undefined, complain fatally

+# since that's a Bison or skeleton error.  Otherwise, return its definition

+# location as a b4_syncline invocation.  Don't record this as a Bison usage of

+# VARIABLE as there's no reason to suspect that the user-supplied value has yet

+# influenced the output.

+#

+# For example:

+#

+#   b4_percent_define_get_syncline([[foo]])

+m4_define([b4_percent_define_get_syncline],

+[m4_ifdef([b4_percent_define_syncline(]$1[)],

+          [m4_indir([b4_percent_define_syncline(]$1[)])],

+          [b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_get_syncline]], [$1])])])

+

+# b4_percent_define_ifdef(VARIABLE, IF-TRUE, [IF-FALSE])

+# ------------------------------------------------------

+# Mimic muscle_percent_define_ifdef in ../src/muscle_tab.h exactly.  That is,

+# if the %define variable VARIABLE is defined, expand IF-TRUE, else expand

+# IF-FALSE.  Also, record Bison's usage of VARIABLE by defining

+# b4_percent_define_bison_variables(VARIABLE).

+#

+# For example:

+#

+#   b4_percent_define_ifdef([[foo]], [[it's defined]], [[it's undefined]])

+m4_define([b4_percent_define_ifdef],

+[m4_ifdef([b4_percent_define(]$1[)],

+          [m4_define([b4_percent_define_bison_variables(]$1[)])$2],

+          [$3])])

+

+# b4_percent_define_flag_if(VARIABLE, IF-TRUE, [IF-FALSE])

+# --------------------------------------------------------

+# Mimic muscle_percent_define_flag_if in ../src/muscle_tab.h exactly.  That is,

+# if the %define variable VARIABLE is defined to "" or "true", expand IF-TRUE.

+# If it is defined to "false", expand IF-FALSE.  Complain if it is undefined

+# (a Bison or skeleton error since the default value should have been set

+# already) or defined to any other value (possibly a user error).  Also, record

+# Bison's usage of VARIABLE by defining

+# b4_percent_define_bison_variables(VARIABLE).

+#

+# For example:

+#

+#   b4_percent_define_flag_if([[foo]], [[it's true]], [[it's false]])

+m4_define([b4_percent_define_flag_if],

+[b4_percent_define_ifdef([$1],

+  [m4_case(b4_percent_define_get([$1]),

+           [], [$2], [true], [$2], [false], [$3],

+           [m4_expand_once([b4_complain_at(b4_percent_define_get_loc([$1]),

+                                           [[invalid value for %%define Boolean variable `%s']],

+                                           [$1])],

+                           [[b4_percent_define_flag_if($1)]])])],

+  [b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_flag_if]], [$1])])])

+

+# b4_percent_define_default(VARIABLE, DEFAULT)

+# --------------------------------------------

+# Mimic muscle_percent_define_default in ../src/muscle_tab.h exactly.  That is,

+# if the %define variable VARIABLE is undefined, set its value to DEFAULT.

+# Don't record this as a Bison usage of VARIABLE as there's no reason to

+# suspect that the value has yet influenced the output.

+#

+# For example:

+#

+#   b4_percent_define_default([[foo]], [[default value]])

+m4_define([b4_percent_define_default],

+[m4_ifndef([b4_percent_define(]$1[)],

+           [m4_define([b4_percent_define(]$1[)], [$2])dnl

+            m4_define([b4_percent_define_loc(]$1[)],

+                      [[[[[Bison:b4_percent_define_default]:1.0]], [[[Bison:b4_percent_define_default]:1.0]]]])dnl

+            m4_define([b4_percent_define_syncline(]$1[)],

+                      [[]b4_syncline(1, [["[Bison:b4_percent_define_default]"]])[

+]])])])

+

+# b4_percent_define_check_values(VALUES)

+# --------------------------------------

+# Mimic muscle_percent_define_check_values in ../src/muscle_tab.h exactly

+# except that the VALUES structure is more appropriate for M4.  That is, VALUES

+# is a list of sublists of strings.  For each sublist, the first string is the

+# name of a %define variable, and all remaining strings in that sublist are the

+# valid values for that variable.  Complain if such a variable is undefined (a

+# Bison error since the default value should have been set already) or defined

+# to any other value (possibly a user error).  Don't record this as a Bison

+# usage of the variable as there's no reason to suspect that the value has yet

+# influenced the output.

+#

+# For example:

+#

+#   b4_percent_define_check_values([[[[foo]], [[foo-value1]], [[foo-value2]]]],

+#                                  [[[[bar]], [[bar-value1]]]])

+m4_define([b4_percent_define_check_values],

+[m4_foreach([b4_sublist], m4_quote($@),

+            [_b4_percent_define_check_values(b4_sublist)])])

+

+m4_define([_b4_percent_define_check_values],

+[m4_ifdef([b4_percent_define(]$1[)],

+  [m4_pushdef([b4_good_value], [0])dnl

+   m4_if($#, 1, [],

+         [m4_foreach([b4_value], m4_dquote(m4_shift($@)),

+                     [m4_if(m4_indir([b4_percent_define(]$1[)]), b4_value,

+                            [m4_define([b4_good_value], [1])])])])dnl

+   m4_if(b4_good_value, [0],

+         [b4_complain_at(b4_percent_define_get_loc([$1]),

+                         [[invalid value for %%define variable `%s': `%s']],

+                         [$1],

+                         m4_dquote(m4_indir([b4_percent_define(]$1[)])))])dnl

+   m4_popdef([b4_good_value])],

+  [b4_fatal([[undefined %%define variable `%s' passed to b4_percent_define_check_values]], [$1])])])

+

+# b4_percent_code_get([QUALIFIER])

+# --------------------------------

+# If any %code blocks for QUALIFIER are defined, emit them beginning with a

+# comment and ending with synclines and a newline.  If QUALIFIER is not

+# specified or empty, do this for the unqualified %code blocks.  Also, record

+# Bison's usage of QUALIFIER (if specified) by defining

+# b4_percent_code_bison_qualifiers(QUALIFIER).

+#

+# For example, to emit any unqualified %code blocks followed by any %code

+# blocks for the qualifier foo:

+#

+#   b4_percent_code_get

+#   b4_percent_code_get([[foo]])

+m4_define([b4_percent_code_get],

+[m4_pushdef([b4_macro_name], [[b4_percent_code(]$1[)]])dnl

+m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])dnl

+m4_ifdef(b4_macro_name,

+[b4_comment([m4_if([$#], [0], [[Unqualified %code]],

+                   [["%code ]$1["]])[ blocks.]])

+b4_user_code([m4_indir(b4_macro_name)])

+])dnl

+m4_popdef([b4_macro_name])])

+

+# b4_percent_code_ifdef(QUALIFIER, IF-TRUE, [IF-FALSE])

+# -----------------------------------------------------

+# If any %code blocks for QUALIFIER (or unqualified %code blocks if

+# QUALIFIER is empty) are defined, expand IF-TRUE, else expand IF-FALSE.

+# Also, record Bison's usage of QUALIFIER (if specified) by defining

+# b4_percent_code_bison_qualifiers(QUALIFIER).

+m4_define([b4_percent_code_ifdef],

+[m4_ifdef([b4_percent_code(]$1[)],

+          [m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])$2],

+          [$3])])

+

+

+## ----------------------------------------------------------- ##

+## After processing the skeletons, check that all the user's   ##

+## %define variables and %code qualifiers were used by Bison.  ##

+## ----------------------------------------------------------- ##

+

+m4_define([b4_check_user_names_wrap],

+[m4_ifdef([b4_percent_]$1[_user_]$2[s],

+          [b4_check_user_names([[%]$1 $2],

+                               [b4_percent_]$1[_user_]$2[s],

+                               [[b4_percent_]$1[_bison_]$2[s]])])])

+

+m4_wrap_lifo([

+b4_check_user_names_wrap([[define]], [[variable]])

+b4_check_user_names_wrap([[code]], [[qualifier]])

+])

diff --git a/tools/mhmake/src/bisondata/c++.m4 b/tools/mhmake/src/bisondata/c++.m4
new file mode 100644
index 000000000..a27064d7b
--- /dev/null
+++ b/tools/mhmake/src/bisondata/c++.m4
@@ -0,0 +1,170 @@
+                                                            -*- Autoconf -*-

+

+# C++ skeleton for Bison

+

+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,

+# Inc.

+

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+m4_include(b4_pkgdatadir/[c.m4])

+

+## ---------------- ##

+## Default values.  ##

+## ---------------- ##

+

+# Default parser class name.

+b4_percent_define_default([[parser_class_name]], [[parser]])

+b4_percent_define_default([[location_type]], [[location]])

+b4_percent_define_default([[filename_type]], [[std::string]])

+b4_percent_define_default([[namespace]], m4_defn([b4_prefix]))

+b4_percent_define_default([[global_tokens_and_yystype]], [[false]])

+b4_percent_define_default([[define_location_comparison]],

+                          [m4_if(b4_percent_define_get([[filename_type]]),

+                                 [std::string], [[true]], [[false]])])

+

+

+## ----------- ##

+## Namespace.  ##

+## ----------- ##

+

+m4_define([b4_namespace_ref], [b4_percent_define_get([[namespace]])])

+

+# Don't permit an empty b4_namespace_ref.  Any `::parser::foo' appended to it

+# would compile as an absolute reference with `parser' in the global namespace.

+# b4_namespace_open would open an anonymous namespace and thus establish

+# internal linkage.  This would compile.  However, it's cryptic, and internal

+# linkage for the parser would be specified in all translation units that

+# include the header, which is always generated.  If we ever need to permit

+# internal linkage somehow, surely we can find a cleaner approach.

+m4_if(m4_bregexp(b4_namespace_ref, [^[   ]*$]), [-1], [],

+[b4_complain_at(b4_percent_define_get_loc([[namespace]]),

+                [[namespace reference is empty]])])

+

+# Instead of assuming the C++ compiler will do it, Bison should reject any

+# invalid b4_namepsace_ref that would be converted to a valid

+# b4_namespace_open.  The problem is that Bison doesn't always output

+# b4_namespace_ref to uncommented code but should reserve the ability to do so

+# in future releases without risking breaking any existing user grammars.

+# Specifically, don't allow empty names as b4_namespace_open would just convert

+# those into anonymous namespaces, and that might tempt some users.

+m4_if(m4_bregexp(b4_namespace_ref, [::[  ]*::]), [-1], [],

+[b4_complain_at(b4_percent_define_get_loc([[namespace]]),

+                [[namespace reference has consecutive "::"]])])

+m4_if(m4_bregexp(b4_namespace_ref, [::[  ]*$]), [-1], [],

+[b4_complain_at(b4_percent_define_get_loc([[namespace]]),

+                [[namespace reference has a trailing "::"]])])

+

+m4_define([b4_namespace_open],

+[b4_user_code([b4_percent_define_get_syncline([[namespace]])

+[namespace ]m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref),

+                                                [^\(.\)[         ]*::], [\1])),

+                         [::], [ { namespace ])[ {]])])

+

+m4_define([b4_namespace_close],

+[b4_user_code([b4_percent_define_get_syncline([[namespace]])

+m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref),

+                                    [^\(.\)[     ]*\(::\)?\([^][:]\|:[^][:]\)*],

+                                    [\1])),

+             [::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])])

+

+

+# b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)

+# -----------------------------------------------------

+# Output the definition of the tokens as enums.

+m4_define([b4_token_enums],

+[/* Tokens.  */

+   enum yytokentype {

+m4_map_sep([     b4_token_enum], [,

+],

+           [$@])

+   };

+])

+

+

+## ----------------- ##

+## Semantic Values.  ##

+## ----------------- ##

+

+

+# b4_lhs_value([TYPE])

+# --------------------

+# Expansion of $<TYPE>$.

+m4_define([b4_lhs_value],

+[(yyval[]m4_ifval([$1], [.$1]))])

+

+

+# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])

+# --------------------------------------

+# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH

+# symbols on RHS.

+m4_define([b4_rhs_value],

+[(yysemantic_stack_@{($1) - ($2)@}m4_ifval([$3], [.$3]))])

+

+# b4_lhs_location()

+# -----------------

+# Expansion of @$.

+m4_define([b4_lhs_location],

+[(yyloc)])

+

+

+# b4_rhs_location(RULE-LENGTH, NUM)

+# ---------------------------------

+# Expansion of @NUM, where the current rule has RULE-LENGTH symbols

+# on RHS.

+m4_define([b4_rhs_location],

+[(yylocation_stack_@{($1) - ($2)@})])

+

+

+# b4_parse_param_decl

+# -------------------

+# Extra formal arguments of the constructor.

+# Change the parameter names from "foo" into "foo_yyarg", so that

+# there is no collision bw the user chosen attribute name, and the

+# argument name in the constructor.

+m4_define([b4_parse_param_decl],

+[m4_ifset([b4_parse_param],

+          [m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])])

+

+m4_define([b4_parse_param_decl_1],

+[$1_yyarg])

+

+

+

+# b4_parse_param_cons

+# -------------------

+# Extra initialisations of the constructor.

+m4_define([b4_parse_param_cons],

+          [m4_ifset([b4_parse_param],

+                    [

+      b4_cc_constructor_calls(b4_parse_param)])])

+m4_define([b4_cc_constructor_calls],

+          [m4_map_sep([b4_cc_constructor_call], [,

+      ], [$@])])

+m4_define([b4_cc_constructor_call],

+          [$2 ($2_yyarg)])

+

+# b4_parse_param_vars

+# -------------------

+# Extra instance variables.

+m4_define([b4_parse_param_vars],

+          [m4_ifset([b4_parse_param],

+                    [

+    /* User arguments.  */

+b4_cc_var_decls(b4_parse_param)])])

+m4_define([b4_cc_var_decls],

+          [m4_map_sep([b4_cc_var_decl], [

+], [$@])])

+m4_define([b4_cc_var_decl],

+          [    $1;])

diff --git a/tools/mhmake/src/bisondata/c.m4 b/tools/mhmake/src/bisondata/c.m4
new file mode 100644
index 000000000..2b44b7e49
--- /dev/null
+++ b/tools/mhmake/src/bisondata/c.m4
@@ -0,0 +1,477 @@
+                                                            -*- Autoconf -*-

+

+# C M4 Macros for Bison.

+# Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008 Free Software

+# Foundation, Inc.

+

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+## ---------------- ##

+## Identification.  ##

+## ---------------- ##

+

+# b4_comment(TEXT)

+# ----------------

+m4_define([b4_comment], [/* m4_bpatsubst([$1], [

+], [

+   ])  */])

+

+# b4_identification

+# -----------------

+# Depends on individual skeletons to define b4_pure_flag, b4_push_flag, or

+# b4_pull_flag if they use the values of the %define variables api.pure or

+# api.push_pull.

+m4_define([b4_identification],

+[[/* Identify Bison output.  */

+#define YYBISON 1

+

+/* Bison version.  */

+#define YYBISON_VERSION "]b4_version["

+

+/* Skeleton name.  */

+#define YYSKELETON_NAME ]b4_skeleton[]m4_ifdef([b4_pure_flag], [[

+

+/* Pure parsers.  */

+#define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[

+

+/* Push parsers.  */

+#define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[

+

+/* Pull parsers.  */

+#define YYPULL ]b4_pull_flag])[

+

+/* Using locations.  */

+#define YYLSP_NEEDED ]b4_locations_flag[

+]])

+

+

+## ---------------- ##

+## Default values.  ##

+## ---------------- ##

+

+# If the %union is not named, its name is YYSTYPE.

+m4_define_default([b4_union_name], [YYSTYPE])

+

+# If the %name-prefix is not given, it is yy.

+m4_define_default([b4_prefix], [yy])

+

+## ------------------------ ##

+## Pure/impure interfaces.  ##

+## ------------------------ ##

+

+# b4_user_args

+# ------------

+m4_define([b4_user_args],

+[m4_ifset([b4_parse_param], [, b4_c_args(b4_parse_param)])])

+

+

+# b4_parse_param

+# --------------

+# If defined, b4_parse_param arrives double quoted, but below we prefer

+# it to be single quoted.

+m4_define([b4_parse_param],

+b4_parse_param)

+

+

+# b4_parse_param_for(DECL, FORMAL, BODY)

+# ---------------------------------------

+# Iterate over the user parameters, binding the declaration to DECL,

+# the formal name to FORMAL, and evaluating the BODY.

+m4_define([b4_parse_param_for],

+[m4_foreach([$1_$2], m4_defn([b4_parse_param]),

+[m4_pushdef([$1], m4_unquote(m4_car($1_$2)))dnl

+m4_pushdef([$2], m4_shift($1_$2))dnl

+$3[]dnl

+m4_popdef([$2])dnl

+m4_popdef([$1])dnl

+])])

+

+# b4_parse_param_use

+# ------------------

+# `YYUSE' all the parse-params.

+m4_define([b4_parse_param_use],

+[b4_parse_param_for([Decl], [Formal], [  YYUSE (Formal);

+])dnl

+])

+

+

+## ------------ ##

+## Data Types.  ##

+## ------------ ##

+

+# b4_int_type(MIN, MAX)

+# ---------------------

+# Return the smallest int type able to handle numbers ranging from

+# MIN to MAX (included).

+m4_define([b4_int_type],

+[m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],

+       b4_ints_in($@,   [-128],   [127]), [1], [signed char],

+

+       b4_ints_in($@,      [0], [65535]), [1], [unsigned short int],

+       b4_ints_in($@, [-32768], [32767]), [1], [short int],

+

+       m4_eval([0 <= $1]),                [1], [unsigned int],

+

+                                               [int])])

+

+

+# b4_int_type_for(NAME)

+# ---------------------

+# Return the smallest int type able to handle numbers ranging from

+# `NAME_min' to `NAME_max' (included).

+m4_define([b4_int_type_for],

+[b4_int_type($1_min, $1_max)])

+

+

+

+## ---------##

+## Values.  ##

+## ---------##

+

+# b4_null

+---------

+# Return a null pointer constant.  NULL infringes on the user name

+# space in C, so use 0 rather than NULL.

+m4_define([b4_null], [0])

+

+

+

+

+## ------------------------- ##

+## Assigning token numbers.  ##

+## ------------------------- ##

+

+# b4_token_define(TOKEN-NAME, TOKEN-NUMBER)

+# -----------------------------------------

+# Output the definition of this token as #define.

+m4_define([b4_token_define],

+[#define $1 $2

+])

+

+

+# b4_token_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)

+# -------------------------------------------------------

+# Output the definition of the tokens (if there are) as #defines.

+m4_define([b4_token_defines],

+[m4_if([$#$1], [1], [],

+[/* Tokens.  */

+m4_map([b4_token_define], [$@])])

+])

+

+

+# b4_token_enum(TOKEN-NAME, TOKEN-NUMBER)

+# ---------------------------------------

+# Output the definition of this token as an enum.

+m4_define([b4_token_enum],

+[$1 = $2])

+

+

+# b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)

+# -----------------------------------------------------

+# Output the definition of the tokens (if there are) as enums.

+m4_define([b4_token_enums],

+[m4_if([$#$1], [1], [],

+[/* Tokens.  */

+#ifndef YYTOKENTYPE

+# define YYTOKENTYPE

+   /* Put the tokens into the symbol table, so that GDB and other debuggers

+      know about them.  */

+   enum yytokentype {

+m4_map_sep([     b4_token_enum], [,

+],

+           [$@])

+   };

+#endif

+])])

+

+

+# b4_token_enums_defines(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER)

+# -------------------------------------------------------------

+# Output the definition of the tokens (if there are any) as enums and, if POSIX

+# Yacc is enabled, as #defines.

+m4_define([b4_token_enums_defines],

+[b4_token_enums($@)b4_yacc_if([b4_token_defines($@)], [])

+])

+

+

+

+## --------------------------------------------- ##

+## Defining C functions in both K&R and ANSI-C.  ##

+## --------------------------------------------- ##

+

+

+# b4_modern_c

+# -----------

+# A predicate useful in #if to determine whether C is ancient or modern.

+#

+# If __STDC__ is defined, the compiler is modern.  IBM xlc 7.0 when run

+# as 'cc' doesn't define __STDC__ (or __STDC_VERSION__) for pedantic

+# reasons, but it defines __C99__FUNC__ so check that as well.

+# Microsoft C normally doesn't define these macros, but it defines _MSC_VER.

+# Consider a C++ compiler to be modern if it defines __cplusplus.

+#

+m4_define([b4_c_modern],

+  [[(defined __STDC__ || defined __C99__FUNC__ \

+     || defined __cplusplus || defined _MSC_VER)]])

+

+# b4_c_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...)

+# ----------------------------------------------------------

+# Declare the function NAME.

+m4_define([b4_c_function_def],

+[#if b4_c_modern

+b4_c_ansi_function_def($@)

+#else

+$2

+$1 (b4_c_knr_formal_names(m4_shift2($@)))

+b4_c_knr_formal_decls(m4_shift2($@))

+#endif[]dnl

+])

+

+

+# b4_c_ansi_function_def(NAME, RETURN-VALUE, [DECL1, NAME1], ...)

+# ---------------------------------------------------------------

+# Declare the function NAME in ANSI.

+m4_define([b4_c_ansi_function_def],

+[$2

+$1 (b4_c_ansi_formals(m4_shift2($@)))[]dnl

+])

+

+

+# b4_c_ansi_formals([DECL1, NAME1], ...)

+# --------------------------------------

+# Output the arguments ANSI-C definition.

+m4_define([b4_c_ansi_formals],

+[m4_if([$#], [0], [void],

+       [$#$1], [1], [void],

+               [m4_map_sep([b4_c_ansi_formal], [, ], [$@])])])

+

+m4_define([b4_c_ansi_formal],

+[$1])

+

+

+# b4_c_knr_formal_names([DECL1, NAME1], ...)

+# ------------------------------------------

+# Output the argument names.

+m4_define([b4_c_knr_formal_names],

+[m4_map_sep([b4_c_knr_formal_name], [, ], [$@])])

+

+m4_define([b4_c_knr_formal_name],

+[$2])

+

+

+# b4_c_knr_formal_decls([DECL1, NAME1], ...)

+# ------------------------------------------

+# Output the K&R argument declarations.

+m4_define([b4_c_knr_formal_decls],

+[m4_map_sep([b4_c_knr_formal_decl],

+            [

+],

+            [$@])])

+

+m4_define([b4_c_knr_formal_decl],

+[    $1;])

+

+

+

+## ------------------------------------------------------------ ##

+## Declaring (prototyping) C functions in both K&R and ANSI-C.  ##

+## ------------------------------------------------------------ ##

+

+

+# b4_c_function_decl(NAME, RETURN-VALUE, [DECL1, NAME1], ...)

+# -----------------------------------------------------------

+# Declare the function NAME.

+m4_define([b4_c_function_decl],

+[#if defined __STDC__ || defined __cplusplus

+b4_c_ansi_function_decl($@)

+#else

+$2 $1 ();

+#endif[]dnl

+])

+

+

+# b4_c_ansi_function_decl(NAME, RETURN-VALUE, [DECL1, NAME1], ...)

+# ----------------------------------------------------------------

+# Declare the function NAME.

+m4_define([b4_c_ansi_function_decl],

+[$2 $1 (b4_c_ansi_formals(m4_shift2($@)));[]dnl

+])

+

+

+

+

+## --------------------- ##

+## Calling C functions.  ##

+## --------------------- ##

+

+

+# b4_c_function_call(NAME, RETURN-VALUE, [DECL1, NAME1], ...)

+# -----------------------------------------------------------

+# Call the function NAME with arguments NAME1, NAME2 etc.

+m4_define([b4_c_function_call],

+[$1 (b4_c_args(m4_shift2($@)))[]dnl

+])

+

+

+# b4_c_args([DECL1, NAME1], ...)

+# ------------------------------

+# Output the arguments NAME1, NAME2...

+m4_define([b4_c_args],

+[m4_map_sep([b4_c_arg], [, ], [$@])])

+

+m4_define([b4_c_arg],

+[$2])

+

+

+## ----------- ##

+## Synclines.  ##

+## ----------- ##

+

+# b4_sync_start(LINE, FILE)

+# -----------------------

+m4_define([b4_sync_start], [[#]line $1 $2])

+

+

+## -------------- ##

+## User actions.  ##

+## -------------- ##

+

+# b4_case(LABEL, STATEMENTS)

+# --------------------------

+m4_define([b4_case],

+[  case $1:

+$2

+    break;])

+

+# b4_symbol_actions(FILENAME, LINENO,

+#                   SYMBOL-TAG, SYMBOL-NUM,

+#                   SYMBOL-ACTION, SYMBOL-TYPENAME)

+# -------------------------------------------------

+m4_define([b4_symbol_actions],

+[m4_pushdef([b4_dollar_dollar],

+   [m4_ifval([$6], [(yyvaluep->$6)], [(*yyvaluep)])])dnl

+m4_pushdef([b4_at_dollar], [(*yylocationp)])dnl

+      case $4: /* $3 */

+b4_syncline([$2], [$1])

+        $5;

+b4_syncline([@oline@], [@ofile@])

+        break;

+m4_popdef([b4_at_dollar])dnl

+m4_popdef([b4_dollar_dollar])dnl

+])

+

+

+# b4_yydestruct_generate(FUNCTION-DECLARATOR)

+# -------------------------------------------

+# Generate the "yydestruct" function, which declaration is issued using

+# FUNCTION-DECLARATOR, which may be "b4_c_ansi_function_def" for ISO C

+# or "b4_c_function_def" for K&R.

+m4_define_default([b4_yydestruct_generate],

+[[/*-----------------------------------------------.

+| Release the memory associated to this symbol.  |

+`-----------------------------------------------*/

+

+/*ARGSUSED*/

+]$1([yydestruct],

+    [static void],

+    [[const char *yymsg],    [yymsg]],

+    [[int yytype],           [yytype]],

+    [[YYSTYPE *yyvaluep],    [yyvaluep]][]dnl

+b4_locations_if(            [, [[YYLTYPE *yylocationp], [yylocationp]]])[]dnl

+m4_ifset([b4_parse_param], [, b4_parse_param]))[

+{

+  YYUSE (yyvaluep);

+]b4_locations_if([  YYUSE (yylocationp);

+])dnl

+b4_parse_param_use[]dnl

+[

+  if (!yymsg)

+    yymsg = "Deleting";

+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

+

+  switch (yytype)

+    {

+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[

+      default:

+        break;

+    }

+}]dnl

+])

+

+

+# b4_yy_symbol_print_generate(FUNCTION-DECLARATOR)

+# ------------------------------------------------

+# Generate the "yy_symbol_print" function, which declaration is issued using

+# FUNCTION-DECLARATOR, which may be "b4_c_ansi_function_def" for ISO C

+# or "b4_c_function_def" for K&R.

+m4_define_default([b4_yy_symbol_print_generate],

+[[

+/*--------------------------------.

+| Print this symbol on YYOUTPUT.  |

+`--------------------------------*/

+

+/*ARGSUSED*/

+]$1([yy_symbol_value_print],

+    [static void],

+               [[FILE *yyoutput],                       [yyoutput]],

+               [[int yytype],                           [yytype]],

+               [[YYSTYPE const * const yyvaluep],       [yyvaluep]][]dnl

+b4_locations_if([, [[YYLTYPE const * const yylocationp], [yylocationp]]])[]dnl

+m4_ifset([b4_parse_param], [, b4_parse_param]))[

+{

+  if (!yyvaluep)

+    return;

+]b4_locations_if([  YYUSE (yylocationp);

+])dnl

+b4_parse_param_use[]dnl

+[# ifdef YYPRINT

+  if (yytype < YYNTOKENS)

+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

+# else

+  YYUSE (yyoutput);

+# endif

+  switch (yytype)

+    {

+]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl

+[      default:

+        break;

+    }

+}

+

+

+/*--------------------------------.

+| Print this symbol on YYOUTPUT.  |

+`--------------------------------*/

+

+]$1([yy_symbol_print],

+    [static void],

+               [[FILE *yyoutput],                       [yyoutput]],

+               [[int yytype],                           [yytype]],

+               [[YYSTYPE const * const yyvaluep],       [yyvaluep]][]dnl

+b4_locations_if([, [[YYLTYPE const * const yylocationp], [yylocationp]]])[]dnl

+m4_ifset([b4_parse_param], [, b4_parse_param]))[

+{

+  if (yytype < YYNTOKENS)

+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

+  else

+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

+

+]b4_locations_if([  YY_LOCATION_PRINT (yyoutput, *yylocationp);

+  YYFPRINTF (yyoutput, ": ");

+])dnl

+[  yy_symbol_value_print (yyoutput, yytype, yyvaluep]dnl

+b4_locations_if([, yylocationp])[]b4_user_args[);

+  YYFPRINTF (yyoutput, ")");

+}]dnl

+])

diff --git a/tools/mhmake/src/bisondata/lalr1.cc b/tools/mhmake/src/bisondata/lalr1.cc
new file mode 100644
index 000000000..25dd01938
--- /dev/null
+++ b/tools/mhmake/src/bisondata/lalr1.cc
@@ -0,0 +1,1169 @@
+# C++ skeleton for Bison

+

+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008

+# Free Software Foundation, Inc.

+

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+m4_include(b4_pkgdatadir/[c++.m4])

+

+m4_define([b4_parser_class_name],

+          [b4_percent_define_get([[parser_class_name]])])

+

+m4_define([b4_parser_base_class_name],

+          [b4_percent_define_get([[parser_base_class_name]])])

+

+m4_define([b4_parser_class_constructor_init],

+          [b4_percent_define_get([[parser_class_constructor_init]])])

+

+m4_define([b4_parser_class_constructor_param],

+          [b4_percent_define_get([[parser_class_constructor_param]])])

+

+# The header is mandatory.

+b4_defines_if([],

+              [b4_fatal([b4_skeleton[: using %%defines is mandatory]])])

+

+# Backward compatibility.

+m4_define([b4_location_constructors])

+m4_include(b4_pkgdatadir/[location.cc])

+

+# We do want M4 expansion after # for CPP macros.

+m4_changecom()

+m4_divert_push(0)dnl

+b4_defines_if(

+[@output(b4_spec_defines_file@)

+b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++],

+             [2002, 2003, 2004, 2005, 2006, 2007, 2008])

+dnl FIXME: This is wrong, we want computed header guards.

+[

+/* C++ LALR(1) parser skeleton written by Akim Demaille.  */

+

+#ifndef PARSER_HEADER_H

+# define PARSER_HEADER_H

+

+]b4_percent_code_get([[requires]])[

+

+#include <string>

+#include <iostream>

+#include "stack.hh"

+

+]b4_namespace_open[

+  class position;

+  class location;

+]b4_namespace_close[

+

+#include "location.hh"

+

+/* Enabling traces.  */

+#ifndef YYDEBUG

+# define YYDEBUG ]b4_debug_flag[

+#endif

+

+/* Enabling verbose error messages.  */

+#ifdef YYERROR_VERBOSE

+# undef YYERROR_VERBOSE

+# define YYERROR_VERBOSE 1

+#else

+# define YYERROR_VERBOSE ]b4_error_verbose_flag[

+#endif

+

+/* Enabling the token table.  */

+#ifndef YYTOKEN_TABLE

+# define YYTOKEN_TABLE ]b4_token_table[

+#endif

+

+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].

+   If N is 0, then set CURRENT to the empty location which ends

+   the previous symbol: RHS[0] (always defined).  */

+

+#ifndef YYLLOC_DEFAULT

+# define YYLLOC_DEFAULT(Current, Rhs, N)                \

+do {                                                    \

+  if (N)                                                \

+    {                                                   \

+      (Current).begin = (Rhs)[1].begin;                 \

+      (Current).end   = (Rhs)[N].end;                   \

+    }                                                   \

+  else                                                  \

+    {                                                   \

+      (Current).begin = (Current).end = (Rhs)[0].end;   \

+    }                                                   \

+} while (false)

+#endif

+

+]b4_namespace_open[

+

+  /// A Bison parser.

+  class ]b4_parser_class_name[ : public ]b4_parser_base_class_name[

+  {

+  public:

+    /// Symbol semantic values.

+#ifndef YYSTYPE

+]m4_ifdef([b4_stype],

+[    union semantic_type

+    {

+b4_user_stype

+    };],

+[m4_if(b4_tag_seen_flag, 0,

+[[    typedef int semantic_type;]],

+[[    typedef YYSTYPE semantic_type;]])])[

+#else

+    typedef YYSTYPE semantic_type;

+#endif

+    /// Symbol locations.

+    typedef ]b4_percent_define_get([[location_type]])[ location_type;

+    /// Tokens.

+    struct token

+    {

+      ]b4_token_enums(b4_tokens)[

+    };

+    /// Token type.

+    typedef token::yytokentype token_type;

+

+    /// Build a parser object.

+    ]b4_parser_class_name[ (]b4_parse_param_decl[ ]b4_parser_class_constructor_param[ );

+    virtual ~]b4_parser_class_name[ ();

+

+    /// Parse.

+    /// \returns  0 iff parsing succeeded.

+    virtual int parse ();

+

+#if YYDEBUG

+    /// The current debugging stream.

+    std::ostream& debug_stream () const;

+    /// Set the current debugging stream.

+    void set_debug_stream (std::ostream &);

+

+    /// Type for debugging levels.

+    typedef int debug_level_type;

+    /// The current debugging level.

+    debug_level_type debug_level () const;

+    /// Set the current debugging level.

+    void set_debug_level (debug_level_type l);

+#endif

+

+  private:

+    /// Report a syntax error.

+    /// \param loc    where the syntax error is found.

+    /// \param msg    a description of the syntax error.

+    virtual void error (const location_type& loc, const std::string& msg);

+

+    /// Generate an error message.

+    /// \param state   the state where the error occurred.

+    /// \param tok     the lookahead token.

+    virtual std::string yysyntax_error_ (int yystate]dnl

+b4_error_verbose_if([, int tok])[);

+

+#if YYDEBUG

+    /// \brief Report a symbol value on the debug stream.

+    /// \param yytype       The token type.

+    /// \param yyvaluep     Its semantic value.

+    /// \param yylocationp  Its location.

+    virtual void yy_symbol_value_print_ (int yytype,

+                                         const semantic_type* yyvaluep,

+                                         const location_type* yylocationp);

+    /// \brief Report a symbol on the debug stream.

+    /// \param yytype       The token type.

+    /// \param yyvaluep     Its semantic value.

+    /// \param yylocationp  Its location.

+    virtual void yy_symbol_print_ (int yytype,

+                                   const semantic_type* yyvaluep,

+                                   const location_type* yylocationp);

+#endif

+

+

+    /// State numbers.

+    typedef int state_type;

+    /// State stack type.

+    typedef stack<state_type>    state_stack_type;

+    /// Semantic value stack type.

+    typedef stack<semantic_type> semantic_stack_type;

+    /// location stack type.

+    typedef stack<location_type> location_stack_type;

+

+    /// The state stack.

+    state_stack_type yystate_stack_;

+    /// The semantic value stack.

+    semantic_stack_type yysemantic_stack_;

+    /// The location stack.

+    location_stack_type yylocation_stack_;

+

+    /// Internal symbol numbers.

+    typedef ]b4_int_type_for([b4_translate])[ token_number_type;

+    /* Tables.  */

+    /// For a state, the index in \a yytable_ of its portion.

+    static const ]b4_int_type_for([b4_pact])[ yypact_[];

+    static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_;

+

+    /// For a state, default rule to reduce.

+    /// Unless\a  yytable_ specifies something else to do.

+    /// Zero means the default is an error.

+    static const ]b4_int_type_for([b4_defact])[ yydefact_[];

+

+    static const ]b4_int_type_for([b4_pgoto])[ yypgoto_[];

+    static const ]b4_int_type_for([b4_defgoto])[ yydefgoto_[];

+

+    /// What to do in a state.

+    /// \a yytable_[yypact_[s]]: what to do in state \a s.

+    /// - if positive, shift that token.

+    /// - if negative, reduce the rule which number is the opposite.

+    /// - if zero, do what YYDEFACT says.

+    static const ]b4_int_type_for([b4_table])[ yytable_[];

+    static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_;

+

+    static const ]b4_int_type_for([b4_check])[ yycheck_[];

+

+    /// For a state, its accessing symbol.

+    static const ]b4_int_type_for([b4_stos])[ yystos_[];

+

+    /// For a rule, its LHS.

+    static const ]b4_int_type_for([b4_r1])[ yyr1_[];

+    /// For a rule, its RHS length.

+    static const ]b4_int_type_for([b4_r2])[ yyr2_[];

+

+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE

+    /// For a symbol, its name in clear.

+    static const char* const yytname_[];

+#endif

+

+#if YYERROR_VERBOSE

+    /// Convert the symbol name \a n to a form suitable for a diagnostic.

+    virtual std::string yytnamerr_ (const char *n);

+#endif

+

+#if YYDEBUG

+    /// A type to store symbol numbers and -1.

+    typedef ]b4_int_type_for([b4_rhs])[ rhs_number_type;

+    /// A `-1'-separated list of the rules' RHS.

+    static const rhs_number_type yyrhs_[];

+    /// For each rule, the index of the first RHS symbol in \a yyrhs_.

+    static const ]b4_int_type_for([b4_prhs])[ yyprhs_[];

+    /// For each rule, its source line number.

+    static const ]b4_int_type_for([b4_rline])[ yyrline_[];

+    /// For each scanner token number, its symbol number.

+    static const ]b4_int_type_for([b4_toknum])[ yytoken_number_[];

+    /// Report on the debug stream that the rule \a r is going to be reduced.

+    virtual void yy_reduce_print_ (int r);

+    /// Print the state stack on the debug stream.

+    virtual void yystack_print_ ();

+

+    /* Debugging.  */

+    int yydebug_;

+    std::ostream* yycdebug_;

+#endif

+

+    /// Convert a scanner token number \a t to a symbol number.

+    token_number_type yytranslate_ (int t);

+

+    /// \brief Reclaim the memory associated to a symbol.

+    /// \param yymsg        Why this token is reclaimed.

+    /// \param yytype       The symbol type.

+    /// \param yyvaluep     Its semantic value.

+    /// \param yylocationp  Its location.

+    inline void yydestruct_ (const char* yymsg,

+                             int yytype,

+                             semantic_type* yyvaluep,

+                             location_type* yylocationp);

+

+    /// Pop \a n symbols the three stacks.

+    inline void yypop_ (unsigned int n = 1);

+

+    /* Constants.  */

+    static const int yyeof_;

+    /* LAST_ -- Last index in TABLE_.  */

+    static const int yylast_;

+    static const int yynnts_;

+    static const int yyempty_;

+    static const int yyfinal_;

+    static const int yyterror_;

+    static const int yyerrcode_;

+    static const int yyntokens_;

+    static const unsigned int yyuser_token_number_max_;

+    static const token_number_type yyundef_token_;

+]b4_parse_param_vars[

+  };

+]b4_namespace_close[

+

+]b4_percent_define_flag_if([[global_tokens_and_yystype]],

+[b4_token_defines(b4_tokens)

+

+#ifndef YYSTYPE

+ /* Redirection for backward compatibility.  */

+# define YYSTYPE b4_namespace_ref::b4_parser_class_name::semantic_type

+#endif

+])

+b4_percent_code_get([[provides]])[]dnl

+

+[#endif /* ! defined PARSER_HEADER_H */]

+])dnl

+@output(b4_parser_file_name@)

+b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++],

+             [2002, 2003, 2004, 2005, 2006, 2007, 2008])

+b4_percent_code_get([[top]])[]dnl

+m4_if(b4_prefix, [yy], [],

+[

+// Take the name prefix into account.

+#define yylex   b4_prefix[]lex])[

+

+/* First part of user declarations.  */

+]b4_user_pre_prologue

+

+b4_defines_if([[

+#include "@basename(]b4_spec_defines_file[@)"]])[

+

+/* User implementation prologue.  */

+]b4_user_post_prologue

+b4_percent_code_get[]dnl

+

+[#ifndef YY_

+# if YYENABLE_NLS

+#  if ENABLE_NLS

+#   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */

+#   define YY_(msgid) dgettext ("bison-runtime", msgid)

+#  endif

+# endif

+# ifndef YY_

+#  define YY_(msgid) msgid

+# endif

+#endif

+

+/* Suppress unused-variable warnings by "using" E.  */

+#define YYUSE(e) ((void) (e))

+

+/* Enable debugging if requested.  */

+#if YYDEBUG

+

+/* A pseudo ostream that takes yydebug_ into account.  */

+# define YYCDEBUG if (yydebug_) (*yycdebug_)

+

+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)  \

+do {                                                    \

+  if (yydebug_)                                         \

+    {                                                   \

+      *yycdebug_ << Title << ' ';                       \

+      yy_symbol_print_ ((Type), (Value), (Location));   \

+      *yycdebug_ << std::endl;                          \

+    }                                                   \

+} while (false)

+

+# define YY_REDUCE_PRINT(Rule)          \

+do {                                    \

+  if (yydebug_)                         \

+    yy_reduce_print_ (Rule);            \

+} while (false)

+

+# define YY_STACK_PRINT()               \

+do {                                    \

+  if (yydebug_)                         \

+    yystack_print_ ();                  \

+} while (false)

+

+#else /* !YYDEBUG */

+

+# define YYCDEBUG if (false) std::cerr

+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)

+# define YY_REDUCE_PRINT(Rule)

+# define YY_STACK_PRINT()

+

+#endif /* !YYDEBUG */

+

+#define yyerrok         (yyerrstatus_ = 0)

+#define yyclearin       (yychar = yyempty_)

+

+#define YYACCEPT        goto yyacceptlab

+#define YYABORT         goto yyabortlab

+#define YYERROR         goto yyerrorlab

+#define YYRECOVERING()  (!!yyerrstatus_)

+

+]b4_namespace_open[

+#if YYERROR_VERBOSE

+

+  /* Return YYSTR after stripping away unnecessary quotes and

+     backslashes, so that it's suitable for yyerror.  The heuristic is

+     that double-quoting is unnecessary unless the string contains an

+     apostrophe, a comma, or backslash (other than backslash-backslash).

+     YYSTR is taken from yytname.  */

+  std::string

+  ]b4_parser_class_name[::yytnamerr_ (const char *yystr)

+  {

+    if (*yystr == '"')

+      {

+        std::string yyr = "";

+        char const *yyp = yystr;

+

+        for (;;)

+          switch (*++yyp)

+            {

+            case '\'':

+            case ',':

+              goto do_not_strip_quotes;

+

+            case '\\':

+              if (*++yyp != '\\')

+                goto do_not_strip_quotes;

+              /* Fall through.  */

+            default:

+              yyr += *yyp;

+              break;

+

+            case '"':

+              return yyr;

+            }

+      do_not_strip_quotes: ;

+      }

+

+    return yystr;

+  }

+

+#endif

+

+  /// Build a parser object.

+  ]b4_parser_class_name::b4_parser_class_name[ (]b4_parse_param_decl[ ]b4_parser_class_constructor_param[) ]b4_parser_class_constructor_init[ ]m4_ifset([b4_parse_param], [

+    :])[

+

+#if YYDEBUG

+    ]m4_ifset([b4_parse_param], [  ], [ :])[yydebug_ (false),

+      yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[

+#endif]b4_parse_param_cons[

+  {

+  }

+

+  ]b4_parser_class_name::~b4_parser_class_name[ ()

+  {

+  }

+

+#if YYDEBUG

+  /*--------------------------------.

+  | Print this symbol on YYOUTPUT.  |

+  `--------------------------------*/

+

+  inline void

+  ]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,

+                           const semantic_type* yyvaluep, const location_type* yylocationp)

+  {

+    YYUSE (yylocationp);

+    YYUSE (yyvaluep);

+    switch (yytype)

+      {

+  ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl

+[       default:

+          break;

+      }

+  }

+

+

+  void

+  ]b4_parser_class_name[::yy_symbol_print_ (int yytype,

+                           const semantic_type* yyvaluep, const location_type* yylocationp)

+  {

+    *yycdebug_ << (yytype < yyntokens_ ? "token" : "nterm")

+               << ' ' << yytname_[yytype] << " ("

+               << *yylocationp << ": ";

+    yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);

+    *yycdebug_ << ')';

+  }

+#endif

+

+  void

+  ]b4_parser_class_name[::yydestruct_ (const char* yymsg,

+                           int yytype, semantic_type* yyvaluep, location_type* yylocationp)

+  {

+    YYUSE (yylocationp);

+    YYUSE (yymsg);

+    YYUSE (yyvaluep);

+

+    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

+

+]m4_ifset([b4_symbol_actions], [  ], [

+    switch (yytype)

+      {

+  ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[

+        default:

+          break;

+      }

+    ])[

+  }

+

+  void

+  ]b4_parser_class_name[::yypop_ (unsigned int n)

+  {

+    yystate_stack_.pop (n);

+    yysemantic_stack_.pop (n);

+    yylocation_stack_.pop (n);

+  }

+

+#if YYDEBUG

+  std::ostream&

+  ]b4_parser_class_name[::debug_stream () const

+  {

+    return *yycdebug_;

+  }

+

+  void

+  ]b4_parser_class_name[::set_debug_stream (std::ostream& o)

+  {

+    yycdebug_ = &o;

+  }

+

+

+  ]b4_parser_class_name[::debug_level_type

+  ]b4_parser_class_name[::debug_level () const

+  {

+    return yydebug_;

+  }

+

+  void

+  ]b4_parser_class_name[::set_debug_level (debug_level_type l)

+  {

+    yydebug_ = l;

+  }

+#endif

+

+  int

+  ]b4_parser_class_name[::parse ()

+  {

+    /// Lookahead and lookahead in internal form.

+    int yychar = yyempty_;

+    int yytoken = 0;

+

+    /* State.  */

+    int yyn;

+    int yylen = 0;

+    int yystate = 0;

+

+    /* Error handling.  */

+    int yynerrs_ = 0;

+    int yyerrstatus_ = 0;

+

+    /// Semantic value of the lookahead.

+    semantic_type yylval;

+    /// Location of the lookahead.

+    location_type yylloc;

+    /// The locations where the error started and ended.

+    location_type yyerror_range[2];

+

+    /// $$.

+    semantic_type yyval;

+    /// @@$.

+    location_type yyloc;

+

+    int yyresult;

+

+    YYCDEBUG << "Starting parse" << std::endl;

+

+]m4_ifdef([b4_initial_action], [

+m4_pushdef([b4_at_dollar],     [yylloc])dnl

+m4_pushdef([b4_dollar_dollar], [yylval])dnl

+    /* User initialization code.  */

+    b4_user_initial_action

+m4_popdef([b4_dollar_dollar])dnl

+m4_popdef([b4_at_dollar])])dnl

+

+  [  /* Initialize the stacks.  The initial state will be pushed in

+       yynewstate, since the latter expects the semantical and the

+       location values to have been already stored, initialize these

+       stacks with a primary value.  */

+    yystate_stack_ = state_stack_type (0);

+    yysemantic_stack_ = semantic_stack_type (0);

+    yylocation_stack_ = location_stack_type (0);

+    yysemantic_stack_.push (yylval);

+    yylocation_stack_.push (yylloc);

+

+    /* New state.  */

+  yynewstate:

+    yystate_stack_.push (yystate);

+    YYCDEBUG << "Entering state " << yystate << std::endl;

+

+    /* Accept?  */

+    if (yystate == yyfinal_)

+      goto yyacceptlab;

+

+    goto yybackup;

+

+    /* Backup.  */

+  yybackup:

+

+    /* Try to take a decision without lookahead.  */

+    yyn = yypact_[yystate];

+    if (yyn == yypact_ninf_)

+      goto yydefault;

+

+    /* Read a lookahead token.  */

+    if (yychar == yyempty_)

+      {

+        YYCDEBUG << "Reading a token: ";

+        yychar = ]b4_c_function_call([yylex], [int],

+                                     [[YYSTYPE*], [&yylval]][]dnl

+b4_locations_if([, [[location*], [&yylloc]]])dnl

+m4_ifdef([b4_lex_param], [, ]b4_lex_param))[;

+      }

+

+

+    /* Convert token to internal form.  */

+    if (yychar <= yyeof_)

+      {

+        yychar = yytoken = yyeof_;

+        YYCDEBUG << "Now at end of input." << std::endl;

+      }

+    else

+      {

+        yytoken = yytranslate_ (yychar);

+        YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);

+      }

+

+    /* If the proper action on seeing token YYTOKEN is to reduce or to

+       detect an error, take that action.  */

+    yyn += yytoken;

+    if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken)

+      goto yydefault;

+

+    /* Reduce or error.  */

+    yyn = yytable_[yyn];

+    if (yyn <= 0)

+      {

+        if (yyn == 0 || yyn == yytable_ninf_)

+        goto yyerrlab;

+        yyn = -yyn;

+        goto yyreduce;

+      }

+

+    /* Shift the lookahead token.  */

+    YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);

+

+    /* Discard the token being shifted.  */

+    yychar = yyempty_;

+

+    yysemantic_stack_.push (yylval);

+    yylocation_stack_.push (yylloc);

+

+    /* Count tokens shifted since error; after three, turn off error

+       status.  */

+    if (yyerrstatus_)

+      --yyerrstatus_;

+

+    yystate = yyn;

+    goto yynewstate;

+

+  /*-----------------------------------------------------------.

+  | yydefault -- do the default action for the current state.  |

+  `-----------------------------------------------------------*/

+  yydefault:

+    yyn = yydefact_[yystate];

+    if (yyn == 0)

+      goto yyerrlab;

+    goto yyreduce;

+

+  /*-----------------------------.

+  | yyreduce -- Do a reduction.  |

+  `-----------------------------*/

+  yyreduce:

+    yylen = yyr2_[yyn];

+    /* If YYLEN is nonzero, implement the default value of the action:

+       `$$ = $1'.  Otherwise, use the top of the stack.

+

+       Otherwise, the following line sets YYVAL to garbage.

+       This behavior is undocumented and Bison

+       users should not rely upon it.  */

+    if (yylen)

+      yyval = yysemantic_stack_[yylen - 1];

+    else

+      yyval = yysemantic_stack_[0];

+

+    {

+      slice<location_type, location_stack_type> slice (yylocation_stack_, yylen);

+      YYLLOC_DEFAULT (yyloc, slice, yylen);

+    }

+    YY_REDUCE_PRINT (yyn);

+    switch (yyn)

+      {

+        ]b4_user_actions[

+        default:

+          break;

+      }

+    YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);

+

+    yypop_ (yylen);

+    yylen = 0;

+    YY_STACK_PRINT ();

+

+    yysemantic_stack_.push (yyval);

+    yylocation_stack_.push (yyloc);

+

+    /* Shift the result of the reduction.  */

+    yyn = yyr1_[yyn];

+    yystate = yypgoto_[yyn - yyntokens_] + yystate_stack_[0];

+    if (0 <= yystate && yystate <= yylast_

+        && yycheck_[yystate] == yystate_stack_[0])

+      yystate = yytable_[yystate];

+    else

+      yystate = yydefgoto_[yyn - yyntokens_];

+    goto yynewstate;

+

+  /*------------------------------------.

+  | yyerrlab -- here on detecting error |

+  `------------------------------------*/

+  yyerrlab:

+    /* If not already recovering from an error, report this error.  */

+    if (!yyerrstatus_)

+      {

+        ++yynerrs_;

+        error (yylloc, yysyntax_error_ (yystate]dnl

+b4_error_verbose_if([, yytoken])[));

+      }

+

+    yyerror_range[0] = yylloc;

+    if (yyerrstatus_ == 3)

+      {

+        /* If just tried and failed to reuse lookahead token after an

+         error, discard it.  */

+

+        if (yychar <= yyeof_)

+          {

+          /* Return failure if at end of input.  */

+          if (yychar == yyeof_)

+            YYABORT;

+          }

+        else

+          {

+            yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);

+            yychar = yyempty_;

+          }

+      }

+

+    /* Else will try to reuse lookahead token after shifting the error

+       token.  */

+    goto yyerrlab1;

+

+

+  /*---------------------------------------------------.

+  | yyerrorlab -- error raised explicitly by YYERROR.  |

+  `---------------------------------------------------*/

+  yyerrorlab:

+

+    /* Pacify compilers like GCC when the user code never invokes

+       YYERROR and the label yyerrorlab therefore never appears in user

+       code.  */

+    if (false)

+      goto yyerrorlab;

+

+    yyerror_range[0] = yylocation_stack_[yylen - 1];

+    /* Do not reclaim the symbols of the rule which action triggered

+       this YYERROR.  */

+    yypop_ (yylen);

+    yylen = 0;

+    yystate = yystate_stack_[0];

+    goto yyerrlab1;

+

+  /*-------------------------------------------------------------.

+  | yyerrlab1 -- common code for both syntax error and YYERROR.  |

+  `-------------------------------------------------------------*/

+  yyerrlab1:

+    yyerrstatus_ = 3;   /* Each real token shifted decrements this.  */

+

+    for (;;)

+      {

+        yyn = yypact_[yystate];

+        if (yyn != yypact_ninf_)

+        {

+          yyn += yyterror_;

+          if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)

+            {

+              yyn = yytable_[yyn];

+              if (0 < yyn)

+                break;

+            }

+        }

+

+        /* Pop the current state because it cannot handle the error token.  */

+        if (yystate_stack_.height () == 1)

+        YYABORT;

+

+        yyerror_range[0] = yylocation_stack_[0];

+        yydestruct_ ("Error: popping",

+                     yystos_[yystate],

+                     &yysemantic_stack_[0], &yylocation_stack_[0]);

+        yypop_ ();

+        yystate = yystate_stack_[0];

+        YY_STACK_PRINT ();

+      }

+

+    yyerror_range[1] = yylloc;

+    // Using YYLLOC is tempting, but would change the location of

+    // the lookahead.  YYLOC is available though.

+    YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);

+    yysemantic_stack_.push (yylval);

+    yylocation_stack_.push (yyloc);

+

+    /* Shift the error token.  */

+    YY_SYMBOL_PRINT ("Shifting", yystos_[yyn],

+                     &yysemantic_stack_[0], &yylocation_stack_[0]);

+

+    yystate = yyn;

+    goto yynewstate;

+

+    /* Accept.  */

+  yyacceptlab:

+    yyresult = 0;

+    goto yyreturn;

+

+    /* Abort.  */

+  yyabortlab:

+    yyresult = 1;

+    goto yyreturn;

+

+  yyreturn:

+    if (yychar != yyempty_)

+      yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc);

+

+    /* Do not reclaim the symbols of the rule which action triggered

+       this YYABORT or YYACCEPT.  */

+    yypop_ (yylen);

+    while (yystate_stack_.height () != 1)

+      {

+        yydestruct_ ("Cleanup: popping",

+                   yystos_[yystate_stack_[0]],

+                   &yysemantic_stack_[0],

+                   &yylocation_stack_[0]);

+        yypop_ ();

+      }

+

+    return yyresult;

+  }

+

+  // Generate an error message.

+  std::string

+  ]b4_parser_class_name[::yysyntax_error_ (int yystate]dnl

+b4_error_verbose_if([, int tok])[)

+  {

+    std::string res;

+    YYUSE (yystate);

+#if YYERROR_VERBOSE

+    int yyn = yypact_[yystate];

+    if (yypact_ninf_ < yyn && yyn <= yylast_)

+      {

+        /* Start YYX at -YYN if negative to avoid negative indexes in

+           YYCHECK.  */

+        int yyxbegin = yyn < 0 ? -yyn : 0;

+

+        /* Stay within bounds of both yycheck and yytname.  */

+        int yychecklim = yylast_ - yyn + 1;

+        int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;

+        int count = 0;

+        for (int x = yyxbegin; x < yyxend; ++x)

+          if (yycheck_[x + yyn] == x && x != yyterror_)

+            ++count;

+

+        // FIXME: This method of building the message is not compatible

+        // with internationalization.  It should work like yacc.c does it.

+        // That is, first build a string that looks like this:

+        // "syntax error, unexpected %s or %s or %s"

+        // Then, invoke YY_ on this string.

+        // Finally, use the string as a format to output

+        // yytname_[tok], etc.

+        // Until this gets fixed, this message appears in English only.

+        res = "syntax error, unexpected ";

+        res += yytnamerr_ (yytname_[tok]);

+        if (count < 5)

+          {

+            count = 0;

+            for (int x = yyxbegin; x < yyxend; ++x)

+              if (yycheck_[x + yyn] == x && x != yyterror_)

+                {

+                  res += (!count++) ? ", expecting " : " or ";

+                  res += yytnamerr_ (yytname_[x]);

+                }

+          }

+      }

+    else

+#endif

+      res = YY_("syntax error");

+    return res;

+  }

+

+

+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing

+     STATE-NUM.  */

+  const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) b4_parser_class_name::yypact_ninf_ = b4_pact_ninf[;

+  const ]b4_int_type_for([b4_pact])[

+  ]b4_parser_class_name[::yypact_[] =

+  {

+    ]b4_pact[

+  };

+

+  /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE

+     doesn't specify something else to do.  Zero means the default is an

+     error.  */

+  const ]b4_int_type_for([b4_defact])[

+  ]b4_parser_class_name[::yydefact_[] =

+  {

+    ]b4_defact[

+  };

+

+  /* YYPGOTO[NTERM-NUM].  */

+  const ]b4_int_type_for([b4_pgoto])[

+  ]b4_parser_class_name[::yypgoto_[] =

+  {

+    ]b4_pgoto[

+  };

+

+  /* YYDEFGOTO[NTERM-NUM].  */

+  const ]b4_int_type_for([b4_defgoto])[

+  ]b4_parser_class_name[::yydefgoto_[] =

+  {

+    ]b4_defgoto[

+  };

+

+  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If

+     positive, shift that token.  If negative, reduce the rule which

+     number is the opposite.  If zero, do what YYDEFACT says.  */

+  const ]b4_int_type(b4_table_ninf, b4_table_ninf) b4_parser_class_name::yytable_ninf_ = b4_table_ninf[;

+  const ]b4_int_type_for([b4_table])[

+  ]b4_parser_class_name[::yytable_[] =

+  {

+    ]b4_table[

+  };

+

+  /* YYCHECK.  */

+  const ]b4_int_type_for([b4_check])[

+  ]b4_parser_class_name[::yycheck_[] =

+  {

+    ]b4_check[

+  };

+

+  /* STOS_[STATE-NUM] -- The (internal number of the) accessing

+     symbol of state STATE-NUM.  */

+  const ]b4_int_type_for([b4_stos])[

+  ]b4_parser_class_name[::yystos_[] =

+  {

+    ]b4_stos[

+  };

+

+#if YYDEBUG

+  /* TOKEN_NUMBER_[YYLEX-NUM] -- Internal symbol number corresponding

+     to YYLEX-NUM.  */

+  const ]b4_int_type_for([b4_toknum])[

+  ]b4_parser_class_name[::yytoken_number_[] =

+  {

+    ]b4_toknum[

+  };

+#endif

+

+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

+  const ]b4_int_type_for([b4_r1])[

+  ]b4_parser_class_name[::yyr1_[] =

+  {

+    ]b4_r1[

+  };

+

+  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

+  const ]b4_int_type_for([b4_r2])[

+  ]b4_parser_class_name[::yyr2_[] =

+  {

+    ]b4_r2[

+  };

+

+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE

+  /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

+     First, the terminals, then, starting at \a yyntokens_, nonterminals.  */

+  const char*

+  const ]b4_parser_class_name[::yytname_[] =

+  {

+    ]b4_tname[

+  };

+#endif

+

+#if YYDEBUG

+  /* YYRHS -- A `-1'-separated list of the rules' RHS.  */

+  const ]b4_parser_class_name[::rhs_number_type

+  ]b4_parser_class_name[::yyrhs_[] =

+  {

+    ]b4_rhs[

+  };

+

+  /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in

+     YYRHS.  */

+  const ]b4_int_type_for([b4_prhs])[

+  ]b4_parser_class_name[::yyprhs_[] =

+  {

+    ]b4_prhs[

+  };

+

+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */

+  const ]b4_int_type_for([b4_rline])[

+  ]b4_parser_class_name[::yyrline_[] =

+  {

+    ]b4_rline[

+  };

+

+  // Print the state stack on the debug stream.

+  void

+  ]b4_parser_class_name[::yystack_print_ ()

+  {

+    *yycdebug_ << "Stack now";

+    for (state_stack_type::const_iterator i = yystate_stack_.begin ();

+         i != yystate_stack_.end (); ++i)

+      *yycdebug_ << ' ' << *i;

+    *yycdebug_ << std::endl;

+  }

+

+  // Report on the debug stream that the rule \a yyrule is going to be reduced.

+  void

+  ]b4_parser_class_name[::yy_reduce_print_ (int yyrule)

+  {

+    unsigned int yylno = yyrline_[yyrule];

+    int yynrhs = yyr2_[yyrule];

+    /* Print the symbols being reduced, and their result.  */

+    *yycdebug_ << "Reducing stack by rule " << yyrule - 1

+               << " (line " << yylno << "):" << std::endl;

+    /* The symbols being reduced.  */

+    for (int yyi = 0; yyi < yynrhs; yyi++)

+      YY_SYMBOL_PRINT ("   $" << yyi + 1 << " =",

+                       yyrhs_[yyprhs_[yyrule] + yyi],

+                       &]b4_rhs_value(yynrhs, yyi + 1)[,

+                       &]b4_rhs_location(yynrhs, yyi + 1)[);

+  }

+#endif // YYDEBUG

+

+  /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */

+  ]b4_parser_class_name[::token_number_type

+  ]b4_parser_class_name[::yytranslate_ (int t)

+  {

+    static

+    const token_number_type

+    translate_table[] =

+    {

+      ]b4_translate[

+    };

+    if ((unsigned int) t <= yyuser_token_number_max_)

+      return translate_table[t];

+    else

+      return yyundef_token_;

+  }

+

+  const int ]b4_parser_class_name[::yyeof_ = 0;

+  const int ]b4_parser_class_name[::yylast_ = ]b4_last[;

+  const int ]b4_parser_class_name[::yynnts_ = ]b4_nterms_number[;

+  const int ]b4_parser_class_name[::yyempty_ = -2;

+  const int ]b4_parser_class_name[::yyfinal_ = ]b4_final_state_number[;

+  const int ]b4_parser_class_name[::yyterror_ = 1;

+  const int ]b4_parser_class_name[::yyerrcode_ = 256;

+  const int ]b4_parser_class_name[::yyntokens_ = ]b4_tokens_number[;

+

+  const unsigned int ]b4_parser_class_name[::yyuser_token_number_max_ = ]b4_user_token_number_max[;

+  const ]b4_parser_class_name[::token_number_type ]b4_parser_class_name[::yyundef_token_ = ]b4_undef_token_number[;

+

+]b4_namespace_close[

+

+]b4_epilogue

+dnl

+@output(b4_dir_prefix[]stack.hh@)

+b4_copyright([Stack handling for Bison parsers in C++],

+             [2002, 2003, 2004, 2005, 2006, 2007, 2008])[

+

+#ifndef BISON_STACK_HH

+# define BISON_STACK_HH

+

+#include <deque>

+

+]b4_namespace_open[

+  template <class T, class S = std::deque<T> >

+  class stack

+  {

+  public:

+

+    // Hide our reversed order.

+    typedef typename S::reverse_iterator iterator;

+    typedef typename S::const_reverse_iterator const_iterator;

+

+    stack () : seq_ ()

+    {

+    }

+

+    stack (unsigned int n) : seq_ (n)

+    {

+    }

+

+    inline

+    T&

+    operator [] (unsigned int i)

+    {

+      return seq_[i];

+    }

+

+    inline

+    const T&

+    operator [] (unsigned int i) const

+    {

+      return seq_[i];

+    }

+

+    inline

+    void

+    push (const T& t)

+    {

+      seq_.push_front (t);

+    }

+

+    inline

+    void

+    pop (unsigned int n = 1)

+    {

+      for (; n; --n)

+        seq_.pop_front ();

+    }

+

+    inline

+    unsigned int

+    height () const

+    {

+      return seq_.size ();

+    }

+

+    inline const_iterator begin () const { return seq_.rbegin (); }

+    inline const_iterator end () const { return seq_.rend (); }

+

+  private:

+

+    S seq_;

+  };

+

+  /// Present a slice of the top of a stack.

+  template <class T, class S = stack<T> >

+  class slice

+  {

+  public:

+

+    slice (const S& stack,

+           unsigned int range) : stack_ (stack),

+                                 range_ (range)

+    {

+    }

+

+    inline

+    const T&

+    operator [] (unsigned int i) const

+    {

+      return stack_[range_ - i];

+    }

+

+  private:

+

+    const S& stack_;

+    unsigned int range_;

+  };

+]b4_namespace_close[

+

+#endif // not BISON_STACK_HH[]dnl

+]

+m4_divert_pop(0)

diff --git a/tools/mhmake/src/bisondata/location.cc b/tools/mhmake/src/bisondata/location.cc
new file mode 100644
index 000000000..e142e5115
--- /dev/null
+++ b/tools/mhmake/src/bisondata/location.cc
@@ -0,0 +1,279 @@
+# C++ skeleton for Bison

+

+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,

+# Inc.

+

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+# We do want M4 expansion after # for CPP macros.

+m4_changecom()

+m4_divert_push(0)dnl

+@output(b4_dir_prefix[]position.hh@)

+b4_copyright([Positions for Bison parsers in C++],

+  [2002, 2003, 2004, 2005, 2006])[

+

+/**

+ ** \file position.hh

+ ** Define the ]b4_namespace_ref[::position class.

+ */

+

+#ifndef BISON_POSITION_HH

+# define BISON_POSITION_HH

+

+# include <iostream>

+# include <string>

+# include <algorithm>

+

+]b4_namespace_open[

+  /// Abstract a position.

+  class position

+  {

+  public:

+]m4_ifdef([b4_location_constructors], [

+    /// Construct a position.

+    position ()

+      : filename (0), line (]b4_location_initial_line[), column (]b4_location_initial_column[)

+    {

+    }

+

+])[

+    /// Initialization.

+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)

+    {

+      filename = fn;

+      line = ]b4_location_initial_line[;

+      column = ]b4_location_initial_column[;

+    }

+

+    /** \name Line and Column related manipulators

+     ** \{ */

+  public:

+    /// (line related) Advance to the COUNT next lines.

+    inline void lines (int count = 1)

+    {

+      column = ]b4_location_initial_column[;

+      line += count;

+    }

+    /// (column related) Advance to the COUNT next columns.

+    inline void columns (int count = 1)

+    {

+      column = std::max (]b4_location_initial_column[u, column + count);

+    }

+    /** \} */

+

+  public:

+    /// File name to which this position refers.

+    ]b4_percent_define_get([[filename_type]])[* filename;

+    /// Current line number.

+    unsigned int line;

+    /// Current column number.

+    unsigned int column;

+  };

+

+  /// Add and assign a position.

+  inline const position&

+  operator+= (position& res, const int width)

+  {

+    res.columns (width);

+    return res;

+  }

+

+  /// Add two position objects.

+  inline const position

+  operator+ (const position& begin, const int width)

+  {

+    position res = begin;

+    return res += width;

+  }

+

+  /// Add and assign a position.

+  inline const position&

+  operator-= (position& res, const int width)

+  {

+    return res += -width;

+  }

+

+  /// Add two position objects.

+  inline const position

+  operator- (const position& begin, const int width)

+  {

+    return begin + -width;

+  }

+]b4_percent_define_flag_if([[define_location_comparison]], [[

+  /// Compare two position objects.

+  inline bool

+  operator== (const position& pos1, const position& pos2)

+  {

+    return

+      (pos1.filename == pos2.filename

+       || pos1.filename && pos2.filename && *pos1.filename == *pos2.filename)

+      && pos1.line == pos2.line && pos1.column == pos2.column;

+  }

+

+  /// Compare two position objects.

+  inline bool

+  operator!= (const position& pos1, const position& pos2)

+  {

+    return !(pos1 == pos2);

+  }

+]])[

+  /** \brief Intercept output stream redirection.

+   ** \param ostr the destination output stream

+   ** \param pos a reference to the position to redirect

+   */

+  inline std::ostream&

+  operator<< (std::ostream& ostr, const position& pos)

+  {

+    if (pos.filename)

+      ostr << *pos.filename << ':';

+    return ostr << pos.line << '.' << pos.column;

+  }

+

+]b4_namespace_close[

+#endif // not BISON_POSITION_HH]

+@output(b4_dir_prefix[]location.hh@)

+b4_copyright([Locations for Bison parsers in C++],

+  [2002, 2003, 2004, 2005, 2006])[

+

+/**

+ ** \file location.hh

+ ** Define the ]b4_namespace_ref[::location class.

+ */

+

+#ifndef BISON_LOCATION_HH

+# define BISON_LOCATION_HH

+

+# include <iostream>

+# include <string>

+# include "position.hh"

+

+]b4_namespace_open[

+

+  /// Abstract a location.

+  class location

+  {

+  public:

+]m4_ifdef([b4_location_constructors], [

+    /// Construct a location.

+    location ()

+      : begin (), end ()

+    {

+    }

+

+])[

+    /// Initialization.

+    inline void initialize (]b4_percent_define_get([[filename_type]])[* fn)

+    {

+      begin.initialize (fn);

+      end = begin;

+    }

+

+    /** \name Line and Column related manipulators

+     ** \{ */

+  public:

+    /// Reset initial location to final location.

+    inline void step ()

+    {

+      begin = end;

+    }

+

+    /// Extend the current location to the COUNT next columns.

+    inline void columns (unsigned int count = 1)

+    {

+      end += count;

+    }

+

+    /// Extend the current location to the COUNT next lines.

+    inline void lines (unsigned int count = 1)

+    {

+      end.lines (count);

+    }

+    inline void incline ()

+    {

+      lines(1);

+      step();

+    }

+    /** \} */

+

+

+  public:

+    /// Beginning of the located region.

+    position begin;

+    /// End of the located region.

+    position end;

+  };

+

+  /// Join two location objects to create a location.

+  inline const location operator+ (const location& begin, const location& end)

+  {

+    location res = begin;

+    res.end = end.end;

+    return res;

+  }

+

+  /// Add two location objects.

+  inline const location operator+ (const location& begin, unsigned int width)

+  {

+    location res = begin;

+    res.columns (width);

+    return res;

+  }

+

+  /// Add and assign a location.

+  inline location& operator+= (location& res, unsigned int width)

+  {

+    res.columns (width);

+    return res;

+  }

+]b4_percent_define_flag_if([[define_location_comparison]], [[

+  /// Compare two location objects.

+  inline bool

+  operator== (const location& loc1, const location& loc2)

+  {

+    return loc1.begin == loc2.begin && loc1.end == loc2.end;

+  }

+

+  /// Compare two location objects.

+  inline bool

+  operator!= (const location& loc1, const location& loc2)

+  {

+    return !(loc1 == loc2);

+  }

+]])[

+  /** \brief Intercept output stream redirection.

+   ** \param ostr the destination output stream

+   ** \param loc a reference to the location to redirect

+   **

+   ** Avoid duplicate information.

+   */

+  inline std::ostream& operator<< (std::ostream& ostr, const location& loc)

+  {

+    position last = loc.end - 1;

+    ostr << loc.begin;

+    if (last.filename

+        && (!loc.begin.filename

+            || *loc.begin.filename != *last.filename))

+      ostr << '-' << last;

+    else if (loc.begin.line != last.line)

+      ostr << '-' << last.line  << '.' << last.column;

+    else if (loc.begin.column != last.column)

+      ostr << '-' << last.column;

+    return ostr;

+  }

+

+]b4_namespace_close[

+

+#endif // not BISON_LOCATION_HH]

+m4_divert_pop(0)

+m4_changecom([#])

diff --git a/tools/mhmake/src/bisondata/m4sugar/foreach.m4 b/tools/mhmake/src/bisondata/m4sugar/foreach.m4
new file mode 100644
index 000000000..f6b724d77
--- /dev/null
+++ b/tools/mhmake/src/bisondata/m4sugar/foreach.m4
@@ -0,0 +1,400 @@
+#                                                  -*- Autoconf -*-

+# This file is part of Autoconf.

+# foreach-based replacements for recursive functions.

+# Speeds up GNU M4 1.4.x by avoiding quadratic $@ recursion, but penalizes

+# GNU M4 1.6 by requiring more memory and macro expansions.

+#

+# Copyright (C) 2008 Free Software Foundation, Inc.

+#

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+# As a special exception, the Free Software Foundation gives unlimited

+# permission to copy, distribute and modify the configure scripts that

+# are the output of Autoconf.  You need not follow the terms of the GNU

+# General Public License when using or distributing such scripts, even

+# though portions of the text of Autoconf appear in them.  The GNU

+# General Public License (GPL) does govern all other use of the material

+# that constitutes the Autoconf program.

+#

+# Certain portions of the Autoconf source text are designed to be copied

+# (in certain cases, depending on the input) into the output of

+# Autoconf.  We call these the "data" portions.  The rest of the Autoconf

+# source text consists of comments plus executable code that decides which

+# of the data portions to output in any given case.  We call these

+# comments and executable code the "non-data" portions.  Autoconf never

+# copies any of the non-data portions into its output.

+#

+# This special exception to the GPL applies to versions of Autoconf

+# released by the Free Software Foundation.  When you make and

+# distribute a modified version of Autoconf, you may extend this special

+# exception to the GPL to apply to your modified version as well, *unless*

+# your modified version has the potential to copy into its output some

+# of the text that was the non-data portion of the version that you started

+# with.  (In other words, unless your change moves or copies text from

+# the non-data portions to the data portions.)  If your modification has

+# such potential, you must delete any notice of this special exception

+# to the GPL from your modified version.

+#

+# Written by Eric Blake.

+#

+

+# In M4 1.4.x, every byte of $@ is rescanned.  This means that an

+# algorithm on n arguments that recurses with one less argument each

+# iteration will scan n * (n + 1) / 2 arguments, for O(n^2) time.  In

+# M4 1.6, this was fixed so that $@ is only scanned once, then

+# back-references are made to information stored about the scan.

+# Thus, n iterations need only scan n arguments, for O(n) time.

+# Additionally, in M4 1.4.x, recursive algorithms did not clean up

+# memory very well, requiring O(n^2) memory rather than O(n) for n

+# iterations.

+#

+# This file is designed to overcome the quadratic nature of $@

+# recursion by writing a variant of m4_foreach that uses m4_for rather

+# than $@ recursion to operate on the list.  This involves more macro

+# expansions, but avoids the need to rescan a quadratic number of

+# arguments, making these replacements very attractive for M4 1.4.x.

+# On the other hand, in any version of M4, expanding additional macros

+# costs additional time; therefore, in M4 1.6, where $@ recursion uses

+# fewer macros, these replacements actually pessimize performance.

+# Additionally, the use of $10 to mean the tenth argument violates

+# POSIX; although all versions of m4 1.4.x support this meaning, a

+# future m4 version may switch to take it as the first argument

+# concatenated with a literal 0, so the implementations in this file

+# are not future-proof.  Thus, this file is conditionally included as

+# part of m4_init(), only when it is detected that M4 probably has

+# quadratic behavior (ie. it lacks the macro __m4_version__).

+#

+# Please keep this file in sync with m4sugar.m4.

+

+# m4_foreach(VARIABLE, LIST, EXPRESSION)

+# --------------------------------------

+# Expand EXPRESSION assigning each value of the LIST to VARIABLE.

+# LIST should have the form `item_1, item_2, ..., item_n', i.e. the

+# whole list must *quoted*.  Quote members too if you don't want them

+# to be expanded.

+#

+# This version minimizes the number of times that $@ is evaluated by

+# using m4_for to generate a boilerplate into VARIABLE then passing $@

+# to that temporary macro.  Thus, the recursion is done in m4_for

+# without reparsing any user input, and is not quadratic.  For an idea

+# of how this works, note that m4_foreach(i,[1,2],[i]) defines i to be

+#   m4_define([$1],[$3])$2[]m4_define([$1],[$4])$2[]m4_popdef([i])

+# then calls i([i],[i],[1],[2]).

+m4_define([m4_foreach],

+[m4_if([$2], [], [], [_$0([$1], [$3], $2)])])

+

+m4_define([_m4_foreach],

+[m4_define([$1], m4_pushdef([$1])_m4_for([$1], [3], [$#], [1],

+    [$0_([1], [2], _m4_defn([$1]))])[m4_popdef([$1])])m4_indir([$1], $@)])

+

+m4_define([_m4_foreach_],

+[[m4_define([$$1], [$$3])$$2[]]])

+

+# m4_case(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT)

+# -----------------------------------------------------------

+# Find the first VAL that SWITCH matches, and expand the corresponding

+# IF-VAL.  If there are no matches, expand DEFAULT.

+#

+# Use m4_for to create a temporary macro in terms of a boilerplate

+# m4_if with final cleanup.  If $# is even, we have DEFAULT; if it is

+# odd, then rounding the last $# up in the temporary macro is

+# harmless.  For example, both m4_case(1,2,3,4,5) and

+# m4_case(1,2,3,4,5,6) result in the intermediate _m4_case being

+#   m4_if([$1],[$2],[$3],[$1],[$4],[$5],_m4_popdef([_m4_case])[$6])

+m4_define([m4_case],

+[m4_if(m4_eval([$# <= 2]), [1], [$2],

+[m4_pushdef([_$0], [m4_if(]m4_for([_m4_count], [2], m4_decr([$#]), [2],

+     [_$0_([1], _m4_count, m4_incr(_m4_count))])[_m4_popdef(

+         [_$0])]m4_dquote($m4_eval([($# + 1) & ~1]))[)])_$0($@)])])

+

+m4_define([_m4_case_],

+[[[$$1],[$$2],[$$3],]])

+

+# m4_bmatch(SWITCH, RE1, VAL1, RE2, VAL2, ..., DEFAULT)

+# -----------------------------------------------------

+# m4 equivalent of

+#

+# if (SWITCH =~ RE1)

+#   VAL1;

+# elif (SWITCH =~ RE2)

+#   VAL2;

+# elif ...

+#   ...

+# else

+#   DEFAULT

+#

+# We build the temporary macro _m4_b:

+#   m4_define([_m4_b], _m4_defn([_m4_bmatch]))_m4_b([$1], [$2], [$3])...

+#   _m4_b([$1], [$m-1], [$m])_m4_b([], [], [$m+1]_m4_popdef([_m4_b]))

+# then invoke m4_unquote(_m4_b($@)), for concatenation with later text.

+m4_define([m4_bmatch],

+[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],

+       [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],

+       [$#], 2, [$2],

+       [m4_define([_m4_b], m4_pushdef([_m4_b])[m4_define([_m4_b],

+  _m4_defn([_$0]))]_m4_for([_m4_b], [3], m4_eval([($# + 1) / 2 * 2 - 1]),

+  [2], [_$0_([1], m4_decr(_m4_b), _m4_b)])[_m4_b([], [],]m4_dquote(

+  [$]m4_incr(_m4_b))[_m4_popdef([_m4_b]))])m4_unquote(_m4_b($@))])])

+

+m4_define([_m4_bmatch],

+[m4_if(m4_bregexp([$1], [$2]), [-1], [], [[$3]m4_define([$0])])])

+

+m4_define([_m4_bmatch_],

+[[_m4_b([$$1], [$$2], [$$3])]])

+

+

+# m4_cond(TEST1, VAL1, IF-VAL1, TEST2, VAL2, IF-VAL2, ..., [DEFAULT])

+# -------------------------------------------------------------------

+# Similar to m4_if, except that each TEST is expanded when encountered.

+# If the expansion of TESTn matches the string VALn, the result is IF-VALn.

+# The result is DEFAULT if no tests passed.  This macro allows

+# short-circuiting of expensive tests, where it pays to arrange quick

+# filter tests to run first.

+#

+# m4_cond already guarantees either 3*n or 3*n + 1 arguments, 1 <= n.

+# We only have to speed up _m4_cond, by building the temporary _m4_c:

+#   m4_define([_m4_c], _m4_defn([m4_unquote]))_m4_c([m4_if(($1), [($2)],

+#   [[$3]m4_define([_m4_c])])])_m4_c([m4_if(($4), [($5)],

+#   [[$6]m4_define([_m4_c])])])..._m4_c([m4_if(($m-2), [($m-1)],

+#   [[$m]m4_define([_m4_c])])])_m4_c([[$m+1]]_m4_popdef([_m4_c]))

+# We invoke m4_unquote(_m4_c($@)), for concatenation with later text.

+m4_define([_m4_cond],

+[m4_define([_m4_c], m4_pushdef([_m4_c])[m4_define([_m4_c],

+  _m4_defn([m4_unquote]))]_m4_for([_m4_c], [2], m4_eval([$# / 3 * 3 - 1]), [3],

+  [$0_(m4_decr(_m4_c), _m4_c, m4_incr(_m4_c))])[_m4_c(]m4_dquote(m4_dquote(

+  [$]m4_eval([$# / 3 * 3 + 1])))[_m4_popdef([_m4_c]))])m4_unquote(_m4_c($@))])

+

+m4_define([_m4_cond_],

+[[_m4_c([m4_if(($$1), [($$2)], [[$$3]m4_define([_m4_c])])])]])

+

+# m4_bpatsubsts(STRING, RE1, SUBST1, RE2, SUBST2, ...)

+# ----------------------------------------------------

+# m4 equivalent of

+#

+#   $_ = STRING;

+#   s/RE1/SUBST1/g;

+#   s/RE2/SUBST2/g;

+#   ...

+#

+# m4_bpatsubsts already validated an odd number of arguments; we only

+# need to speed up _m4_bpatsubsts.  To avoid nesting, we build the

+# temporary _m4_p:

+#   m4_define([_m4_p], [$1])m4_define([_m4_p],

+#   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$2], [$3]))m4_define([_m4_p],

+#   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$4], [$5]))m4_define([_m4_p],...

+#   m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$m-1], [$m]))m4_unquote(

+#   _m4_defn([_m4_p])_m4_popdef([_m4_p]))

+m4_define([_m4_bpatsubsts],

+[m4_define([_m4_p], m4_pushdef([_m4_p])[m4_define([_m4_p],

+  ]m4_dquote([$]1)[)]_m4_for([_m4_p], [3], [$#], [2], [$0_(m4_decr(_m4_p),

+  _m4_p)])[m4_unquote(_m4_defn([_m4_p])_m4_popdef([_m4_p]))])_m4_p($@)])

+

+m4_define([_m4_bpatsubsts_],

+[[m4_define([_m4_p],

+m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$$1], [$$2]))]])

+

+# m4_shiftn(N, ...)

+# -----------------

+# Returns ... shifted N times.  Useful for recursive "varargs" constructs.

+#

+# m4_shiftn already validated arguments; we only need to speed up

+# _m4_shiftn.  If N is 3, then we build the temporary _m4_s, defined as

+#   ,[$5],[$6],...,[$m]_m4_popdef([_m4_s])

+# before calling m4_shift(_m4_s($@)).

+m4_define([_m4_shiftn],

+[m4_if(m4_incr([$1]), [$#], [], [m4_define([_m4_s],

+           m4_pushdef([_m4_s])_m4_for([_m4_s], m4_eval([$1 + 2]), [$#], [1],

+  [[,]m4_dquote([$]_m4_s)])[_m4_popdef([_m4_s])])m4_shift(_m4_s($@))])])

+

+# m4_do(STRING, ...)

+# ------------------

+# This macro invokes all its arguments (in sequence, of course).  It is

+# useful for making your macros more structured and readable by dropping

+# unnecessary dnl's and have the macros indented properly.

+#

+# Here, we use the temporary macro _m4_do, defined as

+#   $1[]$2[]...[]$n[]_m4_popdef([_m4_do])

+m4_define([m4_do],

+[m4_if([$#], [0], [],

+       [m4_define([_$0], m4_pushdef([_$0])_m4_for([_$0], [1], [$#], [1],

+                  [$_$0[[]]])[_m4_popdef([_$0])])_$0($@)])])

+

+# m4_dquote_elt(ARGS)

+# -------------------

+# Return ARGS as an unquoted list of double-quoted arguments.

+#

+# m4_foreach to the rescue.  It's easier to shift off the leading comma.

+m4_define([m4_dquote_elt],

+[m4_shift(m4_foreach([_m4_elt], [$@], [,m4_dquote(_m4_defn([_m4_elt]))]))])

+

+# m4_reverse(ARGS)

+# ----------------

+# Output ARGS in reverse order.

+#

+# Invoke _m4_r($@) with the temporary _m4_r built as

+#   [$m], [$m-1], ..., [$2], [$1]_m4_popdef([_m4_r])

+m4_define([m4_reverse],

+[m4_if([$#], [0], [], [$#], [1], [[$1]],

+[m4_define([_m4_r], m4_dquote([$$#])m4_pushdef([_m4_r])_m4_for([_m4_r],

+      m4_decr([$#]), [1], [-1],

+    [[, ]m4_dquote([$]_m4_r)])[_m4_popdef([_m4_r])])_m4_r($@)])])

+

+

+# m4_map(MACRO, LIST)

+# -------------------

+# Invoke MACRO($1), MACRO($2) etc. where $1, $2... are the elements

+# of LIST.  $1, $2... must in turn be lists, appropriate for m4_apply.

+#

+# m4_map/m4_map_sep only execute once; the speedup comes in fixing

+# _m4_map.  The mismatch in () is intentional, since $1 supplies the

+# opening `(' (but it sure looks odd!).  Build the temporary _m4_m:

+#   $1, [$3])$1, [$4])...$1, [$m])_m4_popdef([_m4_m])

+m4_define([_m4_map],

+[m4_if([$#], [2], [],

+       [m4_define([_m4_m], m4_pushdef([_m4_m])_m4_for([_m4_m], [3], [$#], [1],

+   [$0_([1], _m4_m)])[_m4_popdef([_m4_m])])_m4_m($@)])])

+

+m4_define([_m4_map_],

+[[$$1, [$$2])]])

+

+# m4_transform(EXPRESSION, ARG...)

+# --------------------------------

+# Expand EXPRESSION([ARG]) for each argument.  More efficient than

+# m4_foreach([var], [ARG...], [EXPRESSION(m4_defn([var]))])

+#

+# Invoke the temporary macro _m4_transform, defined as:

+#   $1([$2])[]$1([$3])[]...$1([$m])[]_m4_popdef([_m4_transform])

+m4_define([m4_transform],

+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],

+       [$#], [1], [],

+       [m4_define([_$0], m4_pushdef([_$0])_m4_for([_$0], [2], [$#], [1],

+   [_$0_([1], _$0)])[_m4_popdef([_$0])])_$0($@)])])

+

+m4_define([_m4_transform_],

+[[$$1([$$2])[]]])

+

+# m4_transform_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...)

+# --------------------------------------------------------------

+# Perform a pairwise grouping of consecutive ARGs, by expanding

+# EXPRESSION([ARG1], [ARG2]).  If there are an odd number of ARGs, the

+# final argument is expanded with END-EXPR([ARGn]).

+#

+# Build the temporary macro _m4_transform_pair, with the $2([$m+1])

+# only output if $# is odd:

+#   $1([$3], [$4])[]$1([$5], [$6])[]...$1([$m-1],

+#   [$m])[]m4_default([$2], [$1])([$m+1])[]_m4_popdef([_m4_transform_pair])

+m4_define([m4_transform_pair],

+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],

+       [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])],

+       [$#], [2], [],

+       [$#], [3], [m4_default([$2], [$1])([$3])[]],

+       [m4_define([_$0], m4_pushdef([_$0])_m4_for([_$0], [3],

+   m4_eval([$# / 2 * 2 - 1]), [2], [_$0_([1], _$0, m4_incr(_$0))])_$0_end(

+   [1], [2], [$#])[_m4_popdef([_$0])])_$0($@)])])

+

+m4_define([_m4_transform_pair_],

+[[$$1([$$2], [$$3])[]]])

+

+m4_define([_m4_transform_pair_end],

+[m4_if(m4_eval([$3 & 1]), [1], [[m4_default([$$2], [$$1])([$$3])[]]])])

+

+# m4_join(SEP, ARG1, ARG2...)

+# ---------------------------

+# Produce ARG1SEPARG2...SEPARGn.  Avoid back-to-back SEP when a given ARG

+# is the empty string.  No expansion is performed on SEP or ARGs.

+#

+# Use a self-modifying separator, since we don't know how many

+# arguments might be skipped before a separator is first printed, but

+# be careful if the separator contains $.  m4_foreach to the rescue.

+m4_define([m4_join],

+[m4_pushdef([_m4_sep], [m4_define([_m4_sep], _m4_defn([m4_echo]))])]dnl

+[m4_foreach([_m4_arg], [m4_shift($@)],

+            [m4_ifset([_m4_arg], [_m4_sep([$1])_m4_defn([_m4_arg])])])]dnl

+[_m4_popdef([_m4_sep])])

+

+# m4_joinall(SEP, ARG1, ARG2...)

+# ------------------------------

+# Produce ARG1SEPARG2...SEPARGn.  An empty ARG results in back-to-back SEP.

+# No expansion is performed on SEP or ARGs.

+#

+# A bit easier than m4_join.  m4_foreach to the rescue.

+m4_define([m4_joinall],

+[[$2]m4_if(m4_eval([$# <= 2]), [1], [],

+           [m4_foreach([_m4_arg], [m4_shift2($@)],

+                       [[$1]_m4_defn([_m4_arg])])])])

+

+# m4_list_cmp(A, B)

+# -----------------

+# Compare the two lists of integer expressions A and B.

+#

+# m4_list_cmp takes care of any side effects; we only override

+# _m4_list_cmp_raw, where we can safely expand lists multiple times.

+# First, insert padding so that both lists are the same length; the

+# trailing +0 is necessary to handle a missing list.  Next, create a

+# temporary macro to perform pairwise comparisons until an inequality

+# is found.  For example, m4_list_cmp([1], [1,2]) creates _m4_cmp as

+#   m4_if(m4_eval([($1) != ($3)]), [1], [m4_cmp([$1], [$3])],

+#         m4_eval([($2) != ($4)]), [1], [m4_cmp([$2], [$4])],

+#         [0]_m4_popdef([_m4_cmp], [_m4_size]))

+# then calls _m4_cmp([1+0], [0], [1], [2+0])

+m4_define([_m4_list_cmp_raw],

+[m4_if([$1], [$2], 0, [m4_pushdef(

+     [_m4_size])_m4_list_cmp($1+0_m4_list_pad(m4_count($1), m4_count($2)),

+                             $2+0_m4_list_pad(m4_count($2), m4_count($1)))])])

+

+m4_define([_m4_list_pad],

+[m4_if(m4_eval($1 < $2), [1],

+       [_m4_for([_m4_size], m4_incr([$1]), [$2], [1], [,0])])])

+

+m4_define([_m4_list_cmp],

+[m4_define([_m4_size], m4_eval([$# >> 1]))]dnl

+[m4_define([_m4_cmp], m4_pushdef([_m4_cmp])[m4_if(]_m4_for([_m4_cmp],

+   [1], _m4_size, [1], [$0_(_m4_cmp, m4_eval(_m4_cmp + _m4_size))])[

+      [0]_m4_popdef([_m4_cmp], [_m4_size]))])_m4_cmp($@)])

+

+m4_define([_m4_list_cmp_],

+[[m4_eval([($$1) != ($$2)]), [1], [m4_cmp([$$1], [$$2])],

+]])

+

+# m4_max(EXPR, ...)

+# m4_min(EXPR, ...)

+# -----------------

+# Return the decimal value of the maximum (or minimum) in a series of

+# integer expressions.

+#

+# m4_foreach to the rescue; we only need to replace _m4_minmax.  Here,

+# we need a temporary macro to track the best answer so far, so that

+# the foreach expression is tractable.

+m4_define([_m4_minmax],

+[m4_pushdef([_m4_best], m4_eval([$2]))m4_foreach([_m4_arg], [m4_shift2($@)],

+    [m4_define([_m4_best], $1(_m4_best, _m4_defn([_m4_arg])))])]dnl

+[_m4_best[]_m4_popdef([_m4_best])])

+

+# m4_set_add_all(SET, VALUE...)

+# -----------------------------

+# Add each VALUE into SET.  This is O(n) in the number of VALUEs, and

+# can be faster than calling m4_set_add for each VALUE.

+#

+# m4_foreach to the rescue.  If no deletions have occurred, then avoid

+# the speed penalty of m4_set_add.

+m4_define([m4_set_add_all],

+[m4_if([$#], [0], [], [$#], [1], [],

+       [m4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1])

+          + m4_len(m4_foreach([_m4_arg], [m4_shift($@)],

+    m4_ifdef([_m4_set_cleanup($1)],

+             [[m4_set_add([$1], _m4_defn([_m4_arg]))]],

+             [[m4_ifdef([_m4_set([$1],]_m4_defn([_m4_arg])[)], [],

+                        [m4_define([_m4_set([$1],]_m4_defn([_m4_arg])[)],

+                                   [1])m4_pushdef([_m4_set([$1])],

+        _m4_defn([_m4_arg]))-])]])))))])])

diff --git a/tools/mhmake/src/bisondata/m4sugar/m4sugar.m4 b/tools/mhmake/src/bisondata/m4sugar/m4sugar.m4
new file mode 100644
index 000000000..291267c33
--- /dev/null
+++ b/tools/mhmake/src/bisondata/m4sugar/m4sugar.m4
@@ -0,0 +1,2789 @@
+divert(-1)#                                                  -*- Autoconf -*-

+# This file is part of Autoconf.

+# Base M4 layer.

+# Requires GNU M4.

+#

+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,

+# 2008 Free Software Foundation, Inc.

+#

+# This program is free software: you can redistribute it and/or modify

+# it under the terms of the GNU General Public License as published by

+# the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+

+# As a special exception, the Free Software Foundation gives unlimited

+# permission to copy, distribute and modify the configure scripts that

+# are the output of Autoconf.  You need not follow the terms of the GNU

+# General Public License when using or distributing such scripts, even

+# though portions of the text of Autoconf appear in them.  The GNU

+# General Public License (GPL) does govern all other use of the material

+# that constitutes the Autoconf program.

+#

+# Certain portions of the Autoconf source text are designed to be copied

+# (in certain cases, depending on the input) into the output of

+# Autoconf.  We call these the "data" portions.  The rest of the Autoconf

+# source text consists of comments plus executable code that decides which

+# of the data portions to output in any given case.  We call these

+# comments and executable code the "non-data" portions.  Autoconf never

+# copies any of the non-data portions into its output.

+#

+# This special exception to the GPL applies to versions of Autoconf

+# released by the Free Software Foundation.  When you make and

+# distribute a modified version of Autoconf, you may extend this special

+# exception to the GPL to apply to your modified version as well, *unless*

+# your modified version has the potential to copy into its output some

+# of the text that was the non-data portion of the version that you started

+# with.  (In other words, unless your change moves or copies text from

+# the non-data portions to the data portions.)  If your modification has

+# such potential, you must delete any notice of this special exception

+# to the GPL from your modified version.

+#

+# Written by Akim Demaille.

+#

+

+# Set the quotes, whatever the current quoting system.

+changequote()

+changequote([, ])

+

+# Some old m4's don't support m4exit.  But they provide

+# equivalent functionality by core dumping because of the

+# long macros we define.

+ifdef([__gnu__], ,

+[errprint(M4sugar requires GNU M4. Install it before installing M4sugar or

+set the M4 environment variable to its absolute file name.)

+m4exit(2)])

+

+

+## ------------------------------- ##

+## 1. Simulate --prefix-builtins.  ##

+## ------------------------------- ##

+

+# m4_define

+# m4_defn

+# m4_undefine

+define([m4_define],   defn([define]))

+define([m4_defn],     defn([defn]))

+define([m4_undefine], defn([undefine]))

+

+m4_undefine([define])

+m4_undefine([defn])

+m4_undefine([undefine])

+

+

+# m4_copy(SRC, DST)

+# -----------------

+# Define DST as the definition of SRC.

+# What's the difference between:

+# 1. m4_copy([from], [to])

+# 2. m4_define([to], [from($@)])

+# Well, obviously 1 is more expensive in space.  Maybe 2 is more expensive

+# in time, but because of the space cost of 1, it's not that obvious.

+# Nevertheless, one huge difference is the handling of `$0'.  If `from'

+# uses `$0', then with 1, `to''s `$0' is `to', while it is `from' in 2.

+# The user would certainly prefer to see `to'.

+m4_define([m4_copy],

+[m4_define([$2], m4_defn([$1]))])

+

+

+# m4_rename(SRC, DST)

+# -------------------

+# Rename the macro SRC to DST.

+m4_define([m4_rename],

+[m4_copy([$1], [$2])m4_undefine([$1])])

+

+

+# m4_rename_m4(MACRO-NAME)

+# ------------------------

+# Rename MACRO-NAME to m4_MACRO-NAME.

+m4_define([m4_rename_m4],

+[m4_rename([$1], [m4_$1])])

+

+

+# m4_copy_unm4(m4_MACRO-NAME)

+# ---------------------------

+# Copy m4_MACRO-NAME to MACRO-NAME.

+m4_define([m4_copy_unm4],

+[m4_copy([$1], m4_bpatsubst([$1], [^m4_\(.*\)], [[\1]]))])

+

+

+# Some m4 internals have names colliding with tokens we might use.

+# Rename them a` la `m4 --prefix-builtins'.  Conditionals first, since

+# some subsequent renames are conditional.

+m4_rename_m4([ifdef])

+m4_rename([ifelse], [m4_if])

+

+m4_rename_m4([builtin])

+m4_rename_m4([changecom])

+m4_rename_m4([changequote])

+m4_ifdef([changeword],dnl conditionally available in 1.4.x

+[m4_undefine([changeword])])

+m4_rename_m4([debugfile])

+m4_rename_m4([debugmode])

+m4_rename_m4([decr])

+m4_undefine([divert])

+m4_rename_m4([divnum])

+m4_rename_m4([dumpdef])

+m4_rename_m4([errprint])

+m4_rename_m4([esyscmd])

+m4_rename_m4([eval])

+m4_rename_m4([format])

+m4_undefine([include])

+m4_rename_m4([incr])

+m4_rename_m4([index])

+m4_rename_m4([indir])

+m4_rename_m4([len])

+m4_rename([m4exit], [m4_exit])

+m4_undefine([m4wrap])

+m4_ifdef([mkstemp],dnl added in M4 1.4.8

+[m4_rename_m4([mkstemp])

+m4_copy([m4_mkstemp], [m4_maketemp])

+m4_undefine([maketemp])],

+[m4_rename_m4([maketemp])

+m4_copy([m4_maketemp], [m4_mkstemp])])

+m4_rename([patsubst], [m4_bpatsubst])

+m4_rename_m4([popdef])

+m4_rename_m4([pushdef])

+m4_rename([regexp], [m4_bregexp])

+m4_rename_m4([shift])

+m4_undefine([sinclude])

+m4_rename_m4([substr])

+m4_ifdef([symbols],dnl present only in alpha-quality 1.4o

+[m4_rename_m4([symbols])])

+m4_rename_m4([syscmd])

+m4_rename_m4([sysval])

+m4_rename_m4([traceoff])

+m4_rename_m4([traceon])

+m4_rename_m4([translit])

+m4_undefine([undivert])

+

+

+## ------------------- ##

+## 2. Error messages.  ##

+## ------------------- ##

+

+

+# m4_location

+# -----------

+m4_define([m4_location],

+[__file__:__line__])

+

+

+# m4_errprintn(MSG)

+# -----------------

+# Same as `errprint', but with the missing end of line.

+m4_define([m4_errprintn],

+[m4_errprint([$1

+])])

+

+

+# m4_warning(MSG)

+# ---------------

+# Warn the user.

+m4_define([m4_warning],

+[m4_errprintn(m4_location[: warning: $1])])

+

+

+# m4_fatal(MSG, [EXIT-STATUS])

+# ----------------------------

+# Fatal the user.                                                      :)

+m4_define([m4_fatal],

+[m4_errprintn(m4_location[: error: $1])dnl

+m4_expansion_stack_dump()dnl

+m4_exit(m4_if([$2],, 1, [$2]))])

+

+

+# m4_assert(EXPRESSION, [EXIT-STATUS = 1])

+# ----------------------------------------

+# This macro ensures that EXPRESSION evaluates to true, and exits if

+# EXPRESSION evaluates to false.

+m4_define([m4_assert],

+[m4_if(m4_eval([$1]), 0,

+       [m4_fatal([assert failed: $1], [$2])])])

+

+

+

+## ------------- ##

+## 3. Warnings.  ##

+## ------------- ##

+

+

+# _m4_warn(CATEGORY, MESSAGE, STACK-TRACE)

+# ----------------------------------------

+# Report a MESSAGE to the user if the CATEGORY of warnings is enabled.

+# This is for traces only.

+# The STACK-TRACE is a \n-separated list of "LOCATION: MESSAGE".

+#

+# Within m4, the macro is a no-op.  This macro really matters

+# when autom4te post-processes the trace output.

+m4_define([_m4_warn], [])

+

+

+# m4_warn(CATEGORY, MESSAGE)

+# --------------------------

+# Report a MESSAGE to the user if the CATEGORY of warnings is enabled.

+m4_define([m4_warn],

+[_m4_warn([$1], [$2],

+m4_ifdef([m4_expansion_stack],

+         [_m4_defn([m4_expansion_stack])

+m4_location[: the top level]]))dnl

+])

+

+

+

+## ------------------- ##

+## 4. File inclusion.  ##

+## ------------------- ##

+

+

+# We also want to neutralize include (and sinclude for symmetry),

+# but we want to extend them slightly: warn when a file is included

+# several times.  This is, in general, a dangerous operation, because

+# too many people forget to quote the first argument of m4_define.

+#

+# For instance in the following case:

+#   m4_define(foo, [bar])

+# then a second reading will turn into

+#   m4_define(bar, [bar])

+# which is certainly not what was meant.

+

+# m4_include_unique(FILE)

+# -----------------------

+# Declare that the FILE was loading; and warn if it has already

+# been included.

+m4_define([m4_include_unique],

+[m4_ifdef([m4_include($1)],

+          [m4_warn([syntax], [file `$1' included several times])])dnl

+m4_define([m4_include($1)])])

+

+

+# m4_include(FILE)

+# ----------------

+# Like the builtin include, but warns against multiple inclusions.

+m4_define([m4_include],

+[m4_include_unique([$1])dnl

+m4_builtin([include], [$1])])

+

+

+# m4_sinclude(FILE)

+# -----------------

+# Like the builtin sinclude, but warns against multiple inclusions.

+m4_define([m4_sinclude],

+[m4_include_unique([$1])dnl

+m4_builtin([sinclude], [$1])])

+

+

+

+## ------------------------------------ ##

+## 5. Additional branching constructs.  ##

+## ------------------------------------ ##

+

+# Both `m4_ifval' and `m4_ifset' tests against the empty string.  The

+# difference is that `m4_ifset' is specialized on macros.

+#

+# In case of arguments of macros, eg. $1, it makes little difference.

+# In the case of a macro `FOO', you don't want to check `m4_ifval(FOO,

+# TRUE)', because if `FOO' expands with commas, there is a shifting of

+# the arguments.  So you want to run `m4_ifval([FOO])', but then you just

+# compare the *string* `FOO' against `', which, of course fails.

+#

+# So you want the variation `m4_ifset' that expects a macro name as $1.

+# If this macro is both defined and defined to a non empty value, then

+# it runs TRUE, etc.

+

+

+# m4_ifval(COND, [IF-TRUE], [IF-FALSE])

+# -------------------------------------

+# If COND is not the empty string, expand IF-TRUE, otherwise IF-FALSE.

+# Comparable to m4_ifdef.

+m4_define([m4_ifval],

+[m4_if([$1], [], [$3], [$2])])

+

+

+# m4_n(TEXT)

+# ----------

+# If TEXT is not empty, return TEXT and a new line, otherwise nothing.

+m4_define([m4_n],

+[m4_if([$1],

+       [], [],

+           [$1

+])])

+

+

+# m4_ifvaln(COND, [IF-TRUE], [IF-FALSE])

+# --------------------------------------

+# Same as `m4_ifval', but add an extra newline to IF-TRUE or IF-FALSE

+# unless that argument is empty.

+m4_define([m4_ifvaln],

+[m4_if([$1],

+       [],   [m4_n([$3])],

+             [m4_n([$2])])])

+

+

+# m4_ifset(MACRO, [IF-TRUE], [IF-FALSE])

+# --------------------------------------

+# If MACRO has no definition, or of its definition is the empty string,

+# expand IF-FALSE, otherwise IF-TRUE.

+m4_define([m4_ifset],

+[m4_ifdef([$1],

+          [m4_ifval(_m4_defn([$1]), [$2], [$3])],

+          [$3])])

+

+

+# m4_ifndef(NAME, [IF-NOT-DEFINED], [IF-DEFINED])

+# -----------------------------------------------

+m4_define([m4_ifndef],

+[m4_ifdef([$1], [$3], [$2])])

+

+

+# m4_case(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT)

+# -----------------------------------------------------------

+# m4 equivalent of

+# switch (SWITCH)

+# {

+#   case VAL1:

+#     IF-VAL1;

+#     break;

+#   case VAL2:

+#     IF-VAL2;

+#     break;

+#   ...

+#   default:

+#     DEFAULT;

+#     break;

+# }.

+# All the values are optional, and the macro is robust to active

+# symbols properly quoted.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_case],

+[m4_if([$#], 0, [],

+       [$#], 1, [],

+       [$#], 2, [$2],

+       [$1], [$2], [$3],

+       [$0([$1], m4_shift3($@))])])

+

+

+# m4_bmatch(SWITCH, RE1, VAL1, RE2, VAL2, ..., DEFAULT)

+# -----------------------------------------------------

+# m4 equivalent of

+#

+# if (SWITCH =~ RE1)

+#   VAL1;

+# elif (SWITCH =~ RE2)

+#   VAL2;

+# elif ...

+#   ...

+# else

+#   DEFAULT

+#

+# All the values are optional, and the macro is robust to active symbols

+# properly quoted.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_bmatch],

+[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],

+       [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],

+       [$#], 2, [$2],

+       [m4_if(m4_bregexp([$1], [$2]), -1, [$0([$1], m4_shift3($@))],

+              [$3])])])

+

+

+# m4_car(LIST)

+# m4_cdr(LIST)

+# ------------

+# Manipulate m4 lists.

+m4_define([m4_car], [[$1]])

+m4_define([m4_cdr],

+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],

+       [$#], 1, [],

+       [m4_dquote(m4_shift($@))])])

+

+# _m4_cdr(LIST)

+# -------------

+# Like m4_cdr, except include a leading comma unless only one element

+# remains.  Why?  Because comparing a large list against [] is more

+# expensive in expansion time than comparing the number of arguments; so

+# _m4_cdr can be used to reduce the number of arguments when it is time

+# to end recursion.

+m4_define([_m4_cdr],

+[m4_if([$#], 1, [],

+       [, m4_dquote(m4_shift($@))])])

+

+

+

+# m4_cond(TEST1, VAL1, IF-VAL1, TEST2, VAL2, IF-VAL2, ..., [DEFAULT])

+# -------------------------------------------------------------------

+# Similar to m4_if, except that each TEST is expanded when encountered.

+# If the expansion of TESTn matches the string VALn, the result is IF-VALn.

+# The result is DEFAULT if no tests passed.  This macro allows

+# short-circuiting of expensive tests, where it pays to arrange quick

+# filter tests to run first.

+#

+# For an example, consider a previous implementation of _AS_QUOTE_IFELSE:

+#

+#    m4_if(m4_index([$1], [\]), [-1], [$2],

+#          m4_eval(m4_index([$1], [\\]) >= 0), [1], [$2],

+#          m4_eval(m4_index([$1], [\$]) >= 0), [1], [$2],

+#          m4_eval(m4_index([$1], [\`]) >= 0), [1], [$3],

+#          m4_eval(m4_index([$1], [\"]) >= 0), [1], [$3],

+#          [$2])

+#

+# Here, m4_index is computed 5 times, and m4_eval 4, even if $1 contains

+# no backslash.  It is more efficient to do:

+#

+#    m4_cond([m4_index([$1], [\])], [-1], [$2],

+#            [m4_eval(m4_index([$1], [\\]) >= 0)], [1], [$2],

+#            [m4_eval(m4_index([$1], [\$]) >= 0)], [1], [$2],

+#            [m4_eval(m4_index([$1], [\`]) >= 0)], [1], [$3],

+#            [m4_eval(m4_index([$1], [\"]) >= 0)], [1], [$3],

+#            [$2])

+#

+# In the common case of $1 with no backslash, only one m4_index expansion

+# occurs, and m4_eval is avoided altogether.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_cond],

+[m4_if([$#], [0], [m4_fatal([$0: cannot be called without arguments])],

+       [$#], [1], [$1],

+       m4_eval([$# % 3]), [2], [m4_fatal([$0: missing an argument])],

+       [_$0($@)])])

+

+m4_define([_m4_cond],

+[m4_if(($1), [($2)], [$3],

+       [$#], [3], [],

+       [$#], [4], [$4],

+       [$0(m4_shift3($@))])])

+

+

+## ---------------------------------------- ##

+## 6. Enhanced version of some primitives.  ##

+## ---------------------------------------- ##

+

+# m4_bpatsubsts(STRING, RE1, SUBST1, RE2, SUBST2, ...)

+# ----------------------------------------------------

+# m4 equivalent of

+#

+#   $_ = STRING;

+#   s/RE1/SUBST1/g;

+#   s/RE2/SUBST2/g;

+#   ...

+#

+# All the values are optional, and the macro is robust to active symbols

+# properly quoted.

+#

+# I would have liked to name this macro `m4_bpatsubst', unfortunately,

+# due to quotation problems, I need to double quote $1 below, therefore

+# the anchors are broken :(  I can't let users be trapped by that.

+#

+# Recall that m4_shift3 always results in an argument.  Hence, we need

+# to distinguish between a final deletion vs. ending recursion.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_bpatsubsts],

+[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],

+       [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],

+       [$#], 2, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2]))],

+       [$#], 3, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2], [$3]))],

+       [_$0($@m4_if(m4_eval($# & 1), 0, [,]))])])

+m4_define([_m4_bpatsubsts],

+[m4_if([$#], 2, [$1],

+       [$0(m4_builtin([patsubst], [[$1]], [$2], [$3]),

+           m4_shift3($@))])])

+

+

+# m4_define_default(MACRO, VALUE)

+# -------------------------------

+# If MACRO is undefined, set it to VALUE.

+m4_define([m4_define_default],

+[m4_ifndef([$1], [m4_define($@)])])

+

+

+# m4_default(EXP1, EXP2)

+# ----------------------

+# Returns EXP1 if non empty, otherwise EXP2.

+#

+# This macro is called on hot paths, so inline the contents of m4_ifval,

+# for one less round of expansion.

+m4_define([m4_default],

+[m4_if([$1], [], [$2], [$1])])

+

+

+# m4_defn(NAME)

+# -------------

+# Like the original, except guarantee a warning when using something which is

+# undefined (unlike M4 1.4.x).  This replacement is not a full-featured

+# replacement: if any of the defined macros contain unbalanced quoting, but

+# when pasted together result in a well-quoted string, then only native m4

+# support is able to get it correct.  But that's where quadrigraphs come in

+# handy, if you really need unbalanced quotes inside your macros.

+#

+# This macro is called frequently, so minimize the amount of additional

+# expansions by skipping m4_ifndef.  Better yet, if __m4_version__ exists,

+# (added in M4 1.6), then let m4 do the job for us (see m4_init).

+#

+# _m4_defn is for internal use only - it bypasses the wrapper, so it

+# must only be used on one argument at a time, and only on macros

+# known to be defined.  Make sure this still works if the user renames

+# m4_defn but not _m4_defn.

+m4_copy([m4_defn], [_m4_defn])

+m4_define([m4_defn],

+[m4_if([$#], [0], [[$0]],

+       [$#], [1], [m4_ifdef([$1], [_m4_defn([$1])],

+                            [m4_fatal([$0: undefined macro: $1])])],

+       [m4_foreach([_m4_macro], [$@], [$0(_m4_defn([_m4_macro]))])])])

+

+

+# _m4_dumpdefs_up(NAME)

+# ---------------------

+m4_define([_m4_dumpdefs_up],

+[m4_ifdef([$1],

+          [m4_pushdef([_m4_dumpdefs], _m4_defn([$1]))dnl

+m4_dumpdef([$1])dnl

+_m4_popdef([$1])dnl

+_m4_dumpdefs_up([$1])])])

+

+

+# _m4_dumpdefs_down(NAME)

+# -----------------------

+m4_define([_m4_dumpdefs_down],

+[m4_ifdef([_m4_dumpdefs],

+          [m4_pushdef([$1], _m4_defn([_m4_dumpdefs]))dnl

+_m4_popdef([_m4_dumpdefs])dnl

+_m4_dumpdefs_down([$1])])])

+

+

+# m4_dumpdefs(NAME)

+# -----------------

+# Similar to `m4_dumpdef(NAME)', but if NAME was m4_pushdef'ed, display its

+# value stack (most recent displayed first).

+m4_define([m4_dumpdefs],

+[_m4_dumpdefs_up([$1])dnl

+_m4_dumpdefs_down([$1])])

+

+

+# m4_popdef(NAME)

+# ---------------

+# Like the original, except guarantee a warning when using something which is

+# undefined (unlike M4 1.4.x).

+#

+# This macro is called frequently, so minimize the amount of additional

+# expansions by skipping m4_ifndef.  Better yet, if __m4_version__ exists,

+# (added in M4 1.6), then let m4 do the job for us (see m4_init).

+#

+# _m4_popdef is for internal use only - it bypasses the wrapper, so it

+# must only be used on macros known to be defined.  Make sure this

+# still works if the user renames m4_popdef but not _m4_popdef.

+m4_copy([m4_popdef], [_m4_popdef])

+m4_define([m4_popdef],

+[m4_if([$#], [0], [[$0]],

+       [$#], [1], [m4_ifdef([$1], [_m4_popdef([$1])],

+                            [m4_fatal([$0: undefined macro: $1])])],

+       [m4_foreach([_m4_macro], [$@], [$0(_m4_defn([_m4_macro]))])])])

+

+

+# m4_shiftn(N, ...)

+# -----------------

+# Returns ... shifted N times.  Useful for recursive "varargs" constructs.

+#

+# Autoconf does not use this macro, because it is inherently slower than

+# calling the common cases of m4_shift2 or m4_shift3 directly.  But it

+# might as well be fast for other clients, such as Libtool.  One way to

+# do this is to expand $@ only once in _m4_shiftn (otherwise, for long

+# lists, the expansion of m4_if takes twice as much memory as what the

+# list itself occupies, only to throw away the unused branch).  The end

+# result is strictly equivalent to

+#   m4_if([$1], 1, [m4_shift(,m4_shift(m4_shift($@)))],

+#         [_m4_shiftn(m4_decr([$1]), m4_shift(m4_shift($@)))])

+# but with the final `m4_shift(m4_shift($@)))' shared between the two

+# paths.  The first leg uses a no-op m4_shift(,$@) to balance out the ().

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_shiftn],

+[m4_assert(0 < $1 && $1 < $#)_$0($@)])

+

+m4_define([_m4_shiftn],

+[m4_if([$1], 1, [m4_shift(],

+       [$0(m4_decr([$1])]), m4_shift(m4_shift($@)))])

+

+# m4_shift2(...)

+# m4_shift3(...)

+# -----------------

+# Returns ... shifted twice, and three times.  Faster than m4_shiftn.

+m4_define([m4_shift2], [m4_shift(m4_shift($@))])

+m4_define([m4_shift3], [m4_shift(m4_shift(m4_shift($@)))])

+

+# _m4_shift2(...)

+# _m4_shift3(...)

+# ---------------

+# Like m4_shift2 or m4_shift3, except include a leading comma unless shifting

+# consumes all arguments.  Why?  Because in recursion, it is nice to

+# distinguish between 1 element left and 0 elements left, based on how many

+# arguments this shift expands to.

+m4_define([_m4_shift2],

+[m4_if([$#], [2], [],

+       [, m4_shift(m4_shift($@))])])

+m4_define([_m4_shift3],

+[m4_if([$#], [3], [],

+       [, m4_shift(m4_shift(m4_shift($@)))])])

+

+

+# m4_undefine(NAME)

+# -----------------

+# Like the original, except guarantee a warning when using something which is

+# undefined (unlike M4 1.4.x).

+#

+# This macro is called frequently, so minimize the amount of additional

+# expansions by skipping m4_ifndef.  Better yet, if __m4_version__ exists,

+# (added in M4 1.6), then let m4 do the job for us (see m4_init).

+#

+# _m4_undefine is for internal use only - it bypasses the wrapper, so

+# it must only be used on macros known to be defined.  Make sure this

+# still works if the user renames m4_undefine but not _m4_undefine.

+m4_copy([m4_undefine], [_m4_undefine])

+m4_define([m4_undefine],

+[m4_if([$#], [0], [[$0]],

+       [$#], [1], [m4_ifdef([$1], [_m4_undefine([$1])],

+                            [m4_fatal([$0: undefined macro: $1])])],

+       [m4_foreach([_m4_macro], [$@], [$0(_m4_defn([_m4_macro]))])])])

+

+# _m4_wrap(PRE, POST)

+# -------------------

+# Helper macro for m4_wrap and m4_wrap_lifo.  Allows nested calls to

+# m4_wrap within wrapped text.  Use _m4_defn and _m4_popdef for speed.

+m4_define([_m4_wrap],

+[m4_ifdef([$0_text],

+          [m4_define([$0_text], [$1]_m4_defn([$0_text])[$2])],

+          [m4_builtin([m4wrap], [m4_unquote(

+  _m4_defn([$0_text])_m4_popdef([$0_text]))])m4_define([$0_text], [$1$2])])])

+

+# m4_wrap(TEXT)

+# -------------

+# Append TEXT to the list of hooks to be executed at the end of input.

+# Whereas the order of the original may be LIFO in the underlying m4,

+# this version is always FIFO.

+m4_define([m4_wrap],

+[_m4_wrap([], [$1[]])])

+

+# m4_wrap_lifo(TEXT)

+# ------------------

+# Prepend TEXT to the list of hooks to be executed at the end of input.

+# Whereas the order of m4_wrap may be FIFO in the underlying m4, this

+# version is always LIFO.

+m4_define([m4_wrap_lifo],

+[_m4_wrap([$1[]])])

+

+## ------------------------- ##

+## 7. Quoting manipulation.  ##

+## ------------------------- ##

+

+

+# m4_apply(MACRO, LIST)

+# ---------------------

+# Invoke MACRO, with arguments provided from the quoted list of

+# comma-separated quoted arguments.  If LIST is empty, invoke MACRO

+# without arguments.  The expansion will not be concatenated with

+# subsequent text.

+m4_define([m4_apply],

+[m4_if([$2], [], [$1], [$1($2)])[]])

+

+# _m4_apply(MACRO, LIST)

+# ----------------------

+# Like m4_apply, except do nothing if LIST is empty.

+m4_define([_m4_apply],

+[m4_if([$2], [], [], [$1($2)[]])])

+

+

+# m4_count(ARGS)

+# --------------

+# Return a count of how many ARGS are present.

+m4_define([m4_count], [$#])

+

+

+# m4_do(STRING, ...)

+# ------------------

+# This macro invokes all its arguments (in sequence, of course).  It is

+# useful for making your macros more structured and readable by dropping

+# unnecessary dnl's and have the macros indented properly.  No concatenation

+# occurs after a STRING; use m4_unquote(m4_join(,STRING)) for that.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_do],

+[m4_if([$#], 0, [],

+       [$#], 1, [$1[]],

+       [$1[]$0(m4_shift($@))])])

+

+

+# m4_dquote(ARGS)

+# ---------------

+# Return ARGS as a quoted list of quoted arguments.

+m4_define([m4_dquote],  [[$@]])

+

+

+# m4_dquote_elt(ARGS)

+# -------------------

+# Return ARGS as an unquoted list of double-quoted arguments.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_dquote_elt],

+[m4_if([$#], [0], [],

+       [$#], [1], [[[$1]]],

+       [[[$1]],$0(m4_shift($@))])])

+

+

+# m4_echo(ARGS)

+# -------------

+# Return the ARGS, with the same level of quoting.  Whitespace after

+# unquoted commas are consumed.

+m4_define([m4_echo], [$@])

+

+

+# m4_expand(ARG)

+# --------------

+# Return the expansion of ARG as a single string.  Unlike m4_quote($1), this

+# correctly preserves whitespace following single-quoted commas that appeared

+# within ARG.

+#

+#   m4_define([active], [ACT, IVE])

+#   m4_define([active2], [[ACT, IVE]])

+#   m4_quote(active, active2)

+#   => ACT,IVE,ACT, IVE

+#   m4_expand([active, active2])

+#   => ACT, IVE, ACT, IVE

+#

+# Unfortunately, due to limitations in m4, ARG must expand to something

+# with balanced quotes (use quadrigraphs to get around this).  The input

+# is not likely to have unbalanced -=<{(/)}>=- quotes, and it is possible

+# to have unbalanced (), provided it was specified with proper [] quotes.

+#

+# Exploit that extra () will group unquoted commas and the following

+# whitespace, then convert () to [].  m4_bpatsubst can't handle newlines

+# inside $1, and m4_substr strips quoting.  So we (ab)use m4_changequote.

+m4_define([m4_expand], [_$0(-=<{($1)}>=-)])

+m4_define([_m4_expand],

+[m4_changequote([-=<{(], [)}>=-])$1m4_changequote([, ])])

+

+

+# m4_ignore(ARGS)

+# ---------------

+# Expands to nothing.  Useful for conditionally ignoring an arbitrary

+# number of arguments (see _m4_list_cmp for an example).

+m4_define([m4_ignore])

+

+

+# m4_make_list(ARGS)

+# ------------------

+# Similar to m4_dquote, this creates a quoted list of quoted ARGS.  This

+# version is less efficient than m4_dquote, but separates each argument

+# with a comma and newline, rather than just comma, for readability.

+# When developing an m4sugar algorithm, you could temporarily use

+#   m4_pushdef([m4_dquote],m4_defn([m4_make_list]))

+# around your code to make debugging easier.

+m4_define([m4_make_list], [m4_join([,

+], m4_dquote_elt($@))])

+

+

+# m4_noquote(STRING)

+# ------------------

+# Return the result of ignoring all quotes in STRING and invoking the

+# macros it contains.  Amongst other things, this is useful for enabling

+# macro invocations inside strings with [] blocks (for instance regexps

+# and help-strings).  On the other hand, since all quotes are disabled,

+# any macro expanded during this time that relies on nested [] quoting

+# will likely crash and burn.  This macro is seldom useful; consider

+# m4_unquote or m4_expand instead.

+m4_define([m4_noquote],

+[m4_changequote([-=<{(],[)}>=-])$1-=<{()}>=-m4_changequote([,])])

+

+

+# m4_quote(ARGS)

+# --------------

+# Return ARGS as a single argument.  Any whitespace after unquoted commas

+# is stripped.  There is always output, even when there were no arguments.

+#

+# It is important to realize the difference between `m4_quote(exp)' and

+# `[exp]': in the first case you obtain the quoted *result* of the

+# expansion of EXP, while in the latter you just obtain the string

+# `exp'.

+m4_define([m4_quote],  [[$*]])

+

+

+# _m4_quote(ARGS)

+# ---------------

+# Like m4_quote, except that when there are no arguments, there is no

+# output.  For conditional scenarios (such as passing _m4_quote as the

+# macro name in m4_mapall), this feature can be used to distinguish between

+# one argument of the empty string vs. no arguments.  However, in the

+# normal case with arguments present, this is less efficient than m4_quote.

+m4_define([_m4_quote],

+[m4_if([$#], [0], [], [[$*]])])

+

+

+# m4_reverse(ARGS)

+# ----------------

+# Output ARGS in reverse order.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_reverse],

+[m4_if([$#], [0], [], [$#], [1], [[$1]],

+       [$0(m4_shift($@)), [$1]])])

+

+

+# m4_unquote(ARGS)

+# ----------------

+# Remove one layer of quotes from each ARG, performing one level of

+# expansion.  For one argument, m4_unquote([arg]) is more efficient than

+# m4_do([arg]), but for multiple arguments, the difference is that

+# m4_unquote separates arguments with commas while m4_do concatenates.

+# Follow this macro with [] if concatenation with subsequent text is

+# undesired.

+m4_define([m4_unquote], [$*])

+

+

+## -------------------------- ##

+## 8. Implementing m4 loops.  ##

+## -------------------------- ##

+

+

+# m4_for(VARIABLE, FIRST, LAST, [STEP = +/-1], EXPRESSION)

+# --------------------------------------------------------

+# Expand EXPRESSION defining VARIABLE to FROM, FROM + 1, ..., TO with

+# increments of STEP.  Both limits are included, and bounds are

+# checked for consistency.  The algorithm is robust to indirect

+# VARIABLE names.  Changing VARIABLE inside EXPRESSION will not impact

+# the number of iterations.

+#

+# Uses _m4_defn for speed, and avoid dnl in the macro body.

+m4_define([m4_for],

+[m4_pushdef([$1], m4_eval([$2]))]dnl

+[m4_cond([m4_eval(([$3]) > ([$2]))], 1,

+           [m4_pushdef([_m4_step], m4_eval(m4_default([$4],

+              1)))m4_assert(_m4_step > 0)_$0([$1], _m4_defn([$1]),

+  m4_eval((([$3]) - ([$2])) / _m4_step * _m4_step + ([$2])),

+  _m4_step, [$5])],

+         [m4_eval(([$3]) < ([$2]))], 1,

+           [m4_pushdef([_m4_step], m4_eval(m4_default([$4],

+              -1)))m4_assert(_m4_step < 0)_$0([$1], _m4_defn([$1]),

+  m4_eval((([$2]) - ([$3])) / -(_m4_step) * _m4_step + ([$2])),

+  _m4_step, [$5])],

+         [m4_pushdef([_m4_step])$5])[]]dnl

+[m4_popdef([_m4_step], [$1])])

+

+

+# _m4_for(VARIABLE, COUNT, LAST, STEP, EXPRESSION)

+# ------------------------------------------------

+# Core of the loop, no consistency checks, all arguments are plain

+# numbers.  Define VARIABLE to COUNT, expand EXPRESSION, then alter

+# COUNT by STEP and iterate if COUNT is not LAST.

+m4_define([_m4_for],

+[m4_define([$1], [$2])$5[]m4_if([$2], [$3], [],

+      [$0([$1], m4_eval([$2 + $4]), [$3], [$4], [$5])])])

+

+

+# Implementing `foreach' loops in m4 is much more tricky than it may

+# seem.  For example, the old M4 1.4.4 manual had an incorrect example,

+# which looked like this (when translated to m4sugar):

+#

+# | # foreach(VAR, (LIST), STMT)

+# | m4_define([foreach],

+# |   [m4_pushdef([$1])_foreach([$1], [$2], [$3])m4_popdef([$1])])

+# | m4_define([_arg1], [$1])

+# | m4_define([_foreach],

+# |   [m4_if([$2], [()], ,

+# |     [m4_define([$1], _arg1$2)$3[]_foreach([$1], (m4_shift$2), [$3])])])

+#

+# But then if you run

+#

+# | m4_define(a, 1)

+# | m4_define(b, 2)

+# | m4_define(c, 3)

+# | foreach([f], [([a], [(b], [c)])], [echo f

+# | ])

+#

+# it gives

+#

+#  => echo 1

+#  => echo (2,3)

+#

+# which is not what is expected.

+#

+# Of course the problem is that many quotes are missing.  So you add

+# plenty of quotes at random places, until you reach the expected

+# result.  Alternatively, if you are a quoting wizard, you directly

+# reach the following implementation (but if you really did, then

+# apply to the maintenance of m4sugar!).

+#

+# | # foreach(VAR, (LIST), STMT)

+# | m4_define([foreach], [m4_pushdef([$1])_foreach($@)m4_popdef([$1])])

+# | m4_define([_arg1], [[$1]])

+# | m4_define([_foreach],

+# |  [m4_if($2, [()], ,

+# |    [m4_define([$1], [_arg1$2])$3[]_foreach([$1], [(m4_shift$2)], [$3])])])

+#

+# which this time answers

+#

+#  => echo a

+#  => echo (b

+#  => echo c)

+#

+# Bingo!

+#

+# Well, not quite.

+#

+# With a better look, you realize that the parens are more a pain than

+# a help: since anyway you need to quote properly the list, you end up

+# with always using an outermost pair of parens and an outermost pair

+# of quotes.  Rejecting the parens both eases the implementation, and

+# simplifies the use:

+#

+# | # foreach(VAR, (LIST), STMT)

+# | m4_define([foreach], [m4_pushdef([$1])_foreach($@)m4_popdef([$1])])

+# | m4_define([_arg1], [$1])

+# | m4_define([_foreach],

+# |  [m4_if($2, [], ,

+# |    [m4_define([$1], [_arg1($2)])$3[]_foreach([$1], [m4_shift($2)], [$3])])])

+#

+#

+# Now, just replace the `$2' with `m4_quote($2)' in the outer `m4_if'

+# to improve robustness, and you come up with a nice implementation

+# that doesn't require extra parentheses in the user's LIST.

+#

+# But wait -  now the algorithm is quadratic, because every recursion of

+# the algorithm keeps the entire LIST and merely adds another m4_shift to

+# the quoted text.  If the user has a lot of elements in LIST, you can

+# bring the system to its knees with the memory m4 then requires, or trip

+# the m4 --nesting-limit recursion factor.  The only way to avoid

+# quadratic growth is ensure m4_shift is expanded prior to the recursion.

+# Hence the design below.

+#

+# The M4 manual now includes a chapter devoted to this issue, with

+# the lessons learned from m4sugar.  And still, this design is only

+# optimal for M4 1.6; see foreach.m4 for yet more comments on why

+# M4 1.4.x uses yet another implementation.

+

+

+# m4_foreach(VARIABLE, LIST, EXPRESSION)

+# --------------------------------------

+#

+# Expand EXPRESSION assigning each value of the LIST to VARIABLE.

+# LIST should have the form `item_1, item_2, ..., item_n', i.e. the

+# whole list must *quoted*.  Quote members too if you don't want them

+# to be expanded.

+#

+# This macro is robust to active symbols:

+#      | m4_define(active, [ACT, IVE])

+#      | m4_foreach(Var, [active, active], [-Var-])

+#     => -ACT--IVE--ACT--IVE-

+#

+#      | m4_foreach(Var, [[active], [active]], [-Var-])

+#     => -ACT, IVE--ACT, IVE-

+#

+#      | m4_foreach(Var, [[[active]], [[active]]], [-Var-])

+#     => -active--active-

+#

+# This macro is called frequently, so avoid extra expansions such as

+# m4_ifval and dnl.  Also, since $2 might be quite large, try to use it

+# as little as possible in _m4_foreach; each extra use requires that much

+# more memory for expansion.  So, rather than directly compare $2 against

+# [] and use m4_car/m4_cdr for recursion, we instead unbox the list (which

+# requires swapping the argument order in the helper), insert an ignored

+# third argument, and use m4_shift3 to detect when recursion is complete.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_foreach],

+[m4_if([$2], [], [],

+       [m4_pushdef([$1])_$0([$1], [$3], [], $2)m4_popdef([$1])])])

+

+m4_define([_m4_foreach],

+[m4_if([$#], [3], [],

+       [m4_define([$1], [$4])$2[]$0([$1], [$2], m4_shift3($@))])])

+

+

+# m4_foreach_w(VARIABLE, LIST, EXPRESSION)

+# ----------------------------------------

+#

+# Like m4_foreach, but the list is whitespace separated.

+#

+# This macro is robust to active symbols:

+#    m4_foreach_w([Var], [ active

+#    b  act\

+#    ive  ], [-Var-])end

+#    => -active--b--active-end

+#

+m4_define([m4_foreach_w],

+[m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])

+

+

+# m4_map(MACRO, LIST)

+# m4_mapall(MACRO, LIST)

+# ----------------------

+# Invoke MACRO($1), MACRO($2) etc. where $1, $2... are the elements of

+# LIST.  $1, $2... must in turn be lists, appropriate for m4_apply.

+# If LIST contains an empty sublist, m4_map skips the expansion of

+# MACRO, while m4_mapall expands MACRO with no arguments.

+#

+# Since LIST may be quite large, we want to minimize how often it

+# appears in the expansion.  Rather than use m4_car/m4_cdr iteration,

+# we unbox the list, ignore the second argument, and use m4_shift2 to

+# detect the end of recursion.  The mismatch in () is intentional; see

+# _m4_map.  For m4_map, an empty list behaves like an empty sublist

+# and gets ignored; for m4_mapall, we must special-case the empty

+# list.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_map],

+[_m4_map([_m4_apply([$1]], [], $2)])

+

+m4_define([m4_mapall],

+[m4_if([$2], [], [],

+       [_m4_map([m4_apply([$1]], [], $2)])])

+

+

+# m4_map_sep(MACRO, SEPARATOR, LIST)

+# m4_mapall_sep(MACRO, SEPARATOR, LIST)

+# -------------------------------------

+# Invoke MACRO($1), SEPARATOR, MACRO($2), ..., MACRO($N) where $1,

+# $2... $N are the elements of LIST, and are in turn lists appropriate

+# for m4_apply.  SEPARATOR is expanded, in order to allow the creation

+# of a list of arguments by using a single-quoted comma as the

+# separator.  For each empty sublist, m4_map_sep skips the expansion

+# of MACRO and SEPARATOR, while m4_mapall_sep expands MACRO with no

+# arguments.

+#

+# For m4_mapall_sep, merely expand the first iteration without the

+# separator, then include separator as part of subsequent recursion;

+# but avoid extra expansion of LIST's side-effects via a helper macro.

+# For m4_map_sep, things are trickier - we don't know if the first

+# list element is an empty sublist, so we must define a self-modifying

+# helper macro and use that as the separator instead.

+m4_define([m4_map_sep],

+[m4_pushdef([m4_Sep], [m4_define([m4_Sep], _m4_defn([m4_unquote]))])]dnl

+[_m4_map([_m4_apply([m4_Sep([$2])[]$1]], [], $3)m4_popdef([m4_Sep])])

+

+m4_define([m4_mapall_sep],

+[m4_if([$3], [], [], [_$0([$1], [$2], $3)])])

+

+m4_define([_m4_mapall_sep],

+[m4_apply([$1], [$3])_m4_map([m4_apply([$2[]$1]], m4_shift2($@))])

+

+# _m4_map(PREFIX, IGNORED, SUBLIST, ...)

+# --------------------------------------

+# Common implementation for all four m4_map variants.  The mismatch in

+# the number of () is intentional.  PREFIX must supply a form of

+# m4_apply, the open `(', and the MACRO to be applied.  Each iteration

+# then appends `,', the current SUBLIST and the closing `)', then

+# recurses to the next SUBLIST.  IGNORED is an aid to ending recursion

+# efficiently.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([_m4_map],

+[m4_if([$#], [2], [],

+       [$1, [$3])$0([$1], m4_shift2($@))])])

+

+# m4_transform(EXPRESSION, ARG...)

+# --------------------------------

+# Expand EXPRESSION([ARG]) for each argument.  More efficient than

+# m4_foreach([var], [ARG...], [EXPRESSION(m4_defn([var]))])

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_transform],

+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],

+       [$#], [1], [],

+       [$#], [2], [$1([$2])[]],

+       [$1([$2])[]$0([$1], m4_shift2($@))])])

+

+

+# m4_transform_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...)

+# --------------------------------------------------------------

+# Perform a pairwise grouping of consecutive ARGs, by expanding

+# EXPRESSION([ARG1], [ARG2]).  If there are an odd number of ARGs, the

+# final argument is expanded with END-EXPR([ARGn]).

+#

+# For example:

+#   m4_define([show], [($*)m4_newline])dnl

+#   m4_transform_pair([show], [], [a], [b], [c], [d], [e])dnl

+#   => (a,b)

+#   => (c,d)

+#   => (e)

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_transform_pair],

+[m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])],

+       [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])],

+       [$#], [2], [],

+       [$#], [3], [m4_default([$2], [$1])([$3])[]],

+       [$#], [4], [$1([$3], [$4])[]],

+       [$1([$3], [$4])[]$0([$1], [$2], m4_shift(m4_shift3($@)))])])

+

+

+## --------------------------- ##

+## 9. More diversion support.  ##

+## --------------------------- ##

+

+

+# _m4_divert(DIVERSION-NAME or NUMBER)

+# ------------------------------------

+# If DIVERSION-NAME is the name of a diversion, return its number,

+# otherwise if it is a NUMBER return it.

+m4_define([_m4_divert],

+[m4_ifdef([_m4_divert($1)],

+          [m4_indir([_m4_divert($1)])],

+          [$1])])

+

+# KILL is only used to suppress output.

+m4_define([_m4_divert(KILL)],           -1)

+

+# The empty diversion name is a synonym for 0.

+m4_define([_m4_divert()],                0)

+

+

+# _m4_divert_n_stack

+# ------------------

+# Print m4_divert_stack with newline prepended, if it's nonempty.

+m4_define([_m4_divert_n_stack],

+[m4_ifdef([m4_divert_stack], [

+_m4_defn([m4_divert_stack])])])

+

+

+# m4_divert(DIVERSION-NAME)

+# -------------------------

+# Change the diversion stream to DIVERSION-NAME.

+m4_define([m4_divert],

+[m4_define([m4_divert_stack], m4_location[: $0: $1]_m4_divert_n_stack)]dnl

+[m4_builtin([divert], _m4_divert([$1]))])

+

+

+# m4_divert_push(DIVERSION-NAME)

+# ------------------------------

+# Change the diversion stream to DIVERSION-NAME, while stacking old values.

+m4_define([m4_divert_push],

+[m4_pushdef([m4_divert_stack], m4_location[: $0: $1]_m4_divert_n_stack)]dnl

+[m4_pushdef([_m4_divert_diversion], [$1])]dnl

+[m4_builtin([divert], _m4_divert([$1]))])

+

+

+# m4_divert_pop([DIVERSION-NAME])

+# -------------------------------

+# Change the diversion stream to its previous value, unstacking it.

+# If specified, verify we left DIVERSION-NAME.

+# When we pop the last value from the stack, we divert to -1.

+m4_define([m4_divert_pop],

+[m4_ifndef([_m4_divert_diversion],

+           [m4_fatal([too many m4_divert_pop])])]dnl

+[m4_if([$1], [], [],

+       [$1], _m4_defn([_m4_divert_diversion]), [],

+       [m4_fatal([$0($1): diversion mismatch: ]_m4_divert_n_stack)])]dnl

+[_m4_popdef([m4_divert_stack], [_m4_divert_diversion])]dnl

+[m4_builtin([divert],

+            m4_ifdef([_m4_divert_diversion],

+                     [_m4_divert(_m4_defn([_m4_divert_diversion]))],

+                     -1))])

+

+

+# m4_divert_text(DIVERSION-NAME, CONTENT)

+# ---------------------------------------

+# Output CONTENT into DIVERSION-NAME (which may be a number actually).

+# An end of line is appended for free to CONTENT.

+m4_define([m4_divert_text],

+[m4_divert_push([$1])$2

+m4_divert_pop([$1])])

+

+

+# m4_divert_once(DIVERSION-NAME, CONTENT)

+# ---------------------------------------

+# Output CONTENT into DIVERSION-NAME once, if not already there.

+# An end of line is appended for free to CONTENT.

+m4_define([m4_divert_once],

+[m4_expand_once([m4_divert_text([$1], [$2])])])

+

+

+# m4_undivert(DIVERSION-NAME)

+# ---------------------------

+# Undivert DIVERSION-NAME.  Unlike the M4 version, this only takes a single

+# diversion identifier, and should not be used to undivert files.

+m4_define([m4_undivert],

+[m4_builtin([undivert], _m4_divert([$1]))])

+

+

+## --------------------------------------------- ##

+## 10. Defining macros with bells and whistles.  ##

+## --------------------------------------------- ##

+

+# `m4_defun' is basically `m4_define' but it equips the macro with the

+# needed machinery for `m4_require'.  A macro must be m4_defun'd if

+# either it is m4_require'd, or it m4_require's.

+#

+# Two things deserve attention and are detailed below:

+#  1. Implementation of m4_require

+#  2. Keeping track of the expansion stack

+#

+# 1. Implementation of m4_require

+# ===============================

+#

+# Of course m4_defun AC_PROVIDE's the macro, so that a macro which has

+# been expanded is not expanded again when m4_require'd, but the

+# difficult part is the proper expansion of macros when they are

+# m4_require'd.

+#

+# The implementation is based on two ideas, (i) using diversions to

+# prepare the expansion of the macro and its dependencies (by Franc,ois

+# Pinard), and (ii) expand the most recently m4_require'd macros _after_

+# the previous macros (by Axel Thimm).

+#

+#

+# The first idea: why use diversions?

+# -----------------------------------

+#

+# When a macro requires another, the other macro is expanded in new

+# diversion, GROW.  When the outer macro is fully expanded, we first

+# undivert the most nested diversions (GROW - 1...), and finally

+# undivert GROW.  To understand why we need several diversions,

+# consider the following example:

+#

+# | m4_defun([TEST1], [Test...REQUIRE([TEST2])1])

+# | m4_defun([TEST2], [Test...REQUIRE([TEST3])2])

+# | m4_defun([TEST3], [Test...3])

+#

+# Because m4_require is not required to be first in the outer macros, we

+# must keep the expansions of the various levels of m4_require separated.

+# Right before executing the epilogue of TEST1, we have:

+#

+#          GROW - 2: Test...3

+#          GROW - 1: Test...2

+#          GROW:     Test...1

+#          BODY:

+#

+# Finally the epilogue of TEST1 undiverts GROW - 2, GROW - 1, and

+# GROW into the regular flow, BODY.

+#

+#          GROW - 2:

+#          GROW - 1:

+#          GROW:

+#          BODY:        Test...3; Test...2; Test...1

+#

+# (The semicolons are here for clarification, but of course are not

+# emitted.)  This is what Autoconf 2.0 (I think) to 2.13 (I'm sure)

+# implement.

+#

+#

+# The second idea: first required first out

+# -----------------------------------------

+#

+# The natural implementation of the idea above is buggy and produces

+# very surprising results in some situations.  Let's consider the

+# following example to explain the bug:

+#

+# | m4_defun([TEST1],  [REQUIRE([TEST2a])REQUIRE([TEST2b])])

+# | m4_defun([TEST2a], [])

+# | m4_defun([TEST2b], [REQUIRE([TEST3])])

+# | m4_defun([TEST3],  [REQUIRE([TEST2a])])

+# |

+# | AC_INIT

+# | TEST1

+#

+# The dependencies between the macros are:

+#

+#                3 --- 2b

+#               /        \              is m4_require'd by

+#              /          \       left -------------------- right

+#           2a ------------ 1

+#

+# If you strictly apply the rules given in the previous section you get:

+#

+#          GROW - 2: TEST3

+#          GROW - 1: TEST2a; TEST2b

+#          GROW:     TEST1

+#          BODY:

+#

+# (TEST2a, although required by TEST3 is not expanded in GROW - 3

+# because is has already been expanded before in GROW - 1, so it has

+# been AC_PROVIDE'd, so it is not expanded again) so when you undivert

+# the stack of diversions, you get:

+#

+#          GROW - 2:

+#          GROW - 1:

+#          GROW:

+#          BODY:        TEST3; TEST2a; TEST2b; TEST1

+#

+# i.e., TEST2a is expanded after TEST3 although the latter required the

+# former.

+#

+# Starting from 2.50, we use an implementation provided by Axel Thimm.

+# The idea is simple: the order in which macros are emitted must be the

+# same as the one in which macros are expanded.  (The bug above can

+# indeed be described as: a macro has been AC_PROVIDE'd before its

+# dependent, but it is emitted after: the lack of correlation between

+# emission and expansion order is guilty).

+#

+# How to do that?  You keep the stack of diversions to elaborate the

+# macros, but each time a macro is fully expanded, emit it immediately.

+#

+# In the example above, when TEST2a is expanded, but it's epilogue is

+# not run yet, you have:

+#

+#          GROW - 2:

+#          GROW - 1: TEST2a

+#          GROW:     Elaboration of TEST1

+#          BODY:

+#

+# The epilogue of TEST2a emits it immediately:

+#

+#          GROW - 2:

+#          GROW - 1:

+#          GROW:     Elaboration of TEST1

+#          BODY:     TEST2a

+#

+# TEST2b then requires TEST3, so right before the epilogue of TEST3, you

+# have:

+#

+#          GROW - 2: TEST3

+#          GROW - 1: Elaboration of TEST2b

+#          GROW:     Elaboration of TEST1

+#          BODY:      TEST2a

+#

+# The epilogue of TEST3 emits it:

+#

+#          GROW - 2:

+#          GROW - 1: Elaboration of TEST2b

+#          GROW:     Elaboration of TEST1

+#          BODY:     TEST2a; TEST3

+#

+# TEST2b is now completely expanded, and emitted:

+#

+#          GROW - 2:

+#          GROW - 1:

+#          GROW:     Elaboration of TEST1

+#          BODY:     TEST2a; TEST3; TEST2b

+#

+# and finally, TEST1 is finished and emitted:

+#

+#          GROW - 2:

+#          GROW - 1:

+#          GROW:

+#          BODY:     TEST2a; TEST3; TEST2b: TEST1

+#

+# The idea is simple, but the implementation is a bit evolved.  If you

+# are like me, you will want to see the actual functioning of this

+# implementation to be convinced.  The next section gives the full

+# details.

+#

+#

+# The Axel Thimm implementation at work

+# -------------------------------------

+#

+# We consider the macros above, and this configure.ac:

+#

+#           AC_INIT

+#           TEST1

+#

+# You should keep the definitions of _m4_defun_pro, _m4_defun_epi, and

+# m4_require at hand to follow the steps.

+#

+# This implements tries not to assume that the current diversion is

+# BODY, so as soon as a macro (m4_defun'd) is expanded, we first

+# record the current diversion under the name _m4_divert_dump (denoted

+# DUMP below for short).  This introduces an important difference with

+# the previous versions of Autoconf: you cannot use m4_require if you

+# are not inside an m4_defun'd macro, and especially, you cannot

+# m4_require directly from the top level.

+#

+# We have not tried to simulate the old behavior (better yet, we

+# diagnose it), because it is too dangerous: a macro m4_require'd from

+# the top level is expanded before the body of `configure', i.e., before

+# any other test was run.  I let you imagine the result of requiring

+# AC_STDC_HEADERS for instance, before AC_PROG_CC was actually run....

+#

+# After AC_INIT was run, the current diversion is BODY.

+# * AC_INIT was run

+#   DUMP:                undefined

+#   diversion stack:     BODY |-

+#

+# * TEST1 is expanded

+# The prologue of TEST1 sets _m4_divert_dump, which is the diversion

+# where the current elaboration will be dumped, to the current

+# diversion.  It also m4_divert_push to GROW, where the full

+# expansion of TEST1 and its dependencies will be elaborated.

+#   DUMP:        BODY

+#   BODY:        empty

+#   diversions:  GROW, BODY |-

+#

+# * TEST1 requires TEST2a

+# _m4_require_call m4_divert_pushes another temporary diversion,

+# GROW - 1, and expands TEST2a in there.

+#   DUMP:        BODY

+#   BODY:        empty

+#   GROW - 1:    TEST2a

+#   diversions:  GROW - 1, GROW, BODY |-

+# Than the content of the temporary diversion is moved to DUMP and the

+# temporary diversion is popped.

+#   DUMP:        BODY

+#   BODY:        TEST2a

+#   diversions:  GROW, BODY |-

+#

+# * TEST1 requires TEST2b

+# Again, _m4_require_call pushes GROW - 1 and heads to expand TEST2b.

+#   DUMP:        BODY

+#   BODY:        TEST2a

+#   diversions:  GROW - 1, GROW, BODY |-

+#

+# * TEST2b requires TEST3

+# _m4_require_call pushes GROW - 2 and expands TEST3 here.

+# (TEST3 requires TEST2a, but TEST2a has already been m4_provide'd, so

+# nothing happens.)

+#   DUMP:        BODY

+#   BODY:        TEST2a

+#   GROW - 2:    TEST3

+#   diversions:  GROW - 2, GROW - 1, GROW, BODY |-

+# Than the diversion is appended to DUMP, and popped.

+#   DUMP:        BODY

+#   BODY:        TEST2a; TEST3

+#   diversions:  GROW - 1, GROW, BODY |-

+#

+# * TEST1 requires TEST2b (contd.)

+# The content of TEST2b is expanded...

+#   DUMP:        BODY

+#   BODY:        TEST2a; TEST3

+#   GROW - 1:    TEST2b,

+#   diversions:  GROW - 1, GROW, BODY |-

+# ... and moved to DUMP.

+#   DUMP:        BODY

+#   BODY:        TEST2a; TEST3; TEST2b

+#   diversions:  GROW, BODY |-

+#

+# * TEST1 is expanded: epilogue

+# TEST1's own content is in GROW...

+#   DUMP:        BODY

+#   BODY:        TEST2a; TEST3; TEST2b

+#   GROW:        TEST1

+#   diversions:  BODY |-

+# ... and it's epilogue moves it to DUMP and then undefines DUMP.

+#   DUMP:       undefined

+#   BODY:       TEST2a; TEST3; TEST2b; TEST1

+#   diversions: BODY |-

+#

+#

+# 2. Keeping track of the expansion stack

+# =======================================

+#

+# When M4 expansion goes wrong it is often extremely hard to find the

+# path amongst macros that drove to the failure.  What is needed is

+# the stack of macro `calls'. One could imagine that GNU M4 would

+# maintain a stack of macro expansions, unfortunately it doesn't, so

+# we do it by hand.  This is of course extremely costly, but the help

+# this stack provides is worth it.  Nevertheless to limit the

+# performance penalty this is implemented only for m4_defun'd macros,

+# not for define'd macros.

+#

+# The scheme is simplistic: each time we enter an m4_defun'd macros,

+# we prepend its name in m4_expansion_stack, and when we exit the

+# macro, we remove it (thanks to pushdef/popdef).

+#

+# In addition, we want to detect circular m4_require dependencies.

+# Each time we expand a macro FOO we define _m4_expanding(FOO); and

+# m4_require(BAR) simply checks whether _m4_expanding(BAR) is defined.

+

+

+# m4_expansion_stack_push(TEXT)

+# -----------------------------

+m4_define([m4_expansion_stack_push],

+[m4_pushdef([m4_expansion_stack],

+            [$1]m4_ifdef([m4_expansion_stack], [

+_m4_defn([m4_expansion_stack])]))])

+

+

+# m4_expansion_stack_pop

+# ----------------------

+m4_define([m4_expansion_stack_pop],

+[m4_popdef([m4_expansion_stack])])

+

+

+# m4_expansion_stack_dump

+# -----------------------

+# Dump the expansion stack.

+m4_define([m4_expansion_stack_dump],

+[m4_ifdef([m4_expansion_stack],

+          [m4_errprintn(_m4_defn([m4_expansion_stack]))])dnl

+m4_errprintn(m4_location[: the top level])])

+

+

+# _m4_divert(GROW)

+# ----------------

+# This diversion is used by the m4_defun/m4_require machinery.  It is

+# important to keep room before GROW because for each nested

+# AC_REQUIRE we use an additional diversion (i.e., two m4_require's

+# will use GROW - 2.  More than 3 levels has never seemed to be

+# needed.)

+#

+# ...

+# - GROW - 2

+#   m4_require'd code, 2 level deep

+# - GROW - 1

+#   m4_require'd code, 1 level deep

+# - GROW

+#   m4_defun'd macros are elaborated here.

+

+m4_define([_m4_divert(GROW)],       10000)

+

+

+# _m4_defun_pro(MACRO-NAME)

+# -------------------------

+# The prologue for Autoconf macros.

+#

+# This is called frequently, so minimize the number of macro invocations

+# by avoiding dnl and m4_defn overhead.

+m4_define([_m4_defun_pro],

+m4_do([[m4_ifdef([m4_expansion_stack], [], [_m4_defun_pro_outer[]])]],

+      [[m4_expansion_stack_push(_m4_defn(

+          [m4_location($1)])[: $1 is expanded from...])]],

+      [[m4_pushdef([_m4_expanding($1)])]]))

+

+m4_define([_m4_defun_pro_outer],

+[m4_copy([_m4_divert_diversion], [_m4_divert_dump])m4_divert_push([GROW])])

+

+# _m4_defun_epi(MACRO-NAME)

+# -------------------------

+# The Epilogue for Autoconf macros.  MACRO-NAME only helps tracing

+# the PRO/EPI pairs.

+#

+# This is called frequently, so minimize the number of macro invocations

+# by avoiding dnl and m4_popdef overhead.

+m4_define([_m4_defun_epi],

+m4_do([[_m4_popdef([_m4_expanding($1)])]],

+      [[m4_expansion_stack_pop()]],

+      [[m4_ifdef([m4_expansion_stack], [], [_m4_defun_epi_outer[]])]],

+      [[m4_provide([$1])]]))

+

+m4_define([_m4_defun_epi_outer],

+[_m4_undefine([_m4_divert_dump])m4_divert_pop([GROW])m4_undivert([GROW])])

+

+

+# m4_defun(NAME, EXPANSION)

+# -------------------------

+# Define a macro which automatically provides itself.  Add machinery

+# so the macro automatically switches expansion to the diversion

+# stack if it is not already using it.  In this case, once finished,

+# it will bring back all the code accumulated in the diversion stack.

+# This, combined with m4_require, achieves the topological ordering of

+# macros.  We don't use this macro to define some frequently called

+# macros that are not involved in ordering constraints, to save m4

+# processing.

+m4_define([m4_defun],

+[m4_define([m4_location($1)], m4_location)dnl

+m4_define([$1],

+          [_m4_defun_pro([$1])$2[]_m4_defun_epi([$1])])])

+

+

+# m4_defun_once(NAME, EXPANSION)

+# ------------------------------

+# As m4_defun, but issues the EXPANSION only once, and warns if used

+# several times.

+m4_define([m4_defun_once],

+[m4_define([m4_location($1)], m4_location)dnl

+m4_define([$1],

+          [m4_provide_if([$1],

+                         [m4_warn([syntax], [$1 invoked multiple times])],

+                         [_m4_defun_pro([$1])$2[]_m4_defun_epi([$1])])])])

+

+

+# m4_pattern_forbid(ERE, [WHY])

+# -----------------------------

+# Declare that no token matching the forbidden extended regular

+# expression ERE should be seen in the output unless...

+m4_define([m4_pattern_forbid], [])

+

+

+# m4_pattern_allow(ERE)

+# ---------------------

+# ... that token also matches the allowed extended regular expression ERE.

+# Both used via traces.

+m4_define([m4_pattern_allow], [])

+

+

+## --------------------------------- ##

+## 11. Dependencies between macros.  ##

+## --------------------------------- ##

+

+

+# m4_before(THIS-MACRO-NAME, CALLED-MACRO-NAME)

+# ---------------------------------------------

+# Issue a warning if CALLED-MACRO-NAME was called before THIS-MACRO-NAME.

+m4_define([m4_before],

+[m4_provide_if([$2],

+               [m4_warn([syntax], [$2 was called before $1])])])

+

+

+# m4_require(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK])

+# -----------------------------------------------------------

+# If NAME-TO-CHECK has never been expanded (actually, if it is not

+# m4_provide'd), expand BODY-TO-EXPAND *before* the current macro

+# expansion.  Once expanded, emit it in _m4_divert_dump.  Keep track

+# of the m4_require chain in m4_expansion_stack.

+#

+# The normal cases are:

+#

+# - NAME-TO-CHECK == BODY-TO-EXPAND

+#   Which you can use for regular macros with or without arguments, e.g.,

+#     m4_require([AC_PROG_CC], [AC_PROG_CC])

+#     m4_require([AC_CHECK_HEADERS(limits.h)], [AC_CHECK_HEADERS(limits.h)])

+#   which is just the same as

+#     m4_require([AC_PROG_CC])

+#     m4_require([AC_CHECK_HEADERS(limits.h)])

+#

+# - BODY-TO-EXPAND == m4_indir([NAME-TO-CHECK])

+#   In the case of macros with irregular names.  For instance:

+#     m4_require([AC_LANG_COMPILER(C)], [indir([AC_LANG_COMPILER(C)])])

+#   which means `if the macro named `AC_LANG_COMPILER(C)' (the parens are

+#   part of the name, it is not an argument) has not been run, then

+#   call it.'

+#   Had you used

+#     m4_require([AC_LANG_COMPILER(C)], [AC_LANG_COMPILER(C)])

+#   then m4_require would have tried to expand `AC_LANG_COMPILER(C)', i.e.,

+#   call the macro `AC_LANG_COMPILER' with `C' as argument.

+#

+#   You could argue that `AC_LANG_COMPILER', when it receives an argument

+#   such as `C' should dispatch the call to `AC_LANG_COMPILER(C)'.  But this

+#   `extension' prevents `AC_LANG_COMPILER' from having actual arguments that

+#   it passes to `AC_LANG_COMPILER(C)'.

+#

+# This is called frequently, so minimize the number of macro invocations

+# by avoiding dnl and other overhead on the common path.

+m4_define([m4_require],

+m4_do([[m4_ifdef([_m4_expanding($1)],

+                 [m4_fatal([$0: circular dependency of $1])])]],

+      [[m4_ifdef([_m4_divert_dump], [],

+                 [m4_fatal([$0($1): cannot be used outside of an ]dnl

+m4_bmatch([$0], [^AC_], [[AC_DEFUN]], [[m4_defun]])['d macro])])]],

+      [[m4_provide_if([$1],

+                      [],

+                      [_m4_require_call([$1], [$2])])]]))

+

+

+# _m4_require_call(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK])

+# -----------------------------------------------------------------

+# If m4_require decides to expand the body, it calls this macro.

+#

+# This is called frequently, so minimize the number of macro invocations

+# by avoiding dnl and other overhead on the common path.

+m4_define([_m4_require_call],

+m4_do([[m4_define([_m4_divert_grow], m4_decr(_m4_divert_grow))]],

+      [[m4_divert_push(_m4_divert_grow)]],

+      [[m4_default([$2], [$1])

+m4_provide_if([$1],

+              [],

+              [m4_warn([syntax],

+                       [$1 is m4_require'd but not m4_defun'd])])]],

+      [[m4_divert(_m4_defn([_m4_divert_dump]))]],

+      [[m4_undivert(_m4_divert_grow)]],

+      [[m4_divert_pop(_m4_divert_grow)]],

+      [[m4_define([_m4_divert_grow], m4_incr(_m4_divert_grow))]]))

+

+

+# _m4_divert_grow

+# ---------------

+# The counter for _m4_require_call.

+m4_define([_m4_divert_grow], _m4_divert([GROW]))

+

+

+# m4_expand_once(TEXT, [WITNESS = TEXT])

+# --------------------------------------

+# If TEXT has never been expanded, expand it *here*.  Use WITNESS as

+# as a memory that TEXT has already been expanded.

+m4_define([m4_expand_once],

+[m4_provide_if(m4_ifval([$2], [[$2]], [[$1]]),

+               [],

+               [m4_provide(m4_ifval([$2], [[$2]], [[$1]]))[]$1])])

+

+

+# m4_provide(MACRO-NAME)

+# ----------------------

+m4_define([m4_provide],

+[m4_define([m4_provide($1)])])

+

+

+# m4_provide_if(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

+# -------------------------------------------------------

+# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.

+# The purpose of this macro is to provide the user with a means to

+# check macros which are provided without letting her know how the

+# information is coded.

+m4_define([m4_provide_if],

+[m4_ifdef([m4_provide($1)],

+          [$2], [$3])])

+

+

+## --------------------- ##

+## 12. Text processing.  ##

+## --------------------- ##

+

+

+# m4_cr_letters

+# m4_cr_LETTERS

+# m4_cr_Letters

+# -------------

+m4_define([m4_cr_letters], [abcdefghijklmnopqrstuvwxyz])

+m4_define([m4_cr_LETTERS], [ABCDEFGHIJKLMNOPQRSTUVWXYZ])

+m4_define([m4_cr_Letters],

+m4_defn([m4_cr_letters])dnl

+m4_defn([m4_cr_LETTERS])dnl

+)

+

+

+# m4_cr_digits

+# ------------

+m4_define([m4_cr_digits], [0123456789])

+

+

+# m4_cr_alnum

+# -----------

+m4_define([m4_cr_alnum],

+m4_defn([m4_cr_Letters])dnl

+m4_defn([m4_cr_digits])dnl

+)

+

+

+# m4_cr_symbols1

+# m4_cr_symbols2

+# -------------------------------

+m4_define([m4_cr_symbols1],

+m4_defn([m4_cr_Letters])dnl

+_)

+

+m4_define([m4_cr_symbols2],

+m4_defn([m4_cr_symbols1])dnl

+m4_defn([m4_cr_digits])dnl

+)

+

+# m4_cr_all

+# ---------

+# The character range representing everything, with `-' as the last

+# character, since it is special to m4_translit.  Use with care, because

+# it contains characters special to M4 (fortunately, both ASCII and EBCDIC

+# have [] in order, so m4_defn([m4_cr_all]) remains a valid string).  It

+# also contains characters special to terminals, so it should never be

+# displayed in an error message.  Also, attempts to map [ and ] to other

+# characters via m4_translit must deal with the fact that m4_translit does

+# not add quotes to the output.

+#

+# It is mainly useful in generating inverted character range maps, for use

+# in places where m4_translit is faster than an equivalent m4_bpatsubst;

+# the regex `[^a-z]' is equivalent to:

+#  m4_translit(m4_dquote(m4_defn([m4_cr_all])), [a-z])

+m4_define([m4_cr_all],

+m4_translit(m4_dquote(m4_format(m4_dquote(m4_for(

+  ,1,255,,[[%c]]))m4_for([i],1,255,,[,i]))), [-])-)

+

+

+# _m4_define_cr_not(CATEGORY)

+# ---------------------------

+# Define m4_cr_not_CATEGORY as the inverse of m4_cr_CATEGORY.

+m4_define([_m4_define_cr_not],

+[m4_define([m4_cr_not_$1],

+           m4_translit(m4_dquote(m4_defn([m4_cr_all])),

+                       m4_defn([m4_cr_$1])))])

+

+

+# m4_cr_not_letters

+# m4_cr_not_LETTERS

+# m4_cr_not_Letters

+# m4_cr_not_digits

+# m4_cr_not_alnum

+# m4_cr_not_symbols1

+# m4_cr_not_symbols2

+# ------------------

+# Inverse character sets

+_m4_define_cr_not([letters])

+_m4_define_cr_not([LETTERS])

+_m4_define_cr_not([Letters])

+_m4_define_cr_not([digits])

+_m4_define_cr_not([alnum])

+_m4_define_cr_not([symbols1])

+_m4_define_cr_not([symbols2])

+

+

+# m4_newline

+# ----------

+# Expands to a newline.  Exists for formatting reasons.

+m4_define([m4_newline], [

+])

+

+

+# m4_re_escape(STRING)

+# --------------------

+# Escape RE active characters in STRING.

+m4_define([m4_re_escape],

+[m4_bpatsubst([$1],

+              [[][*+.?\^$]], [\\\&])])

+

+

+# m4_re_string

+# ------------

+# Regexp for `[a-zA-Z_0-9]*'

+# m4_dquote provides literal [] for the character class.

+m4_define([m4_re_string],

+m4_dquote(m4_defn([m4_cr_symbols2]))dnl

+[*]dnl

+)

+

+

+# m4_re_word

+# ----------

+# Regexp for `[a-zA-Z_][a-zA-Z_0-9]*'

+m4_define([m4_re_word],

+m4_dquote(m4_defn([m4_cr_symbols1]))dnl

+m4_defn([m4_re_string])dnl

+)

+

+

+# m4_tolower(STRING)

+# m4_toupper(STRING)

+# ------------------

+# These macros convert STRING to lowercase or uppercase.

+#

+# Rather than expand the m4_defn each time, we inline them up front.

+m4_define([m4_tolower],

+[m4_translit([$1], ]m4_dquote(m4_defn([m4_cr_LETTERS]))[,

+                   ]m4_dquote(m4_defn([m4_cr_letters]))[)])

+m4_define([m4_toupper],

+[m4_translit([$1], ]m4_dquote(m4_defn([m4_cr_letters]))[,

+                   ]m4_dquote(m4_defn([m4_cr_LETTERS]))[)])

+

+

+# m4_split(STRING, [REGEXP])

+# --------------------------

+#

+# Split STRING into an m4 list of quoted elements.  The elements are

+# quoted with [ and ].  Beginning spaces and end spaces *are kept*.

+# Use m4_strip to remove them.

+#

+# REGEXP specifies where to split.  Default is [\t ]+.

+#

+# If STRING is empty, the result is an empty list.

+#

+# Pay attention to the m4_changequotes.  When m4 reads the definition of

+# m4_split, it still has quotes set to [ and ].  Luckily, these are matched

+# in the macro body, so the definition is stored correctly.  Use the same

+# alternate quotes as m4_noquote; it must be unlikely to appear in $1.

+#

+# Also, notice that $1 is quoted twice, since we want the result to

+# be quoted.  Then you should understand that the argument of

+# patsubst is -=<{(STRING)}>=- (i.e., with additional -=<{( and )}>=-).

+#

+# This macro is safe on active symbols, i.e.:

+#   m4_define(active, ACTIVE)

+#   m4_split([active active ])end

+#   => [active], [active], []end

+#

+# Optimize on regex of ` ' (space), since m4_foreach_w already guarantees

+# that the list contains single space separators, and a common case is

+# splitting a single-element list.  This macro is called frequently,

+# so avoid unnecessary dnl inside the definition.

+m4_define([m4_split],

+[m4_if([$1], [], [],

+       [$2], [ ], [m4_if(m4_index([$1], [ ]), [-1], [[[$1]]], [_$0($@)])],

+       [$2], [], [_$0([$1], [[   ]+])],

+       [_$0($@)])])

+

+m4_define([_m4_split],

+[m4_changequote([-=<{(],[)}>=-])]dnl

+[[m4_bpatsubst(-=<{(-=<{($1)}>=-)}>=-, -=<{($2)}>=-,

+               -=<{(], [)}>=-)]m4_changequote([, ])])

+

+

+

+# m4_flatten(STRING)

+# ------------------

+# If STRING contains end of lines, replace them with spaces.  If there

+# are backslashed end of lines, remove them.  This macro is safe with

+# active symbols.

+#    m4_define(active, ACTIVE)

+#    m4_flatten([active

+#    act\

+#    ive])end

+#    => active activeend

+#

+# In m4, m4_bpatsubst is expensive, so first check for a newline.

+m4_define([m4_flatten],

+[m4_if(m4_index([$1], [

+]), [-1], [[$1]],

+       [m4_translit(m4_bpatsubst([[[$1]]], [\\

+]), [

+], [ ])])])

+

+

+# m4_strip(STRING)

+# ----------------

+# Expands into STRING with tabs and spaces singled out into a single

+# space, and removing leading and trailing spaces.

+#

+# This macro is robust to active symbols.

+#    m4_define(active, ACTIVE)

+#    m4_strip([  active <tab> <tab>active ])end

+#    => active activeend

+#

+# First, notice that we guarantee trailing space.  Why?  Because regular

+# expressions are greedy, and `.* ?' would always group the space into the

+# .* portion.  The algorithm is simpler by avoiding `?' at the end.  The

+# algorithm correctly strips everything if STRING is just ` '.

+#

+# Then notice the second pattern: it is in charge of removing the

+# leading/trailing spaces.  Why not just `[^ ]'?  Because they are

+# applied to over-quoted strings, i.e. more or less [STRING], due

+# to the limitations of m4_bpatsubsts.  So the leading space in STRING

+# is the *second* character; equally for the trailing space.

+m4_define([m4_strip],

+[m4_bpatsubsts([$1 ],

+               [[        ]+], [ ],

+               [^. ?\(.*\) .$], [[[\1]]])])

+

+

+# m4_normalize(STRING)

+# --------------------

+# Apply m4_flatten and m4_strip to STRING.

+#

+# The argument is quoted, so that the macro is robust to active symbols:

+#

+#    m4_define(active, ACTIVE)

+#    m4_normalize([  act\

+#    ive

+#    active ])end

+#    => active activeend

+

+m4_define([m4_normalize],

+[m4_strip(m4_flatten([$1]))])

+

+

+

+# m4_join(SEP, ARG1, ARG2...)

+# ---------------------------

+# Produce ARG1SEPARG2...SEPARGn.  Avoid back-to-back SEP when a given ARG

+# is the empty string.  No expansion is performed on SEP or ARGs.

+#

+# Since the number of arguments to join can be arbitrarily long, we

+# want to avoid having more than one $@ in the macro definition;

+# otherwise, the expansion would require twice the memory of the already

+# long list.  Hence, m4_join merely looks for the first non-empty element,

+# and outputs just that element; while _m4_join looks for all non-empty

+# elements, and outputs them following a separator.  The final trick to

+# note is that we decide between recursing with $0 or _$0 based on the

+# nested m4_if ending with `_'.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_join],

+[m4_if([$#], [1], [],

+       [$#], [2], [[$2]],

+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift2($@))])])

+m4_define([_m4_join],

+[m4_if([$#$2], [2], [],

+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift2($@))])])

+

+# m4_joinall(SEP, ARG1, ARG2...)

+# ------------------------------

+# Produce ARG1SEPARG2...SEPARGn.  An empty ARG results in back-to-back SEP.

+# No expansion is performed on SEP or ARGs.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_joinall], [[$2]_$0([$1], m4_shift($@))])

+m4_define([_m4_joinall],

+[m4_if([$#], [2], [], [[$1$3]$0([$1], m4_shift2($@))])])

+

+# m4_combine([SEPARATOR], PREFIX-LIST, [INFIX], SUFFIX...)

+# --------------------------------------------------------

+# Produce the pairwise combination of every element in the quoted,

+# comma-separated PREFIX-LIST with every element from the SUFFIX arguments.

+# Each pair is joined with INFIX, and pairs are separated by SEPARATOR.

+# No expansion occurs on SEPARATOR, INFIX, or elements of either list.

+#

+# For example:

+#   m4_combine([, ], [[a], [b], [c]], [-], [1], [2], [3])

+#   => a-1, a-2, a-3, b-1, b-2, b-3, c-1, c-2, c-3

+#

+# In order to have the correct number of SEPARATORs, we use a temporary

+# variable that redefines itself after the first use.  We must use defn

+# rather than overquoting in case PREFIX or SUFFIX contains $1, but use

+# _m4_defn for speed.  Likewise, we compute the m4_shift3 only once,

+# rather than in each iteration of the outer m4_foreach.

+m4_define([m4_combine],

+[m4_if(m4_eval([$# > 3]), [1],

+       [m4_pushdef([m4_Separator], [m4_define([m4_Separator],

+                                    _m4_defn([m4_echo]))])]]dnl

+[[m4_foreach([m4_Prefix], [$2],

+             [m4_foreach([m4_Suffix], ]m4_dquote(m4_dquote(m4_shift3($@)))[,

+        [m4_Separator([$1])[]_m4_defn([m4_Prefix])[$3]_m4_defn(

+                                                      [m4_Suffix])])])]]dnl

+[[_m4_popdef([m4_Separator])])])

+

+

+# m4_append(MACRO-NAME, STRING, [SEPARATOR])

+# ------------------------------------------

+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR`'STRING'

+# at the end.  It is valid to use this macro with MACRO-NAME undefined,

+# in which case no SEPARATOR is added.  Be aware that the criterion is

+# `not being defined', and not `not being empty'.

+#

+# Note that neither STRING nor SEPARATOR are expanded here; rather, when

+# you expand MACRO-NAME, they will be expanded at that point in time.

+#

+# This macro is robust to active symbols.  It can be used to grow

+# strings.

+#

+#    | m4_define(active, ACTIVE)dnl

+#    | m4_append([sentence], [This is an])dnl

+#    | m4_append([sentence], [ active ])dnl

+#    | m4_append([sentence], [symbol.])dnl

+#    | sentence

+#    | m4_undefine([active])dnl

+#    | sentence

+#    => This is an ACTIVE symbol.

+#    => This is an active symbol.

+#

+# It can be used to define hooks.

+#

+#    | m4_define(active, ACTIVE)dnl

+#    | m4_append([hooks], [m4_define([act1], [act2])])dnl

+#    | m4_append([hooks], [m4_define([act2], [active])])dnl

+#    | m4_undefine([active])dnl

+#    | act1

+#    | hooks

+#    | act1

+#    => act1

+#    =>

+#    => active

+#

+# It can also be used to create lists, although this particular usage was

+# broken prior to autoconf 2.62.

+#    | m4_append([list], [one], [, ])dnl

+#    | m4_append([list], [two], [, ])dnl

+#    | m4_append([list], [three], [, ])dnl

+#    | list

+#    | m4_dquote(list)

+#    => one, two, three

+#    => [one],[two],[three]

+#

+# Note that m4_append can benefit from amortized O(n) m4 behavior, if

+# the underlying m4 implementation is smart enough to avoid copying existing

+# contents when enlarging a macro's definition into any pre-allocated storage

+# (m4 1.4.x unfortunately does not implement this optimization).  We do

+# not implement m4_prepend, since it is inherently O(n^2) (pre-allocated

+# storage only occurs at the end of a macro, so the existing contents must

+# always be moved).

+#

+# Use _m4_defn for speed.

+m4_define([m4_append],

+[m4_define([$1], m4_ifdef([$1], [_m4_defn([$1])[$3]])[$2])])

+

+

+# m4_append_uniq(MACRO-NAME, STRING, [SEPARATOR], [IF-UNIQ], [IF-DUP])

+# --------------------------------------------------------------------

+# Like `m4_append', but append only if not yet present.  Additionally,

+# expand IF-UNIQ if STRING was appended, or IF-DUP if STRING was already

+# present.  Also, warn if SEPARATOR is not empty and occurs within STRING,

+# as the algorithm no longer guarantees uniqueness.

+#

+# Note that while m4_append can be O(n) (depending on the quality of the

+# underlying M4 implementation), m4_append_uniq is inherently O(n^2)

+# because each append operation searches the entire string.

+m4_define([m4_append_uniq],

+[m4_ifval([$3], [m4_if(m4_index([$2], [$3]), [-1], [],

+                       [m4_warn([syntax],

+                                [$0: `$2' contains `$3'])])])_$0($@)])

+m4_define([_m4_append_uniq],

+[m4_ifdef([$1],

+          [m4_if(m4_index([$3]_m4_defn([$1])[$3], [$3$2$3]), [-1],

+                 [m4_append([$1], [$2], [$3])$4], [$5])],

+          [m4_define([$1], [$2])$4])])

+

+# m4_append_uniq_w(MACRO-NAME, STRINGS)

+# -------------------------------------

+# For each of the words in the whitespace separated list STRINGS, append

+# only the unique strings to the definition of MACRO-NAME.

+#

+# Use _m4_defn for speed.

+m4_define([m4_append_uniq_w],

+[m4_foreach_w([m4_Word], [$2],

+              [_m4_append_uniq([$1], _m4_defn([m4_Word]), [ ])])])

+

+

+# m4_text_wrap(STRING, [PREFIX], [FIRST-PREFIX], [WIDTH])

+# -------------------------------------------------------

+# Expands into STRING wrapped to hold in WIDTH columns (default = 79).

+# If PREFIX is given, each line is prefixed with it.  If FIRST-PREFIX is

+# specified, then the first line is prefixed with it.  As a special case,

+# if the length of FIRST-PREFIX is greater than that of PREFIX, then

+# FIRST-PREFIX will be left alone on the first line.

+#

+# No expansion occurs on the contents STRING, PREFIX, or FIRST-PREFIX,

+# although quadrigraphs are correctly recognized.

+#

+# Typical outputs are:

+#

+# m4_text_wrap([Short string */], [   ], [/* ], 20)

+#  => /* Short string */

+#

+# m4_text_wrap([Much longer string */], [   ], [/* ], 20)

+#  => /* Much longer

+#  =>    string */

+#

+# m4_text_wrap([Short doc.], [          ], [  --short ], 30)

+#  =>   --short Short doc.

+#

+# m4_text_wrap([Short doc.], [          ], [  --too-wide ], 30)

+#  =>   --too-wide

+#  =>           Short doc.

+#

+# m4_text_wrap([Super long documentation.], [          ], [  --too-wide ], 30)

+#  =>   --too-wide

+#  =>      Super long

+#  =>      documentation.

+#

+# FIXME: there is no checking of a longer PREFIX than WIDTH, but do

+# we really want to bother with people trying each single corner

+# of a software?

+#

+# This macro does not leave a trailing space behind the last word of a line,

+# which complicates it a bit.  The algorithm is otherwise stupid and simple:

+# all the words are preceded by m4_Separator which is defined to empty for

+# the first word, and then ` ' (single space) for all the others.

+#

+# The algorithm uses a helper that uses $2 through $4 directly, rather than

+# using local variables, to avoid m4_defn overhead, or expansion swallowing

+# any $.  It also bypasses m4_popdef overhead with _m4_popdef since no user

+# macro expansion occurs in the meantime.  Also, the definition is written

+# with m4_do, to avoid time wasted on dnl during expansion (since this is

+# already a time-consuming macro).

+m4_define([m4_text_wrap],

+[_$0([$1], [$2], m4_if([$3], [], [[$2]], [[$3]]),

+     m4_if([$4], [], [79], [[$4]]))])

+m4_define([_m4_text_wrap],

+m4_do(dnl set up local variables, to avoid repeated calculations

+[[m4_pushdef([m4_Indent], m4_qlen([$2]))]],

+[[m4_pushdef([m4_Cursor], m4_qlen([$3]))]],

+[[m4_pushdef([m4_Separator], [m4_define([m4_Separator], [ ])])]],

+dnl expand the first prefix, then check its length vs. regular prefix

+dnl same length: nothing special

+dnl prefix1 longer: output on line by itself, and reset cursor

+dnl prefix1 shorter: pad to length of prefix, and reset cursor

+[[[$3]m4_cond([m4_Cursor], m4_Indent, [],

+              [m4_eval(m4_Cursor > m4_Indent)], [1], [

+[$2]m4_define([m4_Cursor], m4_Indent)],

+              [m4_format([%*s], m4_max([0],

+  m4_eval(m4_Indent - m4_Cursor)), [])m4_define([m4_Cursor], m4_Indent)])]],

+dnl now, for each word, compute the curser after the word is output, then

+dnl check if the cursor would exceed the wrap column

+dnl if so, reset cursor, and insert newline and prefix

+dnl if not, insert the separator (usually a space)

+dnl either way, insert the word

+[[m4_foreach_w([m4_Word], [$1],

+  [m4_define([m4_Cursor],

+             m4_eval(m4_Cursor + m4_qlen(_m4_defn([m4_Word]))

+                     + 1))m4_if(m4_eval(m4_Cursor > ([$4])),

+      [1], [m4_define([m4_Cursor],

+                      m4_eval(m4_Indent + m4_qlen(_m4_defn([m4_Word])) + 1))

+[$2]],

+      [m4_Separator[]])_m4_defn([m4_Word])])]],

+dnl finally, clean up the local variabls

+[[_m4_popdef([m4_Separator], [m4_Cursor], [m4_Indent])]]))

+

+

+# m4_text_box(MESSAGE, [FRAME-CHARACTER = `-'])

+# ---------------------------------------------

+# Turn MESSAGE into:

+#  ## ------- ##

+#  ## MESSAGE ##

+#  ## ------- ##

+# using FRAME-CHARACTER in the border.

+m4_define([m4_text_box],

+[m4_pushdef([m4_Border],

+            m4_translit(m4_format([%*s], m4_qlen(m4_expand([$1])), []),

+                        [ ], m4_if([$2], [], [[-]], [[$2]])))dnl

+@%:@@%:@ m4_Border @%:@@%:@

+@%:@@%:@ $1 @%:@@%:@

+@%:@@%:@ m4_Border @%:@@%:@_m4_popdef([m4_Border])dnl

+])

+

+

+# m4_qlen(STRING)

+# ---------------

+# Expands to the length of STRING after autom4te converts all quadrigraphs.

+#

+# Avoid bpatsubsts for the common case of no quadrigraphs.

+m4_define([m4_qlen],

+[m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])],

+       [m4_len(m4_bpatsubst([[$1]],

+                            [@\(\(<:\|:>\|S|\|%:\|\{:\|:\}\)\(@\)\|&t@\)],

+                            [\3]))])])

+

+

+# m4_qdelta(STRING)

+# -----------------

+# Expands to the net change in the length of STRING from autom4te converting the

+# quadrigraphs in STRING.  This number is always negative or zero.

+m4_define([m4_qdelta],

+[m4_eval(m4_qlen([$1]) - m4_len([$1]))])

+

+

+

+## ----------------------- ##

+## 13. Number processing.  ##

+## ----------------------- ##

+

+# m4_cmp(A, B)

+# ------------

+# Compare two integer expressions.

+# A < B -> -1

+# A = B ->  0

+# A > B ->  1

+m4_define([m4_cmp],

+[m4_eval((([$1]) > ([$2])) - (([$1]) < ([$2])))])

+

+

+# m4_list_cmp(A, B)

+# -----------------

+#

+# Compare the two lists of integer expressions A and B.  For instance:

+#   m4_list_cmp([1, 0],     [1])    ->  0

+#   m4_list_cmp([1, 0],     [1, 0]) ->  0

+#   m4_list_cmp([1, 2],     [1, 0]) ->  1

+#   m4_list_cmp([1, 2, 3],  [1, 2]) ->  1

+#   m4_list_cmp([1, 2, -3], [1, 2]) -> -1

+#   m4_list_cmp([1, 0],     [1, 2]) -> -1

+#   m4_list_cmp([1],        [1, 2]) -> -1

+#   m4_define([xa], [oops])dnl

+#   m4_list_cmp([[0xa]],    [5+5])  -> 0

+#

+# Rather than face the overhead of m4_case, we use a helper function whose

+# expansion includes the name of the macro to invoke on the tail, either

+# m4_ignore or m4_unquote.  This is particularly useful when comparing

+# long lists, since less text is being expanded for deciding when to end

+# recursion.  The recursion is between a pair of macros that alternate

+# which list is trimmed by one element; this is more efficient than

+# calling m4_cdr on both lists from a single macro.  Guarantee exactly

+# one expansion of both lists' side effects.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_list_cmp],

+[_$0_raw(m4_dquote($1), m4_dquote($2))])

+

+m4_define([_m4_list_cmp_raw],

+[m4_if([$1], [$2], [0], [_m4_list_cmp_1([$1], $2)])])

+

+m4_define([_m4_list_cmp],

+[m4_if([$1], [], [0m4_ignore], [$2], [0], [m4_unquote], [$2m4_ignore])])

+

+m4_define([_m4_list_cmp_1],

+[_m4_list_cmp_2([$2], [m4_shift2($@)], $1)])

+

+m4_define([_m4_list_cmp_2],

+[_m4_list_cmp([$1$3], m4_cmp([$3+0], [$1+0]))(

+  [_m4_list_cmp_1(m4_dquote(m4_shift3($@)), $2)])])

+

+# m4_max(EXPR, ...)

+# m4_min(EXPR, ...)

+# -----------------

+# Return the decimal value of the maximum (or minimum) in a series of

+# integer expressions.

+#

+# M4 1.4.x doesn't provide ?:.  Hence this huge m4_eval.  Avoid m4_eval

+# if both arguments are identical, but be aware of m4_max(0xa, 10) (hence

+# the use of <=, not just <, in the second multiply).

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_max],

+[m4_if([$#], [0], [m4_fatal([too few arguments to $0])],

+       [$#], [1], [m4_eval([$1])],

+       [$#$1], [2$2], [m4_eval([$1])],

+       [$#], [2], [_$0($@)],

+       [_m4_minmax([_$0], $@)])])

+

+m4_define([_m4_max],

+[m4_eval((([$1]) > ([$2])) * ([$1]) + (([$1]) <= ([$2])) * ([$2]))])

+

+m4_define([m4_min],

+[m4_if([$#], [0], [m4_fatal([too few arguments to $0])],

+       [$#], [1], [m4_eval([$1])],

+       [$#$1], [2$2], [m4_eval([$1])],

+       [$#], [2], [_$0($@)],

+       [_m4_minmax([_$0], $@)])])

+

+m4_define([_m4_min],

+[m4_eval((([$1]) < ([$2])) * ([$1]) + (([$1]) >= ([$2])) * ([$2]))])

+

+# _m4_minmax(METHOD, ARG1, ARG2...)

+# ---------------------------------

+# Common recursion code for m4_max and m4_min.  METHOD must be _m4_max

+# or _m4_min, and there must be at least two arguments to combine.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([_m4_minmax],

+[m4_if([$#], [3], [$1([$2], [$3])],

+       [$0([$1], $1([$2], [$3]), m4_shift3($@))])])

+

+

+# m4_sign(A)

+# ----------

+# The sign of the integer expression A.

+m4_define([m4_sign],

+[m4_eval((([$1]) > 0) - (([$1]) < 0))])

+

+

+

+## ------------------------ ##

+## 14. Version processing.  ##

+## ------------------------ ##

+

+

+# m4_version_unletter(VERSION)

+# ----------------------------

+# Normalize beta version numbers with letters to numeric expressions, which

+# can then be handed to m4_eval for the purpose of comparison.

+#

+#   Nl -> (N+1).-1.(l#)

+#

+# for example:

+#   [2.14a] -> [2.14+1.-1.[0r36:a]] -> 2.15.-1.10

+#   [2.14b] -> [2.15+1.-1.[0r36:b]] -> 2.15.-1.11

+#   [2.61aa.b] -> [2.61+1.-1.[0r36:aa],+1.-1.[0r36:b]] -> 2.62.-1.370.1.-1.11

+#

+# This macro expects reasonable version numbers, but can handle double

+# letters and does not expand any macros.  Original version strings can

+# use both `.' and `-' separators.

+#

+# Inline constant expansions, to avoid m4_defn overhead.

+# _m4_version_unletter is the real workhorse used by m4_version_compare,

+# but since [0r36:a] is less readable than 10, we provide a wrapper for

+# human use.

+m4_define([m4_version_unletter],

+[m4_map_sep([m4_eval], [.],

+            m4_dquote(m4_dquote_elt(m4_unquote(_$0([$1])))))])

+m4_define([_m4_version_unletter],

+[m4_bpatsubst(m4_translit([[[$1]]], [.-], [,,]),]dnl

+m4_dquote(m4_dquote(m4_defn([m4_cr_Letters])))[[+],

+              [+1,-1,[0r36:\&]])])

+

+

+# m4_version_compare(VERSION-1, VERSION-2)

+# ----------------------------------------

+# Compare the two version numbers and expand into

+#  -1 if VERSION-1 < VERSION-2

+#   0 if           =

+#   1 if           >

+#

+# Since _m4_version_unletter does not output side effects, we can

+# safely bypass the overhead of m4_version_cmp.

+m4_define([m4_version_compare],

+[_m4_list_cmp_raw(_m4_version_unletter([$1]), _m4_version_unletter([$2]))])

+

+

+# m4_PACKAGE_NAME

+# m4_PACKAGE_TARNAME

+# m4_PACKAGE_VERSION

+# m4_PACKAGE_STRING

+# m4_PACKAGE_BUGREPORT

+# --------------------

+# If m4sugar/version.m4 is present, then define version strings.  This

+# file is optional, provided by Autoconf but absent in Bison.

+m4_sinclude([m4sugar/version.m4])

+

+

+# m4_version_prereq(VERSION, [IF-OK], [IF-NOT = FAIL])

+# ----------------------------------------------------

+# Check this Autoconf version against VERSION.

+m4_define([m4_version_prereq],

+m4_ifdef([m4_PACKAGE_VERSION],

+[[m4_if(m4_version_compare(]m4_dquote(m4_defn([m4_PACKAGE_VERSION]))[, [$1]),

+        [-1],

+        [m4_default([$3],

+                    [m4_fatal([Autoconf version $1 or higher is required],

+                              [63])])],

+        [$2])]],

+[[m4_fatal([m4sugar/version.m4 not found])]]))

+

+

+## ------------------ ##

+## 15. Set handling.  ##

+## ------------------ ##

+

+# Autoconf likes to create arbitrarily large sets; for example, as of

+# this writing, the configure.ac for coreutils tracks a set of more

+# than 400 AC_SUBST.  How do we track all of these set members,

+# without introducing duplicates?  We could use m4_append_uniq, with

+# the set NAME residing in the contents of the macro NAME.

+# Unfortunately, m4_append_uniq is quadratic for set creation, because

+# it costs O(n) to search the string for each of O(n) insertions; not

+# to mention that with m4 1.4.x, even using m4_append is slow, costing

+# O(n) rather than O(1) per insertion.  Other set operations, not used

+# by Autoconf but still possible by manipulation of the definition

+# tracked in macro NAME, include O(n) deletion of one element and O(n)

+# computation of set size.  Because the set is exposed to the user via

+# the definition of a single macro, we cannot cache any data about the

+# set without risking the cache being invalidated by the user

+# redefining NAME.

+#

+# Can we do better?  Yes, because m4 gives us an O(1) search function

+# for free: ifdef.  Additionally, even m4 1.4.x gives us an O(1)

+# insert operation for free: pushdef.  But to use these, we must

+# represent the set via a group of macros; to keep the set consistent,

+# we must hide the set so that the user can only manipulate it through

+# accessor macros.  The contents of the set are maintained through two

+# access points; _m4_set([name]) is a pushdef stack of values in the

+# set, useful for O(n) traversal of the set contents; while the

+# existence of _m4_set([name],value) with no particular value is

+# useful for O(1) querying of set membership.  And since the user

+# cannot externally manipulate the set, we are free to add additional

+# caching macros for other performance improvements.  Deletion can be

+# O(1) per element rather than O(n), by reworking the definition of

+# _m4_set([name],value) to be 0 or 1 based on current membership, and

+# adding _m4_set_cleanup(name) to defer the O(n) cleanup of

+# _m4_set([name]) until we have another reason to do an O(n)

+# traversal.  The existence of _m4_set_cleanup(name) can then be used

+# elsewhere to determine if we must dereference _m4_set([name],value),

+# or assume that definition implies set membership.  Finally, size can

+# be tracked in an O(1) fashion with _m4_set_size(name).

+#

+# The quoting in _m4_set([name],value) is chosen so that there is no

+# ambiguity with a set whose name contains a comma, and so that we can

+# supply the value via _m4_defn([_m4_set([name])]) without needing any

+# quote manipulation.

+

+# m4_set_add(SET, VALUE, [IF-UNIQ], [IF-DUP])

+# -------------------------------------------

+# Add VALUE as an element of SET.  Expand IF-UNIQ on the first

+# addition, and IF-DUP if it is already in the set.  Addition of one

+# element is O(1), such that overall set creation is O(n).

+#

+# We do not want to add a duplicate for a previously deleted but

+# unpruned element, but it is just as easy to check existence directly

+# as it is to query _m4_set_cleanup($1).

+m4_define([m4_set_add],

+[m4_ifdef([_m4_set([$1],$2)],

+          [m4_if(m4_indir([_m4_set([$1],$2)]), [0],

+                 [m4_define([_m4_set([$1],$2)],

+                            [1])_m4_set_size([$1], [m4_incr])$3], [$4])],

+          [m4_define([_m4_set([$1],$2)],

+                     [1])m4_pushdef([_m4_set([$1])],

+                                    [$2])_m4_set_size([$1], [m4_incr])$3])])

+

+# m4_set_add_all(SET, VALUE...)

+# -----------------------------

+# Add each VALUE into SET.  This is O(n) in the number of VALUEs, and

+# can be faster than calling m4_set_add for each VALUE.

+#

+# Implement two recursion helpers; the check variant is slower but

+# handles the case where an element has previously been removed but

+# not pruned.  The recursion helpers ignore their second argument, so

+# that we can use the faster m4_shift2 and 2 arguments, rather than

+# _m4_shift2 and one argument, as the signal to end recursion.

+#

+# Please keep foreach.m4 in sync with any adjustments made here.

+m4_define([m4_set_add_all],

+[m4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1])

+  + m4_len(m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], $@))))])

+

+m4_define([_m4_set_add_all],

+[m4_if([$#], [2], [],

+       [m4_ifdef([_m4_set([$1],$3)], [],

+                 [m4_define([_m4_set([$1],$3)], [1])m4_pushdef([_m4_set([$1])],

+           [$3])-])$0([$1], m4_shift2($@))])])

+

+m4_define([_m4_set_add_all_check],

+[m4_if([$#], [2], [],

+       [m4_set_add([$1], [$3])$0([$1], m4_shift2($@))])])

+

+# m4_set_contains(SET, VALUE, [IF-PRESENT], [IF-ABSENT])

+# ------------------------------------------------------

+# Expand IF-PRESENT if SET contains VALUE, otherwise expand IF-ABSENT.

+# This is always O(1).

+m4_define([m4_set_contains],

+[m4_ifdef([_m4_set_cleanup($1)],

+          [m4_if(m4_ifdef([_m4_set([$1],$2)],

+                    [m4_indir([_m4_set([$1],$2)])], [0]), [1], [$3], [$4])],

+          [m4_ifdef([_m4_set([$1],$2)], [$3], [$4])])])

+

+# m4_set_contents(SET, [SEP])

+# ---------------------------

+# Expand to a single string containing all the elements in SET,

+# separated by SEP, without modifying SET.  No provision is made for

+# disambiguating set elements that contain non-empty SEP as a

+# sub-string, or for recognizing a set that contains only the empty

+# string.  Order of the output is not guaranteed.  If any elements

+# have been previously removed from the set, this action will prune

+# the unused memory.  This is O(n) in the size of the set before

+# pruning.

+#

+# Use _m4_popdef for speed.  The existence of _m4_set_cleanup($1)

+# determines which version of _1 helper we use.

+m4_define([m4_set_contents],

+[m4_ifdef([_m4_set_cleanup($1)], [_$0_1c], [_$0_1])([$1])_$0_2([$1],

+    [_m4_defn([_m4_set_($1)])], [[$2]])])

+

+# _m4_set_contents_1(SET)

+# _m4_set_contents_1c(SET)

+# _m4_set_contents_2(SET, SEP, PREP)

+# ----------------------------------

+# Expand to a list of quoted elements currently in the set, separated

+# by SEP, and moving PREP in front of SEP on recursion.  To avoid

+# nesting limit restrictions, the algorithm must be broken into two

+# parts; _1 destructively copies the stack in reverse into

+# _m4_set_($1), producing no output; then _2 destructively copies

+# _m4_set_($1) back into the stack in reverse.  SEP is expanded while

+# _m4_set_($1) contains the current element, so a SEP containing

+# _m4_defn([_m4_set_($1)]) can produce output in the order the set was

+# created.  Behavior is undefined if SEP tries to recursively list or

+# modify SET in any way other than calling m4_set_remove on the

+# current element.  Use _1 if all entries in the stack are guaranteed

+# to be in the set, and _1c to prune removed entries.  Uses _m4_defn

+# and _m4_popdef for speed.

+m4_define([_m4_set_contents_1],

+[m4_ifdef([_m4_set([$1])], [m4_pushdef([_m4_set_($1)],

+    _m4_defn([_m4_set([$1])]))_m4_popdef([_m4_set([$1])])$0([$1])])])

+

+m4_define([_m4_set_contents_1c],

+[m4_ifdef([_m4_set([$1])],

+          [m4_set_contains([$1], _m4_defn([_m4_set([$1])]),

+                   [m4_pushdef([_m4_set_($1)], _m4_defn([_m4_set([$1])]))],

+                   [_m4_popdef([_m4_set([$1],]_m4_defn(

+      [_m4_set([$1])])[)])])_m4_popdef([_m4_set([$1])])$0([$1])],

+          [_m4_popdef([_m4_set_cleanup($1)])])])

+

+m4_define([_m4_set_contents_2],

+[m4_ifdef([_m4_set_($1)], [m4_pushdef([_m4_set([$1])],

+    _m4_defn([_m4_set_($1)]))$2[]_m4_popdef([_m4_set_($1)])$0([$1], [$3$2])])])

+

+# m4_set_delete(SET)

+# ------------------

+# Delete all elements in SET, and reclaim any memory occupied by the

+# set.  This is O(n) in the set size.

+#

+# Use _m4_defn and _m4_popdef for speed.

+m4_define([m4_set_delete],

+[m4_ifdef([_m4_set([$1])],

+          [_m4_popdef([_m4_set([$1],]_m4_defn([_m4_set([$1])])[)],

+                      [_m4_set([$1])])$0([$1])],

+          [m4_ifdef([_m4_set_cleanup($1)],

+                    [_m4_popdef([_m4_set_cleanup($1)])])m4_ifdef(

+                    [_m4_set_size($1)],

+                    [_m4_popdef([_m4_set_size($1)])])])])

+

+# m4_set_difference(SET1, SET2)

+# -----------------------------

+# Produce a LIST of quoted elements that occur in SET1 but not SET2.

+# Output a comma prior to any elements, to distinguish the empty

+# string from no elements.  This can be directly used as a series of

+# arguments, such as for m4_join, or wrapped inside quotes for use in

+# m4_foreach.  Order of the output is not guaranteed.

+#

+# Short-circuit the idempotence relation.  Use _m4_defn for speed.

+m4_define([m4_set_difference],

+[m4_if([$1], [$2], [],

+       [m4_set_foreach([$1], [_m4_element],

+                       [m4_set_contains([$2], _m4_defn([_m4_element]), [],

+                                        [,_m4_defn([_m4_element])])])])])

+

+# m4_set_dump(SET, [SEP])

+# -----------------------

+# Expand to a single string containing all the elements in SET,

+# separated by SEP, then delete SET.  In general, if you only need to

+# list the contents once, this is faster than m4_set_contents.  No

+# provision is made for disambiguating set elements that contain

+# non-empty SEP as a sub-string.  Order of the output is not

+# guaranteed.  This is O(n) in the size of the set before pruning.

+#

+# Use _m4_popdef for speed.  Use existence of _m4_set_cleanup($1) to

+# decide if more expensive recursion is needed.

+m4_define([m4_set_dump],

+[m4_ifdef([_m4_set_size($1)],

+          [_m4_popdef([_m4_set_size($1)])])m4_ifdef([_m4_set_cleanup($1)],

+    [_$0_check], [_$0])([$1], [], [$2])])

+

+# _m4_set_dump(SET, SEP, PREP)

+# _m4_set_dump_check(SET, SEP, PREP)

+# ----------------------------------

+# Print SEP and the current element, then delete the element and

+# recurse with empty SEP changed to PREP.  The check variant checks

+# whether the element has been previously removed.  Use _m4_defn and

+# _m4_popdef for speed.

+m4_define([_m4_set_dump],

+[m4_ifdef([_m4_set([$1])],

+          [[$2]_m4_defn([_m4_set([$1])])_m4_popdef([_m4_set([$1],]_m4_defn(

+                [_m4_set([$1])])[)], [_m4_set([$1])])$0([$1], [$2$3])])])

+

+m4_define([_m4_set_dump_check],

+[m4_ifdef([_m4_set([$1])],

+          [m4_set_contains([$1], _m4_defn([_m4_set([$1])]),

+                           [[$2]_m4_defn([_m4_set([$1])])])_m4_popdef(

+    [_m4_set([$1],]_m4_defn([_m4_set([$1])])[)],

+    [_m4_set([$1])])$0([$1], [$2$3])],

+          [_m4_popdef([_m4_set_cleanup($1)])])])

+

+# m4_set_empty(SET, [IF-EMPTY], [IF-ELEMENTS])

+# --------------------------------------------

+# Expand IF-EMPTY if SET has no elements, otherwise IF-ELEMENTS.

+m4_define([m4_set_empty],

+[m4_ifdef([_m4_set_size($1)],

+          [m4_if(m4_indir([_m4_set_size($1)]), [0], [$2], [$3])], [$2])])

+

+# m4_set_foreach(SET, VAR, ACTION)

+# --------------------------------

+# For each element of SET, define VAR to the element and expand

+# ACTION.  ACTION should not recursively list SET's contents, add

+# elements to SET, nor delete any element from SET except the one

+# currently in VAR.  The order that the elements are visited in is not

+# guaranteed.  This is faster than the corresponding m4_foreach([VAR],

+#   m4_indir([m4_dquote]m4_set_listc([SET])), [ACTION])

+m4_define([m4_set_foreach],

+[m4_pushdef([$2])m4_ifdef([_m4_set_cleanup($1)],

+    [_m4_set_contents_1c], [_m4_set_contents_1])([$1])_m4_set_contents_2([$1],

+       [m4_define([$2], _m4_defn([_m4_set_($1)]))$3[]])m4_popdef([$2])])

+

+# m4_set_intersection(SET1, SET2)

+# -------------------------------

+# Produce a LIST of quoted elements that occur in both SET1 or SET2.

+# Output a comma prior to any elements, to distinguish the empty

+# string from no elements.  This can be directly used as a series of

+# arguments, such as for m4_join, or wrapped inside quotes for use in

+# m4_foreach.  Order of the output is not guaranteed.

+#

+# Iterate over the smaller set, and short-circuit the idempotence

+# relation.  Use _m4_defn for speed.

+m4_define([m4_set_intersection],

+[m4_if([$1], [$2], [m4_set_listc([$1])],

+       m4_eval(m4_set_size([$2]) < m4_set_size([$1])), [1], [$0([$2], [$1])],

+       [m4_set_foreach([$1], [_m4_element],

+                       [m4_set_contains([$2], _m4_defn([_m4_element]),

+                                        [,_m4_defn([_m4_element])])])])])

+

+# m4_set_list(SET)

+# m4_set_listc(SET)

+# -----------------

+# Produce a LIST of quoted elements of SET.  This can be directly used

+# as a series of arguments, such as for m4_join or m4_set_add_all, or

+# wrapped inside quotes for use in m4_foreach or m4_map.  With

+# m4_set_list, there is no way to distinguish an empty set from a set

+# containing only the empty string; with m4_set_listc, a leading comma

+# is output if there are any elements.

+m4_define([m4_set_list],

+[m4_ifdef([_m4_set_cleanup($1)], [_m4_set_contents_1c],

+          [_m4_set_contents_1])([$1])_m4_set_contents_2([$1],

+               [_m4_defn([_m4_set_($1)])], [,])])

+

+m4_define([m4_set_listc],

+[m4_ifdef([_m4_set_cleanup($1)], [_m4_set_contents_1c],

+          [_m4_set_contents_1])([$1])_m4_set_contents_2([$1],

+               [,_m4_defn([_m4_set_($1)])])])

+

+# m4_set_remove(SET, VALUE, [IF-PRESENT], [IF-ABSENT])

+# ----------------------------------------------------

+# If VALUE is an element of SET, delete it and expand IF-PRESENT.

+# Otherwise expand IF-ABSENT.  Deleting a single value is O(1),

+# although it leaves memory occupied until the next O(n) traversal of

+# the set which will compact the set.

+#

+# Optimize if the element being removed is the most recently added,

+# since defining _m4_set_cleanup($1) slows down so many other macros.

+# In particular, this plays well with m4_set_foreach.

+m4_define([m4_set_remove],

+[m4_set_contains([$1], [$2], [_m4_set_size([$1],

+    [m4_decr])m4_if(_m4_defn([_m4_set([$1])]), [$2],

+                    [_m4_popdef([_m4_set([$1],$2)], [_m4_set([$1])])],

+                    [m4_define([_m4_set_cleanup($1)])m4_define(

+                      [_m4_set([$1],$2)], [0])])$3], [$4])])

+

+# m4_set_size(SET)

+# ----------------

+# Expand to the number of elements currently in SET.  This operation

+# is O(1), and thus more efficient than m4_count(m4_set_list([SET])).

+m4_define([m4_set_size],

+[m4_ifdef([_m4_set_size($1)], [m4_indir([_m4_set_size($1)])], [0])])

+

+# _m4_set_size(SET, ACTION)

+# -------------------------

+# ACTION must be either m4_incr or m4_decr, and the size of SET is

+# changed accordingly.  If the set is empty, ACTION must not be

+# m4_decr.

+m4_define([_m4_set_size],

+[m4_define([_m4_set_size($1)],

+           m4_ifdef([_m4_set_size($1)], [$2(m4_indir([_m4_set_size($1)]))],

+                    [1]))])

+

+# m4_set_union(SET1, SET2)

+# ------------------------

+# Produce a LIST of double quoted elements that occur in either SET1

+# or SET2, without duplicates.  Output a comma prior to any elements,

+# to distinguish the empty string from no elements.  This can be

+# directly used as a series of arguments, such as for m4_join, or

+# wrapped inside quotes for use in m4_foreach.  Order of the output is

+# not guaranteed.

+#

+# We can rely on the fact that m4_set_listc prunes SET1, so we don't

+# need to check _m4_set([$1],element) for 0.  Use _m4_defn for speed.

+# Short-circuit the idempotence relation.

+m4_define([m4_set_union],

+[m4_set_listc([$1])m4_if([$1], [$2], [], [m4_set_foreach([$2], [_m4_element],

+  [m4_ifdef([_m4_set([$1],]_m4_defn([_m4_element])[)], [],

+            [,_m4_defn([_m4_element])])])])])

+

+

+## ------------------- ##

+## 16. File handling.  ##

+## ------------------- ##

+

+

+# It is a real pity that M4 comes with no macros to bind a diversion

+# to a file.  So we have to deal without, which makes us a lot more

+# fragile than we should.

+

+

+# m4_file_append(FILE-NAME, CONTENT)

+# ----------------------------------

+m4_define([m4_file_append],

+[m4_syscmd([cat >>$1 <<_m4eof

+$2

+_m4eof

+])

+m4_if(m4_sysval, [0], [],

+      [m4_fatal([$0: cannot write: $1])])])

+

+

+

+## ------------------------ ##

+## 17. Setting M4sugar up.  ##

+## ------------------------ ##

+

+

+# m4_init

+# -------

+# Initialize the m4sugar language.

+m4_define([m4_init],

+[# All the M4sugar macros start with `m4_', except `dnl' kept as is

+# for sake of simplicity.

+m4_pattern_forbid([^_?m4_])

+m4_pattern_forbid([^dnl$])

+

+# If __m4_version__ is defined, we assume that we are being run by M4

+# 1.6 or newer, and thus that $@ recursion is linear and debugmode(d)

+# is available for faster checks of dereferencing undefined macros.

+# But if it is missing, we assume we are being run by M4 1.4.x, that

+# $@ recursion is quadratic, and that we need foreach-based

+# replacement macros.  Use the raw builtin to avoid tripping up

+# include tracing.

+m4_ifdef([__m4_version__],

+[m4_debugmode([+d])

+m4_copy([_m4_defn], [m4_defn])

+m4_copy([_m4_popdef], [m4_popdef])

+m4_copy([_m4_undefine], [m4_undefine])],

+[m4_builtin([include], [m4sugar/foreach.m4])])

+

+# _m4_divert_diversion should be defined:

+m4_divert_push([KILL])

+

+# Check the divert push/pop perfect balance.

+m4_wrap([m4_divert_pop([])

+         m4_ifdef([_m4_divert_diversion],

+           [m4_fatal([$0: unbalanced m4_divert_push:]_m4_divert_n_stack)])[]])

+])

diff --git a/tools/mhmake/src/build.cpp b/tools/mhmake/src/build.cpp
index 9efa90932..185fdb2fb 100644
--- a/tools/mhmake/src/build.cpp
+++ b/tools/mhmake/src/build.cpp
@@ -21,7 +21,6 @@
 #include "stdafx.h"

 

 #include "mhmakefileparser.h"

-#include "mhmakeparser.h"

 #include "rule.h"

 #include "util.h"

 

@@ -834,7 +833,7 @@ static const string &GetComspec()
     const char *pComspec=getenv(COMSPEC);

     if (pComspec)

     {

-      Comspec=getenv(COMSPEC);

+      Comspec=pComspec;

       #ifdef WIN32

       Comspec+=" /c ";

       #else

@@ -983,6 +982,35 @@ string mhmakefileparser::GetFullCommand(string Command)
   return pFound->second;

 }

 

+static void CommandSep(const string &Command, int &EndPos, int &NextBegin)

+{

+  while (1)

+  {

+    EndPos=Command.find('&',NextBegin);

+    if (EndPos==string::npos || !EndPos)

+      return;

+    EndPos--;

+    char C=Command[EndPos];

+    NextBegin=EndPos+2;

+    if (strchr("|<>",C))

+    {

+      continue;

+    }

+    if (NextBegin!=Command.length())

+    {

+      C=Command[NextBegin];

+      if (strchr("|<>",C))

+      {

+        continue;

+      }

+    }

+    while (strchr(" \t|<>",Command[NextBegin])) NextBegin++;

+    while (strchr(" \t|<>",Command[EndPos])) EndPos--;

+    break;

+  };

+

+}

+

 mh_pid_t mhmakefileparser::OsExeCommand(const string &Command, const string &Params, bool IgnoreError, string *pOutput) const

 {

   string FullCommandLine;

@@ -997,7 +1025,44 @@ mh_pid_t mhmakefileparser::OsExeCommand(const string &Command, const string &Par
   {

     string tmpCommand=Command.substr(ComSpec.size(),Command.size());

     FullCommandLine=ComSpec;

-    FullCommandLine+=g_QuoteString+QuoteFileName(tmpCommand)+Params+g_QuoteString;

+

+    string ComspecCommandLine=QuoteFileName(tmpCommand)+Params;

+    int NextBegin=0;

+    int EndPos=0;

+    CommandSep(ComspecCommandLine,EndPos,NextBegin);

+    if (EndPos!=string::npos)

+    {

+        // We have multiple commands so create an temporary batch file

+      FILE *pFile=(FILE*)1;

+      char Filename[MAX_PATH];

+      int Nr=1;

+      while (1)

+      {

+        sprintf(Filename,"%s\\tmp%d.bat",m_MakeDir->GetFullFileName().c_str(),Nr);

+        pFile=fopen(Filename,"r");

+        if (!pFile)

+          break;

+        fclose(pFile);

+        Nr++;

+      }

+      pFile=fopen(Filename,"w");

+      fprintf(pFile,"@echo off\n");

+      int PrevPos=0;

+      while (EndPos!=string::npos)

+      {

+        string SubCommand=ComspecCommandLine.substr(PrevPos,EndPos-PrevPos+1);

+        fprintf(pFile,"%s\n",SubCommand.c_str());

+        PrevPos=NextBegin;

+        CommandSep(ComspecCommandLine,EndPos,NextBegin);

+      }

+      string SubCommand=ComspecCommandLine.substr(PrevPos);

+      fprintf(pFile,"%s\n",SubCommand.c_str());

+      fclose(pFile);

+      FullCommandLine+=QuoteFileName(Filename);

+      ((mhmakefileparser*)this)->m_FilesToRemoveAtEnd.push_back(string(Filename));

+    }

+    else

+      FullCommandLine+=ComspecCommandLine;

   }

   else

   {

@@ -1132,8 +1197,16 @@ mh_pid_t mhmakefileparser::OsExeCommand(const string &Command, const string &Par
     int pipeto[2];      /* pipe to feed the exec'ed program input */

     int pipefrom[2];    /* pipe to get the exec'ed program output */

 

-    pipe( pipeto );

-    pipe( pipefrom );

+    if ( (-1==pipe(pipeto)) || (-1==pipe(pipefrom)) )

+    {

+      if (IgnoreError)

+      {

+        cerr << "Error creating pipe for : "<<Command<<", but ignoring error\n";

+        return (mh_pid_t)0; // Ignore error

+      }

+      else

+        return (mh_pid_t)-1;

+    }

 

     pid_t ID=vfork();

     if (ID==-1)

@@ -1160,7 +1233,8 @@ mh_pid_t mhmakefileparser::OsExeCommand(const string &Command, const string &Par
       close( pipefrom[1] );

 

       poptParseArgvString(FullCommandLine.c_str(), &argc, &pargv);

-      chdir(m_MakeDir->GetFullFileName().c_str());

+      if (-1==chdir(m_MakeDir->GetFullFileName().c_str()))

+        throw string("Error changing current directory to ")+m_MakeDir->GetFullFileName();

       if (m_pEnv)

         execve(pargv[0],(char *const*)pargv,m_pEnv);

       else

@@ -1249,7 +1323,8 @@ mh_pid_t mhmakefileparser::OsExeCommand(const string &Command, const string &Par
       const char **pargv;

 

       poptParseArgvString(FullCommandLine.c_str(), &argc, &pargv);

-      chdir(m_MakeDir->GetFullFileName().c_str());

+      if (-1==chdir(m_MakeDir->GetFullFileName().c_str()))

+        throw string("Error changing current directory to ")+m_MakeDir->GetFullFileName();

       if (m_pEnv)

         execve(pargv[0],(char *const*)pargv,m_pEnv);

       else

diff --git a/tools/mhmake/src/commandqueue.cpp b/tools/mhmake/src/commandqueue.cpp
index 6f3fd4d1a..8ca842362 100644
--- a/tools/mhmake/src/commandqueue.cpp
+++ b/tools/mhmake/src/commandqueue.cpp
@@ -21,7 +21,7 @@
 #include "stdafx.h"

 

 #include "commandqueue.h"

-#include "mhmakeparser.h"

+#include "mhmakefileparser.h"

 

 #ifndef WIN32

 

@@ -64,24 +64,29 @@ commandqueue::commandqueue() :
   m_DummyWaitHandle=(mh_pid_t)CreateEvent(NULL,TRUE,FALSE,NULL);

 #else

   FILE *pFile=fopen("/proc/cpuinfo","r");

-  const char *pProc="\nprocessor";

-  int cur=1;

+  const char szProc[]="processor";

+  int cur=0;

   int NrProcs=0;

   while (!feof(pFile))

   {

     char In=fgetc(pFile);

-    if (In==pProc[cur])

+    if (In=='\n')

     {

-      cur++;

-      if (!pProc[cur])

+      cur=0;

+    }

+    else

+    {

+      if (cur<=sizeof(szProc) && In==szProc[cur])

       {

+        if (!szProc[cur+1])

+        {

         NrProcs++;

-        cur=0;

       }

     }

-    else

-      cur=0;

+      cur++;

+    }

   }

+

   m_MaxNrCommandsInParallel=NrProcs;

   m_DummyWaitHandle=(mh_pid_t)-1;

 

diff --git a/tools/mhmake/src/curdir.cpp b/tools/mhmake/src/curdir.cpp
index 4b905a327..b87dc4f6f 100644
--- a/tools/mhmake/src/curdir.cpp
+++ b/tools/mhmake/src/curdir.cpp
@@ -31,7 +31,8 @@ curdir::initcurdir curdir::m_pCurrentDir;
 curdir::initcurdir::initcurdir()

 {

   char CurDir[MAX_PATH];

-  getcwd(CurDir,MAX_PATH);

+  if (!getcwd(CurDir,MAX_PATH))

+    throw string("Error getting current directory.");

   string strCurDir=CurDir;

   m_pDir=GetAbsFileInfo(NormalizePathName(strCurDir));

 }

diff --git a/tools/mhmake/src/fileinfo.cpp b/tools/mhmake/src/fileinfo.cpp
index 7174c49a4..5ef044e41 100644
--- a/tools/mhmake/src/fileinfo.cpp
+++ b/tools/mhmake/src/fileinfo.cpp
@@ -23,7 +23,7 @@
 #include "fileinfo.h"

 #include "rule.h"

 #include "util.h"

-#include "mhmakeparser.h"

+#include "mhmakefileparser.h"

 

 #ifndef S_ISDIR

 #define S_ISDIR(val) ((val)&_S_IFDIR)

@@ -242,13 +242,16 @@ string &NormalizePathName(string &Name)
           while ((pPtr[0]=='\\' || pPtr[0]=='/')  && pPtr[1]=='.' && pPtr[2]=='.')

           {

             pLastSlash--;

-            while (*pLastSlash!='\\' && *pLastSlash!='/') pLastSlash--;

-            if (pLastSlash<pBeg)

-              pLastSlash=pBeg;  // This is a fault in the file name, just put it back at the beginning

+            while (pLastSlash>pBeg && *pLastSlash!='\\' && *pLastSlash!='/') pLastSlash--; // Be dure to not go further then the beginning of the file name

             pPtr+=3;

           }

           if (pLastSlash)

+          {

+            if (pLastSlash<pBeg)

+              pWr=(char*)pBeg;

+            else

             pWr=(char*)pLastSlash;

+          }

         }

         else

         {

diff --git a/tools/mhmake/src/flex.skl b/tools/mhmake/src/flex.skl
index 4d57bac46..6db7e1c5c 100644
--- a/tools/mhmake/src/flex.skl
+++ b/tools/mhmake/src/flex.skl
@@ -1472,7 +1472,6 @@ yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )
   yy_init = 0;
   yy_start = 0;
   yy_flex_debug = 0;
-  yylineno = 1; // this will only get updated if %option yylineno
 
   yy_did_buffer_switch_on_eof = 0;
 
diff --git a/tools/mhmake/src/flexlexer.h b/tools/mhmake/src/flexlexer.h
index 48dab04ae..08acef335 100644
--- a/tools/mhmake/src/flexlexer.h
+++ b/tools/mhmake/src/flexlexer.h
@@ -47,7 +47,18 @@
 #ifndef __FLEX_LEXER_H
 // Never included before - need to define base class.
 #define __FLEX_LEXER_H
-#include "mhmakeparser.h"
+class mhmakefileparser;
+
+#include "refptr.h"
+
+struct YYSTYPE
+{
+  string theString;
+  int ival;
+};
+typedef struct YYSTYPE YYSTYPE;
+
+#include "location.hh"
 
 #include <iostream>
 #  ifndef FLEX_STD
@@ -62,7 +73,7 @@ typedef int yy_state_type;
 
 class FlexLexer {
 public:
-  FlexLexer() : yylineno(1), m_BraceIndent(0) {}
+  FlexLexer() : m_BraceIndent(0) {}
   virtual ~FlexLexer()  { }
 
   const char* YYText() const  { return yytext; }
@@ -75,23 +86,19 @@ public:
   virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
   virtual void yyrestart( FLEX_STD istream* s ) = 0;
 
-  virtual int yylex(TOKENVALUE &theValue) = 0;
-
+  virtual int yylex(YYSTYPE *yylval, yy::location* yylloc) = 0;
 
   // Switch to new input/output streams.  A nil stream pointer
   // indicates "keep the current one".
   virtual void switch_streams( FLEX_STD istream* new_in = 0,
           FLEX_STD ostream* new_out = 0 ) = 0;
 
-  int lineno() const    { return yylineno; }
-
   int debug() const   { return yy_flex_debug; }
   void set_debug( int flag )  { yy_flex_debug = flag; }
 
 protected:
   char* yytext;
   int yyleng;
-  int yylineno;   // only maintained if you use %option yylineno
   int yy_flex_debug;  // only has effect with -d or "%option debug"
 
 public:
@@ -101,11 +108,11 @@ public:
     YY_BUFFER_STATE m_BufferState;
     ifstream m_Stream;
     string m_FileName;
-    int yylineno;
-    INSTACK(YY_BUFFER_STATE BufferState, const string &FileToOpen, const string &PrevFileName, int Line) :
+    yy::location yylloc;
+    INSTACK(YY_BUFFER_STATE BufferState, const string &FileToOpen, const string &PrevFileName, yy::location *pLocInfo) :
       m_BufferState(BufferState),
       m_FileName(PrevFileName),
-      yylineno(Line),
+      yylloc(*pLocInfo),
       m_Stream(FileToOpen.c_str(), ios_base::in)
     {
     }
@@ -144,16 +151,19 @@ public:
   string m_InputFileName;
   string m_curtoken;
   mystack m_IncludeStack;
-  mhmakeparser *m_pParser;
-  mhmakeparser *GetParser()
+  mhmakefileparser *m_pParser;
+  mhmakefileparser *GetParser()
   {
     return m_pParser;
   }
-
+public:
+  string &GetInputFilename()
+  {
+    return m_InputFileName;
+  }
 };
 
 }
-#endif // FLEXLEXER_H
 
 #if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
 // Either this is the first time through (yyFlexLexerOnce not defined),
@@ -179,7 +189,7 @@ public:
   void yypush_buffer_state( struct yy_buffer_state* new_buffer );
   void yypop_buffer_state();
 
-  virtual int yylex(TOKENVALUE &theValue);
+  virtual int yylex(YYSTYPE* yylval, yy::location* yylloc);
   virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 );
 
 protected:
@@ -258,3 +268,4 @@ protected:
 
 #endif // yyFlexLexer || ! yyFlexLexerOnce
 
+#endif // FLEXLEXER_H
diff --git a/tools/mhmake/src/md5.cpp b/tools/mhmake/src/md5.cpp
index 0ffba0d48..df3a006cb 100644
--- a/tools/mhmake/src/md5.cpp
+++ b/tools/mhmake/src/md5.cpp
@@ -304,7 +304,7 @@ struct WRITEMD5DB
       map<uint32,string>::const_iterator It=g_Md5Database.begin();

       while (It!=g_Md5Database.end())

       {

-        fprintf(pFile,"%08x: ",It->first);

+        fprintf(pFile,"%08lx: ",It->first);

         fwrite(It->second.c_str(),It->second.length(),1,pFile);

         fprintf(pFile,"\n");

         It++;

diff --git a/tools/mhmake/src/mhmake.cpp b/tools/mhmake/src/mhmake.cpp
index 6d99e5f3d..ce2e8f7a7 100644
--- a/tools/mhmake/src/mhmake.cpp
+++ b/tools/mhmake/src/mhmake.cpp
@@ -20,7 +20,7 @@
 

 #include "stdafx.h"

 #include "fileinfo.h"

-#include "mhmakeparser.h"

+#include "mhmakefileparser.h"

 #include "rule.h"

 #include "util.h"

 

diff --git a/tools/mhmake/src/mhmakefileparser.cpp b/tools/mhmake/src/mhmakefileparser.cpp
index f281bc7dd..cf41b3c1c 100644
--- a/tools/mhmake/src/mhmakefileparser.cpp
+++ b/tools/mhmake/src/mhmakefileparser.cpp
@@ -29,19 +29,6 @@
 commandqueue mhmakefileparser::sm_CommandQueue;

 

 ///////////////////////////////////////////////////////////////////////////////

-int mhmakefileparser::yylex(void)

-{

-  m_yyloc=m_ptheLexer->lineno();

-  return m_ptheLexer->yylex(m_theTokenValue);

-}

-

-///////////////////////////////////////////////////////////////////////////////

-void mhmakefileparser::yyerror(const char *m)

-{

-  cerr << this->m_ptheLexer->m_InputFileName<< " ("<<m_yyloc<<"): "<<m<<endl;

-}

-

-///////////////////////////////////////////////////////////////////////////////

 int mhmakefileparser::ParseFile(const fileinfo *pFileInfo, const fileinfo *pMakeDir)

 {

   if (pMakeDir)

@@ -60,8 +47,8 @@ int mhmakefileparser::ParseFile(const fileinfo *pFileInfo, const fileinfo *pMake
   mhmakeFlexLexer theLexer(&yyin);

   m_ptheLexer=&theLexer;

   theLexer.m_InputFileName=pFileInfo->GetFullFileName();

-  theLexer.m_pParser=(mhmakeparser*)this;

-  int Ret=yyparse();

+  theLexer.m_pParser=this;

+  int Ret=parse();

   return Ret;

 }

 

@@ -92,10 +79,15 @@ static inline size_t SkipUntilQuote(const string &Expr,size_t i,char Char)
 static inline size_t SkipMakeExpr(const string &Expr,size_t i)

 {

   char Char=Expr[i++];

-  if (Char!='(')

+  char EndChar;

+  if (Char=='(')

+    EndChar=')';

+  else if (Char=='{')

+    EndChar='}';

+  else

     return i;

   Char=Expr[i++];

-  while (Char!=')')

+  while (Char!=EndChar)

   {

     if (Char=='$')

     {

@@ -103,7 +95,7 @@ static inline size_t SkipMakeExpr(const string &Expr,size_t i)
     }

 #ifdef _DEBUG

     if (i>=Expr.length())

-      throw(string(") not found in ")+Expr);

+      throw(string(1,EndChar)+" not found in "+Expr);

 #endif

     Char=Expr[i++];

   }

@@ -570,11 +562,11 @@ void mhmakefileparser::GetAutoDeps(const fileinfo *pFirstDep, deps_t &Autodeps)
       {

         if (Ret=='#')

         {

-          fscanf(pIn,"%*[ \t]");

-          Ret=fscanf(pIn,"include %1[\"<]%254[^>\"]%*[\">]",&Type,IncludeList);

+          Ret=fscanf(pIn,"%*[ \t]");

+          Ret=fscanf(pIn,"include %1[\"<]%254[^>\"]%*[\">]",(char*)&Type,IncludeList);

         }

         else

-          Ret=fscanf(pIn,"import %1[\"<]%254[^>\"]%*[\">]",&Type,IncludeList);

+          Ret=fscanf(pIn,"import %1[\"<]%254[^>\"]%*[\">]",(char*)&Type,IncludeList);

         if (Ret==2)

         {

           bFound=true;

@@ -744,14 +736,17 @@ void mhmakefileparser::LoadAutoDepsFile(fileinfo *pDepFile)
   m_AutoDepFileLoaded=pDepFile;

 

   FILE *pIn=fopen(pDepFile->GetFullFileName().c_str(),"rb");

-#ifdef _DEBUG

   if (!pIn)

   {

     cerr << "Error opening autodep file "<<pDepFile->GetQuotedFullFileName()<<endl;

     return;

   }

-#endif

-  fread(&m_EnvMd5_32,sizeof(m_EnvMd5_32),1,pIn);

+  if (1!=fread(&m_EnvMd5_32,sizeof(m_EnvMd5_32),1,pIn))

+  {

+    cerr << "Wrong format of autodep file "<<pDepFile->GetQuotedFullFileName()<<endl;

+    fclose(pIn);

+    return;

+  }

 #ifdef _DEBUG

   if (g_PrintAdditionalInfo)

     cout << "Reading Env Md5 from "<<pDepFile->GetQuotedFullFileName()<<": "<<hex<<m_EnvMd5_32<<endl;

@@ -1358,7 +1353,12 @@ string mhmakefileparser::ResolveExpression(const string &InExpr,string &Rest) co
     switch (Expr[i])

     {

     case '!':

-      if (Expr[i+1]!='=')

+      if (i==Expr.length()-1)

+      {

+        i++; // to break out of the loop

+        Ret=s_TrueString; /* the input was ! which means true */

+      }

+      else if (Expr[i+1]!='=')

       {

         Ret=ResolveExpression(Expr.substr(i+1),Expr);

         Ret = Ret.empty() || Ret==s_FalseString ? s_TrueString : g_EmptyString;

@@ -1371,6 +1371,12 @@ string mhmakefileparser::ResolveExpression(const string &InExpr,string &Rest) co
       }

       break;

     case '&':

+      #ifdef _DEBUG

+      if (i==Expr.length()-1)

+      {

+        throw(string("Error in expression near ")+Expr[i]+": "+InExpr);

+      } else

+      #endif

       if (Expr[i+1]!='&')

       {

         Ret+=Expr[i++];

@@ -1382,6 +1388,12 @@ string mhmakefileparser::ResolveExpression(const string &InExpr,string &Rest) co
       }

       break;

     case '|':

+      #ifdef _DEBUG

+      if (i==Expr.length()-1)

+      {

+        throw(string("Error in expression near ")+Expr[i]+": "+InExpr);

+      } else

+      #endif

       if (Expr[i+1]!='|')

       {

         Ret+=Expr[i++];

@@ -1420,6 +1432,11 @@ string mhmakefileparser::ResolveExpression(const string &InExpr,string &Rest) co
       }

       break;

     case '=':

+      if (i==Expr.length()-1)

+      {

+        i++; // To break out of the loop

+      }

+      else

       if (Expr[i+1]!='=')

       {

         Ret+=Expr[i++];

diff --git a/tools/mhmake/src/mhmakefileparser.h b/tools/mhmake/src/mhmakefileparser.h
index f1c9cb280..49c8aedb3 100644
--- a/tools/mhmake/src/mhmakefileparser.h
+++ b/tools/mhmake/src/mhmakefileparser.h
@@ -27,13 +27,7 @@
 

 class rule;

 

-class mhmakeFlexLexer;

-

-struct TOKENVALUE

-{

-  string theString;

-  int ival;

-};

+#include "flexlexer.h"

 

 class mhmakefileparser;

 typedef string (mhmakefileparser::*function_f)(const string &, const string *) const;

@@ -52,13 +46,18 @@ typedef set<fileinfo*> deps_t;
 typedef pair< bool, deps_t > autodeps_entry_t;

 typedef map<fileinfo*, autodeps_entry_t > autodeps_t;

 

-class mhmakefileparser : public refbase

+namespace yy

 {

+  class location;

+}

 

+class mhmakefileparser : public refbase

+{

 private:

   static commandqueue   sm_CommandQueue;

-

+protected:

   mhmakeFlexLexer      *m_ptheLexer;

+private:

   int                   m_yyloc;

   fileinfo             *m_RuleThatIsBuild;

   vector<string>        m_ToBeIncludeAfterBuild;

@@ -74,7 +73,6 @@ private:
 protected:

   map<string,string>    m_Variables;

   map<string,string>    m_CommandLineVars;

-  TOKENVALUE            m_theTokenValue;

   const fileinfo       *m_MakeDir;

   refptr<rule>          m_pCurrentRule;

   refptr<fileinfoarray> m_pCurrentItems;

@@ -106,6 +104,8 @@ protected:
   autodeps_t m_AutoDeps;

   set< const fileinfo* > m_Targets; // List of targets that are build by this makefile

 

+  vector<string> m_FilesToRemoveAtEnd;

+

   static mh_time_t m_sBuildTime;

 private:

   string ResolveExpression(const string &InExpr,string &Rest) const;

@@ -223,6 +223,13 @@ public:
   virtual ~mhmakefileparser() /* virtual to be sure the correct destructor is called when we delete with a pointer to this class which in reality is a pointer to a derived class */

   {

     SaveAutoDepsFile();

+    /* remove generated temporary batch files */

+    vector<string>::const_iterator It=m_FilesToRemoveAtEnd.begin();

+    while (It!=m_FilesToRemoveAtEnd.end())

+    {

+      remove(It->c_str());

+      It++;

+    }

 #ifndef WIN32

     char **pEnv=m_pEnv;

     if (pEnv)

@@ -230,9 +237,12 @@ public:
 #endif

     free(m_pEnv);

   }

-  virtual int yylex(void);

-  virtual void yyerror(const char *m);

-  virtual int yyparse()

+  int yylex (YYSTYPE* yylval, yy::location* yylloc)

+  {

+    return m_ptheLexer->yylex(yylval,yylloc);

+  }

+

+  virtual int parse()

   {

     throw("Please derive if you want to execute yyparse.");

   }

diff --git a/tools/mhmake/src/mhmakelexer.l b/tools/mhmake/src/mhmakelexer.l
index 8cf0f1680..f27fec31a 100644
--- a/tools/mhmake/src/mhmakelexer.l
+++ b/tools/mhmake/src/mhmakelexer.l
@@ -27,15 +27,19 @@
 

 static uint32 LoadMakMd5(fileinfo *pTarget)

 {

+  uint32 Md5_32=0;

   string FileName=pTarget->GetFullFileName();

   FileName+=".md5_32";

   FILE *pFile=fopen(FileName.c_str(),"rb");

   if (!pFile)

-    return 0;

-  uint32 Md5_32=0;

-  fread(&Md5_32,sizeof(Md5_32),1,pFile);

+    return Md5_32;

+  if (1!=fread(&Md5_32,sizeof(Md5_32),1,pFile))

+  {

   fclose(pFile);

+    return Md5_32;

+  }

   pTarget->SetCommandsMd5_32(Md5_32);

+  fclose(pFile);

   return Md5_32;

 }

 

@@ -70,7 +74,14 @@ static void ReplaceCurlyBraces(string &String)
         }

 }

 

-#define YY_DECL int mhmakeFlexLexer::yylex(TOKENVALUE &theValue)

+#include "mhmakeparser.hpp"

+

+#define YY_DECL int mhmakeFlexLexer::yylex(yy::mhmakeparser::semantic_type* yylval, yy::mhmakeparser::location_type* yylloc)

+

+/* By default yylex returns int, we use token_type.

+   Unfortunately yyterminate by default returns 0, which is

+   not of token_type.  */

+#define yyterminate() return yy::mhmakeparser::token::END

 

 %}

 

@@ -87,24 +98,36 @@ static void ReplaceCurlyBraces(string &String)
 %x IFEQ IFNEQ ERRORMACRO MESSAGEMACRO REPARSEMACRO LOAD_MAKEFILE

 %x DEFINE

 

+%{

+# define YY_USER_ACTION  yylloc->columns (yyleng);

+

+#define inclineno() yylloc->incline()

+#define lineno()    yylloc->end.line

+#define colno()     yylloc->end.column

+

+

+%}

 %%

+%{

+  yylloc->step ();

+%}

 

  /*---------------------------------------------------------------------------*/

 [ \t\r]*\n[ ][ \t]* {

   yy_set_bol(1); // Make sure the next rule also matches the ^

-  yylineno++;

-  return mhmakeparser::NEWLINE;

+  inclineno();

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 [ \t\r]*\n {

-  PRINTF(("%s %d: NEWLINE:\n",m_InputFileName.c_str(),yylineno));

-  yylineno++;

-  return mhmakeparser::NEWLINE;

+  PRINTF(("%s %d: NEWLINE:\n",m_InputFileName.c_str(),lineno()));

+  inclineno();

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 ^[s\-]?include {

-  PRINTF(("%s %d: INCLUDE: ",m_InputFileName.c_str(),yylineno));

+  PRINTF(("%s %d: INCLUDE: ",m_InputFileName.c_str(),lineno()));

   BEGIN(INCLUDE);

   unsigned i=0;

   while (strchr(" \t",yytext[i])) i++;

@@ -112,14 +135,14 @@ static void ReplaceCurlyBraces(string &String)
     m_IgnoreIncludeError=true;

   else

     m_IgnoreIncludeError=false;

-  return mhmakeparser::INCLUDEMAK;  // Return a newline to be sure that the previous line is completely parse by yacc (in case it is a variable definition)

+  return yy::mhmakeparser::token::INCLUDEMAK;  // Return a newline to be sure that the previous line is completely parse by yacc (in case it is a variable definition)

 }

 

  /*****************************************************************************/

 <INCLUDE>[ \t]*      /* eat the whitespace */

  /*---------------------------------------------------------------------------*/

 <INCLUDE>[^\r\n]+ { /* got the include file name */

-  mhmakeparser *pParser=GetParser();

+  mhmakefileparser *pParser=GetParser();

 

   /* replace the {} by () before expanding */

   string IncludeFileNames(yytext);

@@ -148,7 +171,7 @@ static void ReplaceCurlyBraces(string &String)
       pParser->AddIncludedMakefile(pInclude);

 

       string strToInclude=pInclude->GetFullFileName();

-      INSTACK *pStackElem=new INSTACK(YY_CURRENT_BUFFER, strToInclude, m_InputFileName, yylineno);

+      INSTACK *pStackElem=new INSTACK(YY_CURRENT_BUFFER, strToInclude, m_InputFileName, yylloc);

       if ( pStackElem->fail() )

       {

         delete pStackElem;

@@ -157,11 +180,11 @@ static void ReplaceCurlyBraces(string &String)
           mystack::reverse_iterator StackIt=m_IncludeStack.rbegin();

           while (StackIt!=m_IncludeStack.rend())

           {

-            cout<<" in "<<(*StackIt)->m_FileName<<" ("<<(*StackIt)->yylineno<<")";

+            cout<<" in "<<(*StackIt)->m_FileName<<" ("<<(*StackIt)->yylloc<<")";

             StackIt++;

           }

           cout<<endl;

-          cout<<"Warning error opening file "<<strToInclude<<" in "<<m_InputFileName<<" ("<<yylineno<<")\n";

+          cout<<"Warning error opening file "<<strToInclude<<" in "<<m_InputFileName<<" ("<<lineno()<<")\n";

           pParser->IncludeAfterBuild(strToInclude);

         }

         else

@@ -170,9 +193,9 @@ static void ReplaceCurlyBraces(string &String)
       else

       {

         m_IncludeStack.push(pStackElem);

-        yylineno=1;

 

         m_InputFileName=strToInclude;

+        yylloc->initialize(&m_InputFileName);

 

         yypush_buffer_state(yy_create_buffer( pStackElem->GetStream(), YY_BUF_SIZE ));

         yyrestart(pStackElem->GetStream());

@@ -186,9 +209,9 @@ static void ReplaceCurlyBraces(string &String)
 

  /*---------------------------------------------------------------------------*/

 load_makefile {

-  PRINTF(("%s %d: LOAD_MAKEFILE:\n",m_InputFileName.c_str(),yylineno));

+  PRINTF(("%s %d: LOAD_MAKEFILE:\n",m_InputFileName.c_str(),lineno()));

   BEGIN(LOAD_MAKEFILE);

-  return mhmakeparser::NEWLINE;  // Return a newline to be sure that the previous line is completely parse by yacc (in case it is a variable definition)

+  return yy::mhmakeparser::token::NEWLINE;  // Return a newline to be sure that the previous line is completely parse by yacc (in case it is a variable definition)

 }

 

  /*****************************************************************************/

@@ -196,7 +219,7 @@ load_makefile {
   string ListOfMakefiles((const char*)yytext);

   ReplaceCurlyBraces(ListOfMakefiles);

   ListOfMakefiles=GetParser()->ExpandExpression(ListOfMakefiles);

-  PRINTF(("%s %d: LOAD_MAKEFILE: '%s'\n",m_InputFileName.c_str(),yylineno,ListOfMakefiles.c_str()));

+  PRINTF(("%s %d: LOAD_MAKEFILE: '%s'\n",m_InputFileName.c_str(),lineno(),ListOfMakefiles.c_str()));

 

   const char *pTmp=ListOfMakefiles.c_str();

   while (*pTmp)

@@ -205,7 +228,7 @@ load_makefile {
     pTmp=NextCharItem(pTmp,Item,';');

     if (Item.empty())

     {

-      throw m_InputFileName + "(" + stringify(yylineno) + "): Error in load_makefile statement";

+      throw m_InputFileName + "(" + stringify(lineno()) + "): Error in load_makefile statement";

     }

     GetParser()->AddMakefileToMakefilesToLoad(Item);

   }

@@ -213,116 +236,116 @@ load_makefile {
 }

  /*---------------------------------------------------------------------------*/

 <LOAD_MAKEFILE>\r?\n {

-  yylineno++;

+  inclineno();

   BEGIN(INITIAL);

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]+ {

-  PRINTF(("%s %d: SPACE:\n",m_InputFileName.c_str(),yylineno));

-  return mhmakeparser::SPACE;

+  PRINTF(("%s %d: SPACE:\n",m_InputFileName.c_str(),lineno()));

+  return yy::mhmakeparser::token::SPACE;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*=[ \t]*\\[ \t\r]*\n[ \t]* {

-  PRINTF(("%s %d: EQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  yylineno++;

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::EQUAL;

+  PRINTF(("%s %d: EQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  inclineno();

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::EQUAL;

 }

 

 [ \t]*=[ \t]* {

-  PRINTF(("%s %d: EQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::EQUAL;

+  PRINTF(("%s %d: EQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::EQUAL;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*:=[ \t]*\\[ \t\r]*\n[ \t]* {

-  yylineno++;

-  PRINTF(("%s %d: IMEQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::IMEQUAL;

+  inclineno();

+  PRINTF(("%s %d: IMEQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::IMEQUAL;

 }

 

 [ \t]*:=[ \t]* {

-  PRINTF(("%s %d: IMEQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::IMEQUAL;

+  PRINTF(("%s %d: IMEQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::IMEQUAL;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*\?=[ \t]*\\[ \t\r]*\n[ \t]* {

-  yylineno++;

-  PRINTF(("%s %d: OPTEQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::OPTEQUAL;

+  inclineno();

+  PRINTF(("%s %d: OPTEQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::OPTEQUAL;

 }

 

 [ \t]*\?=[ \t]* {

-  PRINTF(("%s %d: OPTEQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::OPTEQUAL;

+  PRINTF(("%s %d: OPTEQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::OPTEQUAL;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*\+=[ \t]*\\[ \t\r]*\n[ \t]* {

-  PRINTF(("%s %d: PEQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  yylineno++;

-  return mhmakeparser::PEQUAL;

+  PRINTF(("%s %d: PEQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  inclineno();

+  return yy::mhmakeparser::token::PEQUAL;

 }

 

 [ \t]*\+=[ \t]* {

-  PRINTF(("%s %d: PEQUAL: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::PEQUAL;

+  PRINTF(("%s %d: PEQUAL: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::PEQUAL;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*;[ \t]*\\[ \t\r]*\n[ \t]* {

-  PRINTF(("%s %d: -SEMICOLON (NEWLINE): %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: -SEMICOLON (NEWLINE): %s\n",m_InputFileName.c_str(),lineno(),yytext));

   m_curtoken=g_EmptyString;

-  yylineno++;

+  inclineno();

   BEGIN(COMMANDPARSE);

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 [ \t]*;[ \t]* {

-  PRINTF(("%s %d: -SEMICOLON (NEWLINE): %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: -SEMICOLON (NEWLINE): %s\n",m_InputFileName.c_str(),lineno(),yytext));

   m_curtoken=g_EmptyString;

   BEGIN(COMMANDPARSE);

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*::[ \t]*\\[ \t\r]*\n[ \t]* {

-  PRINTF(("%s %d: DOUBLECOLON: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  yylineno++;

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::DOUBLECOLON;

+  PRINTF(("%s %d: DOUBLECOLON: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  inclineno();

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::DOUBLECOLON;

 }

 

 [ \t]*::[ \t]* {

-  PRINTF(("%s %d: DOUBLECOLON: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::DOUBLECOLON;

+  PRINTF(("%s %d: DOUBLECOLON: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::DOUBLECOLON;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*:[ \t]*\\[ \t\r]*\n[ \t]* {

-  PRINTF(("%s %d: COLON: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  yylineno++;

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::COLON;

+  PRINTF(("%s %d: COLON: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  inclineno();

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::COLON;

 }

 

 [ \t]*:[ \t]* {

-  PRINTF(("%s %d: COLON: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::COLON;

+  PRINTF(("%s %d: COLON: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::COLON;

 }

 

  /*---------------------------------------------------------------------------*/

 , {

-  PRINTF(("%s %d: COMMA: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::COMMA;

+  PRINTF(("%s %d: COMMA: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::COMMA;

 }

 

  /*---------------------------------------------------------------------------*/

@@ -330,92 +353,92 @@ load_makefile {
   if (m_IndentStack.size())

   {

     m_IndentStack.pop();

-    PRINTF(("%s %d: %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

   }

   else

   {

-     throw string("Unexpected endif at line ") + stringify(yylineno) + " of " + m_InputFileName;

+     throw string("Unexpected endif at line ") + stringify(lineno()) + " of " + m_InputFileName;

   }

 }

 

  /*---------------------------------------------------------------------------*/

 ^ifdef[ \t]*\\[ \t\r]*\n[ \t]* {

   BEGIN(IFDEF);

-  yylineno++;

-  return mhmakeparser::NEWLINE;

+  inclineno();

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 ^ifdef[ \t]+ {

   BEGIN(IFDEF);

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 ^if[ \t]*\\[ \t\r]*\n[ \t]* {

   BEGIN(IF);

-  yylineno++;

+  inclineno();

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 ^if[ \t]+ {

   BEGIN(IF);

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 ^ifndef[ \t]*\\[ \t\r]*\n[ \t]* {

   BEGIN(IFNDEF);

-  yylineno++;

-  return mhmakeparser::NEWLINE;

+  inclineno();

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 ^ifndef[ \t]+ {

   BEGIN(IFNDEF);

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 ^ifeq[ \t]*\\[ \t\r]*\n[ \t]* {

   BEGIN(IFEQ);

   m_curtoken=g_EmptyString;

-  yylineno++;

-  return mhmakeparser::NEWLINE;

+  inclineno();

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 ^ifeq[ \t]+ {

   BEGIN(IFEQ);

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 ^ifneq[ \t]*\\[ \t\r]*\n[ \t]* {

   BEGIN(IFNEQ);

   m_curtoken=g_EmptyString;

-  yylineno++;

-  return mhmakeparser::NEWLINE;

+  inclineno();

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

 ^ifneq[ \t]+ {

   BEGIN(IFNEQ);

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 ^else[ \t]* {

   if (m_IndentStack.size() && (!m_IndentStack.top()))

   {

-    PRINTF(("%s %d: skipping else: depth %d\n",m_InputFileName.c_str(),yylineno,m_IndentStack.size()));

+    PRINTF(("%s %d: skipping else: depth %d\n",m_InputFileName.c_str(),lineno(),m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     m_IndentStack.top()=1;

     BEGIN(SKIPUNTILELSEORENDIF);

   }

   else

   {

-     throw string("Unexpected else at line ") + stringify(yylineno) + " of file " + m_InputFileName;

+     throw string("Unexpected else at line ") + stringify(lineno()) + " of file " + m_InputFileName;

   }

 }

 

@@ -425,24 +448,23 @@ load_makefile {
   m_IndentStack.push(0);

   if (GetParser()->IsEqual(m_curtoken))

   {

-    PRINTF(("%s %d: Not Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str(),m_IndentStack.size()));

+    PRINTF(("%s %d: Not Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str(),m_IndentStack.size()));

     BEGIN(INITIAL);

   }

   else

   {

-    PRINTF(("%s %d: Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str(),m_IndentStack.size()));

+    PRINTF(("%s %d: Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str(),m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     BEGIN(SKIPUNTILELSEORENDIF);

   }

 }

 

-<IF,IFEQ,IFNEQ>[ \t]*\\[ \t\r]*\n[ \t]* { yylineno++; m_curtoken += g_SpaceString;}

+<IF,IFEQ,IFNEQ>[ \t]*\\[ \t\r]*\n[ \t]* { inclineno(); m_curtoken += g_SpaceString;}

 

 <IF,IFEQ,IFNEQ>\r    /* skip */

 

-<IF,IFEQ,IFNEQ>[^\\\r\n{}\$]+ |

-<IF,IFEQ,IFNEQ>\$ |

-<IF,IFEQ,IFNEQ>\\                        { m_curtoken += (const char *)yytext; }

+<IF,IFEQ,IFNEQ>[^\\\r\n\$]+ |

+<IF,IFEQ,IFNEQ>[\\\$]         { m_curtoken += (const char *)yytext; }

 

  /*****************************************************************************/

 <IFNEQ>\n {

@@ -450,12 +472,12 @@ load_makefile {
   m_IndentStack.push(0);

   if (!GetParser()->IsEqual(m_curtoken))

   {

-    PRINTF(("%s %d: Not Skipping ifneq %s: depth %d\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str(),m_IndentStack.size()));

+    PRINTF(("%s %d: Not Skipping ifneq %s: depth %d\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str(),m_IndentStack.size()));

     BEGIN(INITIAL);

   }

   else

   {

-    PRINTF(("%s %d: Skipping ifneq %s: depth %d\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str(),m_IndentStack.size()));

+    PRINTF(("%s %d: Skipping ifneq %s: depth %d\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str(),m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     BEGIN(SKIPUNTILELSEORENDIF);

   }

@@ -473,13 +495,13 @@ load_makefile {
   string Val=GetParser()->ExpandVar((const char *)yytext);

   if (Val.empty() || Val=="0")

   {

-    PRINTF(("%s %d: Skipping if %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: Skipping if %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     BEGIN(SKIPUNTILELSEORENDIF);

   }

   else

   {

-    PRINTF(("%s %d: Not Skipping if %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: Not Skipping if %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

     BEGIN(INITIAL);

   }

 }

@@ -490,12 +512,12 @@ load_makefile {
   m_IndentStack.push(0);

   if (GetParser()->IsExprTrue(m_curtoken))

   {

-    PRINTF(("%s %d: Not Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str(),m_IndentStack.size()));

+    PRINTF(("%s %d: Not Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str(),m_IndentStack.size()));

     BEGIN(INITIAL);

   }

   else

   {

-    PRINTF(("%s %d: Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str(),m_IndentStack.size()));

+    PRINTF(("%s %d: Skipping ifeq %s: depth %d\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str(),m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     BEGIN(SKIPUNTILELSEORENDIF);

   }

@@ -509,12 +531,12 @@ load_makefile {
   m_IndentStack.push(0);

   if (GetParser()->IsDefined((const char *)yytext))

   {

-    PRINTF(("%s %d: Not Skipping ifdef %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: Not Skipping ifdef %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

     BEGIN(INITIAL);

   }

   else

   {

-    PRINTF(("%s %d: Skipping ifdef %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: Skipping ifdef %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     BEGIN(SKIPUNTILELSEORENDIF);

   }

@@ -524,12 +546,12 @@ load_makefile {
 <IFNDEF>[a-zA-Z0-9_]+ {

   m_IndentStack.push(0);

   if (!GetParser()->IsDefined((const char *)yytext)) {

-    PRINTF(("%s %d: Not Skipping ifndef %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: Not Skipping ifndef %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

     BEGIN(INITIAL);

   }

   else

   {

-    PRINTF(("%s %d: Skipping ifndef %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext,m_IndentStack.size()));

+    PRINTF(("%s %d: Skipping ifndef %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext,m_IndentStack.size()));

     m_IndentSkip=m_IndentStack.size();

     BEGIN(SKIPUNTILELSEORENDIF);

   }

@@ -537,26 +559,26 @@ load_makefile {
 

  /*****************************************************************************/

 <SKIPUNTILELSEORENDIF>\n[ ]*endif {

-  yylineno++;

+  inclineno();

   if (!m_IndentStack.size())

   {

-    throw string("Unexpected endif at line ") + stringify(yylineno) + " of " + m_InputFileName;

+    throw string("Unexpected endif at line ") + stringify(lineno()) + " of " + m_InputFileName;

   }

   else

   {

     m_IndentStack.pop();

-    PRINTF(("%s %d: endif: depth %d\n",m_InputFileName.c_str(),yylineno,m_IndentStack.size()));

+    PRINTF(("%s %d: endif: depth %d\n",m_InputFileName.c_str(),lineno(),m_IndentStack.size()));

     if (m_IndentStack.size()==m_IndentSkip-1) BEGIN(INITIAL);

   }

 }

 

  /*---------------------------------------------------------------------------*/

 <SKIPUNTILELSEORENDIF>\n[ ]*else {

-  yylineno++;

-  PRINTF(("%s %d: else: depth %d\n",m_InputFileName.c_str(),yylineno,m_IndentStack.size()));

+  inclineno();

+  PRINTF(("%s %d: else: depth %d\n",m_InputFileName.c_str(),lineno(),m_IndentStack.size()));

   if (m_IndentStack.top())

   {

-    throw string("Unexpected else at line ") + stringify(yylineno) + " of file " + m_InputFileName;

+    throw string("Unexpected else at line ") + stringify(lineno()) + " of file " + m_InputFileName;

   }

   m_IndentStack.top()=1;

   if (m_IndentStack.size()==m_IndentSkip)

@@ -567,9 +589,9 @@ load_makefile {
 

  /*---------------------------------------------------------------------------*/

 <SKIPUNTILELSEORENDIF>\n[ ]*if(def|ndef|eq|neq)? {

-  yylineno++;

+  inclineno();

   m_IndentStack.push(0);

-  PRINTF(("%s %d: %s: depth %d\n",m_InputFileName.c_str(),yylineno,yytext+1,m_IndentStack.size()));

+  PRINTF(("%s %d: %s: depth %d\n",m_InputFileName.c_str(),lineno(),yytext+1,m_IndentStack.size()));

 }

 

  /*---------------------------------------------------------------------------*/

@@ -577,46 +599,48 @@ load_makefile {
  /*---------------------------------------------------------------------------*/

 <SKIPUNTILELSEORENDIF>[^a-zA-Z\n]+ /* skip */

  /*---------------------------------------------------------------------------*/

-<SKIPUNTILELSEORENDIF>\n[ ]*[a-zA-Z]+ yylineno++;

+<SKIPUNTILELSEORENDIF>\n[ ]*[a-zA-Z]+ {

+  inclineno();

+}

  /*---------------------------------------------------------------------------*/

 <SKIPUNTILELSEORENDIF>\n {

-  yylineno++;

+  inclineno();

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*#[^\n]* {

-  PRINTF(("%s %d: -COMMENT: %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: -COMMENT: %s\n",m_InputFileName.c_str(),lineno(),yytext));

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t]*\\[ \t\r]*\n[ \t]* {

-  PRINTF(("%s %d: SPACE:\n",m_InputFileName.c_str(),yylineno));

-  yylineno++;

-  return mhmakeparser::SPACE;

+  PRINTF(("%s %d: SPACE:\n",m_InputFileName.c_str(),lineno()));

+  inclineno();

+  return yy::mhmakeparser::token::SPACE;

 }

 

  /*---------------------------------------------------------------------------*/

 \.PHONY {

-  PRINTF(("%s %d: .PHONY: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::PHONY;

+  PRINTF(("%s %d: .PHONY: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::PHONY;

 }

 

  /*---------------------------------------------------------------------------*/

 \.AUTODEPS {

-  PRINTF(("%s %d: .AUTODEPS: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::AUTODEPS;

+  PRINTF(("%s %d: .AUTODEPS: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::AUTODEPS;

 }

 

  /*---------------------------------------------------------------------------*/

 export {

-  PRINTF(("%s %d: export: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::EXPORT;

+  PRINTF(("%s %d: export: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  return yy::mhmakeparser::token::EXPORT;

 }

 

  /*---------------------------------------------------------------------------*/

 ^vpath {

-  PRINTF(("%s %d: vpath\n",m_InputFileName.c_str(),yylineno));

-  return mhmakeparser::VPATH;

+  PRINTF(("%s %d: vpath\n",m_InputFileName.c_str(),lineno()));

+  return yy::mhmakeparser::token::VPATH;

 }

 

  /*---------------------------------------------------------------------------*/

@@ -625,15 +649,15 @@ export {
   while (strchr(" \t\r\n\\",yytext[--EndIndex]));

   yyless(EndIndex+1);

 

-  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

 [a-zA-Z]:[a-zA-Z0-9\\\._\~\-%\@<&/]+ {

-  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

  /*---------------------------------------------------------------------------*/

@@ -642,38 +666,38 @@ export {
   while (strchr(" \t\r\n\\",yytext[--EndIndex]));

   yyless(EndIndex+1);

 

-  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

 ([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*\|]|\\\ |\\#)+\+=  {

-  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

   yyless(yyleng-2);

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

 ([a-zA-Z0-9\\\._\~\-\+%\@<&;/\*\|]|\\\ |\\#)+  {

-  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  PRINTF(("%s %d: STRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

 ^define[ \t]+[a-zA-Z0-9_\.]+[ \t]*\n {

   const char *pVar=(const char *)yytext;

   while (strchr(" \t",*pVar)) pVar++;

   pVar+=6;

-  theValue.theString=pVar;

+  yylval->theString=pVar;

   BEGIN(DEFINE);

   m_curtoken=g_EmptyString;

-  PRINTF(("%s %d: VARDEF: %s\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str()));

-  yylineno++;

-  return mhmakeparser::VARDEF;

+  PRINTF(("%s %d: VARDEF: %s\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str()));

+  inclineno();

+  return yy::mhmakeparser::token::VARDEF;

 }

 

 <DEFINE>[ \t]*\\[ \t\r]*\n[ \t]* {

-  yylineno++;

+  inclineno();

   m_curtoken+=g_SpaceString;

 }

 

@@ -682,11 +706,11 @@ export {
 }

 

 <DEFINE>[ \t]*\n[ \t]*endef {

-  yylineno++;

-  theValue.theString=m_curtoken;

-  PRINTF(("%s %d: VARVAL: %s\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str()));

+  inclineno();

+  yylval->theString=m_curtoken;

+  PRINTF(("%s %d: VARVAL: %s\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str()));

   BEGIN(INITIAL);

-  return mhmakeparser::VARVAL;

+  return yy::mhmakeparser::token::VARVAL;

 }

 

  /*---------------------------------------------------------------------------*/

@@ -702,106 +726,91 @@ export {
 }

 

  /*---------------------------------------------------------------------------*/

-\$\(  {

+\$[\(\{]  {

   m_BraceIndent++;

-  PRINTF(("%s %d: BEGIN MACRO $(: %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: BEGIN MACRO $(: %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   BEGIN(MAKEEXPRES);

   m_curtoken=(const char *)yytext;

 }

 

  /*---------------------------------------------------------------------------*/

-\$\([ \t]*error[ \t]+ {

+\$[\(\{][ \t]*error[ \t]+ {

   m_BraceIndent++;

-  PRINTF(("%s %d: BEGIN ERROR MACRO $(: %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: BEGIN ERROR MACRO $(: %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   BEGIN(ERRORMACRO);

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE; // Make sure that the previous lines are matched by the bison parser (so that all variables until here are defined)

+  return yy::mhmakeparser::token::NEWLINE; // Make sure that the previous lines are matched by the bison parser (so that all variables until here are defined)

 }

 

  /*---------------------------------------------------------------------------*/

-\$\([ \t]*(message|info)[ \t]+ {

+\$[\(\{][ \t]*(message|info)[ \t]+ {

   m_BraceIndent++;

-  PRINTF(("%s %d: BEGIN MESSAGE MACRO $(: %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: BEGIN MESSAGE MACRO $(: %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   BEGIN(MESSAGEMACRO);

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE; // Make sure that the previous lines are matched by the bison parser (so that all variables until here are defined)

+  return yy::mhmakeparser::token::NEWLINE; // Make sure that the previous lines are matched by the bison parser (so that all variables until here are defined)

 }

 

  /*---------------------------------------------------------------------------*/

-\$\([ \t]*reparse[ \t]+ {

+\$[\(\{][ \t]*reparse[ \t]+ {

   m_BraceIndent++;

-  PRINTF(("%s %d: BEGIN REPARSE MACRO $(: %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: BEGIN REPARSE MACRO $(: %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   BEGIN(REPARSEMACRO);

   m_curtoken=g_EmptyString;

-  return mhmakeparser::NEWLINE;

-}

-

- /*---------------------------------------------------------------------------*/

-\(   {

-  PRINTF(("%s %d: OPENBRACE: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::OPENBRACE;

-}

-

- /*---------------------------------------------------------------------------*/

-\)   {

-  PRINTF(("%s %d: CLOSEBRACE: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  return mhmakeparser::CLOSEBRACE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

 \$[<@/$] {

-  PRINTF(("%s %d: DOLLAREXPR: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::DOLLAREXPR;

+  PRINTF(("%s %d: DOLLAREXPR: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::DOLLAREXPR;

 }

 

  /*---------------------------------------------------------------------------*/

 [ \t\r]*\n\t[ \t]* {

   /* token newline */

-  PRINTF(("%s %d: NEWLINE\n",m_InputFileName.c_str(),yylineno));

-  yylineno++;

+  PRINTF(("%s %d: NEWLINE\n",m_InputFileName.c_str(),lineno()));

+  inclineno();

   m_curtoken=g_EmptyString;

   BEGIN(COMMANDPARSE);

-  return mhmakeparser::NEWLINE;

+  return yy::mhmakeparser::token::NEWLINE;

 }

 

  /*---------------------------------------------------------------------------*/

-<*>\$\{ {

-  unput('(');

-  unput('$');

-}

- /*---------------------------------------------------------------------------*/

-<*>\} {

-  unput(')');

+[\(\)\{\}] {

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

  /*---------------------------------------------------------------------------*/

 [^\n] {

-  PRINTF(("%s %d: ANYCHAR: %d: %s\n",m_InputFileName.c_str(),yylineno,yylineno,yytext));

+  PRINTF(("%s %d: ANYCHAR: %d: %s\n",m_InputFileName.c_str(),lineno(),lineno(),yytext));

+  throw string("Unexpected character '")+yytext+"' in makefile '" + m_InputFileName + "' at line "+stringify(lineno()) + ", column " + stringify(colno()-1);

 }

 

  /*****************************************************************************/

 

 <COMMANDPARSE>[ \t\r]*\n {

-  PRINTF(("%s %d: COMMAND: %d: %s\n",m_InputFileName.c_str(),yylineno,yylineno,m_curtoken.c_str()));

-  theValue.theString=m_curtoken;

-  yylineno++;

+  PRINTF(("%s %d: COMMAND: %d: %s\n",m_InputFileName.c_str(),lineno(),lineno(),m_curtoken.c_str()));

+  yylval->theString=m_curtoken;

+  inclineno();

   BEGIN(INITIAL);

-  return mhmakeparser::COMMAND;

+  return yy::mhmakeparser::token::COMMAND;

 }

 

  /*---------------------------------------------------------------------------*/

 <COMMANDPARSE>[ \t\r]*\n\t[ \t]* {

-  PRINTF(("%s %d: COMMAND: %s\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str()));

-  theValue.theString=m_curtoken;

-  yylineno++;

+  PRINTF(("%s %d: COMMAND: %s\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str()));

+  yylval->theString=m_curtoken;

+  inclineno();

   m_curtoken=g_EmptyString;

-  return mhmakeparser::COMMAND;

+  return yy::mhmakeparser::token::COMMAND;

 }

 

  /*---------------------------------------------------------------------------*/

 <COMMANDPARSE>[ \t]*\\[ \t\r]*\n[ \t]* {

-  yylineno++;

+  inclineno();

   m_curtoken+=g_SpaceString;

 }

 

@@ -811,9 +820,8 @@ export {
 }

 

  /*---------------------------------------------------------------------------*/

-<COMMANDPARSE>[^ \r\n#\\{}$]+ |

-<COMMANDPARSE>\$ |

-<COMMANDPARSE>\\ {

+<COMMANDPARSE>[^ \r\n#\\$]+ |

+<COMMANDPARSE>[\\\$] {

   m_curtoken+=(const char *)yytext;

 }

 

@@ -827,23 +835,22 @@ export {
 

  /*---------------------------------------------------------------------------*/

 <COMMANDPARSE>[ \t]*#[^\n]* {

-  PRINTF(("%s %d: -COMMENT: %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: -COMMENT: %s\n",m_InputFileName.c_str(),lineno(),yytext));

 }

 

  /*****************************************************************************/

 <QUOTE>\" {

-  PRINTF(("%s %d: QUOTEDSTRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: QUOTEDSTRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

   BEGIN(INITIAL);

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

  /*---------------------------------------------------------------------------*/

 <QUOTE>\r /* skip */

 

-<QUOTE>[^\\\"\r\n{}$]+  |

-<QUOTE>\$            |

-<QUOTE>\\            |

+<QUOTE>[^\\\"\r\n$]+  |

+<QUOTE>[\\\$]    |

 <QUOTE>\\\"          |

 <QUOTE>\\#  {

   yymore();

@@ -851,44 +858,43 @@ export {
 

  /*****************************************************************************/

 <SINGLEQUOTE>\' {

-  PRINTF(("%s %d: QUOTEDSTRING: %s\n",m_InputFileName.c_str(),yylineno,yytext));

+  PRINTF(("%s %d: QUOTEDSTRING: %s\n",m_InputFileName.c_str(),lineno(),yytext));

   BEGIN(INITIAL);

-  theValue.theString=(const char *)yytext;

-  return mhmakeparser::STRING;

+  yylval->theString=(const char *)yytext;

+  return yy::mhmakeparser::token::STRING;

 }

 

  /*---------------------------------------------------------------------------*/

 <SINGLEQUOTE>\r /* skip */

 

-<SINGLEQUOTE>[^\\\'\r\n{}$]+ |

-<SINGLEQUOTE>\$           |

-<SINGLEQUOTE>\\           |

+<SINGLEQUOTE>[^\\\'\r\n$]+ |

+<SINGLEQUOTE>[\\\$]      |

 <SINGLEQUOTE>\\\'         |

 <SINGLEQUOTE>\\# {

   yymore();

 }

 

  /*****************************************************************************/

-<ERRORMACRO>\) {

+<ERRORMACRO>[\)\}] {

   m_BraceIndent--;

-  PRINTF(("%s %d: CLOSE BRACE ERROR MACRO ): %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: CLOSE BRACE ERROR MACRO ): %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   if (!m_BraceIndent)

   {

-    PRINTF(("%s %d: ERRORMACRO: %s\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str()));

-    throw string("\n-> ")+m_InputFileName.c_str()+"("+stringify(yylineno)+") : "+GetParser()->ExpandExpression(m_curtoken);

+    PRINTF(("%s %d: ERRORMACRO: %s\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str()));

+    throw string("\n-> ")+m_InputFileName.c_str()+"("+stringify(lineno())+") : "+GetParser()->ExpandExpression(m_curtoken);

   } else {

     m_curtoken+=(const char *)yytext;

 }

 }

 

  /*****************************************************************************/

-<MESSAGEMACRO>\) {

+<MESSAGEMACRO>[\)\}] {

   m_BraceIndent--;

-  PRINTF(("%s %d: CLOSE BRACE MESSAGE MACRO ): %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: CLOSE BRACE MESSAGE MACRO ): %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   if (!m_BraceIndent)

   {

-    PRINTF(("%s %d: MESSAGEMACRO: %s\n",m_InputFileName.c_str(),yylineno,yytext));

-    cerr<<m_InputFileName.c_str()<<"("<<stringify(yylineno)+") : "<<GetParser()->ExpandExpression(m_curtoken)<<endl;

+    PRINTF(("%s %d: MESSAGEMACRO: %s\n",m_InputFileName.c_str(),lineno(),yytext));

+    cerr<<m_InputFileName.c_str()<<"("<<stringify(lineno())+") : "<<GetParser()->ExpandExpression(m_curtoken)<<endl;

     BEGIN(INITIAL);

   } else {

     m_curtoken+=(const char *)yytext;

@@ -896,14 +902,14 @@ export {
 }

 

  /*****************************************************************************/

-<REPARSEMACRO>\) {

+<REPARSEMACRO>[\)\}] {

   m_BraceIndent--;

-  PRINTF(("%s %d: CLOSE BRACE REPARSE MACRO ): %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: CLOSE BRACE REPARSE MACRO ): %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   if (!m_BraceIndent)

   {

-    PRINTF(("%s %d: REPARSEMACRO: %s\n",m_InputFileName.c_str(),yylineno,yytext));

+    PRINTF(("%s %d: REPARSEMACRO: %s\n",m_InputFileName.c_str(),lineno(),yytext));

     string Deps=GetParser()->ExpandExpression(m_curtoken);

-    PRINTF(("%s %d: REPARSEMACRO expanded: %s\n",m_InputFileName.c_str(),yylineno,Deps.c_str()));

+    PRINTF(("%s %d: REPARSEMACRO expanded: %s\n",m_InputFileName.c_str(),lineno(),Deps.c_str()));

     string::const_reverse_iterator It=Deps.rbegin()+1; // +1 because we don't want the latest brace

     string::const_reverse_iterator ItBeg=Deps.rend();

     while (It!= ItBeg)

@@ -921,16 +927,16 @@ export {
 }

 

  /*****************************************************************************/

-<MAKEEXPRES>\) {

+<MAKEEXPRES>[\)\}] {

   m_BraceIndent--;

-  PRINTF(("%s %d: CLOSE BRACE MAKEEXPRES MACRO ): %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: CLOSE BRACE MAKEEXPRES MACRO ): %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   if (!m_BraceIndent)

   {

     BEGIN(INITIAL);

     m_curtoken+=(const char *)yytext;

-    theValue.theString=m_curtoken;

-    PRINTF(("%s %d: DOLLAREXPR: %s\n",m_InputFileName.c_str(),yylineno,m_curtoken.c_str()));

-    return mhmakeparser::DOLLAREXPR;

+    yylval->theString=m_curtoken;

+    PRINTF(("%s %d: DOLLAREXPR: %s\n",m_InputFileName.c_str(),lineno(),m_curtoken.c_str()));

+    return yy::mhmakeparser::token::DOLLAREXPR;

   }

   else

   {

@@ -939,21 +945,19 @@ export {
 }

 

  /*---------------------------------------------------------------------------*/

-<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>\$\( {

+<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>\$[\(\{] {

   m_BraceIndent++;

-  PRINTF(("%s %d: MACRO extra $(: %d\n",m_InputFileName.c_str(),yylineno,m_BraceIndent));

+  PRINTF(("%s %d: MACRO extra $(: %d\n",m_InputFileName.c_str(),lineno(),m_BraceIndent));

   m_curtoken+=(const char *)yytext;

 }

 

  /*---------------------------------------------------------------------------*/

-<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>[^$\(\){}\r\n\\]+ |

-<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>\$        |

-<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>\\        |

-<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>\( {

+<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>[^$\(\)\{\}\r\n\\]+ |

+<MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>[\(\$\\\{] {

   m_curtoken+=(const char *)yytext;

 }

 <MAKEEXPRES,ERRORMACRO,MESSAGEMACRO,REPARSEMACRO>[ \t\r]*\\[ \t\r]*\n[ \t\r]* {

-  yylineno++;

+  inclineno();

   m_curtoken+=g_SpaceString;

 }

 

@@ -964,7 +968,7 @@ export {
 <<EOF>> {

   if (m_BraceIndent)

   {

-    throw string("Missing closing ) of macro usage in ") + m_InputFileName;

+    throw string("Missing closing ) or } of macro usage in ") + m_InputFileName;

   }

   if (!m_IncludeStack.size())

   {

@@ -979,7 +983,7 @@ export {
     INSTACK *pInStack=m_IncludeStack.top();

     yypop_buffer_state();

     m_InputFileName=pInStack->m_FileName;

-    yylineno=pInStack->yylineno;

+    *yylloc=pInStack->yylloc;

     m_IncludeStack.pop();

   }

 }

diff --git a/tools/mhmake/src/mhmakeparser.y b/tools/mhmake/src/mhmakeparser.y
index 515caf6e5..4c54ebd29 100644
--- a/tools/mhmake/src/mhmakeparser.y
+++ b/tools/mhmake/src/mhmakeparser.y
@@ -20,27 +20,38 @@
 

 /* -------------- declaration section -------------- */

 

-%name mhmakeparser

-

-%define LLOC m_yyloc

-%define LTYPE int            // This is the type of LLOC (defined in mhmakefileparser)

-

-%define LVAL m_theTokenValue

-%define STYPE TOKENVALUE     // This is the type of LVAL (defined in mhmakefileparser)

-

-%define INHERIT : public mhmakefileparser

+%require "2.4.1"

+%defines

+%define parser_class_name "mhmakeparser"

+%define parser_base_class_name "mhmakefileparser"

+%define parser_class_constructor_init ": mhmakefileparser(CommandLineVariables)"

+%define parser_class_constructor_param "const map<string,string> &CommandLineVariables"

+%error-verbose

+

+%code requires {

+#include "mhmakefileparser.h"

+}

 

-%define CONSTRUCTOR_PARAM  const map<string,string> &CommandLineVariables

-%define CONSTRUCTOR_INIT   : mhmakefileparser(CommandLineVariables)

+%code provides {

+const char Test[]="dit is een test";

+}

 

-%header{

+%{

 #include "mhmakefileparser.h"

 #include "rule.h"

 #include "util.h"

 %}

 

+%locations

+%initial-action

+{

+  // Initialize the initial location.

+  @$.initialize(&m_ptheLexer->GetInputFilename());

+};

+

+%token END      0 "end of file"

 %token <theString> COMMAND

-%token <theString> COMMA OPENBRACE CLOSEBRACE

+%token <theString> COMMA

 %token <theString> STRING DOLLAREXPR EQUAL COLON DOUBLECOLON VARDEF VARVAL

 %token IMEQUAL PEQUAL OPTEQUAL PHONY AUTODEPS EXPORT NEWLINE INCLUDEMAK SPACE VPATH

 

@@ -68,6 +79,10 @@ statements :
              | statements statement

 ;

 

+space : SPACE |

+        space SPACE

+;

+

 statement: NEWLINE |

            SPACE |

            includemak |

@@ -161,11 +176,11 @@ autodepsrule: AUTODEPS COLON expression
            NEWLINE

 ;

 

-exportrule: EXPORT SPACE exportstrings NEWLINE

+exportrule: EXPORT space exportstrings NEWLINE

 ;

 

 exportstrings : exportstring |

-                exportstring SPACE exportstrings

+                exportstring space exportstrings

 ;

 

 exportstring : STRING

@@ -175,7 +190,7 @@ exportstring : STRING
                }

 ;

 

-vpathrule: VPATH SPACE nonspaceexpression SPACE expression NEWLINE

+vpathrule: VPATH space nonspaceexpression space expression NEWLINE

            {

              SetvPath(ExpandExpression($3),ExpandExpression($5));

              PRINTF(("Setting vpath %s to %s\n",$3.c_str(),ExpandExpression($5).c_str()));

@@ -203,7 +218,7 @@ imvarassignment: STRING IMEQUAL maybeemptyexpression
 

 pvarassignment: STRING PEQUAL maybeemptyexpression

                {

-                 m_Variables[$1]=m_Variables[$1]+g_SpaceString+$3;

+                 m_Variables[$1]=ExpandVar($1)+g_SpaceString+$3;

                  PRINTF(("Adding to variable %s: %s\n",$1.c_str(), $3.c_str()));

                }

 ;

@@ -220,15 +235,15 @@ optvarassignment: STRING OPTEQUAL maybeemptyexpression
 

 maybeemptyexpression: NEWLINE {$$=g_EmptyString;} |

                       expression NEWLINE |

-                      expression SPACE NEWLINE

+                      expression space NEWLINE

 ;

 

 expression: nonspaceexpression |

-            expression SPACE nonspaceexpression {$$=$1+g_SpaceString+$3;}

+            expression space nonspaceexpression {$$=$1+g_SpaceString+$3;}

 ;

 

 expression_nocolorequal: nonspaceexpression_nocolorequal |

-                         expression_nocolorequal SPACE nonspaceexpression_nocolorequal {$$=$1+g_SpaceString+$3;}

+                         expression_nocolorequal space nonspaceexpression_nocolorequal {$$=$1+g_SpaceString+$3;}

 ;

 

 nonspaceexpression: simpleexpression |

@@ -246,10 +261,14 @@ simpleexpression: simpleexpression_nocolorequal |
                   COMMA

 ;

 

-simpleexpression_nocolorequal: STRING {$$=$1;} |

-                               DOLLAREXPR {$$=$1;}

+simpleexpression_nocolorequal: STRING |

+                               DOLLAREXPR

 ;

 

 %%

 /* -------------- body section -------------- */

 

+void yy::mhmakeparser::error (const yy::mhmakeparser::location_type& l, const std::string& m)

+{

+  cerr << l << " -> "<<m<<endl;

+}

diff --git a/tools/mhmake/src/rule.cpp b/tools/mhmake/src/rule.cpp
index 0beb29c39..35884e2f0 100644
--- a/tools/mhmake/src/rule.cpp
+++ b/tools/mhmake/src/rule.cpp
@@ -23,7 +23,7 @@
 #include "fileinfo.h"

 #include "rule.h"

 #include "util.h"

-#include "mhmakeparser.h"

+#include "mhmakefileparser.h"

 

 refptr<rule> NullRule;

 

diff --git a/tools/mhmake/src/stdafx.h b/tools/mhmake/src/stdafx.h
index 5d1ffedfb..e586ebb6b 100644
--- a/tools/mhmake/src/stdafx.h
+++ b/tools/mhmake/src/stdafx.h
@@ -75,6 +75,12 @@
 #include <sys/stat.h>

 #ifdef WIN32

 #include <windows.h>

+#ifdef max

+#undef max

+#endif

+#ifdef min

+#undef min

+#endif

 #endif

 

 using namespace std;

diff --git a/tools/mhmake/src/util.cpp b/tools/mhmake/src/util.cpp
index 63bdb767b..b1298c91f 100644
--- a/tools/mhmake/src/util.cpp
+++ b/tools/mhmake/src/util.cpp
@@ -22,7 +22,7 @@
 

 #include "rule.h"

 #include "util.h"

-#include "mhmakeparser.h"

+#include "mhmakeparser.hpp"

 

 #ifdef WIN32

 

@@ -114,7 +114,7 @@ void PrintVersionInfo(void)
   static const char VersionStr[]="\

 mhmake : GNU compatible make tool with extensions\n\

 version: "MHMAKEVER"\n\

-Remarks and bug reports -> marha@sourceforge.net\n\

+Remarks and bug reports -> Marc Haesen\n\

 ";

   cerr << VersionStr;

   exit(1);

@@ -593,7 +593,7 @@ void loadedmakefile::LoadMakefile()
     cout << "Loading makefile "<<m_Makefile->GetQuotedFullFileName()<<endl;

   #endif

 

-  m_pParser=refptr<mhmakefileparser>(new mhmakeparser(m_CommandLineVars));

+  m_pParser=refptr<mhmakefileparser>(new yy::mhmakeparser(m_CommandLineVars));

 

   // Add the MAKECMDGOALS environment variable

   string MakeCmdGoals;

@@ -660,7 +660,7 @@ void loadedmakefile::LoadMakefile()
     md5_update(&ctx, (uint8*)m_Makefile->GetFullFileName().c_str(), m_Makefile->GetFullFileName().size());

 

     char ID[10];

-    sprintf(ID,"_%x",md5_finish32( &ctx));

+    sprintf(ID,"_%lx",md5_finish32( &ctx));

 

     pDepFile=GetFileInfo(string(".") + m_Makefile->GetName()+ ".dep"+ID,m_MakeDir);

     m_pParser->SetVariable(AUTODEPFILE,pDepFile->GetQuotedFullFileName());

diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 8676bd0d6..648ca01ee 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,7 +50,7 @@
 #define PLATFORM     "linux"

 #endif

 

-#define MHMAKEVER    "2.3.17"

+#define MHMAKEVER    "2.3.28"

 

 class makecommand

 {

diff --git a/tools/mhmake/ylwrap b/tools/mhmake/ylwrap
deleted file mode 100644
index e69de29bb..000000000
--- a/tools/mhmake/ylwrap
+++ /dev/null