diff --git a/COPYING b/COPYING
index d60c31a..94a9ed0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,285 +1,626 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+ 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
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+ 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 give the recipients all the rights that
-you have. 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.
+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.
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+ 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.
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+ 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.
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+ 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.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
+ TERMS AND CONDITIONS
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+ 0. Definitions.
- 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+ "This License" refers to version 3 of the GNU General Public License.
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+ "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.
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
+ 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.
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+ 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.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+ 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.
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+ 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.
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+ 1. Source Code.
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
+ 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.
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
+ 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.
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
+ 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 source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+ 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.
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+ The Corresponding Source for a work in source code form is that
+same work.
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+ 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.
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+ 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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+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.
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+ 13. Use with the GNU Affero General Public License.
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+ 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.
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+ 14. Revised Versions of this License.
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
+ 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+ 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.
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+ 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.
- NO WARRANTY
+ 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.
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+ 15. Disclaimer of Warranty.
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE 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.
+ 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.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ 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
@@ -287,15 +628,15 @@ 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
-convey the exclusion of warranty; and each file should have at least
+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.
Copyright (C)
- This program is free software; you can redistribute it and/or modify
+ 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
+ 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,
@@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
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
-
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ Copyright (C)
+ 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+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 your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
+ 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
+.
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This 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 Library General
-Public License instead of this License.
+ 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
+.
diff --git a/INSTALL b/INSTALL
index 5458714..d3c5b40 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
diff --git a/Makefile.am b/Makefile.am
index b6e5f2e..cbca5d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\"
dist-hook:
- make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
+ $(MAKE) THANKS
echo ${VERSION} >$(distdir)/release
install-root:
@@ -28,13 +28,6 @@ test test-debug:
cd plugins && $(MAKE) $@
cd plugins-scripts && $(MAKE) $@
-nagios-plugins.spec: nagios-plugins.spec.in
- sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
-
-pkg/fedora/nagios-plugins.spec: nagios-plugins.spec.in
- $(top_srcdir)/mkinstalldirs pkg/fedora
- sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;/^# Requires$$/r $(top_srcdir)/pkg/fedora/requires" $? > $@
-
# Solaris pkgmk
BUILDDIR = build-solaris
PACKDIR = build-pkg
@@ -45,7 +38,9 @@ solpkg:
if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
$(MAKE) all
$(MAKE) DESTDIR=$$PWD/$(BUILDDIR) install
+ $(INSTALL) plugins-root/pst3 $(BUILDDIR)$(libexecdir)
$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
+ $(INSTALL) pkg/solaris/preinstall $(BUILDDIR)
cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
THANKS: THANKS.in
diff --git a/Makefile.in b/Makefile.in
index 2dd7ee8..a107cae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -34,13 +34,14 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/command.cfg.in \
- $(srcdir)/config.h.in $(srcdir)/test.pl.in \
- $(top_srcdir)/configure $(top_srcdir)/pkg/solaris/pkginfo.in \
- ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS THANKS \
- build-aux/compile build-aux/config.guess \
- build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
- build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
- build-aux/mkinstalldirs config.rpath mkinstalldirs
+ $(srcdir)/config.h.in $(srcdir)/nagios-plugins.spec.in \
+ $(srcdir)/test.pl.in $(top_srcdir)/configure \
+ $(top_srcdir)/pkg/solaris/pkginfo.in ABOUT-NLS AUTHORS COPYING \
+ ChangeLog INSTALL NEWS THANKS build-aux/compile \
+ build-aux/config.guess build-aux/config.rpath \
+ build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+ build-aux/ltmain.sh build-aux/missing build-aux/mkinstalldirs \
+ config.rpath mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
$(top_srcdir)/gl/m4/00gnulib.m4 $(top_srcdir)/gl/m4/alloca.m4 \
@@ -138,7 +139,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = command.cfg test.pl pkg/solaris/pkginfo
+CONFIG_CLEAN_FILES = nagios-plugins.spec command.cfg test.pl \
+ pkg/solaris/pkginfo
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -1057,6 +1059,8 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
+nagios-plugins.spec: $(top_builddir)/config.status $(srcdir)/nagios-plugins.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
command.cfg: $(top_builddir)/config.status $(srcdir)/command.cfg.in
cd $(top_builddir) && $(SHELL) ./config.status $@
test.pl: $(top_builddir)/config.status $(srcdir)/test.pl.in
@@ -1148,8 +1152,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1174,8 +1178,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1185,13 +1189,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -1265,6 +1268,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -1291,6 +1298,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -1442,22 +1451,22 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am
dist-hook:
- make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
+ $(MAKE) THANKS
echo ${VERSION} >$(distdir)/release
install-root:
@@ -1469,19 +1478,14 @@ test test-debug:
cd plugins && $(MAKE) $@
cd plugins-scripts && $(MAKE) $@
-nagios-plugins.spec: nagios-plugins.spec.in
- sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;s/^%%{requires}$$//" $? > $@
-
-pkg/fedora/nagios-plugins.spec: nagios-plugins.spec.in
- $(top_srcdir)/mkinstalldirs pkg/fedora
- sed "s/%%{VERSION}/${VERSION}/;s/%%{RELEASE}/${RELEASE}/;/^# Requires$$/r $(top_srcdir)/pkg/fedora/requires" $? > $@
-
solpkg:
if [ ! -d $(BUILDDIR) ] ; then mkdir $(BUILDDIR); fi
if [ ! -d $(PACKDIR) ] ; then mkdir $(PACKDIR); fi
$(MAKE) all
$(MAKE) DESTDIR=$$PWD/$(BUILDDIR) install
+ $(INSTALL) plugins-root/pst3 $(BUILDDIR)$(libexecdir)
$(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
+ $(INSTALL) pkg/solaris/preinstall $(BUILDDIR)
cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
THANKS: THANKS.in
diff --git a/NEWS b/NEWS
index ff92401..7452a6b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,31 @@
This file documents the major additions and syntax changes between releases.
+...
+ ENHANCEMENTS
+ check_nt UPTIME accepts warning/critical thresholds (Ryan Kelly)
+ check_disk_smb now allows spaces in share names (#990948, #1370031, Debian #601699)
+ check_http now uses standard threshold functions (enables floating point and ranges)
+ check_http now checks for and prints the certificate cn (hostname) in SSL certificate checks (Stéphane Urbanovski)
+ check_http now supports an optional -S/--ssl value to choose the SSL protocol version (#3066166 - Jason Lunn)
+ Add perfdata to check_ssh (#3244097 - Marco Beck)
+ New option to check_smtp to ignore failures when sending QUIT (#3358348 - Duncan Ferguson)
+ New check_by_ssh -F option which allows for specifying an alternative ssh_config(5) file (#2895334 - Sven Nierlein)
+ check_sensors now detects faulty sensors unless --ignore-fault is specified (Jan Wagner)
+ utils.sh now provides a check_range function (Alex Griffin)
+ Improved the performance of check_users (Marc Remy)
+ Updated Nagios::Plugin perl module
+
+ FIXES
+ Fix check_disk free space calculation if blocksizes differ within a disk group (Bekar - #2973603)
+ check_disk_smb now handles NT_STATUS_ACCESS_DENIED properly (Debian #601696)
+ Make check_snmp work more like v1.4.14 with regard to using special values (Timeticks, STRING) as numeric thresholds
+ Fix check_ldap overriding the port when --ssl was specified after -p
+ Fix check_procs where regex input of '|' would get displayed in output - now replaced with ','
+ Fix segfault in check_host when hostname returns multiple IP addresses (Sebastian Harl)
+ Fix check_smtp and check_tcp where duplicate messages were displayed for certificate errors
+ Fix check_ping's parsing of the output of Debian's ping6(1) implementation (#1894850 - Matej Vela)
+ Disable RFC4507 support, to work around SSL negotiation issues with (at least) some Tomcat versions
+
1.4.15 27th July 2010
ENHANCEMENTS
New check_ntp_peer -m and -n options to check the number of usable time sources ("truechimers")
diff --git a/THANKS b/THANKS
index 63cab6a..df564f1 100644
--- a/THANKS
+++ b/THANKS
@@ -23,6 +23,7 @@ Michael Bakker
Nobuhiro Ban
John Barbuto
Jeremy Baumgartner
+Marco Beck
Andreas Behal
Lutz Behnke
Marlo Bell
@@ -99,12 +100,14 @@ Aravind Gottipati
Kev Green
Steve Greenland
Olaf Greis
+Alex Griffin
Chris Grim
Steven Grimm
Sebastien Guay
Jon Hallett
Steve Hanselman
Ask Bjoern Hansen
+Sebastian Harl
Michael Haro
Olli Hauer
Gunnar Hellekson
@@ -124,6 +127,7 @@ Nikita Kalabukhov
Frank Kannemann
Roy Sigurd Karlsbakk
Jason Kau
+Ryan Kelly
Bo Kersey
Konstantin Khomoutov
Serhan Kiymaz
@@ -145,6 +149,7 @@ Craig Leres
Jan Lipphaus
Larry Low
Jacob Lundqvist
+Jason Lunn
Guenther Mair
Pawel Malachowski
Michael Markstaller
@@ -197,6 +202,7 @@ Olivier 'Babar' Raginel
Phil Randal
Abid Rasheed
Jeremy Reed
+Marc Remy
Alessandro Ren
Joe Rhett
Cliff Rice
@@ -242,10 +248,12 @@ Ibere Tizio
Julien Touche
Kyle Tucker
Jerome Tytgat
+Stéphane Urbanovski
Matthias Urlichs
Matteo HCE Valsasna
Jon Vandegrift
Laurent Vaslin
+Matej Vela
Carole Verdon
Ludse Verhoeven
Robert August Vincent
diff --git a/aclocal.m4 b/aclocal.m4
index affb499..0507386 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,6667 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 52 Debian 1.5.26-4+lenny1 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+ [],
+ [m4_define([AC_PROVIDE_IFELSE],
+ [m4_ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [AC_LIBTOOL_CXX],
+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+ ])])
+dnl And a similar setup for Fortran 77 support
+ AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [AC_LIBTOOL_F77],
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+ [AC_LIBTOOL_GCJ],
+ [ifdef([AC_PROG_GCJ],
+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([A][M_PROG_GCJ],
+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+ ifdef([LT_AC_PROG_GCJ],
+ [define([LT_AC_PROG_GCJ],
+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# 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']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ AC_PATH_MAGIC
+ fi
+ ;;
+esac
+
+_LT_REQUIRED_DARWIN_CHECKS
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
+
+AC_ARG_ENABLE([libtool-lock],
+ [AC_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+AC_ARG_WITH([pic],
+ [AC_HELP_STRING([--with-pic],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+ [pic_mode="$withval"],
+ [pic_mode=default])
+test -z "$pic_mode" && pic_mode=default
+
+# Use C for the default configuration in the libtool script
+tagname=
+AC_LIBTOOL_LANG_C_CONFIG
+_LT_AC_TAGCONFIG
+])# AC_LIBTOOL_SETUP
+
+
+# _LT_AC_SYS_COMPILER
+# -------------------
+AC_DEFUN([_LT_AC_SYS_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_AC_SYS_COMPILER
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+ [lt_cv_apple_cc_single_mod=no
+ if test -z "${LT_MULTI_MODULE}"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ echo "int foo(void){return 1;}" > conftest.c
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib ${wl}-single_module conftest.c
+ if test -f libconftest.dylib; then
+ lt_cv_apple_cc_single_mod=yes
+ rm -rf libconftest.dylib*
+ fi
+ rm conftest.c
+ fi])
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
+ ])
+ case $host_os in
+ rhapsody* | darwin1.[[0123]])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*)
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ else
+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ fi
+ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+])
+
+# _LT_AC_SYS_LIBPATH_AIX
+# ----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\(.*\)$/\1/
+ p
+ }
+ }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_AC_SYS_LIBPATH_AIX
+
+
+# _LT_AC_SHELL_INIT(ARG)
+# ----------------------
+AC_DEFUN([_LT_AC_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+ [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_AC_SHELL_INIT
+
+
+# _LT_AC_PROG_ECHO_BACKSLASH
+# --------------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+[_LT_AC_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$ECHO in
+X*--fallback-echo)
+ # Remove one level of quotation (which was required for Make).
+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+ ;;
+esac
+
+echo=${ECHO-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.
+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat </dev/null 2>&1 && unset CDPATH
+
+if test -z "$ECHO"; then
+if test "X${echo_test_string+set}" != Xset; then
+# find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+ fi
+ done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
+
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ echo="$dir/echo"
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # This shell has a builtin print -r that does the trick.
+ echo='print -r'
+ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+ test "X$CONFIG_SHELL" != X/bin/ksh; then
+ # If we have ksh, try running configure again with it.
+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+ export ORIGINAL_CONFIG_SHELL
+ CONFIG_SHELL=/bin/ksh
+ export CONFIG_SHELL
+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ else
+ # Try using printf.
+ echo='printf %s\n'
+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ # Cool, printf works
+ :
+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+ export CONFIG_SHELL
+ SHELL="$CONFIG_SHELL"
+ export SHELL
+ echo="$CONFIG_SHELL [$]0 --fallback-echo"
+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+ test "X$echo_testing_string" = 'X\t' &&
+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ echo="$CONFIG_SHELL [$]0 --fallback-echo"
+ else
+ # maybe with a smaller string...
+ prev=:
+
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+ then
+ break
+ fi
+ prev="$cmd"
+ done
+
+ if test "$prev" != 'sed 50q "[$]0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+ else
+ # Oops. We lost completely, so just stick with echo.
+ echo=echo
+ fi
+ fi
+ fi
+ fi
+fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
+
+
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+ [AC_HELP_STRING([--disable-libtool-lock],
+ [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE="32"
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ ppc*-*linux*|powerpc*-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+ [AC_LANG_PUSH(C)
+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+ AC_LANG_POP])
+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+ ])
+esac
+
+need_locks="$enable_libtool_lock"
+
+])# _LT_AC_LOCK
+
+
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+ $rm conftest*
+])
+
+if test x"[$]$2" = xyes; then
+ ifelse([$5], , :, [$5])
+else
+ ifelse([$6], , :, [$6])
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+
+
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ else
+ $2=yes
+ fi
+ fi
+ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+ ifelse([$4], , :, [$4])
+else
+ ifelse([$5], , :, [$5])
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+
+
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+[# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
+
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ lt_cv_sys_max_cmd_len=$new_result &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on massive
+ # amounts of additional arguments before passing them to the linker.
+ # It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
+ ;;
+ esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+ AC_MSG_RESULT(none)
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+
+
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
+
+
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+ [$4]
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <
+#endif
+
+#include
+
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+
+ exit (status);
+}]
+EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+ $3
+ fi
+fi
+rm -fr conftest*
+])# _LT_AC_TRY_DLOPEN_SELF
+
+
+# AC_LIBTOOL_DLOPEN_SELF
+# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32*)
+ lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+ lt_cv_dlopen="dyld"
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+ ])
+ ])
+ ;;
+ esac
+
+ if test "x$lt_cv_dlopen" != xno; then
+ enable_dlopen=yes
+ else
+ enable_dlopen=no
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS="$CPPFLAGS"
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK([whether a program can dlopen itself],
+ lt_cv_dlopen_self, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
+ ])
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
+ ;;
+ esac
+
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
+])# AC_LIBTOOL_DLOPEN_SELF
+
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+ $rm -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+ $rm out/* && rmdir out
+ cd ..
+ rmdir conftest
+ $rm conftest*
+])
+])# AC_LIBTOOL_PROG_CC_C_O
+
+
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+# -----------------------------------------
+# Check to see if we can do hard links to lock some files if needed
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
+
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+ # do not overwrite the value of need_locks provided by the user
+ AC_MSG_CHECKING([if we can lock with hard links])
+ hard_links=yes
+ $rm conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ AC_MSG_RESULT([$hard_links])
+ if test "$hard_links" = no; then
+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+
+
+# AC_LIBTOOL_OBJDIR
+# -----------------
+AC_DEFUN([AC_LIBTOOL_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
+
+
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_AC_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+ # Linking always hardcodes the temporary library directory.
+ _LT_AC_TAGVAR(hardcode_action, $1)=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+[striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+fi
+ ;;
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+ esac
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
+
+
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
+if test "$GCC" = yes; then
+ case $host_os in
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+ else
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo="/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+ if test "$host_cpu" = ia64; then
+ # AIX 5 supports IA64
+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line `#! .'. This would cause the generated library to
+ # depend on `.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[[01]] | aix4.[[01]].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+ echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ if test "$aix_use_runtimelinking" = yes; then
+ # If using run time linking (on AIX 4.2 or later) use lib.so
+ # instead of lib.a to let people know that these are not
+ # typical AIX shared libraries.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ else
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+ library_names_spec='${libname}${release}.a $libname.a'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+
+amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+
+cygwin* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \${file}`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+ shlibpath_overrides_runpath=yes
+
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+ # It is most probably a Windows format PATH printed by
+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
+ # path with ; separators, and with drive letters. We can handle the
+ # drive letters (cygwin fileutils understands them), so leave them,
+ # especially as we might pass files found there to a mingw objdump,
+ # which wouldn't understand a cygwinified path. Ahh.
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+ m4_if([$1], [],[
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+freebsd1*)
+ dynamic_linker=no
+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[[123]]*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ need_version=yes
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
+
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ ;;
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ if test "X$HPUX_IA64_MODE" = X32; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ fi
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
+interix[[3-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+ version_type=linux
+ else
+ version_type=irix
+ fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ hardcode_into_libs=yes
+ ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case $host_os in
+ openbsd2.[[89]] | openbsd2.[[89]].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ shlibpath_overrides_runpath=yes
+ fi
+ ;;
+
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test "$with_gnu_ld" = yes; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ export_dynamic_flag_spec='${wl}-Blargedynsym'
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ hardcode_into_libs=yes
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ shlibpath_overrides_runpath=yes
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+# _LT_AC_TAGCONFIG
+# ----------------
+AC_DEFUN([_LT_AC_TAGCONFIG],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+
+if test -f "$ltmain" && test -n "$tagnames"; then
+ if test ! -f "${ofile}"; then
+ AC_MSG_WARN([output file `$ofile' does not exist])
+ fi
+
+ if test -z "$LTCC"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+ if test -z "$LTCC"; then
+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+ else
+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+ fi
+ if test -z "$LTCFLAGS"; then
+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+ fi
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for tagname in $tagnames; do
+ IFS="$lt_save_ifs"
+ # Check whether tagname contains only valid characters
+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+ "") ;;
+ *) AC_MSG_ERROR([invalid tag name: $tagname])
+ ;;
+ esac
+
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+ then
+ AC_MSG_ERROR([tag name \"$tagname\" already exists])
+ fi
+
+ # Update the list of available tags.
+ if test -n "$tagname"; then
+ echo appending configuration tag \"$tagname\" to $ofile
+
+ case $tagname in
+ CXX)
+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+ fi
+ ;;
+
+ F77)
+ if test -n "$F77" && test "X$F77" != "Xno"; then
+ AC_LIBTOOL_LANG_F77_CONFIG
+ else
+ tagname=""
+ fi
+ ;;
+
+ GCJ)
+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ AC_LIBTOOL_LANG_GCJ_CONFIG
+ else
+ tagname=""
+ fi
+ ;;
+
+ RC)
+ AC_LIBTOOL_LANG_RC_CONFIG
+ ;;
+
+ *)
+ AC_MSG_ERROR([Unsupported tag name: $tagname])
+ ;;
+ esac
+
+ # Append the new tag name to the list of available tags.
+ if test -n "$tagname" ; then
+ available_tags="$available_tags $tagname"
+ fi
+ fi
+ done
+ IFS="$lt_save_ifs"
+
+ # Now substitute the updated list of available tags.
+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+ mv "${ofile}T" "$ofile"
+ chmod +x "$ofile"
+ else
+ rm -f "${ofile}T"
+ AC_MSG_ERROR([unable to update list of available tagged configurations.])
+ fi
+fi
+])# _LT_AC_TAGCONFIG
+
+
+# AC_LIBTOOL_DLOPEN
+# -----------------
+# enable checks for dlopen support
+AC_DEFUN([AC_LIBTOOL_DLOPEN],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_DLOPEN
+
+
+# AC_LIBTOOL_WIN32_DLL
+# --------------------
+# declare package support for building win32 DLLs
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+])# AC_LIBTOOL_WIN32_DLL
+
+
+# AC_ENABLE_SHARED([DEFAULT])
+# ---------------------------
+# implement the --enable-shared flag
+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_SHARED],
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([shared],
+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+ [p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+])# AC_ENABLE_SHARED
+
+
+# AC_DISABLE_SHARED
+# -----------------
+# set the default shared flag to --disable-shared
+AC_DEFUN([AC_DISABLE_SHARED],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_SHARED(no)
+])# AC_DISABLE_SHARED
+
+
+# AC_ENABLE_STATIC([DEFAULT])
+# ---------------------------
+# implement the --enable-static flag
+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_STATIC],
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([static],
+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+ [p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+])# AC_ENABLE_STATIC
+
+
+# AC_DISABLE_STATIC
+# -----------------
+# set the default static flag to --disable-static
+AC_DEFUN([AC_DISABLE_STATIC],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_STATIC(no)
+])# AC_DISABLE_STATIC
+
+
+# AC_ENABLE_FAST_INSTALL([DEFAULT])
+# ---------------------------------
+# implement the --enable-fast-install flag
+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE([fast-install],
+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+ [p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac],
+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+])# AC_ENABLE_FAST_INSTALL
+
+
+# AC_DISABLE_FAST_INSTALL
+# -----------------------
+# set the default to --disable-fast-install
+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_ENABLE_FAST_INSTALL(no)
+])# AC_DISABLE_FAST_INSTALL
+
+
+# AC_LIBTOOL_PICMODE([MODE])
+# --------------------------
+# implement the --with-pic flag
+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+AC_DEFUN([AC_LIBTOOL_PICMODE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+pic_mode=ifelse($#,1,$1,default)
+])# AC_LIBTOOL_PICMODE
+
+
+# AC_PROG_EGREP
+# -------------
+# This is predefined starting with Autoconf 2.54, so this conditional
+# definition can be removed once we require Autoconf 2.54 or later.
+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+ then ac_cv_prog_egrep='grep -E'
+ else ac_cv_prog_egrep='egrep'
+ fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])])
+
+
+# AC_PATH_TOOL_PREFIX
+# -------------------
+# find a file program which can recognize shared library
+AC_DEFUN([AC_PATH_TOOL_PREFIX],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] | ?:[\\/]*])
+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD="$MAGIC_CMD"
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word. This closes a longstanding sh security hole.
+ ac_dummy="ifelse([$2], , $PATH, [$2])"
+ for ac_dir in $ac_dummy; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$1; then
+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+EOF
+ fi ;;
+ esac
+ fi
+ break
+ fi
+ done
+ IFS="$lt_save_ifs"
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+ AC_MSG_RESULT($MAGIC_CMD)
+else
+ AC_MSG_RESULT(no)
+fi
+])# AC_PATH_TOOL_PREFIX
+
+
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
+AC_DEFUN([AC_PATH_MAGIC],
+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+ else
+ MAGIC_CMD=:
+ fi
+fi
+])# AC_PATH_MAGIC
+
+
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AC_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+ [AC_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])
+AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by $CC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
+ ;;
+
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+ ;;
+
+interix[[3-9]]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+ fi
+ ;;
+
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+nto-qnx*)
+ lt_cv_deplibs_check_method=unknown
+ ;;
+
+openbsd*)
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
+osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+])# AC_DEPLIBS_CHECK_METHOD
+
+
+# AC_PROG_NM
+# ----------
+# find the pathname to a BSD-compatible name lister
+AC_DEFUN([AC_PROG_NM],
+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+[if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+else
+ lt_nm_to_check="${ac_tool_prefix}nm"
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm="$ac_dir/$lt_tmp_nm"
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+ */dev/null* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+ done
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+fi])
+NM="$lt_cv_path_NM"
+])# AC_PROG_NM
+
+
+# AC_CHECK_LIBM
+# -------------
+# check for math library
+AC_DEFUN([AC_CHECK_LIBM],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+*-ncr-sysv4.3*)
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ ;;
+*)
+ AC_CHECK_LIB(m, cos, LIBM="-lm")
+ ;;
+esac
+])# AC_CHECK_LIBM
+
+
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-convenience to the configure arguments. Note that
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!). If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+ "") enable_ltdl_convenience=yes
+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+ esac
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
+
+
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
+# LTDLINCL to the include flags for the libltdl header and adds
+# --enable-ltdl-install to the configure arguments. Note that
+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!). If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_CHECK_LIB(ltdl, lt_dlinit,
+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+ [if test x"$enable_ltdl_install" = xno; then
+ AC_MSG_WARN([libltdl not installed, but installation disabled])
+ else
+ enable_ltdl_install=yes
+ fi
+ ])
+ if test x"$enable_ltdl_install" = x"yes"; then
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ LTDLINCL=
+ fi
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
+
+
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
+AC_DEFUN([AC_LIBTOOL_CXX],
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
+
+
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
+
+# AC_LIBTOOL_F77
+# --------------
+# enable support for Fortran 77 libraries
+AC_DEFUN([AC_LIBTOOL_F77],
+[AC_REQUIRE([_LT_AC_LANG_F77])
+])# AC_LIBTOOL_F77
+
+
+# _LT_AC_LANG_F77
+# ---------------
+AC_DEFUN([_LT_AC_LANG_F77],
+[AC_REQUIRE([AC_PROG_F77])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+])# _LT_AC_LANG_F77
+
+
+# AC_LIBTOOL_GCJ
+# --------------
+# enable support for GCJ libraries
+AC_DEFUN([AC_LIBTOOL_GCJ],
+[AC_REQUIRE([_LT_AC_LANG_GCJ])
+])# AC_LIBTOOL_GCJ
+
+
+# _LT_AC_LANG_GCJ
+# ---------------
+AC_DEFUN([_LT_AC_LANG_GCJ],
+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+])# _LT_AC_LANG_GCJ
+
+
+# AC_LIBTOOL_RC
+# -------------
+# enable support for Windows resource files
+AC_DEFUN([AC_LIBTOOL_RC],
+[AC_REQUIRE([LT_AC_PROG_RC])
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+])# AC_LIBTOOL_RC
+
+
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined. Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+[lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_DLOPEN_SELF
+
+# Report which library types will actually be built
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+
+aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_C_CONFIG
+
+
+# AC_LIBTOOL_LANG_CXX_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined. Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
+_LT_AC_TAGVAR(predeps, $1)=
+_LT_AC_TAGVAR(postdeps, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_LD=$LD
+lt_save_GCC=$GCC
+GCC=$GXX
+lt_save_with_gnu_ld=$with_gnu_ld
+lt_save_path_LD=$lt_cv_path_LD
+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+else
+ $as_unset lt_cv_prog_gnu_ld
+fi
+if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+else
+ $as_unset lt_cv_path_LD
+fi
+test -z "${LDCXX+set}" || LD=$LDCXX
+CC=${CXX-"c++"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
+if test "$GXX" = yes; then
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+else
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+
+if test "$GXX" = yes; then
+ # Set up default GNU C++ configuration
+
+ AC_PROG_LD
+
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='${wl}'
+
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+ grep 'no-whole-archive' > /dev/null; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ with_gnu_ld=no
+ wlarc=
+
+ # A generic and very simple default shared library creation
+ # command for GNU C++ for the case where it uses the native
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+else
+ GXX=no
+ with_gnu_ld=no
+ wlarc=
+fi
+
+# PORTME: fill in a description of your system's C++ link characteristics
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+case $host_os in
+ aix3*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+ aix_use_runtimelinking=yes
+ break
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ _LT_AC_TAGVAR(archive_cmds, $1)=''
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
+ ;;
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ chorus*)
+ case $cc_basename in
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ darwin* | rhapsody*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ fi
+ ;;
+
+ dgux*)
+ case $cc_basename in
+ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ freebsd-elf*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+ gnu*)
+ ;;
+ hpux9*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*) ;;
+ *)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+ # but as the default
+ # location of the library.
+ ;;
+ esac
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+ # SGI C++
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ fi
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+ esac
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+ icpc*)
+ # Intel C++
+ with_gnu_ld=yes
+ # version 8.0 and above of icpc choke on multiply defined symbols
+ # if we add $predep_objects and $postdep_objects, however 7.1 and
+ # earlier do not add the objects themselves.
+ case `$CC -V 2>&1` in
+ *"Version 7."*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ *) # Version 8.0 or newer
+ tmp_idyn=
+ case $host_cpu in
+ ia64*) tmp_idyn=' -i_dynamic';;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ lynxos*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ m88k*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ mvs*)
+ case $cc_basename in
+ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ fi
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
+ openbsd2*)
+ # C++ shared libraries are fairly broken
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+ output_verbose_link_cmd='echo'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ osf3*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Archives containing C++ object files must be created using
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+ psos*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+ solaris*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
+ *)
+ # GNU C++ compiler with Solaris linker
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | grep -v '^2\.7' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ # So that behaviour is only enabled if SCOABSPATH is set to a
+ # non-empty value in the environment. Most likely only useful for
+ # creating official distributions of packages.
+ # This is a hack until libtool officially supports absolute path
+ # names for shared libraries.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+ tandem*)
+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ ;;
+ vxworks*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+esac
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
+LD=$lt_save_LD
+GCC=$lt_save_GCC
+with_gnu_ldcxx=$with_gnu_ld
+with_gnu_ld=$lt_save_with_gnu_ld
+lt_cv_path_LDCXX=$lt_cv_path_LD
+lt_cv_path_LD=$lt_save_path_LD
+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library. It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ #
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+solaris*)
+ case $cc_basename in
+ CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+ # -library=stlport4 depends on it.
+ case " $CXX $CXXFLAGS " in
+ *" -library=stlport4 "*)
+ solaris_use_stlport4=yes
+ ;;
+ esac
+
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+ if test "$solaris_use_stlport4" != yes; then
+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+esac
+])
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
+
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined. Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
+
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_direct, $1)=no
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(module_cmds, $1)=
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="\
+ program t
+ end
+"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
+
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
+aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+ ;;
+esac
+AC_MSG_RESULT([$enable_shared])
+
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
+
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
+
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
+
+
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
+# suitably defined. Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+AC_LIBTOOL_PROG_LD_SHLIBS($1)
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_GCJ_CONFIG
+
+
+# AC_LIBTOOL_LANG_RC_CONFIG
+# -------------------------
+# Ensure that the configuration vars for the Windows resource compiler are
+# suitably defined. Those variables are subsequently used by
+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+[AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${RC-"windres"}
+compiler=$CC
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+AC_LIBTOOL_CONFIG($1)
+
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_RC_CONFIG
+
+
+# AC_LIBTOOL_CONFIG([TAGNAME])
+# ----------------------------
+# If TAGNAME is not passed, then create an initial libtool script
+# with a default configuration from the untagged config vars. Otherwise
+# add code to config.status for appending the configuration named by
+# TAGNAME from the matching tagged config vars.
+AC_DEFUN([AC_LIBTOOL_CONFIG],
+[# The else clause should only fire when bootstrapping the
+# libtool distribution, otherwise you forgot to ship ltmain.sh
+# with your package, and you will get complaints that there are
+# no rules to generate ltmain.sh.
+if test -f "$ltmain"; then
+ # See if we are running on zsh, and set the options which allow our commands through
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+ old_postinstall_cmds old_postuninstall_cmds \
+ _LT_AC_TAGVAR(compiler, $1) \
+ _LT_AC_TAGVAR(CC, $1) \
+ _LT_AC_TAGVAR(LD, $1) \
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+ _LT_AC_TAGVAR(old_archive_cmds, $1) \
+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+ _LT_AC_TAGVAR(predep_objects, $1) \
+ _LT_AC_TAGVAR(postdep_objects, $1) \
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+ _LT_AC_TAGVAR(no_undefined_flag, $1) \
+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+ _LT_AC_TAGVAR(hardcode_automatic, $1) \
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+ case $var in
+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+ _LT_AC_TAGVAR(archive_cmds, $1) | \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_cmds, $1) | \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+ postinstall_cmds | postuninstall_cmds | \
+ old_postinstall_cmds | old_postuninstall_cmds | \
+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+ # Double-quote double-evaled strings.
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ ;;
+ *)
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+ ;;
+ esac
+ done
+
+ case $lt_echo in
+ *'\[$]0 --fallback-echo"')
+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+ ;;
+ esac
+
+ifelse([$1], [],
+ [cfgfile="${ofile}T"
+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+ $rm -f "$cfgfile"
+ AC_MSG_NOTICE([creating $ofile])],
+ [cfgfile="$ofile"])
+
+ cat <<__EOF__ >> "$cfgfile"
+ifelse([$1], [],
+[#! $SHELL
+
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit , 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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.
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="$SED -e 1s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# The names of the tagged configurations supported by this script.
+available_tags=
+
+# ### BEGIN LIBTOOL CONFIG],
+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A C compiler.
+LTCC=$lt_LTCC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_LTCFLAGS
+
+# A language-specific compiler.
+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+# Is the compiler the GNU C compiler?
+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# The linker used to build libraries.
+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+
+# Whether we need hard or soft links.
+LN_S=$lt_LN_S
+
+# A BSD-compatible nm program.
+NM=$lt_NM
+
+# A symbol stripping program
+STRIP=$lt_STRIP
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=$MAGIC_CMD
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin: object dumper.
+OBJDUMP="$OBJDUMP"
+
+# Used on cygwin: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+
+# Object file suffix (normally "o").
+objext="$ac_objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
+
+# Executable file suffix (normally "").
+exeext="$exeext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
+
+# What is the maximum length of a command?
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$lt_RANLIB
+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+
+# Commands used to build and install a shared archive.
+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+postinstall_cmds=$lt_postinstall_cmds
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd=$lt_file_magic_cmd
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$lt_finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+# If ld is used when linking, flag to hardcode \$libdir into
+# a binary during linking. This must work even if \$libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+
+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="$variables_saved_for_relink"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to yes if exported symbols are required.
+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+
+# Symbols that must always be exported.
+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+
+ifelse([$1],[],
+[# ### END LIBTOOL CONFIG],
+[# ### END LIBTOOL TAG CONFIG: $tagname])
+
+__EOF__
+
+ifelse([$1],[], [
+ case $host_os in
+ aix3*)
+ cat <<\EOF >> "$cfgfile"
+
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+EOF
+ ;;
+ esac
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" || \
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+])
+else
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
+ # libtool script then.
+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+ if test -f "$ltmain_in"; then
+ test -f Makefile && make "$ltmain"
+ fi
+fi
+])# AC_LIBTOOL_CONFIG
+
+
+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+ lt_cv_prog_compiler_rtti_exceptions,
+ [-fno-rtti -fno-exceptions], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+
+
+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+# ---------------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+[AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
+AC_REQUIRE([AC_PROG_NM])
+AC_REQUIRE([AC_OBJEXT])
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Transform an extracted symbol line into a proper C declaration
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+ symcode='[[BCDT]]'
+ ;;
+cygwin* | mingw* | pw32*)
+ symcode='[[ABCDGISTW]]'
+ ;;
+hpux*) # Its linker distinguishes data from code symbols
+ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDEGRST]]'
+ fi
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
+linux* | k*bsd*-gnu)
+ if test "$host_cpu" = ia64; then
+ symcode='[[ABCDGIRSTW]]'
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ fi
+ ;;
+irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+osf*)
+ symcode='[[BCDEGQRST]]'
+ ;;
+solaris*)
+ symcode='[[BDRT]]'
+ ;;
+sco3.2v5*)
+ symcode='[[DT]]'
+ ;;
+sysv4.2uw2*)
+ symcode='[[DT]]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[[ABDT]]'
+ ;;
+sysv4)
+ symcode='[[DFNSTU]]'
+ ;;
+esac
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+ # Write the raw and C identifiers.
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+
+ rm -f conftest*
+ cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+ else
+ rm -f "$nlist"T
+ fi
+
+ # Make sure that we snagged all the symbols we need.
+ if grep ' nm_test_var$' "$nlist" >/dev/null; then
+ if grep ' nm_test_func$' "$nlist" >/dev/null; then
+ cat < conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+ # Now generate the symbol file.
+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
+ cat <> conftest.$ac_ext
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ lt_ptr_t address;
+}
+lt_preloaded_symbols[[]] =
+{
+EOF
+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+ cat <<\EOF >> conftest.$ac_ext
+ {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_save_LIBS="$LIBS"
+ lt_save_CFLAGS="$CFLAGS"
+ LIBS="conftstm.$ac_objext"
+ CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ pipe_works=yes
+ fi
+ LIBS="$lt_save_LIBS"
+ CFLAGS="$lt_save_CFLAGS"
+ else
+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+ fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+ lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+ AC_MSG_RESULT(failed)
+else
+ AC_MSG_RESULT(ok)
+fi
+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+
+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+# ---------------------------------------
+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+ ifelse([$1],[CXX],[
+ # C++ specific cases for pic, static, wl, etc.
+ if test "$GXX" = yes; then
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+ amigaos*)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+ *djgpp*)
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ else
+ case $host_os in
+ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+ chorus*)
+ case $cc_basename in
+ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ esac
+ ;;
+ dgux*)
+ case $cc_basename in
+ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ freebsd* | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ ;;
+ esac
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ interix*)
+ # This is c89, which is MS Visual C++ (no shared libs)
+ # Anyone wants to do a port?
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ icpc* | ecpc*)
+ # Intel C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C++ 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ lynxos*)
+ ;;
+ m88k*)
+ ;;
+ mvs*)
+ case $cc_basename in
+ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ psos*)
+ ;;
+ solaris*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ tandem*)
+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+ vxworks*)
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+ esac
+ fi
+],
+[
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+
+ amigaos*)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the `-m68020' flag to GCC prevents building anything better,
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
+ interix[[3-9]]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ enable_shared=no
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
+
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ ;;
+
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+ aix*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+ darwin*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ case $cc_basename in
+ xlc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ esac
+ ;;
+
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC (with -KPIC) is the default.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ newsos6)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ icc* | ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ # Sun C 5.9
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ ;;
+ *Sun\ F*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
+ osf3* | osf4* | osf5*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All OSF/1 code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ rdos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ solaris*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+ esac
+ ;;
+
+ sunos4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ unicos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+ esac
+ fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+ esac],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+ ;;
+esac
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+])
+
+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ _LT_AC_TAGVAR(archive_cmds, $1)=
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ # include_expsyms should be a list of space-separated symbols to be *always*
+ # included in the symbol list
+ _LT_AC_TAGVAR(include_expsyms, $1)=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+ esac
+
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+ if test "$with_gnu_ld" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>/dev/null` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+EOF
+ fi
+ ;;
+
+ amigaos*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+
+ # Samuel A. Falvo II reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
+ # with the same dynamic library. Since this doesn't match the
+ # behavior of shared libraries on other platforms, we can't use
+ # them.
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ *)
+ tmp_sharedflag='-shared' ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+EOF
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+ runpath_var=
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case $host_os in
+ aix3*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ fi
+ ;;
+
+ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ _LT_AC_TAGVAR(archive_cmds, $1)=''
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
+ ;;
+ esac
+ shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
+ else
+ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+ # Exported symbols can be pulled into shared objects from archives
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+
+ amigaos*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ # see comment about different semantics on the GNU ld section
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+ ;;
+ *) # Darwin 1.3 on
+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ else
+ case ${MACOSX_DEPLOYMENT_TARGET} in
+ 10.[[012]])
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+ ;;
+ 10.*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ fi
+ ;;
+
+ dgux*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ freebsd1*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ hpux9*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ fi
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ newsos6)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ else
+ case $host_os in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ ;;
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ os2*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
+ wlarc='${wl}'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
+ wlarc=''
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ sunos4*)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ sysv4)
+ case $host_vendor in
+ sni)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+ ;;
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ ;;
+ motorola)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ sysv4.3*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+ fi
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We can NOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ uts4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+ fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+ # Assume -lc should be added
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+ if test "$enable_shared" = yes && test "$GCC" = yes; then
+ case $_LT_AC_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+ if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+ then
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ else
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $rm conftest*
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+ ;;
+ esac
+ fi
+ ;;
+esac
+])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+
+# _LT_AC_FILE_LTDLL_C
+# -------------------
+# Be careful that the start marker always follows a newline.
+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include
+# #undef WIN32_LEAN_AND_MEAN
+# #include
+#
+# #ifndef __CYGWIN__
+# # ifdef __CYGWIN32__
+# # define __CYGWIN__ __CYGWIN32__
+# # endif
+# #endif
+#
+# #ifdef __cplusplus
+# extern "C" {
+# #endif
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+# #ifdef __cplusplus
+# }
+# #endif
+#
+# #ifdef __CYGWIN__
+# #include
+# DECLARE_CYGWIN_DLL( DllMain );
+# #endif
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+# __hDllInstance_base = hInst;
+# return TRUE;
+# }
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+
+
+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# ---------------------------------
+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+
+# old names
+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+
+# This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])
+
+AC_DEFUN([LT_AC_PROG_GCJ],
+[AC_CHECK_TOOL(GCJ, gcj, no)
+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ AC_SUBST(GCJFLAGS)
+])
+
+AC_DEFUN([LT_AC_PROG_RC],
+[AC_CHECK_TOOL(RC, windres, no)
+])
+
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+ as_executable_p='test -x'
+else
+ as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+# LT_AC_PROG_SED
+# --------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible. Prefer GNU sed if found.
+AC_DEFUN([LT_AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+ # Check for GNU sed and select it if it is found.
+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+ lt_cv_path_SED=$lt_ac_sed
+ break
+ fi
+ while true; do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >>conftest.nl
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+ test $lt_ac_count -gt 10 && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+ if test $lt_ac_count -gt $lt_ac_max; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+ done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +6686,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -47,8 +6702,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -320,7 +6977,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -380,13 +7037,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -491,16 +7148,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -806,7 +7464,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 396482d..f32079a 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-07-02'
+timestamp='2008-01-23'
# 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
@@ -56,8 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -531,7 +532,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,18 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -829,7 +836,14 @@ EOF
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -950,6 +964,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1225,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
@@ -1458,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/build-aux/config.sub b/build-aux/config.sub
index fab0aa3..6759825 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-09-20'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to ."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 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."
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@ case $basic_machine in
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -925,6 +957,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1014,6 +1049,10 @@ case $basic_machine in
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1219,7 +1258,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1453,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/build-aux/depcomp b/build-aux/depcomp
index ca5ea4e..e5f9736 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# 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"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
diff --git a/build-aux/install-sh b/build-aux/install-sh
index 4fbbae7..a5897de 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@ IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@ fi
# Put in absolute file names if you don't have them in your path;
# or use environment 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}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
- -d) dir_arg=true
- shift
- continue;;
+ -C) copy_on_change=true;;
+
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@ while test $# -ne 0; do
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@ for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@ do
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
- # 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 test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
diff --git a/config.h.in b/config.h.in
index a9297de..62c03da 100644
--- a/config.h.in
+++ b/config.h.in
@@ -535,6 +535,9 @@
/* Define to 1 if you have the `mprotect' function. */
#undef HAVE_MPROTECT
+/* Define to 1 if you have the header file. */
+#undef HAVE_MP_H
+
/* Defined if mysqlclient is found and can compile */
#undef HAVE_MYSQLCLIENT
diff --git a/configure b/configure
index a93e57d..744a78a 100755
--- a/configure
+++ b/configure
@@ -2750,7 +2750,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_config_files="$ac_config_files gl/Makefile"
+ac_config_files="$ac_config_files gl/Makefile nagios-plugins.spec"
ac_aux_dir=
for ac_dir in build-aux "$srcdir"/build-aux; do
@@ -13886,6 +13886,211 @@ if test $ac_cv_lib_m_floor = yes; then
fi
+for ac_header in mp.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+{ echo "$as_me:$LINENO: checking for pow in -lbsd" >&5
+echo $ECHO_N "checking for pow in -lbsd... $ECHO_C" >&6; }
+if test "${ac_cv_lib_bsd_pow+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pow ();
+int
+main ()
+{
+return pow ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_bsd_pow=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_bsd_pow=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_pow" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_pow" >&6; }
+if test $ac_cv_lib_bsd_pow = yes; then
+ MATHLIBS="$MATHLIBS -lbsd"
+fi
+
+
# Check whether --enable-libtap was given.
if test "${enable_libtap+set}" = set; then
@@ -15391,6 +15596,12 @@ fi
fi
np_mysql_libs="`$np_mysql_config --libs`"
np_mysql_cflags="`$np_mysql_config --cflags`"
+ # On Solaris, cflags may contain -xstrconst, which is not acceptable to the
+ # gcc compiler. In this case, use the include flags as the cflags
+ echo $np_mysql_cflags | grep -- -xstrconst > /dev/null 2> /dev/null
+ if test $? -eq 0 -a "$CC" = "gcc" ; then
+ np_mysql_cflags="`$np_mysql_config --include`"
+ fi
_savedcppflags="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $np_mysql_include"
@@ -56405,6 +56616,7 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"gl/Makefile") CONFIG_FILES="$CONFIG_FILES gl/Makefile" ;;
+ "nagios-plugins.spec") CONFIG_FILES="$CONFIG_FILES nagios-plugins.spec" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
@@ -58047,21 +58259,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -58098,7 +58311,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/configure.in b/configure.in
index bdd4431..e8fc789 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(nagios-plugins,1.4.15)
AC_CONFIG_SRCDIR(NPTest.pm)
-AC_CONFIG_FILES(gl/Makefile)
+AC_CONFIG_FILES([gl/Makefile
+ nagios-plugins.spec])
AC_CONFIG_AUX_DIR(build-aux)
AM_INIT_AUTOMAKE([1.8.3])
AM_CONFIG_HEADER(config.h)
@@ -162,6 +163,8 @@ dnl
dnl check for math-related functions needing -lm
AC_CHECK_HEADERS(math.h)
AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
+AC_CHECK_HEADERS(mp.h)
+AC_CHECK_LIB(bsd,pow,MATHLIBS="$MATHLIBS -lbsd")
AC_SUBST(MATHLIBS)
dnl Check if we buils local libtap
diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
index d2e5b46..77e75f6 100644
--- a/contrib/check_linux_raid.pl
+++ b/contrib/check_linux_raid.pl
@@ -71,7 +71,8 @@ while(defined $nextdev){
} elsif (/^($nextdev)\s*:/) {
$device=$1;
$devices{$device}=$device;
- if (/active/) {
+ if (/\sactive/) {
+ $status{$device} = ''; # Shall be filled later if available
$active{$device} = 1;
}
}
@@ -80,7 +81,11 @@ while(defined $nextdev){
}
foreach my $k (sort keys %devices){
- if ($status{$k} =~ /_/) {
+ if (!exists($status{$k})) {
+ $msg .= sprintf " %s inactive with no status information.",
+ $devices{$k};
+ $code = max_state($code, "CRITICAL");
+ } elsif ($status{$k} =~ /_/) {
if (defined $recovery{$k}) {
$msg .= sprintf " %s status=%s, recovery=%s, finish=%s.",
$devices{$k}, $status{$k}, $recovery{$k}, $finish{$k};
@@ -94,10 +99,11 @@ foreach my $k (sort keys %devices){
$code = max_state($code, "OK");
} else {
if ($active{$k}) {
- $msg .= sprintf " %s active with no status information.\n",
+ $msg .= sprintf " %s active with no status information.",
$devices{$k};
$code = max_state($code, "OK");
} else {
+ # This should't run anymore, but is left as a catch-all
$msg .= sprintf " %s does not exist.\n", $devices{$k};
$code = max_state($code, "CRITICAL");
}
diff --git a/gl/Makefile.in b/gl/Makefile.in
index 30347ea..6113d48 100644
--- a/gl/Makefile.in
+++ b/gl/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -154,7 +154,7 @@ am_libgnu_a_OBJECTS = base64.$(OBJEXT) close-hook.$(OBJEXT) \
xalloc-die.$(OBJEXT) xstrndup.$(OBJEXT)
libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1345,8 +1345,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1371,8 +1371,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1382,13 +1382,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 026ebf1..89e2ed9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -142,7 +142,7 @@ am__libnagiosplug_a_SOURCES_DIST = utils_base.c utils_disk.c \
am_libnagiosplug_a_OBJECTS = utils_base.$(OBJEXT) utils_disk.$(OBJEXT) \
utils_tcp.$(OBJEXT) utils_cmd.$(OBJEXT) $(am__objects_1)
libnagiosplug_a_OBJECTS = $(am_libnagiosplug_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1156,8 +1156,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1182,8 +1182,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1193,13 +1193,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 8bfe6d9..944002f 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -185,7 +185,7 @@ test_utils_OBJECTS = test_utils.$(OBJEXT)
test_utils_LDADD = $(LDADD)
test_utils_DEPENDENCIES = $(top_srcdir)/lib/libnagiosplug.a \
$(top_srcdir)/gl/libgnu.a
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1172,8 +1172,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1185,8 +1185,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1196,13 +1196,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 3d20f4d..5be2b2c 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -58,6 +58,19 @@ np_add_parameter(struct parameter_list **list, const char *name)
new_path->usedinodes_percent = NULL;
new_path->freeinodes_percent = NULL;
new_path->group = NULL;
+ new_path->dfree_pct = -1;
+ new_path->dused_pct = -1;
+ new_path->total = 0;
+ new_path->available = 0;
+ new_path->available_to_root = 0;
+ new_path->used = 0;
+ new_path->dused_units = 0;
+ new_path->dfree_units = 0;
+ new_path->dtotal_units = 0;
+ new_path->inodes_total = 0;
+ new_path->inodes_free = 0;
+ new_path->dused_inodes_percent = 0;
+ new_path->dfree_inodes_percent = 0;
if (current == NULL) {
*list = new_path;
diff --git a/lib/utils_disk.h b/lib/utils_disk.h
index f99b905..83a3763 100644
--- a/lib/utils_disk.h
+++ b/lib/utils_disk.h
@@ -24,6 +24,10 @@ struct parameter_list
char *group;
struct mount_entry *best_match;
struct parameter_list *name_next;
+ uintmax_t total, available, available_to_root, used, inodes_free, inodes_total;
+ double dfree_pct, dused_pct;
+ double dused_units, dfree_units, dtotal_units;
+ double dused_inodes_percent, dfree_inodes_percent;
};
void np_add_name (struct name_list **list, const char *name);
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4
index 9bbe63c..cd36c4f 100644
--- a/m4/np_mysqlclient.m4
+++ b/m4/np_mysqlclient.m4
@@ -42,6 +42,12 @@ AC_DEFUN([np_mysqlclient],
fi
np_mysql_libs="`$np_mysql_config --libs`"
np_mysql_cflags="`$np_mysql_config --cflags`"
+ # On Solaris, cflags may contain -xstrconst, which is not acceptable to the
+ # gcc compiler. In this case, use the include flags as the cflags
+ echo $np_mysql_cflags | grep -- -xstrconst > /dev/null 2> /dev/null
+ if test $? -eq 0 -a "$CC" = "gcc" ; then
+ np_mysql_cflags="`$np_mysql_config --include`"
+ fi
dnl Test a mysql_init. Some systems have mysql_config, but no headers
_savedcppflags="$CPPFLAGS"
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index f2dde1c..cd3a864 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,3 +1,20 @@
+# Macros
+%define isaix %(test "`uname -s`" = "AIX" && echo "1" || echo "0")
+%define islinux %(test "`uname -s`" = "Linux" && echo "1" || echo "0")
+%define isredhatfamily %(test -f /etc/redhat-release && echo "1" || echo "0")
+
+%if %{isaix}
+ %define _prefix /opt/nagios
+# %define _defaultdocdir %{_datadir}/doc
+%else
+ %define _libexecdir %{_exec_prefix}/lib/nagios/plugins
+%endif
+%define _sysconfdir /etc/nagios
+
+%define npusr nagios
+%define nphome /opt/nagios
+%define npgrp nagios
+
Name: nagios-plugins
Version: 1.4.15
Release: 1
@@ -9,7 +26,13 @@ URL: http://nagiosplug.sourceforge.net/
Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define npdir %{_builddir}/%{name}-%{version}
+
+%if %{isaix}
+Prefix: %{_prefix}
+%else
Prefix: %{_prefix}/lib/nagios/plugins
+%endif
Packager: Karl DeBisschop
Vendor: Nagios Plugin Development Group
Provides: nagios-plugins
@@ -19,6 +42,60 @@ Obsoletes: nagios-plugins-custom nagios-plugins-extras
# Requires
+%if %{isaix}
+Requires: fping
+Requires: gawk
+Requires: net-snmp
+Requires: net-snmp-perl
+Requires: net-snmp-utils
+Requires: openldap
+Requires: openssl
+Requires: perl
+Requires: python
+Requires: openssl
+BuildRequires: fping
+BuildRequires: gawk
+BuildRequires: net-snmp
+BuildRequires: net-snmp-perl
+BuildRequires: net-snmp-utils
+BuildRequires: openldap-devel
+%endif
+%if %{isredhatfamily}
+Requires: bind-utils
+Requires: coreutils
+Requires: fping
+Requires: gawk
+Requires: grep
+Requires: iputils
+Requires: mysql
+Requires: net-snmp-utils
+Requires: ntp
+Requires: openldap
+Requires: openssl
+Requires: openssh-clients
+Requires: perl
+Requires: postgresql-libs
+Requires: procps
+Requires: python
+Requires: samba-client
+Requires: shadow-utils
+Requires: traceroute
+Requires: /usr/bin/mailq
+BuildRequires: bind-utils
+BuildRequires: coreutils
+BuildRequires: iputils
+BuildRequires: mysql-devel
+BuildRequires: net-snmp-utils
+BuildRequires: net-tools
+BuildRequires: ntp
+BuildRequires: openldap-devel
+BuildRequires: openssh-clients
+BuildRequires: openssl-devel
+BuildRequires: postgresql-devel
+BuildRequires: procps
+BuildRequires: samba-client
+BuildRequires: /usr/bin/mailq
+%endif
%description
@@ -37,38 +114,79 @@ contains those plugins.
%build
-./configure \
+%{?isaix: MAKE=gmake} ./configure \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
---libexecdir=%{_exec_prefix}/lib/nagios/plugins \
---sysconfdir=%{_sysconfdir}/nagios \
+--libexecdir=%{_libexecdir} \
+--sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--with-cgiurl=/nagios/cgi-bin
+ls -1 %{npdir}/plugins > %{npdir}/ls-plugins-before
+ls -1 %{npdir}/plugins-root > %{npdir}/ls-plugins-root-before
+ls -1 %{npdir}/plugins-scripts > %{npdir}/ls-plugins-scripts-before
make %{?_smp_mflags}
+ls -1 %{npdir}/plugins > %{npdir}/ls-plugins-after
+ls -1 %{npdir}/plugins-root > %{npdir}/ls-plugins-root-after
+ls -1 %{npdir}/plugins-scripts > %{npdir}/ls-plugins-scripts-after
+%pre
+# Create `nagios' group on the system if necessary
+%if %{isaix}
+lsgroup %{npgrp} > /dev/null 2> /dev/null
+if [ $? -eq 2 ] ; then
+ mkgroup %{npgrp} || %nnmmsg Unexpected error adding group "%{npgrp}". Aborting install process.
+fi
+%endif
+%if %{islinux}
+getent group %{npgrp} > /dev/null 2> /dev/null
+if [ $? -ne 0 ] ; then
+ groupadd %{npgrp} || %nnmmsg Unexpected error adding group "%{npgrp}". Aborting install process.
+fi
+%endif
+
+# Create `nagios' user on the system if necessary
+%if %{isaix}
+lsuser %{npusr} > /dev/null 2> /dev/null
+if [ $? -eq 2 ] ; then
+ useradd -d %{nphome} -c "%{npusr}" -g %{npgrp} %{npusr} || \
+ %nnmmsg Unexpected error adding user "%{npusr}". Aborting install process.
+fi
+%endif
+%if %{islinux}
+getent passwd %{npusr} > /dev/null 2> /dev/null
+if [ $? -ne 0 ] ; then
+ useradd -r -d %{nshome} -c "%{npusr}" -g %{npgrp} %{npusr} || \
+ %nnmmsg Unexpected error adding user "%{npusr}". Aborting install process.
+fi
+%endif
%install
rm -rf $RPM_BUILD_ROOT
make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install
-install -d ${RPM_BUILD_ROOT}/etc/nagios
-install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios
+build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir}
+build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir}
%find_lang %{name}
-
+echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
+comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
+echo "%defattr(755,root,root)" >> %{name}.lang
+comm -13 %{npdir}/ls-plugins-root-before %{npdir}/ls-plugins-root-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
+echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
+comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
+echo "%{_libexecdir}/utils.pm" >> %{name}.lang
+echo "%{_libexecdir}/utils.sh" >> %{name}.lang
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
-%defattr(-,root,root)
-%config(missingok,noreplace) /etc/nagios/command.cfg
+%config(missingok,noreplace) %{_sysconfdir}/command.cfg
%doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS
%doc ChangeLog command.cfg
-%defattr(775,root,root)
-%dir %{_exec_prefix}/lib/nagios/plugins
+%if ! %{isaix}
%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo
%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo
-%{_exec_prefix}/lib/nagios/plugins
+%endif
%changelog
* Mon May 23 2005 Sean Finney - cvs head
diff --git a/nagios-plugins.spec.in b/nagios-plugins.spec.in
new file mode 100644
index 0000000..17a44c3
--- /dev/null
+++ b/nagios-plugins.spec.in
@@ -0,0 +1,199 @@
+# Macros
+%define isaix %(test "`uname -s`" = "AIX" && echo "1" || echo "0")
+%define islinux %(test "`uname -s`" = "Linux" && echo "1" || echo "0")
+%define isredhatfamily %(test -f /etc/redhat-release && echo "1" || echo "0")
+
+%if %{isaix}
+ %define _prefix /opt/nagios
+# %define _defaultdocdir %{_datadir}/doc
+%else
+ %define _libexecdir %{_exec_prefix}/lib/nagios/plugins
+%endif
+%define _sysconfdir /etc/nagios
+
+%define npusr nagios
+%define nphome /opt/nagios
+%define npgrp nagios
+
+Name: nagios-plugins
+Version: @PACKAGE_VERSION@
+Release: @RELEASE@
+Summary: Host/service/network monitoring program plugins for Nagios
+
+Group: Applications/System
+License: GPL
+URL: http://nagiosplug.sourceforge.net/
+Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%define npdir %{_builddir}/%{name}-%{version}
+
+%if %{isaix}
+Prefix: %{_prefix}
+%else
+Prefix: %{_prefix}/lib/nagios/plugins
+%endif
+Packager: Karl DeBisschop
+Vendor: Nagios Plugin Development Group
+Provides: nagios-plugins
+
+%{!?custom:%global custom 0}
+Obsoletes: nagios-plugins-custom nagios-plugins-extras
+
+
+# Requires
+%if %{isaix}
+Requires: fping
+Requires: gawk
+Requires: net-snmp
+Requires: net-snmp-perl
+Requires: net-snmp-utils
+Requires: openldap
+Requires: openssl
+Requires: perl
+Requires: python
+Requires: openssl
+BuildRequires: fping
+BuildRequires: gawk
+BuildRequires: net-snmp
+BuildRequires: net-snmp-perl
+BuildRequires: net-snmp-utils
+BuildRequires: openldap-devel
+%endif
+%if %{isredhatfamily}
+Requires: bind-utils
+Requires: coreutils
+Requires: fping
+Requires: gawk
+Requires: grep
+Requires: iputils
+Requires: mysql
+Requires: net-snmp-utils
+Requires: ntp
+Requires: openldap
+Requires: openssl
+Requires: openssh-clients
+Requires: perl
+Requires: postgresql-libs
+Requires: procps
+Requires: python
+Requires: samba-client
+Requires: shadow-utils
+Requires: traceroute
+Requires: /usr/bin/mailq
+BuildRequires: bind-utils
+BuildRequires: coreutils
+BuildRequires: iputils
+BuildRequires: mysql-devel
+BuildRequires: net-snmp-utils
+BuildRequires: net-tools
+BuildRequires: ntp
+BuildRequires: openldap-devel
+BuildRequires: openssh-clients
+BuildRequires: openssl-devel
+BuildRequires: postgresql-devel
+BuildRequires: procps
+BuildRequires: samba-client
+BuildRequires: /usr/bin/mailq
+%endif
+
+
+%description
+
+Nagios is a program that will monitor hosts and services on your
+network, and to email or page you when a problem arises or is
+resolved. Nagios runs on a unix server as a background or daemon
+process, intermittently running checks on various services that you
+specify. The actual service checks are performed by separate "plugin"
+programs which return the status of the checks to Nagios. This package
+contains those plugins.
+
+
+%prep
+%setup -q
+
+
+%build
+%{?isaix: MAKE=gmake} ./configure \
+--prefix=%{_prefix} \
+--exec-prefix=%{_exec_prefix} \
+--libexecdir=%{_libexecdir} \
+--sysconfdir=%{_sysconfdir} \
+--datadir=%{_datadir} \
+--with-cgiurl=/nagios/cgi-bin
+ls -1 %{npdir}/plugins > %{npdir}/ls-plugins-before
+ls -1 %{npdir}/plugins-root > %{npdir}/ls-plugins-root-before
+ls -1 %{npdir}/plugins-scripts > %{npdir}/ls-plugins-scripts-before
+make %{?_smp_mflags}
+ls -1 %{npdir}/plugins > %{npdir}/ls-plugins-after
+ls -1 %{npdir}/plugins-root > %{npdir}/ls-plugins-root-after
+ls -1 %{npdir}/plugins-scripts > %{npdir}/ls-plugins-scripts-after
+
+%pre
+# Create `nagios' group on the system if necessary
+%if %{isaix}
+lsgroup %{npgrp} > /dev/null 2> /dev/null
+if [ $? -eq 2 ] ; then
+ mkgroup %{npgrp} || %nnmmsg Unexpected error adding group "%{npgrp}". Aborting install process.
+fi
+%endif
+%if %{islinux}
+getent group %{npgrp} > /dev/null 2> /dev/null
+if [ $? -ne 0 ] ; then
+ groupadd %{npgrp} || %nnmmsg Unexpected error adding group "%{npgrp}". Aborting install process.
+fi
+%endif
+
+# Create `nagios' user on the system if necessary
+%if %{isaix}
+lsuser %{npusr} > /dev/null 2> /dev/null
+if [ $? -eq 2 ] ; then
+ useradd -d %{nphome} -c "%{npusr}" -g %{npgrp} %{npusr} || \
+ %nnmmsg Unexpected error adding user "%{npusr}". Aborting install process.
+fi
+%endif
+%if %{islinux}
+getent passwd %{npusr} > /dev/null 2> /dev/null
+if [ $? -ne 0 ] ; then
+ useradd -r -d %{nshome} -c "%{npusr}" -g %{npgrp} %{npusr} || \
+ %nnmmsg Unexpected error adding user "%{npusr}". Aborting install process.
+fi
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install
+build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir}
+build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir}
+%find_lang %{name}
+echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
+comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
+echo "%defattr(755,root,root)" >> %{name}.lang
+comm -13 %{npdir}/ls-plugins-root-before %{npdir}/ls-plugins-root-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
+echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
+comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
+echo "%{_libexecdir}/utils.pm" >> %{name}.lang
+echo "%{_libexecdir}/utils.sh" >> %{name}.lang
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{name}.lang
+%config(missingok,noreplace) %{_sysconfdir}/command.cfg
+%doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS
+%doc ChangeLog command.cfg
+%if ! %{isaix}
+%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo
+%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo
+%endif
+
+%changelog
+* Mon May 23 2005 Sean Finney - cvs head
+- just include the nagios plugins directory, which will automatically include
+ all generated plugins (which keeps the build from failing on systems that
+ don't have all build-dependencies for every plugin)
+* Tue Mar 04 2004 Karl DeBisschop - 1.4.0alpha1
+- extensive rewrite to facilitate processing into various distro-compatible specs
+* Tue Mar 04 2004 Karl DeBisschop - 1.4.0alpha1
+- extensive rewrite to facilitate processing into various distro-compatible specs
diff --git a/perlmods/Makefile b/perlmods/Makefile
index 9a27861..9267ee0 100644
--- a/perlmods/Makefile
+++ b/perlmods/Makefile
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# perlmods/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -29,8 +29,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-apple-darwin9.8.0
-host_triplet = i386-apple-darwin9.8.0
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
subdir = perlmods
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -132,23 +132,23 @@ CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/nagiosplugins/staging/nagiosplugins/build-aux/missing --run aclocal-1.10
ALLOCA =
ALLOCA_H = alloca.h
-AMTAR = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run tar
+AMTAR = ${SHELL} /home/nagiosplugins/staging/nagiosplugins/build-aux/missing --run tar
APPLE_UNIVERSAL_BUILD = 0
AR = ar
-ASM_SYMBOL_PREFIX = "_"
-AUTOCONF = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoconf
-AUTOHEADER = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoheader
-AUTOMAKE = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run automake-1.10
-AWK = awk
+ASM_SYMBOL_PREFIX = ""
+AUTOCONF = ${SHELL} /home/nagiosplugins/staging/nagiosplugins/build-aux/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/nagiosplugins/staging/nagiosplugins/build-aux/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/nagiosplugins/staging/nagiosplugins/build-aux/missing --run automake-1.10
+AWK = mawk
BASENAME = /usr/bin/basename
-BITSIZEOF_PTRDIFF_T = 32
-BITSIZEOF_SIG_ATOMIC_T = 32
-BITSIZEOF_SIZE_T = 32
-BITSIZEOF_WCHAR_T = 32
-BITSIZEOF_WINT_T = 32
+BITSIZEOF_PTRDIFF_T =
+BITSIZEOF_SIG_ATOMIC_T =
+BITSIZEOF_SIZE_T =
+BITSIZEOF_WCHAR_T =
+BITSIZEOF_WINT_T =
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@@ -158,12 +158,12 @@ CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
DEPLIBS =
-DSYMUTIL = dsymutil
+DSYMUTIL =
DUMPBIN =
-ECHO_C = \c
-ECHO_N =
+ECHO_C =
+ECHO_N = -n
ECHO_T =
-EGREP = /usr/bin/grep -E
+EGREP = /bin/grep -E
EMULTIHOP_HIDDEN =
EMULTIHOP_VALUE =
ENOLINK_HIDDEN =
@@ -172,21 +172,21 @@ EOVERFLOW_HIDDEN =
EOVERFLOW_VALUE =
ERRNO_H =
EXEEXT =
-EXTRAS = check_ldap check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
+EXTRAS = check_pgsql check_ldap check_ide_smart check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_swap check_dig check_apt check_nt
EXTRAS_ROOT =
EXTRA_NETOBJS =
EXTRA_TEST =
-FGREP = /usr/bin/grep -F
+FGREP = /bin/grep -F
FLOAT_H =
-FLOORF_LIBM =
+FLOORF_LIBM = -lm
GETADDRINFO_LIB =
GETHOSTNAME_LIB =
GETLOADAVG_LIBS =
GETOPT_H = getopt.h
GETTEXT_MACRO_VERSION = 0.18
-GLIBC21 = no
-GMSGFMT = /opt/local/bin/msgfmt
-GMSGFMT_015 = /opt/local/bin/msgfmt
+GLIBC21 = yes
+GMSGFMT = /usr/bin/msgfmt
+GMSGFMT_015 = /usr/bin/msgfmt
GNULIB_ACCEPT = 0
GNULIB_ACCEPT4 = 0
GNULIB_ACOSL = 0
@@ -407,7 +407,7 @@ GNULIB_WCSRTOMBS = 0
GNULIB_WCTOB = 0
GNULIB_WCWIDTH = 0
GNULIB_WRITE = 1
-GREP = /usr/bin/grep
+GREP = /bin/grep
HAVE_ACCEPT4 = 1
HAVE_ACOSL = 1
HAVE_ARPA_INET_H = 1
@@ -425,7 +425,7 @@ HAVE_DECL_ATANL = 1
HAVE_DECL_CEILF = 1
HAVE_DECL_CEILL = 1
HAVE_DECL_COSL = 1
-HAVE_DECL_ENVIRON = 0
+HAVE_DECL_ENVIRON = 1
HAVE_DECL_EXPL = 1
HAVE_DECL_FLOORF = 1
HAVE_DECL_FLOORL = 1
@@ -456,8 +456,8 @@ HAVE_DECL_SINL = 1
HAVE_DECL_SNPRINTF = 1
HAVE_DECL_SQRTL = 1
HAVE_DECL_STRDUP = 1
-HAVE_DECL_STRNDUP = 0
-HAVE_DECL_STRNLEN = 0
+HAVE_DECL_STRNDUP = 1
+HAVE_DECL_STRNLEN = 1
HAVE_DECL_STRSIGNAL = 1
HAVE_DECL_STRTOK_R = 1
HAVE_DECL_TANL = 1
@@ -550,9 +550,9 @@ HAVE_RENAMEAT = 1
HAVE_RPMATCH = 1
HAVE_SA_FAMILY_T = 1
HAVE_SETENV = 1
-HAVE_SIGNED_SIG_ATOMIC_T = 1
-HAVE_SIGNED_WCHAR_T = 1
-HAVE_SIGNED_WINT_T = 1
+HAVE_SIGNED_SIG_ATOMIC_T =
+HAVE_SIGNED_WCHAR_T =
+HAVE_SIGNED_WINT_T =
HAVE_SINL = 1
HAVE_SLEEP = 1
HAVE_SQRTL = 1
@@ -568,13 +568,13 @@ HAVE_STRTOD = 1
HAVE_STRTOLL = 1
HAVE_STRTOULL = 1
HAVE_STRUCT_ADDRINFO = 1
-HAVE_STRUCT_RANDOM_DATA = 0
+HAVE_STRUCT_RANDOM_DATA = 1
HAVE_STRUCT_SOCKADDR_STORAGE = 1
HAVE_STRVERSCMP = 1
HAVE_SYMLINK = 1
HAVE_SYMLINKAT = 1
-HAVE_SYS_BITYPES_H = 0
-HAVE_SYS_INTTYPES_H = 0
+HAVE_SYS_BITYPES_H =
+HAVE_SYS_INTTYPES_H =
HAVE_SYS_LOADAVG_H = 0
HAVE_SYS_PARAM_H = 0
HAVE_SYS_SOCKET_H = 1
@@ -613,10 +613,10 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
INTLLIBS =
-INTL_MACOSX_LIBS = -Wl,-framework -Wl,CoreFoundation
+INTL_MACOSX_LIBS =
KMEM_GROUP =
KRBINCLUDE =
-LD = /usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld
+LD = /usr/bin/ld -m elf_x86_64
LDAPINCLUDE = -I/usr/include/ldap
LDAPLIBS = -lldap -llber
LDFLAGS = -L.
@@ -625,29 +625,29 @@ LIBGNU_LIBDEPS =
LIBGNU_LTLIBDEPS =
LIBICONV = -liconv
LIBINTL =
-LIBOBJS = ${LIBOBJDIR}error$U.o
+LIBOBJS =
LIBS = -lpthread -ldl
LIBSOCKET =
LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = lipo
+LIPO =
LN_S = ln -s
LOCALCHARSET_TESTS_ENVIRONMENT = CHARSETALIASDIR="$(top_builddir)/gl"
-LOCALE_FR = fr_FR.ISO8859-1
-LOCALE_FR_UTF8 = fr_FR.UTF-8
-LOCALE_JA = ja_JP.eucJP
-LOCALE_ZH_CN = zh_CN.GB18030
+LOCALE_FR = none
+LOCALE_FR_UTF8 = none
+LOCALE_JA = none
+LOCALE_ZH_CN = none
LTLIBICONV = -liconv
LTLIBINTL =
-LTLIBOBJS = ${LIBOBJDIR}error$U.lo
-MAKEINFO = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run makeinfo
+LTLIBOBJS =
+MAKEINFO = ${SHELL} /home/nagiosplugins/staging/nagiosplugins/build-aux/missing --run makeinfo
MATHLIBS = -lm
-MKDIR_P = ../build-aux/install-sh -c -d
-MSGFMT = /opt/local/bin/msgfmt
-MSGFMT_015 = /opt/local/bin/msgfmt
-MSGMERGE = /opt/local/bin/msgmerge
-MYSQLCFLAGS = -I/usr/local/mysql/include -Os -arch i386 -fno-common -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -DDONT_DECLARE_CXA_PURE_VIRTUAL
-MYSQLINCLUDE = -I/usr/local/mysql/include
-MYSQLLIBS = -L/usr/local/mysql/lib -lmysqlclient -lz -lm
+MKDIR_P = /bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGFMT_015 = /usr/bin/msgfmt
+MSGMERGE = /usr/bin/msgmerge
+MYSQLCFLAGS = -I/usr/include/mysql -DBIG_JOINS=1 -fPIC
+MYSQLINCLUDE = -I/usr/include/mysql
+MYSQLLIBS = -L/usr/lib/mysql -lmysqlclient
NEED_SETGID = false
NETINET_IN_H =
NEXT_ARPA_INET_H =
@@ -692,13 +692,13 @@ NEXT_TIME_H =
NEXT_UNISTD_H =
NEXT_WCHAR_H =
NEXT_WCTYPE_H =
-NM = /usr/bin/nm -p
-NMEDIT = nmedit
+NM = /usr/bin/nm -B
+NMEDIT =
NP_RELEASE = 1.4.15
-OBJDUMP = false
+OBJDUMP = objdump
OBJEXT = o
-OTOOL = otool
-OTOOL64 = :
+OTOOL =
+OTOOL64 =
PACKAGE = nagios-plugins
PACKAGE_BUGREPORT =
PACKAGE_NAME = nagios-plugins
@@ -706,21 +706,21 @@ PACKAGE_STRING = nagios-plugins 1.4.15
PACKAGE_TARNAME = nagios-plugins
PACKAGE_VERSION = 1.4.15
PATH_SEPARATOR = :
-PATH_TO_APTGET =
+PATH_TO_APTGET = /usr/bin/apt-get
PATH_TO_DIG = /usr/bin/dig
PATH_TO_FPING =
PATH_TO_LMSTAT =
PATH_TO_LSPS =
PATH_TO_MAILQ = /usr/bin/mailq
PATH_TO_NSLOOKUP = /usr/bin/nslookup
-PATH_TO_PING = /sbin/ping
-PATH_TO_PING6 = /sbin/ping6
+PATH_TO_PING = /bin/ping
+PATH_TO_PING6 = /bin/ping6
PATH_TO_PS = /bin/ps
PATH_TO_QMAIL_QSTAT =
PATH_TO_QSTAT =
PATH_TO_QUAKESTAT =
-PATH_TO_RPCINFO = /usr/sbin/rpcinfo
-PATH_TO_SMBCLIENT = /usr/bin/smbclient
+PATH_TO_RPCINFO = /usr/bin/rpcinfo
+PATH_TO_SMBCLIENT =
PATH_TO_SNMPGET = /usr/bin/snmpget
PATH_TO_SNMPGETNEXT = /usr/bin/snmpgetnext
PATH_TO_SSH = /usr/bin/ssh
@@ -730,11 +730,11 @@ PATH_TO_UPTIME = /usr/bin/uptime
PATH_TO_WHO = /usr/bin/who
PERL = /usr/bin/perl
PERLMODS_DIR =
-PGINCLUDE =
-PGLIBS =
-PKG_ARCH = i386
+PGINCLUDE = -I/usr/include/postgresql
+PGLIBS = -L/lib -lpq -lcrypt
+PKG_ARCH = unknown
PLUGIN_TEST = t/check_by_ssh.t t/check_cluster.t t/check_dig.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t
-POSUB =
+POSUB = po
POW_LIB =
PRAGMA_SYSTEM_HEADER = #pragma GCC system_header
PST3CFLAGS =
@@ -808,7 +808,7 @@ REPLACE_NANOSLEEP = GNULIB_PORTCHECK
REPLACE_NL_LANGINFO = 0
REPLACE_NULL = 0
REPLACE_OBSTACK_PRINTF = 0
-REPLACE_OPEN = 1
+REPLACE_OPEN = 0
REPLACE_OPENAT = 0
REPLACE_PERROR = 0
REPLACE_POPEN = 0
@@ -825,13 +825,13 @@ REPLACE_RMDIR = 0
REPLACE_ROUND = 0
REPLACE_ROUNDF = 0
REPLACE_ROUNDL = 0
-REPLACE_SETENV = 1
+REPLACE_SETENV = 0
REPLACE_SIGNBIT = 0
REPLACE_SIGNBIT_USING_GCC = 0
REPLACE_SLEEP = 0
REPLACE_SNPRINTF = 0
REPLACE_SPRINTF = 0
-REPLACE_STAT = 1
+REPLACE_STAT = 0
REPLACE_STDIO_WRITE_FUNCS = 0
REPLACE_STPNCPY = 0
REPLACE_STRCASESTR = 0
@@ -866,22 +866,22 @@ REPLACE_WCSRTOMBS = 0
REPLACE_WCTOB = 0
REPLACE_WCWIDTH = 0
REPLACE_WRITE = 0
-REV_DATESTAMP = 2010.07.27.21.48
-REV_TIMESTAMP = 20100727214823
-SCRIPT_TEST = t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
-SED = /usr/bin/sed
+REV_DATESTAMP = 2012.06.11.23.00
+REV_TIMESTAMP = 20120611230042
+SCRIPT_TEST = t/check_disk_smb.t t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
+SED = /bin/sed
SERVENT_LIB =
SET_MAKE =
SH = /bin/sh
SHELL = /bin/sh
SIG_ATOMIC_T_SUFFIX =
-SIZE_T_SUFFIX = ul
-SOCKETLIBS = -lresolv
+SIZE_T_SUFFIX =
+SOCKETLIBS = -lnsl -lresolv
SSLINCLUDE = -I/usr/include
SSLLIBS = -lssl -lcrypto
STDBOOL_H =
STDDEF_H =
-STDINT_H = stdint.h
+STDINT_H =
STRIP = strip
SUPPORT = Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = 0
@@ -889,18 +889,18 @@ TIME_H_DEFINES_STRUCT_TIMESPEC = 1
UNDEFINE_STRTOK_R = 0
UNISTD_H_HAVE_WINSOCK2_H = 0
UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = 0
-USE_NLS = no
+USE_NLS = yes
VERSION = 1.4.15
WARRANTY = The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n
WCHAR_T_SUFFIX =
WINT_T_SUFFIX =
-XGETTEXT = /opt/local/bin/xgettext
-XGETTEXT_015 = /opt/local/bin/xgettext
+XGETTEXT = /usr/bin/xgettext
+XGETTEXT_015 = /usr/bin/xgettext
XGETTEXT_EXTRA_OPTIONS = --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format
-abs_builddir = /tmp/nagiosplugins/perlmods
-abs_srcdir = /tmp/nagiosplugins/perlmods
-abs_top_builddir = /tmp/nagiosplugins
-abs_top_srcdir = /tmp/nagiosplugins
+abs_builddir = /home/nagiosplugins/staging/nagiosplugins/perlmods
+abs_srcdir = /home/nagiosplugins/staging/nagiosplugins/perlmods
+abs_top_builddir = /home/nagiosplugins/staging/nagiosplugins
+abs_top_srcdir = /home/nagiosplugins/staging/nagiosplugins
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -909,11 +909,11 @@ am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-apple-darwin9.8.0
+build = x86_64-unknown-linux-gnu
build_alias =
-build_cpu = i386
-build_os = darwin9.8.0
-build_vendor = apple
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = unknown
builddir = .
check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp
datadir = ${datarootdir}
@@ -921,28 +921,28 @@ datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-gl_LIBOBJS = asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o error.o fcntl.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strndup.o strnlen.o vasnprintf.o xmalloc.o
-gl_LTLIBOBJS = asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo error.lo fcntl.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strndup.lo strnlen.lo vasnprintf.lo xmalloc.lo
+gl_LIBOBJS = asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o fcntl.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o sha1.o stripslash.o vasnprintf.o xmalloc.o
+gl_LTLIBOBJS = asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo fcntl.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo sha1.lo stripslash.lo vasnprintf.lo xmalloc.lo
gltests_LIBOBJS =
gltests_LTLIBOBJS =
gltests_WITNESS = IN_NAGIOS_PLUGINS_GNULIB_TESTS
-host = i386-apple-darwin9.8.0
+host = x86_64-unknown-linux-gnu
host_alias =
-host_cpu = i386
-host_os = darwin9.8.0
-host_vendor = apple
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /tmp/nagiosplugins/build-aux/install-sh
+install_sh = $(SHELL) /home/nagiosplugins/staging/nagiosplugins/build-aux/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
-lt_ECHO = /bin/echo
+lt_ECHO = echo
mandir = ${datarootdir}/man
-mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
-np_mysql_config = /usr/local/mysql/bin/mysql_config
+mkdir_p = /bin/mkdir -p
+np_mysql_config = /usr/bin/mysql_config
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /usr/local/nagios
diff --git a/perlmods/Makefile.in b/perlmods/Makefile.in
index dcad73b..00e13be 100644
--- a/perlmods/Makefile.in
+++ b/perlmods/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/perlmods/Nagios-Plugin-0.34.tar.gz b/perlmods/Nagios-Plugin-0.34.tar.gz
deleted file mode 100644
index d3182d2..0000000
Binary files a/perlmods/Nagios-Plugin-0.34.tar.gz and /dev/null differ
diff --git a/perlmods/Nagios-Plugin-0.36.tar.gz b/perlmods/Nagios-Plugin-0.36.tar.gz
new file mode 100644
index 0000000..811dcb9
Binary files /dev/null and b/perlmods/Nagios-Plugin-0.36.tar.gz differ
diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo
index 78af601..673a6fc 100644
--- a/pkg/solaris/pkginfo
+++ b/pkg/solaris/pkginfo
@@ -1,12 +1,12 @@
-PKG="NAGplugin"
+PKG="NGOSplugin"
NAME="nagios-plugins"
DESC="Nagios network monitoring plugins"
-ARCH="i386"
-VERSION="1.4.15,REV=2010.07.27.21.48"
+ARCH="unknown"
+VERSION="1.4.15,REV=2012.06.11.23.00"
CATEGORY="application"
VENDOR="Nagios Plugin Development Team"
EMAIL="nagiosplug-devel@lists.sourceforge.net"
-PSTAMP="nag20100727214823"
+PSTAMP="nag20120611230042"
BASEDIR="/"
CLASSES="none"
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index c9dcced..3bed346 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,4 +1,4 @@
-PKG="NAGplugin"
+PKG="NGOSplugin"
NAME="nagios-plugins"
DESC="Nagios network monitoring plugins"
ARCH="@PKG_ARCH@"
diff --git a/pkg/solaris/preinstall b/pkg/solaris/preinstall
new file mode 100755
index 0000000..c4cc269
--- /dev/null
+++ b/pkg/solaris/preinstall
@@ -0,0 +1,35 @@
+#!/usr/bin/sh
+
+user="nagios"
+uid=-1
+group="nagios"
+gid=-1
+
+/usr/bin/getent group $group > /dev/null 2> /dev/null
+result=$?
+if [ $result -eq 2 ] ; then
+ echo "Group $group does not exist. Creating..."
+ if [ $gid -ne -1 ] ; then
+ /usr/sbin/groupadd -g $gid $group
+ else
+ /usr/sbin/groupadd $group
+ fi
+elif [ $result -ne 0 ] ; then
+ echo "An error occurred determining the existence of the groug $group. Terminating."
+ exit 1;
+fi
+
+/usr/bin/getent passwd $user > /dev/null 2> /dev/null
+result=$?
+if [ $result -eq 2 ] ; then
+ echo "User $user does not exist. Creating..."
+ if [ $uid -ne -1 ] ; then
+ /usr/sbin/useradd -u $uid -g $group $user
+ else
+ /usr/sbin/useradd -g $group $user
+ fi
+elif [ $result -ne 0 ] ; then
+ echo "An error occurred determining the existence of the user $user. Terminating."
+ exit 1;
+fi
+
diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg
index 41d8e17..a21176e 100755
--- a/pkg/solaris/solpkg
+++ b/pkg/solaris/solpkg
@@ -8,6 +8,7 @@ $pkgmk = "/usr/bin/pkgmk";
$pkgtrans = "/usr/bin/pkgtrans";
$prototype = "prototype";
$pkginfo = "pkginfo";
+$preinstall = "preinstall";
$egrep = "/usr/bin/egrep";
# Sanity check
@@ -24,17 +25,24 @@ open (PREPROTO,"$find . -print |$egrep -v \"^\.(/usr(/local)?|/opt)?\$\" | $pkgp
open (PROTO,">$prototype") ||
die "Unable to write file prototype ($!)\n";
print PROTO "i pkginfo=./$pkginfo\n";
+print PROTO "i preinstall=./$preinstall\n";
while () {
# Read in the prototype information
chomp;
$thisline = $_;
if ($thisline =~ " prototype "
- or $thisline =~ " pkginfo ") {
+ or $thisline =~ " pkginfo "
+ or $thisline =~ " preinstall ") {
# Don't do anything as they aren't important
+ } elsif ($thisline =~ "pst3") {
+ # Needs to be installed SUID root
+ ($dir, $none, $file, $mode, $user, $group) = split / /,$thisline;
+ print PROTO "$dir $none $file 4755 root bin\n";
+
} elsif ($thisline =~ "^[fd] ") {
# Change the ownership of files and directories
($dir, $none, $file, $mode, $user, $group) = split / /,$thisline;
- print PROTO "$dir $none $file $mode bin bin\n";
+ print PROTO "$dir $none $file $mode $user bin\n";
} else {
# Symlinks and other stuff should be printed also
print PROTO "$thisline\n";
@@ -58,6 +66,7 @@ while () {
$thisline = $_;
($var,$value) = split /=/,$thisline;
if ("$var" eq "NAME"
+ or "$var" eq "PKG"
or "$var" eq "VERSION"
or "$var" eq "ARCH") {
$tmp = lc($var);
@@ -77,5 +86,5 @@ $packagename = "$name-$version-$os-$arch-local";
print "Building package\n";
system ("$pkgmk -o -r `pwd` -d $pkgdevice");
-system ("(cd $pkgdevice && $pkgtrans -s `pwd` ../$packagename)");
+system ("(cd $pkgdevice && $pkgtrans -s `pwd` ../$packagename $pkg)");
print "Done. ($packagename)\n";
diff --git a/plugins-root/Makefile.in b/plugins-root/Makefile.in
index df2e7c7..45dcdac 100644
--- a/plugins-root/Makefile.in
+++ b/plugins-root/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -147,7 +147,7 @@ pst3_LDADD = $(LDADD)
pst3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(pst3_CFLAGS) $(CFLAGS) $(pst3_LDFLAGS) \
$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1133,8 +1133,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1146,8 +1146,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1157,13 +1157,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 6d8ba09..fe8fc56 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -621,7 +621,7 @@ main(int argc, char **argv)
}
host = list;
- table = malloc(sizeof(struct rta_host **) * (argc - 1));
+ table = malloc(sizeof(struct rta_host **) * targets);
i = 0;
while(host) {
host->id = i*packets;
diff --git a/plugins-scripts/Makefile.in b/plugins-scripts/Makefile.in
index 76d659a..a069afc 100644
--- a/plugins-scripts/Makefile.in
+++ b/plugins-scripts/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 7c81fc2..6783543 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -67,7 +67,7 @@ my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
($host) || usage("Invalid host: $opt_H\n");
($opt_s) || ($opt_s = shift @ARGV) || usage("Share volume not specified\n");
-my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/);
+my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
($share) || usage("Invalid share: $opt_s\n");
defined($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest");
@@ -239,7 +239,7 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
$answer = "Result from smbclient not suitable\n";
$state = "UNKNOWN";
foreach (@lines) {
- if (/(Access denied|NT_STATUS_LOGON_FAILURE)/) {
+ if (/(Access denied|NT_STATUS_LOGON_FAILURE|NT_STATUS_ACCESS_DENIED)/) {
$answer = "Access Denied\n";
$state = "CRITICAL";
last;
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index ae80fc4..ffaa974 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -10,7 +10,7 @@ REVISION="@NP_VERSION@"
print_usage() {
- echo "Usage: $PROGNAME"
+ echo "Usage: $PROGNAME" [--ignore-fault]
}
print_help() {
@@ -21,25 +21,25 @@ print_help() {
echo "This plugin checks hardware status using the lm_sensors package."
echo ""
support
- exit 0
+ exit $STATE_OK
}
case "$1" in
--help)
print_help
- exit 0
+ exit $STATE_OK
;;
-h)
print_help
- exit 0
+ exit $STATE_OK
;;
--version)
- print_revision $PROGNAME $REVISION
- exit 0
+ print_revision $PROGNAME $REVISION
+ exit $STATE_OK
;;
-V)
print_revision $PROGNAME $REVISION
- exit 0
+ exit $STATE_OK
;;
*)
sensordata=`sensors 2>&1`
@@ -49,17 +49,20 @@ case "$1" in
fi
if test ${status} -eq 127; then
echo "SENSORS UNKNOWN - command not found (did you install lmsensors?)"
- exit -1
- elif test ${status} -ne 0 ; then
+ exit $STATE_UNKNOWN
+ elif test ${status} -ne 0; then
echo "WARNING - sensors returned state $status"
- exit 1
+ exit $STATE_WARNING
fi
if echo ${sensordata} | egrep ALARM > /dev/null; then
echo SENSOR CRITICAL - Sensor alarm detected!
- exit 2
- else
- echo sensor ok
- exit 0
+ exit $STATE_CRITICAL
+ elif echo ${sensordata} | egrep FAULT > /dev/null \
+ && test "$1" != "-i" -a "$1" != "--ignore-fault"; then
+ echo SENSOR UNKNOWN - Sensor reported fault
+ exit $STATE_UNKNOWN
fi
+ echo sensor ok
+ exit $STATE_OK
;;
esac
diff --git a/plugins-scripts/t/check_disk_smb.t b/plugins-scripts/t/check_disk_smb.t
new file mode 100644
index 0000000..bd43c9c
--- /dev/null
+++ b/plugins-scripts/t/check_disk_smb.t
@@ -0,0 +1,96 @@
+#! /usr/bin/perl -w -I ..
+#
+# test cases for check_disk_smb
+#
+
+use strict;
+use Test::More;
+use NPTest;
+
+my $tests = 14;
+plan tests => $tests;
+my $res;
+
+my $plugin = "check_disk_smb";
+SKIP: {
+ skip "$plugin is not created", $tests if ( ! -x $plugin );
+ my $auth = "";
+
+ my $host = getTestParameter("NP_HOST_SMB", "A host providing an SMB Service",
+ "localhost");
+
+ my $smb_share = getTestParameter("NP_SMB_SHARE",
+ "An SMB share name the host provides",
+ "public");
+
+ my $smb_share_spc = getTestParameter("NP_SMB_SHARE_SPC",
+ "An SMB share name containing one or more spaces the host provides",
+ "pub lic");
+
+ my $smb_share_deny = getTestParameter("NP_SMB_SHARE_DENY",
+ "An access denying SMB share name the host provides",
+ "private");
+
+ my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE",
+ "The hostname of system not responsive to network requests", "10.0.0.1" );
+
+ my $hostname_invalid = getTestParameter( "NP_HOSTNAME_INVALID",
+ "An invalid (not known to DNS) hostname",
+ "nosuchhost" );
+ my $user = getTestParameter( "NP_SMB_VALID_USER", "A valid smb user", "" );
+ my $pass = getTestParameter( "NP_SMB_VALID_USER_PASS", "A valid password for valid smb user", "" );
+ $auth .= "-u $user " if ($user);
+ $auth .= "-p $pass " if ($pass);
+
+
+
+ $res = NPTest->testCmd( "./$plugin" );
+ is( $res->return_code, 3, "No arguments" );
+
+ $res = NPTest->testCmd( "./$plugin -H fakehostname" );
+ is( $res->return_code, 3, "No share specified" );
+
+ $res = NPTest->testCmd( "./$plugin -H fakehostname -s share -w 100G -c 101G" );
+ is( $res->return_code, 3, "warn is less than critical" );
+
+ SKIP: {
+ skip "no smb host defined", 6 if ( ! $host );
+
+ SKIP: {
+ skip "no share name defined", 2 if ( ! $smb_share );
+ $res = NPTest->testCmd( "./$plugin -H $host $auth -s $smb_share -w 2k -c 1k" );
+ cmp_ok( $res->return_code, '==', 0, "Exit OK if $smb_share has > 1k free space");
+ like($res->output, '/free/i', "String contains the word 'free'");
+
+ $res = NPTest->testCmd( "./$plugin -H $host $auth -s $smb_share -w 10001G -c 10000G" );
+ cmp_ok( $res->return_code, '==', 2, "Exit CRIT if $smb_share has < 10000G free space");
+ like($res->output, '/free/i', "String contains the word 'free'");
+
+ $res = NPTest->testCmd( "./$plugin -H $host $auth -s $smb_share -w 10000G -c 1k" );
+ cmp_ok( $res->return_code, '==', 1, "Exit WARN if $smb_share has > 10000G and <1k free space");
+ like($res->output, '/free/i', "String contains the word 'free'");
+ }
+
+ SKIP: {
+ skip "no share name containing spaces defined", 2 if ( ! $smb_share_spc );
+ $res = NPTest->testCmd( "./$plugin -H $host $auth -s '$smb_share_spc' -w 2k -c 1k" );
+ cmp_ok( $res->return_code, '==', 0, "Exit OK if '$smb_share_spc' has > 1k free space");
+ like($res->output, '/free/i', "String contains the word 'free'");
+
+ }
+ SKIP: {
+ skip "no share name without permissions ", 2 if ( ! $smb_share_deny );
+ $res = NPTest->testCmd( "./$plugin -H $host $auth -s $smb_share_deny -w 2k -c 1k" );
+ cmp_ok( $res->return_code, '==', 2, "Exit CRIT if $smb_share_deny has > 1k free space");
+ unlike($res->output, '/free/i', "String does not contain the word 'free'");
+
+ }
+ }
+
+ SKIP: {
+ skip "no non responsive host defined", 1 if ( ! $host_nonresponsive );
+ $res = NPTest->testCmd( "./$plugin -H $host_nonresponsive -s np_foobar ");
+ cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with non responsive host" );
+ }
+
+}
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in
index b30b908..5fae6ad 100644
--- a/plugins-scripts/utils.sh.in
+++ b/plugins-scripts/utils.sh.in
@@ -21,3 +21,88 @@ support() {
$ECHO "@SUPPORT@" | sed -e 's/\n/ /g'
}
+#
+# check_range takes a value and a range string, returning successfully if an
+# alert should be raised based on the range.
+#
+check_range() {
+ local v range yes no err decimal start end cmp match
+ v="$1"
+ range="$2"
+
+ # whether to raise an alert or not
+ yes=0
+ no=1
+ err=2
+
+ # regex to match a decimal number
+ decimal="-?([0-9]+\.?[0-9]*|[0-9]*\.[0-9]+)"
+
+ # compare numbers (including decimals), returning true/false
+ cmp() { awk "BEGIN{ if ($1) exit(0); exit(1)}"; }
+
+ # returns successfully if the string in the first argument matches the
+ # regex in the second
+ match() { echo "$1" | grep -E -q -- "$2"; }
+
+ # make sure value is valid
+ if ! match "$v" "^$decimal$"; then
+ echo "${0##*/}: check_range: invalid value" >&2
+ unset -f cmp match
+ return "$err"
+ fi
+
+ # make sure range is valid
+ if ! match "$range" "^@?(~|$decimal)(:($decimal)?)?$"; then
+ echo "${0##*/}: check_range: invalid range" >&2
+ unset -f cmp match
+ return "$err"
+ fi
+
+ # check for leading @ char, which negates the range
+ if match $range '^@'; then
+ range=${range#@}
+ yes=1
+ no=0
+ fi
+
+ # parse the range string
+ if ! match "$range" ':'; then
+ start=0
+ end="$range"
+ else
+ start="${range%%:*}"
+ end="${range#*:}"
+ fi
+
+ # do the comparison, taking positive ("") and negative infinity ("~")
+ # into account
+ if [ "$start" != "~" ] && [ "$end" != "" ]; then
+ if cmp "$start <= $v" && cmp "$v <= $end"; then
+ unset -f cmp match
+ return "$no"
+ else
+ unset -f cmp match
+ return "$yes"
+ fi
+ elif [ "$start" != "~" ] && [ "$end" = "" ]; then
+ if cmp "$start <= $v"; then
+ unset -f cmp match
+ return "$no"
+ else
+ unset -f cmp match
+ return "$yes"
+ fi
+ elif [ "$start" = "~" ] && [ "$end" != "" ]; then
+ if cmp "$v <= $end"; then
+ unset -f cmp match
+ return "$no"
+ else
+ unset -f cmp match
+ return "$yes"
+ fi
+ else
+ unset -f cmp match
+ return "$no"
+ fi
+}
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 36a28b0..3a2afc1 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -101,7 +101,7 @@ check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
check_time_LDADD = $(NETLIBS)
check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
check_ups_LDADD = $(NETLIBS)
-check_users_LDADD = $(BASEOBJS) popen.o
+check_users_LDADD = $(BASEOBJS)
check_by_ssh_LDADD = $(NETLIBS)
check_ide_smart_LDADD = $(BASEOBJS)
negate_LDADD = $(BASEOBJS)
diff --git a/plugins/Makefile.in b/plugins/Makefile.in
index 057a075..fd01738 100644
--- a/plugins/Makefile.in
+++ b/plugins/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -239,7 +239,7 @@ negate_SOURCES = negate.c
negate_OBJECTS = negate.$(OBJEXT)
urlize_SOURCES = urlize.c
urlize_OBJECTS = urlize.$(OBJEXT)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1159,7 +1159,7 @@ check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
check_time_LDADD = $(NETLIBS)
check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
check_ups_LDADD = $(NETLIBS)
-check_users_LDADD = $(BASEOBJS) popen.o
+check_users_LDADD = $(BASEOBJS)
check_by_ssh_LDADD = $(NETLIBS)
check_ide_smart_LDADD = $(BASEOBJS)
negate_LDADD = $(BASEOBJS)
@@ -1246,8 +1246,8 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
else :; fi; \
done
@@ -1493,8 +1493,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1506,8 +1506,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1517,13 +1517,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index ff27b39..8752016 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -187,6 +187,7 @@ process_arguments (int argc, char **argv)
{"use-ipv6", no_argument, 0, '6'},
{"ssh-option", required_argument, 0, 'o'},
{"quiet", no_argument, 0, 'q'},
+ {"configfile", optional_argument, 0, 'F'},
{0, 0, 0, 0}
};
@@ -198,7 +199,7 @@ process_arguments (int argc, char **argv)
strcpy (argv[c], "-t");
while (1) {
- c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:", longopts,
+ c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:F:", longopts,
&option);
if (c == -1 || c == EOF)
@@ -306,6 +307,10 @@ process_arguments (int argc, char **argv)
case 'q': /* Tell the ssh command to be quiet */
comm_append("-q");
break;
+ case 'F': /* ssh configfile */
+ comm_append("-F");
+ comm_append(optarg);
+ break;
default: /* help */
usage5();
}
@@ -418,6 +423,8 @@ print_help (void)
printf (" %s\n", _("short name of host in nagios configuration [optional]"));
printf (" %s\n","-o, --ssh-option=OPTION");
printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
+ printf (" %s\n","-F, --configfile");
+ printf (" %s\n", _("Tell ssh to use this configfile [optional]"));
printf (" %s\n","-q, --quiet");
printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
printf (UT_WARN_CRIT);
@@ -454,6 +461,6 @@ print_usage (void)
printf (" %s -H -C [-fqv] [-1|-2] [-4|-6]\n"
" [-S [lines]] [-E [lines]] [-t timeout] [-i identity]\n"
" [-l user] [-n name] [-s servicelist] [-O outputfile]\n"
- " [-p port] [-o ssh-option]\n",
+ " [-p port] [-o ssh-option] [-F configfile]\n",
progname);
}
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 851d800..f889764 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -122,6 +122,8 @@ void print_help (void);
void print_usage (void);
double calculate_percent(uintmax_t, uintmax_t);
void stat_path (struct parameter_list *p);
+void get_stats (struct parameter_list *p, struct fs_usage *fsp);
+void get_path_stats (struct parameter_list *p, struct fs_usage *fsp);
double w_dfp = -1.0;
double c_dfp = -1.0;
@@ -148,6 +150,7 @@ char *crit_freeinodes_percent = NULL;
int path_selected = FALSE;
char *group = NULL;
struct stat *stat_buf;
+struct name_list *seen = NULL;
int
@@ -160,10 +163,6 @@ main (int argc, char **argv)
char *perf;
char *preamble;
double inode_space_pct;
- uintmax_t total, available, available_to_root, used;
- double dfree_pct = -1, dused_pct = -1;
- double dused_units, dfree_units, dtotal_units;
- double dused_inodes_percent, dfree_inodes_percent;
double warning_high_tide;
double critical_high_tide;
int temp_result;
@@ -171,7 +170,6 @@ main (int argc, char **argv)
struct mount_entry *me;
struct fs_usage fsp, tmpfsp;
struct parameter_list *temp_list, *path;
- struct name_list *seen = NULL;
preamble = strdup (" - free space:");
output = strdup ("");
@@ -237,45 +235,8 @@ main (int argc, char **argv)
/* Remove filesystems already seen */
if (np_seen_name(seen, me->me_mountdir)) {
continue;
- } else {
- if (path->group != NULL) {
- /* find all group members */
- fsp.fsu_blocksize = 0;
- fsp.fsu_blocks = 0;
- fsp.fsu_bfree = 0;
- fsp.fsu_bavail = 0;
- fsp.fsu_files = 0;
- fsp.fsu_ffree = 0;
-
-
- for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next) {
- if (temp_list->group && ! (strcmp(temp_list->group, path->group))) {
-
- stat_path(path);
- get_fs_usage (temp_list->best_match->me_mountdir, temp_list->best_match->me_devname, &tmpfsp);
-
- /* possibly differing blocksizes if disks are grouped. Calculating average */
- fsp.fsu_blocksize = (fsp.fsu_blocksize * fsp.fsu_blocks + tmpfsp.fsu_blocksize * tmpfsp.fsu_blocks) / \
- (fsp.fsu_blocks + tmpfsp.fsu_blocks); /* Size of a block. */
- fsp.fsu_blocks += tmpfsp.fsu_blocks; /* Total blocks. */
- fsp.fsu_bfree += tmpfsp.fsu_bfree; /* Free blocks available to superuser. */
- /* Gnulib workaround - see comment about it a few lines below */
- fsp.fsu_bavail += (tmpfsp.fsu_bavail > tmpfsp.fsu_bfree ? 0 : tmpfsp.fsu_bavail); /* Free blocks available to non-superuser. */
- fsp.fsu_files += tmpfsp.fsu_files; /* Total file nodes. */
- fsp.fsu_ffree += tmpfsp.fsu_ffree; /* Free file nodes. */
-
- if (verbose >= 3)
- printf("Group %s: add %llu blocks (%s) \n", path->group, tmpfsp.fsu_bavail, temp_list->name);
- /* printf("Group %s: add %u blocks (%s)\n", temp_list->name); *//* path->group, tmpfsp.fsu_bavail, temp_list->name); */
-
- np_add_name(&seen, temp_list->best_match->me_mountdir);
- }
- }
- /* modify devname and mountdir for output */
- me->me_mountdir = me->me_devname = path->group;
- } else
- np_add_name(&seen, me->me_mountdir);
- }
+ }
+ np_add_name(&seen, me->me_mountdir);
if (path->group == NULL) {
/* Skip remote filesystems if we're not interested in them */
@@ -301,55 +262,36 @@ main (int argc, char **argv)
}
if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
- total = fsp.fsu_blocks;
- /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
- * space on BSD (the actual value should be negative but fsp.fsu_bavail
- * is unsigned) */
- available = fsp.fsu_bavail > fsp.fsu_bfree ? 0 : fsp.fsu_bavail;
- available_to_root = fsp.fsu_bfree;
- used = total - available_to_root;
-
- if (verbose >= 3)
- printf ("For %s, total=%llu, available=%llu, available_to_root=%llu, used=%llu, fsp.fsu_files=%llu, fsp.fsu_ffree=%llu\n",
- me->me_mountdir, total, available, available_to_root, used, fsp.fsu_files, fsp.fsu_ffree);
-
- dused_pct = calculate_percent( used, used + available ); /* used + available can never be > uintmax */
-
- dfree_pct = 100 - dused_pct;
- dused_units = used*fsp.fsu_blocksize/mult;
- dfree_units = available*fsp.fsu_blocksize/mult;
- dtotal_units = total*fsp.fsu_blocksize/mult;
- dused_inodes_percent = calculate_percent(fsp.fsu_files - fsp.fsu_ffree, fsp.fsu_files);
- dfree_inodes_percent = 100 - dused_inodes_percent;
+ get_stats (path, &fsp);
if (verbose >= 3) {
printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%llu mult=%llu\n",
- me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dused_inodes_percent, dfree_inodes_percent, fsp.fsu_blocksize, mult);
+ me->me_mountdir, path->dused_pct, path->dfree_pct, path->dused_units, path->dfree_units, path->dtotal_units, path->dused_inodes_percent, path->dfree_inodes_percent, fsp.fsu_blocksize, mult);
}
/* Threshold comparisons */
- temp_result = get_status(dfree_units, path->freespace_units);
+ temp_result = get_status(path->dfree_units, path->freespace_units);
if (verbose >=3) printf("Freespace_units result=%d\n", temp_result);
disk_result = max_state( disk_result, temp_result );
- temp_result = get_status(dfree_pct, path->freespace_percent);
+ temp_result = get_status(path->dfree_pct, path->freespace_percent);
if (verbose >=3) printf("Freespace%% result=%d\n", temp_result);
disk_result = max_state( disk_result, temp_result );
- temp_result = get_status(dused_units, path->usedspace_units);
+ temp_result = get_status(path->dused_units, path->usedspace_units);
if (verbose >=3) printf("Usedspace_units result=%d\n", temp_result);
disk_result = max_state( disk_result, temp_result );
- temp_result = get_status(dused_pct, path->usedspace_percent);
+ temp_result = get_status(path->dused_pct, path->usedspace_percent);
if (verbose >=3) printf("Usedspace_percent result=%d\n", temp_result);
disk_result = max_state( disk_result, temp_result );
- temp_result = get_status(dused_inodes_percent, path->usedinodes_percent);
+ temp_result = get_status(path->dused_inodes_percent, path->usedinodes_percent);
if (verbose >=3) printf("Usedinodes_percent result=%d\n", temp_result);
disk_result = max_state( disk_result, temp_result );
- temp_result = get_status(dfree_inodes_percent, path->freeinodes_percent);
+ temp_result = get_status(path->dfree_inodes_percent, path->freeinodes_percent);
if (verbose >=3) printf("Freeinodes_percent result=%d\n", temp_result);
disk_result = max_state( disk_result, temp_result );
@@ -365,26 +307,26 @@ main (int argc, char **argv)
critical_high_tide = UINT_MAX;
if (path->freespace_units->warning != NULL) {
- warning_high_tide = dtotal_units - path->freespace_units->warning->end;
+ warning_high_tide = path->dtotal_units - path->freespace_units->warning->end;
}
if (path->freespace_percent->warning != NULL) {
- warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_units ));
+ warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*path->dtotal_units ));
}
if (path->freespace_units->critical != NULL) {
- critical_high_tide = dtotal_units - path->freespace_units->critical->end;
+ critical_high_tide = path->dtotal_units - path->freespace_units->critical->end;
}
if (path->freespace_percent->critical != NULL) {
- critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units ));
+ critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*path->dtotal_units ));
}
/* Nb: *_high_tide are unset when == UINT_MAX */
asprintf (&perf, "%s %s", perf,
perfdata ((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
- dused_units, units,
+ path->dused_units, units,
(warning_high_tide != UINT_MAX ? TRUE : FALSE), warning_high_tide,
(critical_high_tide != UINT_MAX ? TRUE : FALSE), critical_high_tide,
TRUE, 0,
- TRUE, dtotal_units));
+ TRUE, path->dtotal_units));
if (disk_result==STATE_OK && erronly && !verbose)
continue;
@@ -392,13 +334,13 @@ main (int argc, char **argv)
asprintf (&output, "%s %s %.0f %s (%.0f%%",
output,
(!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
- dfree_units,
+ path->dfree_units,
units,
- dfree_pct);
- if (dused_inodes_percent < 0) {
+ path->dfree_pct);
+ if (path->dused_inodes_percent < 0) {
asprintf(&output, "%s inode=-);", output);
} else {
- asprintf(&output, "%s inode=%.0f%%);", output, dfree_inodes_percent );
+ asprintf(&output, "%s inode=%.0f%%);", output, path->dfree_inodes_percent );
}
/* TODO: Need to do a similar debug line
@@ -996,3 +938,74 @@ stat_path (struct parameter_list *p)
die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno));
}
}
+
+
+void
+get_stats (struct parameter_list *p, struct fs_usage *fsp) {
+ struct parameter_list *p_list;
+ struct fs_usage tmpfsp;
+ int first = 1;
+
+ if (p->group == NULL) {
+ get_path_stats(p,fsp);
+ } else {
+ /* find all group members */
+ for (p_list = path_select_list; p_list; p_list=p_list->name_next) {
+ if (p_list->group && ! (strcmp(p_list->group, p->group))) {
+ stat_path(p_list);
+ get_fs_usage (p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp);
+ get_path_stats(p_list, &tmpfsp);
+ if (verbose >= 3)
+ printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n",
+ p_list->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize, p_list->best_match->me_mountdir, p_list->dused_units, p_list->dfree_units,
+ p_list->dtotal_units, mult);
+
+ /* prevent counting the first FS of a group twice since its parameter_list entry
+ * is used to carry the information of all file systems of the entire group */
+ if (! first) {
+ p->total += p_list->total;
+ p->available += p_list->available;
+ p->available_to_root += p_list->available_to_root;
+ p->used += p_list->used;
+
+ p->dused_units += p_list->dused_units;
+ p->dfree_units += p_list->dfree_units;
+ p->dtotal_units += p_list->dtotal_units;
+ p->inodes_total += p_list->inodes_total;
+ p->inodes_free += p_list->inodes_free;
+ }
+ first = 0;
+ }
+ if (verbose >= 3)
+ printf("Group %s now has: used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n",
+ p->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize, p->best_match->me_mountdir, p->dused_units,
+ p->dfree_units, p->dtotal_units, mult);
+ }
+ /* modify devname and mountdir for output */
+ p->best_match->me_mountdir = p->best_match->me_devname = p->group;
+ }
+ /* finally calculate percentages for either plain FS or summed up group */
+ p->dused_pct = calculate_percent( p->used, p->used + p->available ); /* used + available can never be > uintmax */
+ p->dfree_pct = 100 - p->dused_pct;
+ p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total);
+ p->dfree_inodes_percent = 100 - p->dused_inodes_percent;
+
+}
+
+void
+get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
+ p->total = fsp->fsu_blocks;
+ /* 2007-12-08 - Workaround for Gnulib reporting insanely high available
+ * space on BSD (the actual value should be negative but fsp->fsu_bavail
+ * is unsigned) */
+ p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail;
+ p->available_to_root = fsp->fsu_bfree;
+ p->used = p->total - p->available_to_root;
+
+ p->dused_units = p->used*fsp->fsu_blocksize/mult;
+ p->dfree_units = p->available*fsp->fsu_blocksize/mult;
+ p->dtotal_units = p->total*fsp->fsu_blocksize/mult;
+ p->inodes_total = fsp->fsu_files; /* Total file nodes. */
+ p->inodes_free = fsp->fsu_ffree; /* Free file nodes. */
+ np_add_name(&seen, p->best_match->me_mountdir);
+}
diff --git a/plugins/check_http.c b/plugins/check_http.c
index f08ad17..315848f 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -34,7 +34,7 @@
/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
const char *progname = "check_http";
-const char *copyright = "1999-2008";
+const char *copyright = "1999-2011";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
@@ -59,6 +59,7 @@ enum {
#ifdef HAVE_SSL
int check_cert = FALSE;
int days_till_exp;
+int ssl_version;
char *randbuff;
X509 *server_cert;
# define my_recv(buf, len) ((use_ssl) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
@@ -101,10 +102,9 @@ int server_expect_yn = 0;
char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
char string_expect[MAX_INPUT_BUFFER] = "";
char output_string_search[30] = "";
-double warning_time = 0;
-int check_warning_time = FALSE;
-double critical_time = 0;
-int check_critical_time = FALSE;
+char *warning_thresholds = NULL;
+char *critical_thresholds = NULL;
+thresholds *thlds;
char user_auth[MAX_INPUT_BUFFER] = "";
char proxy_auth[MAX_INPUT_BUFFER] = "";
int display_html = FALSE;
@@ -189,7 +189,7 @@ process_arguments (int argc, char **argv)
STD_LONG_OPTS,
{"link", no_argument, 0, 'L'},
{"nohtml", no_argument, 0, 'n'},
- {"ssl", no_argument, 0, 'S'},
+ {"ssl", optional_argument, 0, 'S'},
{"sni", no_argument, 0, SNI_OPTION},
{"post", required_argument, 0, 'P'},
{"method", required_argument, 0, 'j'},
@@ -235,7 +235,7 @@ process_arguments (int argc, char **argv)
}
while (1) {
- c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option);
+ c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:e:p:s:R:r:u:f:C:nlLS::m:M:N", longopts, &option);
if (c == -1 || c == EOF)
break;
@@ -258,20 +258,10 @@ process_arguments (int argc, char **argv)
socket_timeout = atoi (optarg);
break;
case 'c': /* critical time threshold */
- if (!is_nonnegative (optarg))
- usage2 (_("Critical threshold must be integer"), optarg);
- else {
- critical_time = strtod (optarg, NULL);
- check_critical_time = TRUE;
- }
+ critical_thresholds = optarg;
break;
case 'w': /* warning time threshold */
- if (!is_nonnegative (optarg))
- usage2 (_("Warning threshold must be integer"), optarg);
- else {
- warning_time = strtod (optarg, NULL);
- check_warning_time = TRUE;
- }
+ warning_thresholds = optarg;
break;
case 'A': /* User Agent String */
asprintf (&user_agent, "User-Agent: %s", optarg);
@@ -305,6 +295,13 @@ process_arguments (int argc, char **argv)
usage4 (_("Invalid option - SSL is not available"));
#endif
use_ssl = TRUE;
+ if (optarg == NULL || c != 'S')
+ ssl_version = 0;
+ else {
+ ssl_version = atoi(optarg);
+ if (ssl_version < 1 || ssl_version > 3)
+ usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));
+ }
if (specify_port == FALSE)
server_port = HTTPS_PORT;
break;
@@ -478,8 +475,10 @@ process_arguments (int argc, char **argv)
server_address = strdup (host_name);
}
- if (check_critical_time && critical_time>(double)socket_timeout)
- socket_timeout = (int)critical_time + 1;
+ set_thresholds(&thlds, warning_thresholds, critical_thresholds);
+
+ if (critical_thresholds && thlds->critical->end>(double)socket_timeout)
+ socket_timeout = (int)thlds->critical->end + 1;
if (http_method == NULL)
http_method = strdup ("GET");
@@ -807,7 +806,9 @@ check_http (void)
die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
#ifdef HAVE_SSL
if (use_ssl == TRUE) {
- np_net_ssl_init_with_hostname(sd, (use_sni ? host_name : NULL));
+ result = np_net_ssl_init_with_hostname_and_version(sd, (use_sni ? host_name : NULL), ssl_version);
+ if (result != STATE_OK)
+ return result;
if (check_cert == TRUE) {
result = np_net_ssl_check_cert(days_till_exp);
np_net_ssl_cleanup();
@@ -1099,10 +1100,7 @@ check_http (void)
(display_html ? "" : ""),
perfd_time (elapsed_time), perfd_size (page_len));
- if (check_critical_time == TRUE && elapsed_time > critical_time)
- result = STATE_CRITICAL;
- if (check_warning_time == TRUE && elapsed_time > warning_time)
- result = max_state_alt(STATE_WARNING, result);
+ result = max_state_alt(get_status(elapsed_time, thlds), result);
die (result, "HTTP %s: %s\n", state_text(result), msg);
/* die failed? */
@@ -1284,8 +1282,8 @@ server_port_check (int ssl_flag)
char *perfd_time (double elapsed_time)
{
return fperfdata ("time", elapsed_time, "s",
- check_warning_time, warning_time,
- check_critical_time, critical_time,
+ thlds->warning?TRUE:FALSE, thlds->warning?thlds->warning->end:0,
+ thlds->critical?TRUE:FALSE, thlds->critical?thlds->critical->end:0,
TRUE, 0, FALSE, 0);
}
@@ -1335,13 +1333,14 @@ print_help (void)
printf (UT_IPv46);
#ifdef HAVE_SSL
- printf (" %s\n", "-S, --ssl");
- printf (" %s\n", _("Connect via SSL. Port defaults to 443"));
+ printf (" %s\n", "-S, --ssl=VERSION");
+ printf (" %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
+ printf (" %s\n", _("auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."));
printf (" %s\n", "--sni");
- printf (" %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+ printf (" %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
printf (" %s\n", "-C, --certificate=INTEGER");
- printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
- printf (" %s\n", _("(when this option is used the URL is not checked.)\n"));
+ printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
+ printf (" %s\n", _("(when this option is used the URL is not checked.)\n"));
#endif
printf (" %s\n", "-e, --expect=STRING");
@@ -1378,16 +1377,16 @@ print_help (void)
printf (" %s\n", "-a, --authorization=AUTH_PAIR");
printf (" %s\n", _("Username:password on sites with basic authentication"));
printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
- printf (" %s\n", _("Username:password on proxy-servers with basic authentication"));
+ printf (" %s\n", _("Username:password on proxy-servers with basic authentication"));
printf (" %s\n", "-A, --useragent=STRING");
printf (" %s\n", _("String to be sent in http header as \"User Agent\""));
printf (" %s\n", "-k, --header=STRING");
- printf (" %s\n", _(" Any other tags to be sent in http header. Use multiple times for additional headers"));
+ printf (" %s\n", _("Any other tags to be sent in http header. Use multiple times for additional headers"));
printf (" %s\n", "-L, --link");
printf (" %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
printf (" %s\n", "-f, --onredirect=");
printf (" %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
- printf (" %s\n", _("specified IP address. stickyport also ensure post stays the same."));
+ printf (" %s\n", _("specified IP address. stickyport also ensures port stays the same."));
printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
@@ -1412,6 +1411,10 @@ print_help (void)
printf (" %s\n", _("serve content (optionally within a specified time) or whether the X509 "));
printf (" %s\n", _("certificate is still valid for the specified number of days."));
printf ("\n");
+ printf (" %s\n", _("Please note that this plugin does not check if the presented server"));
+ printf (" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
+ printf (" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
+ printf ("\n");
printf ("%s\n", _("Examples:"));
printf (" %s\n\n", "CHECK CONTENT: check_http -w 5 -c 10 --ssl -H www.verisign.com");
printf (" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));
@@ -1441,6 +1444,6 @@ print_usage (void)
printf (" [-b proxy_auth] [-f ]\n");
printf (" [-e ] [-s string] [-l] [-r | -R ]\n");
printf (" [-P string] [-m :] [-4|-6] [-N] [-M ]\n");
- printf (" [-A string] [-k string] [-S] [--sni] [-C ] [-T ]\n");
+ printf (" [-A string] [-k string] [-S ] [--sni] [-C ] [-T ]\n");
printf (" [-j method]\n");
}
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index b933ff2..f83f139 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -58,7 +58,7 @@ char *ld_host = NULL;
char *ld_base = NULL;
char *ld_passwd = NULL;
char *ld_binddn = NULL;
-int ld_port = DEFAULT_PORT;
+int ld_port = -1;
#ifdef HAVE_LDAP_SET_OPTION
int ld_protocol = DEFAULT_PROTOCOL;
#endif
@@ -247,7 +247,7 @@ process_arguments (int argc, char **argv)
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"timeout", required_argument, 0, 't'},
- {"host", required_argument, 0, 'H'},
+ {"hostname", required_argument, 0, 'H'},
{"base", required_argument, 0, 'b'},
{"attr", required_argument, 0, 'a'},
{"bind", required_argument, 0, 'D'},
@@ -341,7 +341,8 @@ process_arguments (int argc, char **argv)
case 'S':
if (! starttls) {
ssl_on_connect = TRUE;
- ld_port = LDAPS_PORT;
+ if (ld_port == -1)
+ ld_port = LDAPS_PORT;
} else
usage_va(_("%s cannot be combined with %s"), "-S/--ssl", "-T/--starttls");
break;
@@ -364,6 +365,9 @@ process_arguments (int argc, char **argv)
if (ld_base == NULL && argv[c])
ld_base = strdup (argv[c++]);
+ if (ld_port == -1)
+ ld_port = DEFAULT_PORT;
+
return validate_arguments ();
}
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 32d4ff6..60806bb 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -203,7 +203,12 @@ int main(int argc, char **argv){
uphours = (uptime % 86400) / 3600;
upminutes = ((uptime % 86400) % 3600) / 60;
asprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes);
- return_code=STATE_OK;
+ if (check_critical_value==TRUE && uptime <= critical_value)
+ return_code=STATE_CRITICAL;
+ else if (check_warning_value==TRUE && uptime <= warning_value)
+ return_code=STATE_WARNING;
+ else
+ return_code=STATE_OK;
break;
case CHECK_USEDDISKSPACE:
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index ecdd618..1367e90 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -432,6 +432,7 @@ run_ping (const char *cmd, const char *addr)
{
char buf[MAX_INPUT_BUFFER];
int result = STATE_UNKNOWN;
+ int match;
if ((child_process = spopen (cmd)) == NULL)
die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
@@ -448,28 +449,29 @@ run_ping (const char *cmd, const char *addr)
result = max_state (result, error_scan (buf, addr));
/* get the percent loss statistics */
- if(sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss",&pl)==1 ||
- sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss", &pl) == 1 ||
- sscanf(buf,"%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss", &pl) == 1 ||
- sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss",&pl)==1 ||
- sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time",&pl)==1 ||
- sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time", &pl)==1 ||
- sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time", &pl)==1 ||
- sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss", &pl) == 1 ||
- sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss", &pl) == 1
+ match = 0;
+ if((sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% packet loss%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d packets received, %d%% loss, time%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d received, %d%% loss, time%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d received, %d%% packet loss, time%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match) ||
+ (sscanf(buf,"%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",&pl,&match) && match)
)
continue;
/* get the round trip average */
else
- if(sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f",&rta)==1 ||
- sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f",&rta)==1 ||
- sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f",&rta)==1 ||
- sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f",&rta)==1 ||
- sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f",&rta)==1 ||
- sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f",&rta)==1 ||
- sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f",&rta)==1 ||
- sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms",&rta)==1)
+ if((sscanf(buf,"round-trip min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"round-trip (ms) min/avg/max = %*f/%f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n",&rta,&match) && match) ||
+ (sscanf(buf,"rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n",&rta,&match) && match))
continue;
}
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 2151fb3..d875a61 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -318,6 +318,8 @@ process_arguments (int argc, char **argv)
int err;
int cflags = REG_NOSUB | REG_EXTENDED;
char errbuf[MAX_INPUT_BUFFER];
+ char *temp_string;
+ int i=0;
static struct option longopts[] = {
{"warning", required_argument, 0, 'w'},
{"critical", required_argument, 0, 'c'},
@@ -450,7 +452,14 @@ process_arguments (int argc, char **argv)
regerror (err, &re_args, errbuf, MAX_INPUT_BUFFER);
die (STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
}
- asprintf (&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), optarg);
+ /* Strip off any | within the regex optarg */
+ temp_string = strdup(optarg);
+ while(temp_string[i]!='\0'){
+ if(temp_string[i]=='|')
+ temp_string[i]=',';
+ i++;
+ }
+ asprintf (&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), temp_string);
options |= EREG_ARGS;
break;
case 'r': /* RSS */
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 61d84fb..c2c93ee 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -211,7 +211,7 @@ main (int argc, char **argv)
if (result == OK_RC)
die (STATE_OK, _("Auth OK"));
(void)snprintf(msg, sizeof(msg), _("Unexpected result code %d"), result);
- die (STATE_UNKNOWN, msg);
+ die (STATE_UNKNOWN, "%s", msg);
}
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 3da724b..494bc2c 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -114,6 +114,7 @@ enum {
TCP_PROTOCOL = 1,
UDP_PROTOCOL = 2,
};
+int ignore_send_quit_failure = FALSE;
int
@@ -129,6 +130,9 @@ main (int argc, char **argv)
char *error_msg = "";
struct timeval tv;
+ /* Catch pipe errors in read/write - sometimes occurs when writing QUIT */
+ (void) signal (SIGPIPE, SIG_IGN);
+
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
@@ -183,7 +187,7 @@ main (int argc, char **argv)
/* return a WARNING status if we couldn't read any data */
if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) {
printf (_("recv() failed\n"));
- result = STATE_WARNING;
+ return STATE_WARNING;
}
else {
if (verbose)
@@ -197,7 +201,7 @@ main (int argc, char **argv)
else
printf (_("Invalid SMTP response received from host on port %d: %s\n"),
server_port, buffer);
- result = STATE_WARNING;
+ return STATE_WARNING;
}
}
@@ -272,9 +276,6 @@ main (int argc, char **argv)
# ifdef USE_OPENSSL
if ( check_cert ) {
result = np_net_ssl_check_cert(days_till_exp);
- if(result != STATE_OK){
- printf ("%s\n", _("CRITICAL - Cannot retrieve server certificate."));
- }
my_close();
return result;
}
@@ -476,6 +477,7 @@ process_arguments (int argc, char **argv)
{"help", no_argument, 0, 'h'},
{"starttls",no_argument,0,'S'},
{"certificate",required_argument,0,'D'},
+ {"ignore-quit-failure",no_argument,0,'q'},
{0, 0, 0, 0}
};
@@ -492,7 +494,7 @@ process_arguments (int argc, char **argv)
}
while (1) {
- c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:",
+ c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:q",
longopts, &option);
if (c == -1 || c == EOF)
@@ -579,6 +581,9 @@ process_arguments (int argc, char **argv)
case 'v': /* verbose */
verbose++;
break;
+ case 'q':
+ ignore_send_quit_failure++; /* ignore problem sending QUIT */
+ break;
case 't': /* timeout */
if (is_intnonneg (optarg)) {
socket_timeout = atoi (optarg);
@@ -662,8 +667,20 @@ void
smtp_quit(void)
{
int bytes;
+ int n;
+
+ n = my_send(SMTP_QUIT, strlen(SMTP_QUIT));
+ if(n < 0) {
+ if(ignore_send_quit_failure) {
+ if(verbose) {
+ printf(_("Connection closed by server before sending QUIT command\n"));
+ }
+ return;
+ }
+ die (STATE_UNKNOWN,
+ _("Connection closed by server before sending QUIT command\n"));
+ }
- my_send(SMTP_QUIT, strlen(SMTP_QUIT));
if (verbose)
printf(_("sent %s\n"), "QUIT");
@@ -797,7 +814,9 @@ print_help (void)
printf (" %s\n", _("SMTP AUTH username"));
printf (" %s\n", "-P, --authpass=STRING");
printf (" %s\n", _("SMTP AUTH password"));
-
+ printf (" %s\n", "-q, --ignore-quit-failure");
+ printf (" %s\n", _("Ignore failure when sending QUIT command to server"));
+
printf (UT_WARN_CRIT);
printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
@@ -821,6 +840,6 @@ print_usage (void)
printf ("%s\n", _("Usage:"));
printf ("%s -H host [-p port] [-e expect] [-C command] [-f from addr]", progname);
printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout]\n");
- printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6]\n");
+ printf ("[-F fqdn] [-S] [-D days] [-v] [-4|-6] [-q]\n");
}
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index f32a26e..4cd3805 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -169,7 +169,6 @@ main (int argc, char **argv)
char *state_string=NULL;
size_t response_length, current_length, string_length;
char *temp_string=NULL;
- int is_numeric=0;
time_t current_time;
double temp_double;
time_t duration;
@@ -335,29 +334,24 @@ main (int argc, char **argv)
/* We strip out the datatype indicator for PHBs */
if (strstr (response, "Gauge: ")) {
show = strstr (response, "Gauge: ") + 7;
- is_numeric++;
}
else if (strstr (response, "Gauge32: ")) {
show = strstr (response, "Gauge32: ") + 9;
- is_numeric++;
}
else if (strstr (response, "Counter32: ")) {
show = strstr (response, "Counter32: ") + 11;
- is_numeric++;
is_counter=1;
if(!calculate_rate)
strcpy(type, "c");
}
else if (strstr (response, "Counter64: ")) {
show = strstr (response, "Counter64: ") + 11;
- is_numeric++;
is_counter=1;
if(!calculate_rate)
strcpy(type, "c");
}
else if (strstr (response, "INTEGER: ")) {
show = strstr (response, "INTEGER: ") + 9;
- is_numeric++;
}
else if (strstr (response, "STRING: ")) {
show = strstr (response, "STRING: ") + 8;
@@ -396,15 +390,17 @@ main (int argc, char **argv)
}
}
- else if (strstr (response, "Timeticks: "))
+ else if (strstr (response, "Timeticks: ")) {
show = strstr (response, "Timeticks: ");
+ }
else
show = response;
iresult = STATE_DEPENDENT;
/* Process this block for numeric comparisons */
- if (is_numeric) {
+ /* Make some special values,like Timeticks numeric only if a threshold is defined */
+ if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
ptr = strpbrk (show, "0123456789");
if (ptr == NULL)
die (STATE_UNKNOWN,_("No valid data returned"));
@@ -744,7 +740,7 @@ process_arguments (int argc, char **argv)
labels[nlabels - 1] = optarg;
ptr = thisarg (optarg);
labels[nlabels - 1] = ptr;
- if (strstr (ptr, "'") == ptr)
+ if (ptr[0] == '\'')
labels[nlabels - 1] = ptr + 1;
while (ptr && (ptr = nextarg (ptr))) {
if (nlabels >= labels_size) {
@@ -753,9 +749,9 @@ process_arguments (int argc, char **argv)
if (labels == NULL)
die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
}
- labels++;
+ nlabels++;
ptr = thisarg (ptr);
- if (strstr (ptr, "'") == ptr)
+ if (ptr[0] == '\'')
labels[nlabels - 1] = ptr + 1;
else
labels[nlabels - 1] = ptr;
@@ -773,7 +769,7 @@ process_arguments (int argc, char **argv)
unitv[nunits - 1] = optarg;
ptr = thisarg (optarg);
unitv[nunits - 1] = ptr;
- if (strstr (ptr, "'") == ptr)
+ if (ptr[0] == '\'')
unitv[nunits - 1] = ptr + 1;
while (ptr && (ptr = nextarg (ptr))) {
if (nunits >= unitv_size) {
@@ -784,7 +780,7 @@ process_arguments (int argc, char **argv)
}
nunits++;
ptr = thisarg (ptr);
- if (strstr (ptr, "'") == ptr)
+ if (ptr[0] == '\'')
unitv[nunits - 1] = ptr + 1;
else
unitv[nunits - 1] = ptr;
@@ -939,7 +935,7 @@ char *
thisarg (char *str)
{
str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
- if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+ if (str[0] == '\'') { /* handle SIMPLE quoted strings */
if (strlen (str) == 1 || !strstr (str + 1, "'"))
die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
}
@@ -955,7 +951,7 @@ thisarg (char *str)
char *
nextarg (char *str)
{
- if (strstr (str, "'") == str) {
+ if (str[0] == '\'') {
str[0] = 0;
if (strlen (str) > 1) {
str = strstr (str + 1, "'");
@@ -965,7 +961,7 @@ nextarg (char *str)
return NULL;
}
}
- if (strstr (str, ",") == str) {
+ if (str[0] == ',') {
str[0] = 0;
if (strlen (str) > 1) {
return (++str);
@@ -1076,8 +1072,8 @@ print_help (void)
printf ("\n");
printf ("%s\n", _("Notes:"));
- printf (" %s\n", _("- Multiple OIDs may be indicated by a comma or space-delimited list (lists with"));
- printf (" %s %i %s\n", _("internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
+ printf (" %s\n", _("- Multiple OIDs (and labels) may be indicated by a comma or space-delimited "));
+ printf (" %s %i %s\n", _("list (lists with internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
printf(" -%s", UT_THRESHOLDS_NOTES);
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 2509b86..3bbf44d 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -215,6 +215,10 @@ ssh_connect (char *haddr, int hport, char *remote_version)
char *ssh_proto = NULL;
char *ssh_server = NULL;
static char *rev_no = VERSION;
+ struct timeval tv;
+ double elapsed_time;
+
+ gettimeofday(&tv, NULL);
result = my_tcp_connect (haddr, hport, &sd);
@@ -250,9 +254,12 @@ ssh_connect (char *haddr, int hport, char *remote_version)
exit (STATE_WARNING);
}
+ elapsed_time = (double)deltime(tv) / 1.0e6;
+
printf
- (_("SSH OK - %s (protocol %s)\n"),
- ssh_server, ssh_proto);
+ (_("SSH OK - %s (protocol %s) | %s\n"),
+ ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
+ FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
close(sd);
exit (STATE_OK);
}
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 178bd56..d3c92a4 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -236,12 +236,9 @@ main (int argc, char **argv)
result = np_net_ssl_init(sd);
if (result == STATE_OK && check_cert == TRUE) {
result = np_net_ssl_check_cert(days_till_exp);
- if(result != STATE_OK) {
- printf(_("CRITICAL - Cannot retrieve server certificate.\n"));
- }
}
}
- if(result != STATE_OK){
+ if(result != STATE_OK || check_cert == TRUE){
np_net_ssl_cleanup();
if(sd) close(sd);
return result;
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 8368612..3766292 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -3,7 +3,7 @@
* Nagios check_users plugin
*
* License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2012 Nagios Plugins Development Team
*
* Description:
*
@@ -35,8 +35,8 @@ const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
-#include "popen.h"
#include "utils.h"
+#include
#define possibly_set(a,b) ((a) == 0 ? (b) : 0)
@@ -52,58 +52,33 @@ main (int argc, char **argv)
{
int users = -1;
int result = STATE_UNKNOWN;
- char input_buffer[MAX_INPUT_BUFFER];
char *perf;
+ struct utmpx *putmpx;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- perf = strdup("");
+ perf = strdup ("");
/* Parse extra opts if any */
- argv=np_extra_opts (&argc, argv, progname);
+ argv = np_extra_opts (&argc, argv, progname);
if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
- /* run the command */
- child_process = spopen (WHO_COMMAND);
- if (child_process == NULL) {
- printf (_("Could not open pipe: %s\n"), WHO_COMMAND);
- return STATE_UNKNOWN;
- }
-
- child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
- if (child_stderr == NULL)
- printf (_("Could not open stderr for %s\n"), WHO_COMMAND);
-
users = 0;
- while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+ /* get currently logged users from utmpx */
+ setutxent ();
- /* increment 'users' on all lines except total user count */
- if (input_buffer[0] != '#') {
+ while ((putmpx = getutxent ()) != NULL)
+ if (putmpx->ut_type == USER_PROCESS)
users++;
- continue;
- }
- /* get total logged in users */
- if (sscanf (input_buffer, _("# users=%d"), &users) == 1)
- break;
+ endutxent ();
- }
-
- /* check STDERR */
- if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
- result = possibly_set (result, STATE_UNKNOWN);
- (void) fclose (child_stderr);
-
- /* close the pipe */
- if (spclose (child_process))
- result = possibly_set (result, STATE_UNKNOWN);
-
- /* else check the user count against warning and critical thresholds */
+ /* check the user count against warning and critical thresholds */
if (users > cusers)
result = STATE_CRITICAL;
else if (users > wusers)
@@ -114,7 +89,7 @@ main (int argc, char **argv)
if (result == STATE_UNKNOWN)
printf ("%s\n", _("Unable to read output"));
else {
- asprintf(&perf, "%s", perfdata ("users", users, "",
+ asprintf (&perf, "%s", perfdata ("users", users, "",
TRUE, wusers,
TRUE, cusers,
TRUE, 0,
@@ -126,14 +101,11 @@ main (int argc, char **argv)
return result;
}
-
-
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
{
int c;
-
int option = 0;
static struct option longopts[] = {
{"critical", required_argument, 0, 'c'},
@@ -183,7 +155,6 @@ process_arguments (int argc, char **argv)
else
wusers = atoi (argv[c++]);
}
-
if (cusers == -1 && argc > c) {
if (is_intnonneg (argv[c]) == FALSE)
usage4 (_("Warning threshold must be a positive integer"));
@@ -194,8 +165,6 @@ process_arguments (int argc, char **argv)
return OK;
}
-
-
void
print_help (void)
{
@@ -205,9 +174,9 @@ print_help (void)
printf (COPYRIGHT, copyright, email);
printf ("%s\n", _("This plugin checks the number of users currently logged in on the local"));
- printf ("%s\n", _("system and generates an error if the number exceeds the thresholds specified."));
+ printf ("%s\n", _("system and generates an error if the number exceeds the thresholds specified."));
- printf ("\n\n");
+ printf ("\n\n");
print_usage ();
@@ -215,17 +184,16 @@ print_help (void)
printf (UT_EXTRA_OPTS);
printf (" %s\n", "-w, --warning=INTEGER");
- printf (" %s\n", _("Set WARNING status if more than INTEGER users are logged in"));
- printf (" %s\n", "-c, --critical=INTEGER");
- printf (" %s\n", _("Set CRITICAL status if more than INTEGER users are logged in"));
+ printf (" %s\n", _("Set WARNING status if more than INTEGER users are logged in"));
+ printf (" %s\n", "-c, --critical=INTEGER");
+ printf (" %s\n", _("Set CRITICAL status if more than INTEGER users are logged in"));
printf (UT_SUPPORT);
}
-
void
print_usage (void)
{
- printf ("%s\n", _("Usage:"));
+ printf ("%s\n", _("Usage:"));
printf ("%s -w -c \n", progname);
}
diff --git a/plugins/common.h b/plugins/common.h
index dfc0941..09af7e7 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -59,6 +59,12 @@
#include
#endif
+#ifdef _AIX
+#ifdef HAVE_MP_H
+#include
+#endif
+#endif
+
#ifdef HAVE_STRINGS_H
#include
#endif
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 64f4d61..5425bb2 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -3,7 +3,7 @@
* Nagios plugins SSL utilities
*
* License: GPL
-* Copyright (c) 2005-2007 Nagios Plugins Development Team
+* Copyright (c) 2005-2010 Nagios Plugins Development Team
*
* Description:
*
@@ -26,6 +26,7 @@
*
*****************************************************************************/
+#define MAX_CN_LENGTH 256
#define LOCAL_TIMEOUT_ALARM_HANDLER
#include "common.h"
#include "netutils.h"
@@ -35,68 +36,104 @@ static SSL_CTX *c=NULL;
static SSL *s=NULL;
static int initialized=0;
-int np_net_ssl_init (int sd) {
- return np_net_ssl_init_with_hostname(sd, NULL);
+int np_net_ssl_init(int sd) {
+ return np_net_ssl_init_with_hostname(sd, NULL);
}
-int np_net_ssl_init_with_hostname (int sd, char *host_name) {
- if (!initialized) {
- /* Initialize SSL context */
- SSLeay_add_ssl_algorithms ();
- SSL_load_error_strings ();
- OpenSSL_add_all_algorithms ();
- initialized = 1;
- }
- if ((c = SSL_CTX_new (SSLv23_client_method ())) == NULL) {
- printf ("%s\n", _("CRITICAL - Cannot create SSL context."));
- return STATE_CRITICAL;
- }
- if ((s = SSL_new (c)) != NULL){
-#ifdef SSL_set_tlsext_host_name
- if (host_name != NULL)
- SSL_set_tlsext_host_name(s, host_name);
-#endif
- SSL_set_fd (s, sd);
- if (SSL_connect(s) == 1){
- return OK;
- } else {
- printf ("%s\n", _("CRITICAL - Cannot make SSL connection "));
-# ifdef USE_OPENSSL /* XXX look into ERR_error_string */
- ERR_print_errors_fp (stdout);
-# endif /* USE_OPENSSL */
- }
- } else {
- printf ("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
- }
+int np_net_ssl_init_with_hostname(int sd, char *host_name) {
+ return np_net_ssl_init_with_hostname_and_version(sd, host_name, 0);
+}
+
+int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version) {
+ const SSL_METHOD *method = NULL;
+
+ switch (version) {
+ case 0: /* Deafult to auto negotiation */
+ method = SSLv23_client_method();
+ break;
+ case 1: /* TLSv1 protocol */
+ method = TLSv1_client_method();
+ break;
+ case 2: /* SSLv2 protocol */
+#if defined(USE_GNUTLS) || defined(OPENSSL_NO_SSL2)
+ printf(("%s\n", _("CRITICAL - SSL protocol version 2 is not supported by your SSL library.")));
return STATE_CRITICAL;
-}
-
-void np_net_ssl_cleanup (){
- if(s){
-#ifdef SSL_set_tlsext_host_name
- SSL_set_tlsext_host_name(s, NULL);
+#else
+ method = SSLv2_client_method();
#endif
- SSL_shutdown (s);
- SSL_free (s);
- if(c) {
- SSL_CTX_free (c);
- c=NULL;
- }
- s=NULL;
+ break;
+ case 3: /* SSLv3 protocol */
+ method = SSLv3_client_method();
+ break;
+ default: /* Unsupported */
+ printf("%s\n", _("CRITICAL - Unsupported SSL protocol version."));
+ return STATE_CRITICAL;
+ }
+ if (!initialized) {
+ /* Initialize SSL context */
+ SSLeay_add_ssl_algorithms();
+ SSL_load_error_strings();
+ OpenSSL_add_all_algorithms();
+ initialized = 1;
+ }
+ if ((c = SSL_CTX_new(method)) == NULL) {
+ printf("%s\n", _("CRITICAL - Cannot create SSL context."));
+ return STATE_CRITICAL;
+ }
+#ifdef SSL_OP_NO_TICKET
+ SSL_CTX_set_options(c, SSL_OP_NO_TICKET);
+#endif
+ if ((s = SSL_new(c)) != NULL) {
+#ifdef SSL_set_tlsext_host_name
+ if (host_name != NULL)
+ SSL_set_tlsext_host_name(s, host_name);
+#endif
+ SSL_set_fd(s, sd);
+ if (SSL_connect(s) == 1) {
+ return OK;
+ } else {
+ printf("%s\n", _("CRITICAL - Cannot make SSL connection."));
+# ifdef USE_OPENSSL /* XXX look into ERR_error_string */
+ ERR_print_errors_fp(stdout);
+# endif /* USE_OPENSSL */
}
+ } else {
+ printf("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
+ }
+ return STATE_CRITICAL;
}
-int np_net_ssl_write(const void *buf, int num){
+void np_net_ssl_cleanup() {
+ if (s) {
+#ifdef SSL_set_tlsext_host_name
+ SSL_set_tlsext_host_name(s, NULL);
+#endif
+ SSL_shutdown(s);
+ SSL_free(s);
+ if (c) {
+ SSL_CTX_free(c);
+ c=NULL;
+ }
+ s=NULL;
+ }
+}
+
+int np_net_ssl_write(const void *buf, int num) {
return SSL_write(s, buf, num);
}
-int np_net_ssl_read(void *buf, int num){
+int np_net_ssl_read(void *buf, int num) {
return SSL_read(s, buf, num);
}
-int np_net_ssl_check_cert(int days_till_exp){
+int np_net_ssl_check_cert(int days_till_exp) {
# ifdef USE_OPENSSL
X509 *certificate=NULL;
+ X509_NAME *subj=NULL;
+ char cn[MAX_CN_LENGTH]= "";
+ int cnlen =-1;
+ int status=STATE_UNKNOWN;
+
ASN1_STRING *tm;
int offset;
struct tm stamp;
@@ -105,18 +142,29 @@ int np_net_ssl_check_cert(int days_till_exp){
char timestamp[17] = "";
certificate=SSL_get_peer_certificate(s);
- if(! certificate){
- printf ("%s\n",_("CRITICAL - Cannot retrieve server certificate."));
+ if (!certificate) {
+ printf("%s\n",_("CRITICAL - Cannot retrieve server certificate."));
return STATE_CRITICAL;
}
+ /* Extract CN from certificate subject */
+ subj=X509_get_subject_name(certificate);
+
+ if (!subj) {
+ printf("%s\n",_("CRITICAL - Cannot retrieve certificate subject."));
+ return STATE_CRITICAL;
+ }
+ cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, cn, sizeof(cn));
+ if (cnlen == -1)
+ strcpy(cn, _("Unknown CN"));
+
/* Retrieve timestamp of certificate */
- tm = X509_get_notAfter (certificate);
+ tm = X509_get_notAfter(certificate);
/* Generate tm structure to process timestamp */
if (tm->type == V_ASN1_UTCTIME) {
if (tm->length < 10) {
- printf ("%s\n", _("CRITICAL - Wrong time format in certificate."));
+ printf("%s\n", _("CRITICAL - Wrong time format in certificate."));
return STATE_CRITICAL;
} else {
stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
@@ -126,7 +174,7 @@ int np_net_ssl_check_cert(int days_till_exp){
}
} else {
if (tm->length < 12) {
- printf ("%s\n", _("CRITICAL - Wrong time format in certificate."));
+ printf("%s\n", _("CRITICAL - Wrong time format in certificate."));
return STATE_CRITICAL;
} else {
stamp.tm_year =
@@ -155,21 +203,22 @@ int np_net_ssl_check_cert(int days_till_exp){
stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
if (days_left > 0 && days_left <= days_till_exp) {
- printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
- return STATE_WARNING;
+ printf(_("WARNING - Certificate '%s' expires in %d day(s) (%s).\n"), cn, days_left, timestamp);
+ status=STATE_WARNING;
} else if (time_left < 0) {
- printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
- return STATE_CRITICAL;
+ printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), cn, timestamp);
+ status=STATE_CRITICAL;
} else if (days_left == 0) {
- printf (_("WARNING - Certificate expires today (%s).\n"), timestamp);
- return STATE_WARNING;
+ printf(_("WARNING - Certificate '%s' expires today (%s).\n"), cn, timestamp);
+ status=STATE_WARNING;
+ } else {
+ printf(_("OK - Certificate '%s' will expire on %s.\n"), cn, timestamp);
+ status=STATE_OK;
}
-
- printf (_("OK - Certificate will expire on %s.\n"), timestamp);
- X509_free (certificate);
- return STATE_OK;
+ X509_free(certificate);
+ return status;
# else /* ifndef USE_OPENSSL */
- printf ("%s\n", _("WARNING - Plugin does not support checking certificates."));
+ printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
return STATE_WARNING;
# endif /* USE_OPENSSL */
}
diff --git a/plugins/t/check_by_ssh.t b/plugins/t/check_by_ssh.t
index 5f2c534..cca72c9 100644
--- a/plugins/t/check_by_ssh.t
+++ b/plugins/t/check_by_ssh.t
@@ -17,9 +17,14 @@ my $ssh_key = getTestParameter( "NP_SSH_IDENTITY",
"A key allowing access to NP_SSH_HOST",
"~/.ssh/id_dsa");
+my $ssh_conf = getTestParameter( "NP_SSH_CONFIGFILE",
+ "A config file with ssh settings",
+ "~/.ssh/config");
+
+
plan skip_all => "SSH_HOST and SSH_IDENTITY must be defined" unless ($ssh_service && $ssh_key);
-plan tests => 40;
+plan tests => 42;
# Some random check strings/response
my @responce = ('OK: Everything is fine!',
@@ -85,6 +90,12 @@ $result = NPTest->testCmd(
cmp_ok($result->return_code, '==', 8, "Exit with return code 8 (out of bounds)");
is($result->output, $responce[4], "Return proper status text even with unknown status codes");
+$result = NPTest->testCmd(
+ "./check_by_ssh -i $ssh_key -H $ssh_service -F $ssh_conf -C 'exit 0'"
+ );
+cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+is($result->output, 'OK - check_by_ssh: Remote command \'exit 0\' returned status 0', "Status text if command returned none (OK)");
+
# Multiple active checks
$result = NPTest->testCmd(
"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[1]; sh -c exit\\ 1' -C '$check[0]; sh -c exit\\ 0' -C '$check[3]; sh -c exit\\ 3' -C '$check[2]; sh -c exit\\ 2'"
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index c43a64a..55a5a53 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -102,7 +102,7 @@ SKIP: {
$res = NPTest->testCmd( "./check_http -C 1 --ssl www.verisign.com" );
cmp_ok( $res->return_code, '==', 0, "Checking certificate for www.verisign.com");
- like ( $res->output, '/Certificate will expire on/', "Output OK" );
+ like ( $res->output, "/Certificate 'www.verisign.com' will expire on/", "Output OK" );
my $saved_cert_output = $res->output;
$res = NPTest->testCmd( "./check_http www.verisign.com -C 1" );
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 004ba1a..04bf500 100644
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@@ -8,7 +8,7 @@ use strict;
use Test::More;
use NPTest;
-my $tests = 8+38+2+2;
+my $tests = 8+42+2+2;
plan tests => $tests;
my $res;
@@ -124,6 +124,13 @@ SKIP: {
cmp_ok( $res->return_code, '==', 0, "Skipping all thresholds");
like($res->output, '/^SNMP OK - \d+ \w+ \d+\s.*$/', "Skipping all thresholds, result printed rather than parsed");
+ $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -c 1000000000000: -u '1/100 sec'");
+ cmp_ok( $res->return_code, '==', 2, "Timetick used as a threshold");
+ like($res->output, '/^SNMP CRITICAL - \*\d+\* 1\/100 sec.*$/', "Timetick used as a threshold, parsed as numeric");
+
+ $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0");
+ cmp_ok( $res->return_code, '==', 0, "Timetick used as a string");
+ like($res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "Timetick used as a string, result printed rather than parsed");
}
# These checks need a complete command line. An invalid community is used so
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index f03933b..9ae6bbd 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -18,9 +18,24 @@ use Test::More;
use NPTest;
use FindBin qw($Bin);
-use HTTP::Daemon;
-use HTTP::Status;
-use HTTP::Response;
+my $common_tests = 66;
+my $ssl_only_tests = 6;
+# Check that all dependent modules are available
+eval {
+ require HTTP::Daemon;
+ require HTTP::Status;
+ require HTTP::Response;
+};
+
+if ($@) {
+ plan skip_all => "Missing required module for test: $@";
+} else {
+ if (-x "./check_http") {
+ plan tests => $common_tests * 2 + $ssl_only_tests;
+ } else {
+ plan skip_all => "No check_http compiled";
+ }
+}
my $servers = { http => 0 }; # HTTP::Daemon should always be available
eval { require HTTP::Daemon::SSL };
@@ -112,9 +127,9 @@ sub run_server {
$c->send_response("slow");
} elsif ($r->url->path eq "/method") {
if ($r->method eq "DELETE") {
- $c->send_error(RC_METHOD_NOT_ALLOWED);
+ $c->send_error(HTTP::Status->RC_METHOD_NOT_ALLOWED);
} elsif ($r->method eq "foo") {
- $c->send_error(RC_NOT_IMPLEMENTED);
+ $c->send_error(HTTP::Status->RC_NOT_IMPLEMENTED);
} else {
$c->send_status_line(200, $r->method);
}
@@ -138,7 +153,7 @@ sub run_server {
delete($persist[1000]);
next MAINLOOP;
} else {
- $c->send_error(RC_FORBIDDEN);
+ $c->send_error(HTTP::Status->RC_FORBIDDEN);
}
$c->close;
}
@@ -157,14 +172,6 @@ if ($ARGV[0] && $ARGV[0] eq "-d") {
}
}
-my $common_tests = 66;
-my $ssl_only_tests = 6;
-if (-x "./check_http") {
- plan tests => $common_tests * 2 + $ssl_only_tests;
-} else {
- plan skip_all => "No check_http compiled";
-}
-
my $result;
my $command = "./check_http -H 127.0.0.1";
@@ -175,17 +182,17 @@ SKIP: {
$result = NPTest->testCmd( "$command -p $port_https -S -C 14" );
is( $result->return_code, 0, "$command -p $port_https -S -C 14" );
- is( $result->output, 'OK - Certificate will expire on 03/03/2019 21:41.', "output ok" );
+ is( $result->output, 'OK - Certificate \'Ton Voon\' will expire on 03/03/2019 21:41.', "output ok" );
$result = NPTest->testCmd( "$command -p $port_https -S -C 14000" );
is( $result->return_code, 1, "$command -p $port_https -S -C 14000" );
- like( $result->output, '/WARNING - Certificate expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" );
+ like( $result->output, '/WARNING - Certificate \'Ton Voon\' expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" );
# Expired cert tests
$result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" );
is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" );
is( $result->output,
- 'CRITICAL - Certificate expired on 03/05/2009 00:13.',
+ 'CRITICAL - Certificate \'Ton Voon\' expired on 03/05/2009 00:13.',
"output ok" );
}
diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t
index 1d0c034..d71c83a 100644
--- a/plugins/tests/check_procs.t
+++ b/plugins/tests/check_procs.t
@@ -8,7 +8,7 @@ use Test::More;
use NPTest;
if (-x "./check_procs") {
- plan tests => 48;
+ plan tests => 50;
} else {
plan skip_all => "No check_procs compiled";
}
@@ -113,3 +113,7 @@ $result = NPTest->testCmd( "$command --metric=RSS -c 70000 -v" );
is( $result->return_code, 2, "Checking against RSS > 70MB" );
is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari]', "Output correct" );
+$result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" );
+is( $result->return_code, 0, "Checking no pipe symbol in output" );
+is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)'", "Output correct" );
+
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index e7ad192..2645cc1 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -8,6 +8,7 @@ use Test::More;
use NPTest;
use FindBin qw($Bin);
+my $tests = 41;
# Check that all dependent modules are available
eval {
require NetSNMP::OID;
@@ -17,6 +18,12 @@ eval {
if ($@) {
plan skip_all => "Missing required module for test: $@";
+} else {
+ if (-x "./check_snmp") {
+ plan tests => $tests;
+ } else {
+ plan skip_all => "No check_snmp compiled";
+ }
}
my $port_snmp = 16100 + int(rand(100));
@@ -51,12 +58,8 @@ if ($ARGV[0] && $ARGV[0] eq "-d") {
}
}
-my $tests = 33;
-if (-x "./check_snmp") {
- plan tests => $tests;
-} else {
- plan skip_all => "No check_snmp compiled";
-}
+# We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data
+$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp";
my $res;
@@ -106,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
"And now have fun with with this: \"C:\\\\\"
because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
-system("rm /usr/local/nagios/var/check_snmp/*");
+system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*");
$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
is($res->return_code, 0, "Returns OK");
is($res->output, "No previous data to calculate rate - assume okay");
@@ -170,5 +173,19 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1
is($res->return_code, 0, "OK as string doesn't match but inverted" );
is($res->output, 'SNMP OK - "stringtests" | ', "OK as inverted string no match" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.12 -w 4:5" );
+is($res->return_code, 1, "Numeric in string test" );
+is($res->output, 'SNMP WARNING - *3.5* | iso.3.6.1.4.1.8072.3.2.67.12=3.5 ', "WARNING threshold checks for string masquerading as number" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.13" );
+is($res->return_code, 0, "Not really numeric test" );
+is($res->output, 'SNMP OK - "87.4startswithnumberbutshouldbestring" | ', "Check string with numeric start is still string" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.14" );
+is($res->return_code, 0, "Not really numeric test (trying best to fool it)" );
+is($res->output, 'SNMP OK - "555\"I said\"" | ', "Check string with a double quote following is still a string (looks like the perl routine will always escape though)" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.15 -r 'CUSTOM CHECK OK'" );
+is($res->return_code, 0, "String check should check whole string, not a parsed number" );
+is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check witn numbers returns whole string");
diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl
index 8784ab1..8cacd52 100644
--- a/plugins/tests/check_snmp_agent.pl
+++ b/plugins/tests/check_snmp_agent.pl
@@ -33,9 +33,10 @@ ends with with this: C:\\';
my $multilin5 = 'And now have fun with with this: "C:\\"
because we\'re not done yet!';
-my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR);
-my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests");
-my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef);
+# 0..15 <---- please update comment when adding/removing fields
+my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR );
+my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345' );
+my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef );
# Number of elements in our OID
my $oidelts;
diff --git a/po/de.gmo b/po/de.gmo
index 7323bb6..0df58a2 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index cb886f9..a734dbc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nagiosplug\n"
"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-09 19:30-0400\n"
+"POT-Creation-Date: 2012-06-11 23:01+0100\n"
"PO-Revision-Date: 2004-12-23 17:46+0100\n"
"Last-Translator: <>\n"
"Language-Team: English \n"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);X-Generator: KBabel 1.3.1\n"
#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87
-#: plugins/check_disk.c:192 plugins/check_dns.c:102 plugins/check_dummy.c:52
+#: plugins/check_disk.c:190 plugins/check_dns.c:102 plugins/check_dummy.c:52
#: plugins/check_fping.c:89 plugins/check_game.c:82 plugins/check_hpjd.c:103
#: plugins/check_http.c:157 plugins/check_ldap.c:109 plugins/check_load.c:122
#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:85
@@ -27,8 +27,8 @@ msgstr ""
#: plugins/check_ntp_peer.c:569 plugins/check_ntp_time.c:548
#: plugins/check_nwstat.c:173 plugins/check_overcr.c:102
#: plugins/check_pgsql.c:154 plugins/check_ping.c:95 plugins/check_procs.c:147
-#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:140
-#: plugins/check_snmp.c:205 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
+#: plugins/check_snmp.c:204 plugins/check_ssh.c:73 plugins/check_swap.c:110
#: plugins/check_tcp.c:209 plugins/check_time.c:78 plugins/check_ups.c:122
#: plugins/check_users.c:68 plugins/negate.c:211 plugins-root/check_dhcp.c:270
msgid "Could not parse arguments"
@@ -60,59 +60,59 @@ msgstr "SSH WARNING: Konnte %s nicht
msgid "%s: Error parsing output\n"
msgstr ""
-#: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
+#: plugins/check_by_ssh.c:220 plugins/check_disk.c:467
#: plugins/check_http.c:256 plugins/check_ldap.c:293 plugins/check_pgsql.c:250
-#: plugins/check_procs.c:364 plugins/check_radius.c:308
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:665
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
+#: plugins/check_procs.c:366 plugins/check_radius.c:308
+#: plugins/check_real.c:356 plugins/check_smtp.c:592 plugins/check_snmp.c:661
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:487 plugins/check_time.c:302
#: plugins/check_ups.c:556 plugins/negate.c:161
msgid "Timeout interval must be a positive integer"
msgstr "Timeout interval muss ein positiver Integer sein"
-#: plugins/check_by_ssh.c:229 plugins/check_pgsql.c:274
+#: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:274
#: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:514 plugins/check_tcp.c:496 plugins/check_time.c:296
+#: plugins/check_smtp.c:516 plugins/check_tcp.c:493 plugins/check_time.c:296
#: plugins/check_ups.c:518
msgid "Port must be a positive integer"
msgstr "Port muss ein positiver Integer sein"
-#: plugins/check_by_ssh.c:290
+#: plugins/check_by_ssh.c:291
#, fuzzy
msgid "skip-stdout argument must be an integer"
msgstr "skip-stdout argument muss ein Integer sein"
-#: plugins/check_by_ssh.c:298
+#: plugins/check_by_ssh.c:299
#, fuzzy
msgid "skip-stderr argument must be an integer"
msgstr "skip-stderr argument muss ein Integer sein"
-#: plugins/check_by_ssh.c:317
+#: plugins/check_by_ssh.c:322
#, c-format
msgid "%s: You must provide a host name\n"
msgstr "%s: Hostname muss angegeben werden\n"
-#: plugins/check_by_ssh.c:335
+#: plugins/check_by_ssh.c:340
msgid "No remotecmd"
msgstr "Kein remotecm"
-#: plugins/check_by_ssh.c:349
+#: plugins/check_by_ssh.c:354
#, c-format
msgid "%s: Argument limit of %d exceeded\n"
msgstr ""
-#: plugins/check_by_ssh.c:352
+#: plugins/check_by_ssh.c:357
#, fuzzy
msgid "Can not (re)allocate 'commargv' buffer\n"
msgstr "Konnte·url·nicht·zuweisen\n"
-#: plugins/check_by_ssh.c:366
+#: plugins/check_by_ssh.c:371
#, c-format
msgid ""
"%s: In passive mode, you must provide a service name for each command.\n"
msgstr ""
"%s: Im passive mode muss ein Servicename für jeden Befehl angegeben werden.\n"
-#: plugins/check_by_ssh.c:369
+#: plugins/check_by_ssh.c:374
#, c-format
msgid ""
"%s: In passive mode, you must provide the host short name from the nagios "
@@ -121,126 +121,130 @@ msgstr ""
"%s: Im passive mode muss der \"host short name\" aus der Nagios "
"Konfiguration angegeben werden\n"
-#: plugins/check_by_ssh.c:383
+#: plugins/check_by_ssh.c:388
#, fuzzy, c-format
msgid "This plugin uses SSH to execute commands on a remote host"
msgstr ""
"Dieses Plugin nutzt SSH um Befehle auf dem entfernten Rechner auszuführen\n"
"\n"
-#: plugins/check_by_ssh.c:398
+#: plugins/check_by_ssh.c:403
msgid "tell ssh to use Protocol 1 [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:400
+#: plugins/check_by_ssh.c:405
msgid "tell ssh to use Protocol 2 [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:402
+#: plugins/check_by_ssh.c:407
msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:404
+#: plugins/check_by_ssh.c:409
msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:406
+#: plugins/check_by_ssh.c:411
msgid ""
"tells ssh to fork rather than create a tty [optional]. This will always "
"return OK if ssh is executed"
msgstr ""
-#: plugins/check_by_ssh.c:408
+#: plugins/check_by_ssh.c:413
msgid "command to execute on the remote machine"
msgstr ""
-#: plugins/check_by_ssh.c:410
+#: plugins/check_by_ssh.c:415
msgid "SSH user name on remote host [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:412
+#: plugins/check_by_ssh.c:417
msgid "identity of an authorized key [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:414
+#: plugins/check_by_ssh.c:419
msgid "external command file for nagios [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:416
+#: plugins/check_by_ssh.c:421
msgid "list of nagios service names, separated by ':' [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:418
+#: plugins/check_by_ssh.c:423
msgid "short name of host in nagios configuration [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:420
+#: plugins/check_by_ssh.c:425
msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:422
-msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
-msgstr ""
-
#: plugins/check_by_ssh.c:427
-msgid "The most common mode of use is to refer to a local identity file with"
-msgstr ""
-
-#: plugins/check_by_ssh.c:428
-msgid "the '-i' option. In this mode, the identity pair should have a null"
+msgid "Tell ssh to use this configfile [optional]"
msgstr ""
#: plugins/check_by_ssh.c:429
-msgid "passphrase and the public key should be listed in the authorized_keys"
+msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:430
-msgid "file of the remote host. Usually the key will be restricted to running"
-msgstr ""
-
-#: plugins/check_by_ssh.c:431
-msgid "only one command on the remote server. If the remote SSH server tracks"
-msgstr ""
-
-#: plugins/check_by_ssh.c:432
-msgid "invocation arguments, the one remote program may be an agent that can"
-msgstr ""
-
-#: plugins/check_by_ssh.c:433
-msgid "execute additional commands as proxy"
+#: plugins/check_by_ssh.c:434
+msgid "The most common mode of use is to refer to a local identity file with"
msgstr ""
#: plugins/check_by_ssh.c:435
-msgid "To use passive mode, provide multiple '-C' options, and provide"
+msgid "the '-i' option. In this mode, the identity pair should have a null"
msgstr ""
#: plugins/check_by_ssh.c:436
+msgid "passphrase and the public key should be listed in the authorized_keys"
+msgstr ""
+
+#: plugins/check_by_ssh.c:437
+msgid "file of the remote host. Usually the key will be restricted to running"
+msgstr ""
+
+#: plugins/check_by_ssh.c:438
+msgid "only one command on the remote server. If the remote SSH server tracks"
+msgstr ""
+
+#: plugins/check_by_ssh.c:439
+msgid "invocation arguments, the one remote program may be an agent that can"
+msgstr ""
+
+#: plugins/check_by_ssh.c:440
+msgid "execute additional commands as proxy"
+msgstr ""
+
+#: plugins/check_by_ssh.c:442
+msgid "To use passive mode, provide multiple '-C' options, and provide"
+msgstr ""
+
+#: plugins/check_by_ssh.c:443
msgid ""
"all of -O, -s, and -n options (servicelist order must match '-C'options)"
msgstr ""
-#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:261
-#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1415
+#: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261
+#: plugins/check_dig.c:342 plugins/check_disk.c:905 plugins/check_http.c:1418
#: plugins/check_nagios.c:302 plugins/check_ntp.c:864
#: plugins/check_ntp_peer.c:698 plugins/check_ntp_time.c:628
-#: plugins/check_procs.c:742 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_procs.c:751 plugins/negate.c:268 plugins/urlize.c:180
msgid "Examples:"
msgstr ""
-#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:274
-#: plugins/check_dig.c:354 plugins/check_disk.c:980 plugins/check_dns.c:486
+#: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274
+#: plugins/check_dig.c:354 plugins/check_disk.c:922 plugins/check_dns.c:486
#: plugins/check_dummy.c:122 plugins/check_fping.c:432
-#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1438
-#: plugins/check_ldap.c:452 plugins/check_load.c:325 plugins/check_mrtg.c:382
-#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:759
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1441
+#: plugins/check_ldap.c:456 plugins/check_load.c:325 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:764
#: plugins/check_ntp.c:883 plugins/check_ntp_peer.c:718
#: plugins/check_ntp_time.c:637 plugins/check_nwstat.c:1685
#: plugins/check_overcr.c:467 plugins/check_pgsql.c:477
-#: plugins/check_ping.c:601 plugins/check_procs.c:760
+#: plugins/check_ping.c:603 plugins/check_procs.c:769
#: plugins/check_radius.c:385 plugins/check_real.c:451
-#: plugins/check_smtp.c:821 plugins/check_snmp.c:1107 plugins/check_ssh.c:302
-#: plugins/check_swap.c:558 plugins/check_tcp.c:651 plugins/check_time.c:371
-#: plugins/check_ups.c:660 plugins/check_users.c:229
+#: plugins/check_smtp.c:840 plugins/check_snmp.c:1103 plugins/check_ssh.c:309
+#: plugins/check_swap.c:558 plugins/check_tcp.c:648 plugins/check_time.c:371
+#: plugins/check_ups.c:660 plugins/check_users.c:197
#: plugins/check_ide_smart.c:527 plugins/negate.c:292 plugins/urlize.c:197
#: plugins-root/check_dhcp.c:1421 plugins-root/check_icmp.c:1347
msgid "Usage:"
@@ -251,7 +255,7 @@ msgstr ""
msgid "Host/Service Cluster Plugin for Nagios 2"
msgstr ""
-#: plugins/check_cluster.c:236 plugins/check_nt.c:661
+#: plugins/check_cluster.c:236 plugins/check_nt.c:666
msgid "Options:"
msgstr ""
@@ -288,11 +292,11 @@ msgid "commas"
msgstr ""
#: plugins/check_cluster.c:257 plugins/check_game.c:318
-#: plugins/check_http.c:1401 plugins/check_ldap.c:434 plugins/check_mrtg.c:363
+#: plugins/check_http.c:1400 plugins/check_ldap.c:438 plugins/check_mrtg.c:363
#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:414
-#: plugins/check_nt.c:743 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
+#: plugins/check_nt.c:748 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
-#: plugins/check_overcr.c:456 plugins/check_snmp.c:1078
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:1074
#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
#: plugins-root/check_icmp.c:1322
msgid "Notes:"
@@ -380,12 +384,12 @@ msgstr ""
msgid "Pass STRING as argument(s) to dig"
msgstr ""
-#: plugins/check_disk.c:214
+#: plugins/check_disk.c:212
#, fuzzy, c-format
msgid "DISK %s: %s not found\n"
msgstr "%s [%s nicht gefunden]"
-#: plugins/check_disk.c:214 plugins/check_disk.c:995 plugins/check_dns.c:241
+#: plugins/check_disk.c:212 plugins/check_disk.c:937 plugins/check_dns.c:241
#: plugins/check_dummy.c:74 plugins/check_mysql.c:212
#: plugins/check_nagios.c:104 plugins/check_nagios.c:168
#: plugins/check_nagios.c:172 plugins/check_procs.c:290
@@ -393,72 +397,72 @@ msgstr "%s [%s nicht gefunden]"
msgid "CRITICAL"
msgstr "CRITICAL"
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:541
#, c-format
msgid "unit type %s not known\n"
msgstr "unbekannter unit type: %s\n"
-#: plugins/check_disk.c:602
+#: plugins/check_disk.c:544
#, c-format
msgid "failed allocating storage for '%s'\n"
msgstr "konnte keinen Speicher für '%s' reservieren\n"
-#: plugins/check_disk.c:626 plugins/check_disk.c:664 plugins/check_disk.c:669
-#: plugins/check_disk.c:676 plugins/check_disk.c:680 plugins/check_disk.c:720
-#: plugins/check_disk.c:726 plugins/check_disk.c:745 plugins/check_dummy.c:77
-#: plugins/check_dummy.c:80 plugins/check_procs.c:451
+#: plugins/check_disk.c:568 plugins/check_disk.c:606 plugins/check_disk.c:611
+#: plugins/check_disk.c:618 plugins/check_disk.c:622 plugins/check_disk.c:662
+#: plugins/check_disk.c:668 plugins/check_disk.c:687 plugins/check_dummy.c:77
+#: plugins/check_dummy.c:80 plugins/check_procs.c:453
#, c-format
msgid "UNKNOWN"
msgstr "UNKNOWN"
-#: plugins/check_disk.c:626
+#: plugins/check_disk.c:568
msgid "Must set a threshold value before using -p\n"
msgstr ""
-#: plugins/check_disk.c:664
+#: plugins/check_disk.c:606
msgid "Must set -E before selecting paths\n"
msgstr ""
-#: plugins/check_disk.c:669
+#: plugins/check_disk.c:611
msgid "Must set group value before selecting paths\n"
msgstr ""
-#: plugins/check_disk.c:676
+#: plugins/check_disk.c:618
msgid ""
"Paths need to be selected before using -i/-I. Use -A to select all paths "
"explicitly"
msgstr ""
-#: plugins/check_disk.c:680 plugins/check_disk.c:726 plugins/check_procs.c:451
+#: plugins/check_disk.c:622 plugins/check_disk.c:668 plugins/check_procs.c:453
msgid "Could not compile regular expression"
msgstr ""
-#: plugins/check_disk.c:720
+#: plugins/check_disk.c:662
msgid "Must set a threshold value before using -r/-R\n"
msgstr ""
-#: plugins/check_disk.c:746
+#: plugins/check_disk.c:688
msgid "Regular expression did not match any path or disk"
msgstr ""
-#: plugins/check_disk.c:792
+#: plugins/check_disk.c:734
#, fuzzy
msgid "Unknown argument"
msgstr "Unbekanntes Argument"
-#: plugins/check_disk.c:826
+#: plugins/check_disk.c:768
#, c-format
msgid " for %s\n"
msgstr ""
-#: plugins/check_disk.c:900
+#: plugins/check_disk.c:842
#, fuzzy
msgid ""
"This plugin checks the amount of used disk space on a mounted file system"
msgstr ""
"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem"
-#: plugins/check_disk.c:901
+#: plugins/check_disk.c:843
#, fuzzy
msgid ""
"and generates an alert if free space is less than one of the threshold values"
@@ -466,141 +470,141 @@ msgstr ""
"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
"unterschritten wird."
-#: plugins/check_disk.c:911
+#: plugins/check_disk.c:853
msgid "Exit with WARNING status if less than INTEGER units of disk are free"
msgstr ""
-#: plugins/check_disk.c:913
+#: plugins/check_disk.c:855
msgid "Exit with WARNING status if less than PERCENT of disk space is free"
msgstr ""
-#: plugins/check_disk.c:915
+#: plugins/check_disk.c:857
msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
msgstr ""
-#: plugins/check_disk.c:917
+#: plugins/check_disk.c:859
msgid "Exit with CRITCAL status if less than PERCENT of disk space is free"
msgstr ""
-#: plugins/check_disk.c:919
+#: plugins/check_disk.c:861
msgid "Exit with WARNING status if less than PERCENT of inode space is free"
msgstr ""
-#: plugins/check_disk.c:921
+#: plugins/check_disk.c:863
msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
msgstr ""
-#: plugins/check_disk.c:923
+#: plugins/check_disk.c:865
msgid "Path or partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:925
+#: plugins/check_disk.c:867
msgid "Ignore device (only works if -p unspecified)"
msgstr ""
-#: plugins/check_disk.c:927
+#: plugins/check_disk.c:869
msgid "Clear thresholds"
msgstr ""
-#: plugins/check_disk.c:929
+#: plugins/check_disk.c:871
msgid "For paths or partitions specified with -p, only check for exact paths"
msgstr ""
-#: plugins/check_disk.c:931
+#: plugins/check_disk.c:873
msgid "Display only devices/mountpoints with errors"
msgstr ""
-#: plugins/check_disk.c:933
+#: plugins/check_disk.c:875
msgid ""
"Group paths. Thresholds apply to (free-)space of all partitions together"
msgstr ""
-#: plugins/check_disk.c:935
+#: plugins/check_disk.c:877
msgid "Same as '--units kB'"
msgstr ""
-#: plugins/check_disk.c:937
+#: plugins/check_disk.c:879
msgid "Only check local filesystems"
msgstr ""
-#: plugins/check_disk.c:939
+#: plugins/check_disk.c:881
msgid ""
"Only check local filesystems against thresholds. Yet call stat on remote "
"filesystems"
msgstr ""
-#: plugins/check_disk.c:940
+#: plugins/check_disk.c:882
msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
msgstr ""
-#: plugins/check_disk.c:942
+#: plugins/check_disk.c:884
msgid "Display the mountpoint instead of the partition"
msgstr ""
-#: plugins/check_disk.c:944
+#: plugins/check_disk.c:886
msgid "Same as '--units MB'"
msgstr ""
-#: plugins/check_disk.c:946
+#: plugins/check_disk.c:888
msgid "Explicitly select all paths. This is equivalent to -R '.*'"
msgstr ""
-#: plugins/check_disk.c:948
+#: plugins/check_disk.c:890
msgid ""
"Case insensitive regular expression for path/partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:950
+#: plugins/check_disk.c:892
msgid "Regular expression for path or partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:952
+#: plugins/check_disk.c:894
msgid ""
"Regular expression to ignore selected path/partition (case insensitive) (may "
"be repeated)"
msgstr ""
-#: plugins/check_disk.c:954
+#: plugins/check_disk.c:896
msgid ""
"Regular expression to ignore selected path or partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:957
+#: plugins/check_disk.c:899
msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
msgstr ""
-#: plugins/check_disk.c:960
+#: plugins/check_disk.c:902
msgid "Ignore all filesystems of indicated type (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:965
+#: plugins/check_disk.c:907
msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
msgstr ""
-#: plugins/check_disk.c:967
+#: plugins/check_disk.c:909
msgid ""
"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
"r regex"
msgstr ""
-#: plugins/check_disk.c:968
+#: plugins/check_disk.c:910
msgid ""
"are grouped which means the freespace thresholds are applied to all disks "
"together"
msgstr ""
-#: plugins/check_disk.c:970
+#: plugins/check_disk.c:912
msgid ""
"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
"100M/50M"
msgstr ""
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:938
#, c-format
msgid "%s %s: %s\n"
msgstr ""
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:938
msgid "is not accessible"
msgstr ""
@@ -811,14 +815,14 @@ msgstr ""
msgid "of the argument with optional text"
msgstr ""
-#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:437
-#: plugins/check_swap.c:175 plugins/check_users.c:73 plugins/urlize.c:110
+#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:438
+#: plugins/check_swap.c:175 plugins/urlize.c:110
#, c-format
msgid "Could not open pipe: %s\n"
msgstr "Pipe: %s konnte nicht geöffnet werden\n"
#: plugins/check_fping.c:114 plugins/check_hpjd.c:134 plugins/check_load.c:153
-#: plugins/check_swap.c:181 plugins/check_users.c:79 plugins/urlize.c:116
+#: plugins/check_swap.c:181 plugins/urlize.c:116
#, c-format
msgid "Could not open stderr for %s\n"
msgstr "Konnte stderr nicht öffnen für: %s\n"
@@ -853,7 +857,7 @@ msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n"
#: plugins/check_ntp_peer.c:491 plugins/check_ntp_time.c:492
#: plugins/check_pgsql.c:268 plugins/check_ping.c:295 plugins/check_ping.c:418
#: plugins/check_radius.c:264 plugins/check_real.c:314
-#: plugins/check_real.c:376 plugins/check_smtp.c:507 plugins/check_smtp.c:633
+#: plugins/check_real.c:376 plugins/check_smtp.c:509 plugins/check_smtp.c:638
#: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315
#: plugins/check_ups.c:504 plugins/check_ups.c:573
msgid "Invalid hostname/address"
@@ -909,12 +913,12 @@ msgid ""
"reducing system load)"
msgstr ""
-#: plugins/check_fping.c:408 plugins/check_ping.c:573
+#: plugins/check_fping.c:408 plugins/check_ping.c:575
#, fuzzy
msgid "warning threshold pair"
msgstr "Warning threshold Integer sein"
-#: plugins/check_fping.c:410 plugins/check_ping.c:575
+#: plugins/check_fping.c:410 plugins/check_ping.c:577
#, fuzzy
msgid "critical threshold pair"
msgstr "Critical threshold muss ein Integer sein"
@@ -1086,453 +1090,471 @@ msgstr ""
msgid "(default=%s)"
msgstr ""
-#: plugins/check_http.c:262
-msgid "Critical threshold must be integer"
-msgstr "Critical threshold muss ein Integer sein"
-
-#: plugins/check_http.c:270
-msgid "Warning threshold must be integer"
-msgstr "Warning threshold Integer sein"
-
-#: plugins/check_http.c:296 plugins/check_tcp.c:559
+#: plugins/check_http.c:286 plugins/check_tcp.c:556
msgid "Invalid certificate expiration period"
msgstr "Ungültiger Zertifikatsablauftermin"
-#: plugins/check_http.c:305 plugins/check_tcp.c:571
+#: plugins/check_http.c:295 plugins/check_tcp.c:568
#, fuzzy
msgid "Invalid option - SSL is not available"
msgstr "Ungültige Option - SSL ist nicht verfügbar\n"
-#: plugins/check_http.c:329
+#: plugins/check_http.c:303
+msgid ""
+"Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 "
+"(SSLv3)"
+msgstr ""
+
+#: plugins/check_http.c:326
msgid "Invalid onredirect option"
msgstr ""
-#: plugins/check_http.c:331
+#: plugins/check_http.c:328
#, c-format
msgid "option f:%d \n"
msgstr "Option f:%d \n"
-#: plugins/check_http.c:352
+#: plugins/check_http.c:349
msgid "Invalid port number"
msgstr "Ungültige Portnummer"
-#: plugins/check_http.c:400
+#: plugins/check_http.c:397
#, c-format
msgid "Could Not Compile Regular Expression: %s"
msgstr ""
-#: plugins/check_http.c:414 plugins/check_ntp.c:718
+#: plugins/check_http.c:411 plugins/check_ntp.c:718
#: plugins/check_ntp_peer.c:507 plugins/check_ntp_time.c:508
-#: plugins/check_smtp.c:613 plugins/check_ssh.c:149 plugins/check_tcp.c:463
+#: plugins/check_smtp.c:618 plugins/check_ssh.c:149 plugins/check_tcp.c:460
msgid "IPv6 support not available"
msgstr "IPv6 Unterstützung nicht vorhanden"
-#: plugins/check_http.c:476 plugins/check_ping.c:422
+#: plugins/check_http.c:473 plugins/check_ping.c:422
msgid "You must specify a server address or host name"
msgstr "Hostname oder Serveradresse muss angegeben werden"
-#: plugins/check_http.c:609 plugins/check_http.c:777
+#: plugins/check_http.c:608 plugins/check_http.c:776
#, fuzzy
msgid "HTTP UNKNOWN - Memory allocation error\n"
msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
-#: plugins/check_http.c:681
+#: plugins/check_http.c:680
#, fuzzy, c-format
msgid "%sServer date unknown, "
msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n"
-#: plugins/check_http.c:684
+#: plugins/check_http.c:683
#, fuzzy, c-format
msgid "%sDocument modification date unknown, "
msgstr "HTTP CRITICAL - Datum der letzten Änderung unbekannt\n"
-#: plugins/check_http.c:691
+#: plugins/check_http.c:690
#, fuzzy, c-format
msgid "%sServer date \"%100s\" unparsable, "
msgstr "HTTP CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
-#: plugins/check_http.c:694
+#: plugins/check_http.c:693
#, fuzzy, c-format
msgid "%sDocument date \"%100s\" unparsable, "
msgstr ""
"HTTP CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden"
-#: plugins/check_http.c:697
+#: plugins/check_http.c:696
#, fuzzy, c-format
msgid "%sDocument is %d seconds in the future, "
msgstr "HTTP CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
-#: plugins/check_http.c:702
+#: plugins/check_http.c:701
#, fuzzy, c-format
msgid "%sLast modified %.1f days ago, "
msgstr "HTTP CRITICAL - Letzte Änderung vor %.1f Tagen\n"
-#: plugins/check_http.c:705
+#: plugins/check_http.c:704
#, fuzzy, c-format
msgid "%sLast modified %d:%02d:%02d ago, "
msgstr "HTTP CRITICAL - Letzte Änderung vor %d:%02d:%02d \n"
-#: plugins/check_http.c:807
+#: plugins/check_http.c:806
msgid "HTTP CRITICAL - Unable to open TCP socket\n"
msgstr "HTTP CRITICAL - Konnte TCP socket nicht öffnen\n"
-#: plugins/check_http.c:910
+#: plugins/check_http.c:911
msgid "HTTP CRITICAL - Error on receive\n"
msgstr "HTTP CRITICAL - Fehler beim Empfangen\n"
-#: plugins/check_http.c:920
+#: plugins/check_http.c:921
#, fuzzy
msgid "HTTP CRITICAL - No data received from host\n"
msgstr "HTTP CRITICAL - Keine Daten empfangen\n"
-#: plugins/check_http.c:971
+#: plugins/check_http.c:972
#, fuzzy, c-format
msgid "Invalid HTTP response received from host: %s\n"
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_http.c:975
+#: plugins/check_http.c:976
#, fuzzy, c-format
msgid "Invalid HTTP response received from host on port %d: %s\n"
msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
-#: plugins/check_http.c:984
+#: plugins/check_http.c:985
#, fuzzy, c-format
msgid "Status line output matched \"%s\" - "
msgstr "HTTP OK: Statusausgabe passt auf \"%s\"\n"
-#: plugins/check_http.c:995
+#: plugins/check_http.c:996
#, c-format
msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
msgstr "HTTP CRITICAL: Ungültige Statusmeldung (%s)\n"
-#: plugins/check_http.c:1002
+#: plugins/check_http.c:1003
#, c-format
msgid "HTTP CRITICAL: Invalid Status (%s)\n"
msgstr "HTTP CRITICAL: Ungültiger Status (%s)\n"
-#: plugins/check_http.c:1006 plugins/check_http.c:1011
-#: plugins/check_http.c:1021 plugins/check_http.c:1025
+#: plugins/check_http.c:1007 plugins/check_http.c:1012
+#: plugins/check_http.c:1022 plugins/check_http.c:1026
#, c-format
msgid "%s - "
msgstr ""
-#: plugins/check_http.c:1045
+#: plugins/check_http.c:1046
#, fuzzy, c-format
msgid "%sstring '%s' not found on '%s://%s:%d%s', "
msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-#: plugins/check_http.c:1058
+#: plugins/check_http.c:1059
#, fuzzy, c-format
msgid "%spattern not found, "
msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-#: plugins/check_http.c:1060
+#: plugins/check_http.c:1061
#, fuzzy, c-format
msgid "%spattern found, "
msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-#: plugins/check_http.c:1066
+#: plugins/check_http.c:1067
#, fuzzy, c-format
msgid "%sExecute Error: %s, "
msgstr "HTTP CRITICAL - Fehler: %s\n"
-#: plugins/check_http.c:1082
+#: plugins/check_http.c:1083
#, fuzzy, c-format
msgid "%spage size %d too large, "
msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n"
-#: plugins/check_http.c:1085
+#: plugins/check_http.c:1086
#, fuzzy, c-format
msgid "%spage size %d too small, "
msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n"
-#: plugins/check_http.c:1097
+#: plugins/check_http.c:1098
#, fuzzy, c-format
msgid "%s - %d bytes in %.3f second response time %s|%s %s"
msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n"
-#: plugins/check_http.c:1137
+#: plugins/check_http.c:1135
msgid "HTTP UNKNOWN - Could not allocate addr\n"
msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n"
-#: plugins/check_http.c:1141 plugins/check_http.c:1172
+#: plugins/check_http.c:1139 plugins/check_http.c:1170
#, fuzzy
msgid "HTTP UNKNOWN - Could not allocate URL\n"
msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
-#: plugins/check_http.c:1150
+#: plugins/check_http.c:1148
#, c-format
msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
msgstr ""
-#: plugins/check_http.c:1165
+#: plugins/check_http.c:1163
#, fuzzy, c-format
msgid "HTTP UNKNOWN - Empty redirect location%s\n"
msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n"
-#: plugins/check_http.c:1215
+#: plugins/check_http.c:1213
#, c-format
msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
msgstr ""
-#: plugins/check_http.c:1225
+#: plugins/check_http.c:1223
#, fuzzy, c-format
msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
-#: plugins/check_http.c:1233
+#: plugins/check_http.c:1231
#, c-format
msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
-#: plugins/check_http.c:1254
+#: plugins/check_http.c:1252
#, fuzzy, c-format
msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
-#: plugins/check_http.c:1259
+#: plugins/check_http.c:1257
#, c-format
msgid "Redirection to %s://%s:%d%s\n"
msgstr ""
-#: plugins/check_http.c:1310
+#: plugins/check_http.c:1308
#, fuzzy
msgid "This plugin tests the HTTP service on the specified host. It can test"
msgstr ""
"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
"\n"
-#: plugins/check_http.c:1311
+#: plugins/check_http.c:1309
msgid "normal (http) and secure (https) servers, follow redirects, search for"
msgstr ""
-#: plugins/check_http.c:1312
+#: plugins/check_http.c:1310
msgid "strings and regular expressions, check connection times, and report on"
msgstr ""
-#: plugins/check_http.c:1313
+#: plugins/check_http.c:1311
#, fuzzy
msgid "certificate expiration times."
msgstr "Clientzertifikat benötigt\n"
-#: plugins/check_http.c:1319
+#: plugins/check_http.c:1317
#, c-format
msgid "NOTE: One or both of -H and -I must be specified"
msgstr ""
-#: plugins/check_http.c:1327
+#: plugins/check_http.c:1325
msgid "Host name argument for servers using host headers (virtual host)"
msgstr ""
-#: plugins/check_http.c:1328
+#: plugins/check_http.c:1326
msgid "Append a port to include it in the header (eg: example.com:5000)"
msgstr ""
-#: plugins/check_http.c:1330
+#: plugins/check_http.c:1328
msgid ""
"IP address or name (use numeric address if possible to bypass DNS lookup)."
msgstr ""
-#: plugins/check_http.c:1332
+#: plugins/check_http.c:1330
msgid "Port number (default: "
msgstr ""
-#: plugins/check_http.c:1339
-msgid "Connect via SSL. Port defaults to 443"
+#: plugins/check_http.c:1337
+msgid ""
+"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
msgstr ""
-#: plugins/check_http.c:1341
+#: plugins/check_http.c:1338
+msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."
+msgstr ""
+
+#: plugins/check_http.c:1340
msgid "Enable SSL/TLS hostname extension support (SNI)"
msgstr ""
-#: plugins/check_http.c:1343
+#: plugins/check_http.c:1342
msgid ""
"Minimum number of days a certificate has to be valid. Port defaults to 443"
msgstr ""
-#: plugins/check_http.c:1344
+#: plugins/check_http.c:1343
msgid "(when this option is used the URL is not checked.)\n"
msgstr ""
-#: plugins/check_http.c:1348
+#: plugins/check_http.c:1347
msgid "Comma-delimited list of strings, at least one of them is expected in"
msgstr ""
-#: plugins/check_http.c:1349
+#: plugins/check_http.c:1348
msgid "the first (status) line of the server response (default: "
msgstr ""
-#: plugins/check_http.c:1351
+#: plugins/check_http.c:1350
msgid ""
"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
msgstr ""
-#: plugins/check_http.c:1353
+#: plugins/check_http.c:1352
msgid "String to expect in the content"
msgstr ""
-#: plugins/check_http.c:1355
+#: plugins/check_http.c:1354
msgid "URL to GET or POST (default: /)"
msgstr ""
-#: plugins/check_http.c:1357
+#: plugins/check_http.c:1356
msgid "URL encoded http POST data"
msgstr ""
-#: plugins/check_http.c:1359
+#: plugins/check_http.c:1358
msgid "Set HTTP method."
msgstr ""
-#: plugins/check_http.c:1361
+#: plugins/check_http.c:1360
msgid "Don't wait for document body: stop reading after headers."
msgstr ""
-#: plugins/check_http.c:1362
+#: plugins/check_http.c:1361
msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
msgstr ""
-#: plugins/check_http.c:1364
+#: plugins/check_http.c:1363
msgid "Warn if document is more than SECONDS old. the number can also be of"
msgstr ""
-#: plugins/check_http.c:1365
+#: plugins/check_http.c:1364
msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
msgstr ""
-#: plugins/check_http.c:1367
+#: plugins/check_http.c:1366
msgid "specify Content-Type header media type when POSTing\n"
msgstr ""
-#: plugins/check_http.c:1370
+#: plugins/check_http.c:1369
msgid "Allow regex to span newlines (must precede -r or -R)"
msgstr ""
-#: plugins/check_http.c:1372
+#: plugins/check_http.c:1371
msgid "Search page for regex STRING"
msgstr ""
-#: plugins/check_http.c:1374
+#: plugins/check_http.c:1373
msgid "Search page for case-insensitive regex STRING"
msgstr ""
-#: plugins/check_http.c:1376
+#: plugins/check_http.c:1375
msgid "Return CRITICAL if found, OK if not\n"
msgstr ""
-#: plugins/check_http.c:1379
+#: plugins/check_http.c:1378
msgid "Username:password on sites with basic authentication"
msgstr ""
-#: plugins/check_http.c:1381
+#: plugins/check_http.c:1380
msgid "Username:password on proxy-servers with basic authentication"
msgstr ""
-#: plugins/check_http.c:1383
+#: plugins/check_http.c:1382
msgid "String to be sent in http header as \"User Agent\""
msgstr ""
-#: plugins/check_http.c:1385
+#: plugins/check_http.c:1384
msgid ""
-" Any other tags to be sent in http header. Use multiple times for additional "
+"Any other tags to be sent in http header. Use multiple times for additional "
"headers"
msgstr ""
-#: plugins/check_http.c:1387
+#: plugins/check_http.c:1386
msgid "Wrap output in HTML link (obsoleted by urlize)"
msgstr ""
-#: plugins/check_http.c:1389
+#: plugins/check_http.c:1388
msgid "How to handle redirected pages. sticky is like follow but stick to the"
msgstr ""
-#: plugins/check_http.c:1390
-msgid "specified IP address. stickyport also ensure post stays the same."
+#: plugins/check_http.c:1389
+msgid "specified IP address. stickyport also ensures port stays the same."
msgstr ""
-#: plugins/check_http.c:1392
+#: plugins/check_http.c:1391
msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
msgstr ""
-#: plugins/check_http.c:1402
+#: plugins/check_http.c:1401
#, fuzzy
msgid "This plugin will attempt to open an HTTP connection with the host."
msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-#: plugins/check_http.c:1403
+#: plugins/check_http.c:1402
msgid ""
"Successful connects return STATE_OK, refusals and timeouts return "
"STATE_CRITICAL"
msgstr ""
-#: plugins/check_http.c:1404
+#: plugins/check_http.c:1403
msgid ""
"other errors return STATE_UNKNOWN. Successful connects, but incorrect "
"reponse"
msgstr ""
-#: plugins/check_http.c:1405
+#: plugins/check_http.c:1404
msgid ""
"messages from the host result in STATE_WARNING return values. If you are"
msgstr ""
-#: plugins/check_http.c:1406
+#: plugins/check_http.c:1405
msgid ""
"checking a virtual server that uses 'host headers' you must supply the FQDN"
msgstr ""
-#: plugins/check_http.c:1407
+#: plugins/check_http.c:1406
msgid "(fully qualified domain name) as the [host_name] argument."
msgstr ""
-#: plugins/check_http.c:1411
+#: plugins/check_http.c:1410
msgid "This plugin can also check whether an SSL enabled web server is able to"
msgstr ""
-#: plugins/check_http.c:1412
+#: plugins/check_http.c:1411
msgid "serve content (optionally within a specified time) or whether the X509 "
msgstr ""
-#: plugins/check_http.c:1413
+#: plugins/check_http.c:1412
msgid "certificate is still valid for the specified number of days."
msgstr ""
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1414
+#, fuzzy
+msgid "Please note that this plugin does not check if the presented server"
+msgstr ""
+"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
+"\n"
+
+#: plugins/check_http.c:1415
+msgid "certificate matches the hostname of the server, or if the certificate"
+msgstr ""
+
+#: plugins/check_http.c:1416
+msgid "has a valid chain of trust to one of the locally installed CAs."
+msgstr ""
+
+#: plugins/check_http.c:1420
msgid ""
"When the 'www.verisign.com' server returns its content within 5 seconds,"
msgstr ""
-#: plugins/check_http.c:1418
+#: plugins/check_http.c:1421
msgid ""
"a STATE_OK will be returned. When the server returns its content but exceeds"
msgstr ""
-#: plugins/check_http.c:1419
+#: plugins/check_http.c:1422
msgid ""
"the 5-second threshold, a STATE_WARNING will be returned. When an error "
"occurs,"
msgstr ""
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1423
msgid "a STATE_CRITICAL will be returned."
msgstr ""
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1426
msgid ""
"When the certificate of 'www.verisign.com' is valid for more than 14 days,"
msgstr ""
-#: plugins/check_http.c:1424
+#: plugins/check_http.c:1427
msgid ""
"a STATE_OK is returned. When the certificate is still valid, but for less "
"than"
msgstr ""
-#: plugins/check_http.c:1425
+#: plugins/check_http.c:1428
msgid ""
"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
msgstr ""
-#: plugins/check_http.c:1426
+#: plugins/check_http.c:1429
#, fuzzy
msgid "the certificate is expired."
msgstr "Clientzertifikat benötigt\n"
@@ -1582,81 +1604,81 @@ msgstr ""
msgid "LDAP %s - %.3f seconds response time|%s\n"
msgstr ""
-#: plugins/check_ldap.c:339 plugins/check_ldap.c:346
+#: plugins/check_ldap.c:339 plugins/check_ldap.c:347
#, c-format
msgid "%s cannot be combined with %s"
msgstr ""
-#: plugins/check_ldap.c:352 plugins/check_ping.c:246
+#: plugins/check_ldap.c:353 plugins/check_ping.c:246
msgid "IPv6 support not available\n"
msgstr ""
-#: plugins/check_ldap.c:375
+#: plugins/check_ldap.c:379
msgid "Please specify the host name\n"
msgstr ""
-#: plugins/check_ldap.c:378
+#: plugins/check_ldap.c:382
msgid "Please specify the LDAP base\n"
msgstr ""
-#: plugins/check_ldap.c:407
+#: plugins/check_ldap.c:411
msgid "ldap attribute to search (default: \"(objectclass=*)\""
msgstr ""
-#: plugins/check_ldap.c:409
+#: plugins/check_ldap.c:413
msgid "ldap base (eg. ou=my unit, o=my org, c=at"
msgstr ""
-#: plugins/check_ldap.c:411
+#: plugins/check_ldap.c:415
msgid "ldap bind DN (if required)"
msgstr ""
-#: plugins/check_ldap.c:413
+#: plugins/check_ldap.c:417
msgid "ldap password (if required)"
msgstr ""
-#: plugins/check_ldap.c:415
+#: plugins/check_ldap.c:419
msgid "use starttls mechanism introduced in protocol version 3"
msgstr ""
-#: plugins/check_ldap.c:417
+#: plugins/check_ldap.c:421
msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
msgstr ""
-#: plugins/check_ldap.c:421
+#: plugins/check_ldap.c:425
msgid "use ldap protocol version 2"
msgstr ""
-#: plugins/check_ldap.c:423
+#: plugins/check_ldap.c:427
msgid "use ldap protocol version 3"
msgstr ""
-#: plugins/check_ldap.c:424
+#: plugins/check_ldap.c:428
msgid "default protocol version:"
msgstr ""
-#: plugins/check_ldap.c:435
+#: plugins/check_ldap.c:439
msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
msgstr ""
-#: plugins/check_ldap.c:436
+#: plugins/check_ldap.c:440
#, c-format
msgid ""
" implied (using default port %i) unless --port=636 is specified. In that "
"case\n"
msgstr ""
-#: plugins/check_ldap.c:437
+#: plugins/check_ldap.c:441
msgid "'SSL on connect' will be used no matter how the plugin was called."
msgstr ""
-#: plugins/check_ldap.c:438
+#: plugins/check_ldap.c:442
msgid ""
"This detection is deprecated, please use 'check_ldap' with the '--starttls' "
"or '--ssl' flags"
msgstr ""
-#: plugins/check_ldap.c:439
+#: plugins/check_ldap.c:443
msgid "to define the behaviour explicitly instead."
msgstr ""
@@ -2164,7 +2186,7 @@ msgstr ""
msgid "Wrong client version - running: %s, required: %s"
msgstr ""
-#: plugins/check_nt.c:152 plugins/check_nt.c:212
+#: plugins/check_nt.c:152 plugins/check_nt.c:217
msgid "missing -l parameters"
msgstr ""
@@ -2195,321 +2217,321 @@ msgstr ""
msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)"
msgstr ""
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:219
msgid "wrong -l argument"
msgstr ""
-#: plugins/check_nt.c:230
+#: plugins/check_nt.c:235
#, c-format
msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
msgstr ""
-#: plugins/check_nt.c:233
+#: plugins/check_nt.c:238
#, c-format
msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
msgstr ""
-#: plugins/check_nt.c:247
+#: plugins/check_nt.c:252
msgid "Free disk space : Invalid drive"
msgstr ""
-#: plugins/check_nt.c:257
+#: plugins/check_nt.c:262
msgid "No service/process specified"
msgstr ""
-#: plugins/check_nt.c:281
+#: plugins/check_nt.c:286
#, c-format
msgid ""
"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
msgstr ""
-#: plugins/check_nt.c:284
+#: plugins/check_nt.c:289
#, c-format
msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
msgstr ""
-#: plugins/check_nt.c:320 plugins/check_nt.c:405 plugins/check_nt.c:435
+#: plugins/check_nt.c:325 plugins/check_nt.c:410 plugins/check_nt.c:440
msgid "No counter specified"
msgstr ""
-#: plugins/check_nt.c:352
+#: plugins/check_nt.c:357
msgid "Minimum value contains non-numbers"
msgstr ""
-#: plugins/check_nt.c:356
+#: plugins/check_nt.c:361
msgid "Maximum value contains non-numbers"
msgstr ""
-#: plugins/check_nt.c:363
+#: plugins/check_nt.c:368
msgid "No unit counter specified"
msgstr ""
-#: plugins/check_nt.c:450
+#: plugins/check_nt.c:455
msgid "Please specify a variable to check"
msgstr ""
-#: plugins/check_nt.c:534
+#: plugins/check_nt.c:539
#, fuzzy
msgid "Server port must be an integer\n"
msgstr "skip lines muss ein Integer sein"
-#: plugins/check_nt.c:588
+#: plugins/check_nt.c:593
#, fuzzy
msgid "You must provide a server address or host name"
msgstr "Hostname oder Serveradresse muss angegeben werden"
-#: plugins/check_nt.c:594
+#: plugins/check_nt.c:599
msgid "None"
msgstr ""
-#: plugins/check_nt.c:607
+#: plugins/check_nt.c:612
msgid "could not fetch information from server\n"
msgstr ""
-#: plugins/check_nt.c:651
+#: plugins/check_nt.c:656
msgid "This plugin collects data from the NSClient service running on a"
msgstr ""
-#: plugins/check_nt.c:652
+#: plugins/check_nt.c:657
msgid "Windows NT/2000/XP/2003 server."
msgstr ""
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:668
msgid "Name of the host to check"
msgstr ""
-#: plugins/check_nt.c:665
+#: plugins/check_nt.c:670
#, fuzzy
msgid "Optional port number (default: "
msgstr "Ungültige Portnummer"
-#: plugins/check_nt.c:668
+#: plugins/check_nt.c:673
msgid "Password needed for the request"
msgstr ""
-#: plugins/check_nt.c:670 plugins/check_nwstat.c:1661
+#: plugins/check_nt.c:675 plugins/check_nwstat.c:1661
#: plugins/check_overcr.c:432
msgid "Threshold which will result in a warning status"
msgstr ""
-#: plugins/check_nt.c:672 plugins/check_nwstat.c:1663
+#: plugins/check_nt.c:677 plugins/check_nwstat.c:1663
#: plugins/check_overcr.c:434
msgid "Threshold which will result in a critical status"
msgstr ""
-#: plugins/check_nt.c:674
+#: plugins/check_nt.c:679
msgid "Seconds before connection attempt times out (default: "
msgstr ""
-#: plugins/check_nt.c:676
+#: plugins/check_nt.c:681
msgid "Parameters passed to specified check (see below)"
msgstr ""
-#: plugins/check_nt.c:678
+#: plugins/check_nt.c:683
msgid "Display options (currently only SHOWALL works)"
msgstr ""
-#: plugins/check_nt.c:680
+#: plugins/check_nt.c:685
msgid "Return UNKNOWN on timeouts"
msgstr ""
-#: plugins/check_nt.c:683
+#: plugins/check_nt.c:688
msgid "Print this help screen"
msgstr ""
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:690
msgid "Print version information"
msgstr ""
-#: plugins/check_nt.c:687
+#: plugins/check_nt.c:692
msgid "Variable to check"
msgstr ""
-#: plugins/check_nt.c:688
+#: plugins/check_nt.c:693
msgid "Valid variables are:"
msgstr ""
-#: plugins/check_nt.c:690
+#: plugins/check_nt.c:695
msgid "Get the NSClient version"
msgstr ""
-#: plugins/check_nt.c:691
+#: plugins/check_nt.c:696
msgid "If -l is specified, will return warning if versions differ."
msgstr ""
-#: plugins/check_nt.c:693
+#: plugins/check_nt.c:698
msgid "Average CPU load on last x minutes."
msgstr ""
-#: plugins/check_nt.c:694
+#: plugins/check_nt.c:699
msgid "Request a -l parameter with the following syntax:"
msgstr ""
-#: plugins/check_nt.c:695
+#: plugins/check_nt.c:700
msgid "-l ,,."
msgstr ""
-#: plugins/check_nt.c:696
+#: plugins/check_nt.c:701
msgid " should be less than 24*60."
msgstr ""
-#: plugins/check_nt.c:697
+#: plugins/check_nt.c:702
msgid ""
"Thresholds are percentage and up to 10 requests can be done in one shot."
msgstr ""
-#: plugins/check_nt.c:700
+#: plugins/check_nt.c:705
msgid "Get the uptime of the machine."
msgstr ""
-#: plugins/check_nt.c:701
+#: plugins/check_nt.c:706
msgid "No specific parameters. No warning or critical threshold"
msgstr ""
-#: plugins/check_nt.c:703
+#: plugins/check_nt.c:708
msgid "Size and percentage of disk use."
msgstr ""
-#: plugins/check_nt.c:704
+#: plugins/check_nt.c:709
msgid "Request a -l parameter containing the drive letter only."
msgstr ""
-#: plugins/check_nt.c:705 plugins/check_nt.c:708
+#: plugins/check_nt.c:710 plugins/check_nt.c:713
msgid "Warning and critical thresholds can be specified with -w and -c."
msgstr ""
-#: plugins/check_nt.c:707
+#: plugins/check_nt.c:712
msgid "Memory use."
msgstr ""
-#: plugins/check_nt.c:710
+#: plugins/check_nt.c:715
msgid "Check the state of one or several services."
msgstr ""
-#: plugins/check_nt.c:711 plugins/check_nt.c:720
+#: plugins/check_nt.c:716 plugins/check_nt.c:725
msgid "Request a -l parameters with the following syntax:"
msgstr ""
-#: plugins/check_nt.c:712
+#: plugins/check_nt.c:717
msgid "-l ,,,..."
msgstr ""
-#: plugins/check_nt.c:713
+#: plugins/check_nt.c:718
msgid "You can specify -d SHOWALL in case you want to see working services"
msgstr ""
-#: plugins/check_nt.c:714
+#: plugins/check_nt.c:719
msgid "in the returned string."
msgstr ""
-#: plugins/check_nt.c:716
+#: plugins/check_nt.c:721
msgid "Check if one or several process are running."
msgstr ""
-#: plugins/check_nt.c:717
+#: plugins/check_nt.c:722
msgid "Same syntax as SERVICESTATE."
msgstr ""
-#: plugins/check_nt.c:719
+#: plugins/check_nt.c:724
msgid "Check any performance counter of Windows NT/2000."
msgstr ""
-#: plugins/check_nt.c:721
+#: plugins/check_nt.c:726
msgid "-l \"\\\\\\\\counter\",\""
msgstr ""
-#: plugins/check_nt.c:722
+#: plugins/check_nt.c:727
msgid "The parameter is optional and is given to a printf "
msgstr ""
-#: plugins/check_nt.c:723
+#: plugins/check_nt.c:728
msgid "output command which requires a float parameter."
msgstr ""
-#: plugins/check_nt.c:724
+#: plugins/check_nt.c:729
#, c-format
msgid "If does not include \"%%\", it is used as a label."
msgstr ""
-#: plugins/check_nt.c:725 plugins/check_nt.c:740
+#: plugins/check_nt.c:730 plugins/check_nt.c:745
msgid "Some examples:"
msgstr ""
-#: plugins/check_nt.c:729
+#: plugins/check_nt.c:734
msgid "Check any performance counter object of Windows NT/2000."
msgstr ""
-#: plugins/check_nt.c:730
+#: plugins/check_nt.c:735
msgid ""
"Syntax: check_nt -H -p -v INSTANCES -l "
msgstr ""
-#: plugins/check_nt.c:731
+#: plugins/check_nt.c:736
msgid " is a Windows Perfmon Counter object (eg. Process),"
msgstr ""
-#: plugins/check_nt.c:732
+#: plugins/check_nt.c:737
msgid "if it is two words, it should be enclosed in quotes"
msgstr ""
-#: plugins/check_nt.c:733
+#: plugins/check_nt.c:738
msgid "The returned results will be a comma-separated list of instances on "
msgstr ""
-#: plugins/check_nt.c:734
+#: plugins/check_nt.c:739
msgid " the selected computer for that object."
msgstr ""
-#: plugins/check_nt.c:735
+#: plugins/check_nt.c:740
msgid ""
"The purpose of this is to be run from command line to determine what "
"instances"
msgstr ""
-#: plugins/check_nt.c:736
+#: plugins/check_nt.c:741
msgid ""
" are available for monitoring without having to log onto the Windows server"
msgstr ""
-#: plugins/check_nt.c:737
+#: plugins/check_nt.c:742
msgid " to run Perfmon directly."
msgstr ""
-#: plugins/check_nt.c:738
+#: plugins/check_nt.c:743
msgid "It can also be used in scripts that automatically create Nagios service"
msgstr ""
-#: plugins/check_nt.c:739
+#: plugins/check_nt.c:744
msgid " configuration files."
msgstr ""
-#: plugins/check_nt.c:741
+#: plugins/check_nt.c:746
msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
msgstr ""
-#: plugins/check_nt.c:744
+#: plugins/check_nt.c:749
msgid ""
"- The NSClient service should be running on the server to get any information"
msgstr ""
-#: plugins/check_nt.c:746
+#: plugins/check_nt.c:751
msgid "- Critical thresholds should be lower than warning thresholds"
msgstr ""
-#: plugins/check_nt.c:747
+#: plugins/check_nt.c:752
msgid "- Default port 1248 is sometimes in use by other services. The error"
msgstr ""
-#: plugins/check_nt.c:748
+#: plugins/check_nt.c:753
msgid ""
"output when this happens contains \"Cannot map xxxxx to protocol number\"."
msgstr ""
-#: plugins/check_nt.c:749
+#: plugins/check_nt.c:754
msgid "One fix for this is to change the port to something else on check_nt "
msgstr ""
-#: plugins/check_nt.c:750
+#: plugins/check_nt.c:755
msgid "and on the client service it's connecting to."
msgstr ""
@@ -3286,13 +3308,13 @@ msgid " %s - database %s (%d sec.)|%s\n"
msgstr ""
#: plugins/check_pgsql.c:256 plugins/check_time.c:277 plugins/check_time.c:289
-#: plugins/check_users.c:166
+#: plugins/check_users.c:138
msgid "Critical threshold must be a positive integer"
msgstr "Critical threshold muss ein positiver Integer sein"
#: plugins/check_pgsql.c:262 plugins/check_time.c:258 plugins/check_time.c:282
-#: plugins/check_users.c:172 plugins/check_users.c:182
-#: plugins/check_users.c:189
+#: plugins/check_users.c:144 plugins/check_users.c:154
+#: plugins/check_users.c:160
msgid "Warning threshold must be a positive integer"
msgstr "Warning threshold muss ein positiver Integer sein"
@@ -3461,116 +3483,116 @@ msgstr ""
msgid " (%d) cannot be larger than (%d)\n"
msgstr ""
-#: plugins/check_ping.c:441
+#: plugins/check_ping.c:442
#, c-format
msgid "Cannot open stderr for %s\n"
msgstr ""
-#: plugins/check_ping.c:490 plugins/check_ping.c:492
+#: plugins/check_ping.c:492 plugins/check_ping.c:494
msgid "System call sent warnings to stderr "
msgstr ""
-#: plugins/check_ping.c:519
+#: plugins/check_ping.c:521
#, fuzzy, c-format
msgid "CRITICAL - Network Unreachable (%s)"
msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-#: plugins/check_ping.c:521
+#: plugins/check_ping.c:523
#, c-format
msgid "CRITICAL - Host Unreachable (%s)"
msgstr ""
-#: plugins/check_ping.c:523
+#: plugins/check_ping.c:525
#, fuzzy, c-format
msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-#: plugins/check_ping.c:525
+#: plugins/check_ping.c:527
#, fuzzy, c-format
msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-#: plugins/check_ping.c:527
+#: plugins/check_ping.c:529
#, fuzzy, c-format
msgid "CRITICAL - Network Prohibited (%s)"
msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-#: plugins/check_ping.c:529
+#: plugins/check_ping.c:531
#, fuzzy, c-format
msgid "CRITICAL - Host Prohibited (%s)"
msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-#: plugins/check_ping.c:531
+#: plugins/check_ping.c:533
#, fuzzy, c-format
msgid "CRITICAL - Packet Filtered (%s)"
msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-#: plugins/check_ping.c:533
+#: plugins/check_ping.c:535
#, c-format
msgid "CRITICAL - Host not found (%s)"
msgstr ""
-#: plugins/check_ping.c:535
+#: plugins/check_ping.c:537
#, c-format
msgid "CRITICAL - Time to live exceeded (%s)"
msgstr ""
-#: plugins/check_ping.c:542
+#: plugins/check_ping.c:544
msgid "Unable to realloc warn_text"
msgstr ""
-#: plugins/check_ping.c:559
+#: plugins/check_ping.c:561
#, c-format
msgid "Use ping to check connection statistics for a remote host."
msgstr ""
-#: plugins/check_ping.c:571
+#: plugins/check_ping.c:573
msgid "host to ping"
msgstr ""
-#: plugins/check_ping.c:577
+#: plugins/check_ping.c:579
msgid "number of ICMP ECHO packets to send"
msgstr ""
-#: plugins/check_ping.c:578
+#: plugins/check_ping.c:580
#, c-format
msgid "(Default: %d)\n"
msgstr ""
-#: plugins/check_ping.c:580
+#: plugins/check_ping.c:582
msgid "show HTML in the plugin output (obsoleted by urlize)"
msgstr ""
-#: plugins/check_ping.c:585
+#: plugins/check_ping.c:587
msgid "THRESHOLD is ,% where is the round trip average travel"
msgstr ""
-#: plugins/check_ping.c:586
+#: plugins/check_ping.c:588
msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the"
msgstr ""
-#: plugins/check_ping.c:587
+#: plugins/check_ping.c:589
msgid "percentage of packet loss to trigger an alarm state."
msgstr ""
-#: plugins/check_ping.c:590
+#: plugins/check_ping.c:592
#, fuzzy
msgid ""
"This plugin uses the ping command to probe the specified host for packet loss"
msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-#: plugins/check_ping.c:591
+#: plugins/check_ping.c:593
msgid ""
"(percentage) and round trip average (milliseconds). It can produce HTML "
"output"
msgstr ""
-#: plugins/check_ping.c:592
+#: plugins/check_ping.c:594
msgid ""
"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
msgstr ""
-#: plugins/check_ping.c:593
+#: plugins/check_ping.c:595
msgid "the contrib area of the downloads section at http://www.nagios.org/"
msgstr ""
@@ -3608,167 +3630,167 @@ msgstr ""
msgid " with %s"
msgstr ""
-#: plugins/check_procs.c:378
+#: plugins/check_procs.c:380
#, fuzzy
msgid "Critical Process Count must be an integer!"
msgstr "Critical threshold muss ein Integer sein"
-#: plugins/check_procs.c:390
+#: plugins/check_procs.c:392
#, fuzzy
msgid "Warning Process Count must be an integer!"
msgstr "Warning threshold Integer sein"
-#: plugins/check_procs.c:398
+#: plugins/check_procs.c:400
#, fuzzy
msgid "Parent Process ID must be an integer!"
msgstr "Argument für check_dummy muss ein Integer sein"
-#: plugins/check_procs.c:404 plugins/check_procs.c:518
+#: plugins/check_procs.c:406 plugins/check_procs.c:527
#, c-format
msgid "%s%sSTATE = %s"
msgstr ""
-#: plugins/check_procs.c:413
+#: plugins/check_procs.c:415
#, fuzzy
msgid "UID was not found"
msgstr "%s [%s nicht gefunden]"
-#: plugins/check_procs.c:419
+#: plugins/check_procs.c:421
#, fuzzy
msgid "User name was not found"
msgstr "%s [%s nicht gefunden]"
-#: plugins/check_procs.c:434
+#: plugins/check_procs.c:436
#, c-format
msgid "%s%scommand name '%s'"
msgstr ""
-#: plugins/check_procs.c:462
+#: plugins/check_procs.c:471
#, fuzzy
msgid "RSS must be an integer!"
msgstr "skip lines muss ein Integer sein"
-#: plugins/check_procs.c:469
+#: plugins/check_procs.c:478
#, fuzzy
msgid "VSZ must be an integer!"
msgstr "skip lines muss ein Integer sein"
-#: plugins/check_procs.c:477
+#: plugins/check_procs.c:486
msgid "PCPU must be a float!"
msgstr ""
-#: plugins/check_procs.c:501
+#: plugins/check_procs.c:510
msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
msgstr ""
-#: plugins/check_procs.c:537
+#: plugins/check_procs.c:546
#, c-format
msgid "wmax (%d) cannot be greater than cmax (%d)\n"
msgstr ""
-#: plugins/check_procs.c:541
+#: plugins/check_procs.c:550
#, c-format
msgid "wmin (%d) cannot be less than cmin (%d)\n"
msgstr ""
-#: plugins/check_procs.c:678
+#: plugins/check_procs.c:687
msgid ""
"Checks all processes and generates WARNING or CRITICAL states if the "
"specified"
msgstr ""
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:688
msgid ""
"metric is outside the required threshold ranges. The metric defaults to "
"number"
msgstr ""
-#: plugins/check_procs.c:680
+#: plugins/check_procs.c:689
msgid ""
"of processes. Search filters can be applied to limit the processes to check."
msgstr ""
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:698
msgid "Generate warning state if metric is outside this range"
msgstr ""
-#: plugins/check_procs.c:691
+#: plugins/check_procs.c:700
msgid "Generate critical state if metric is outside this range"
msgstr ""
-#: plugins/check_procs.c:693
+#: plugins/check_procs.c:702
msgid "Check thresholds against metric. Valid types:"
msgstr ""
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:703
msgid "PROCS - number of processes (default)"
msgstr ""
-#: plugins/check_procs.c:695
+#: plugins/check_procs.c:704
msgid "VSZ - virtual memory size"
msgstr ""
-#: plugins/check_procs.c:696
+#: plugins/check_procs.c:705
msgid "RSS - resident set memory size"
msgstr ""
-#: plugins/check_procs.c:697
+#: plugins/check_procs.c:706
msgid "CPU - percentage CPU"
msgstr ""
-#: plugins/check_procs.c:700
+#: plugins/check_procs.c:709
msgid "ELAPSED - time elapsed in seconds"
msgstr ""
-#: plugins/check_procs.c:705
+#: plugins/check_procs.c:714
msgid "Extra information. Up to 3 verbosity levels"
msgstr ""
-#: plugins/check_procs.c:710
+#: plugins/check_procs.c:719
msgid "Only scan for processes that have, in the output of `ps`, one or"
msgstr ""
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:720
msgid "more of the status flags you specify (for example R, Z, S, RS,"
msgstr ""
-#: plugins/check_procs.c:712
+#: plugins/check_procs.c:721
msgid "RSZDT, plus others based on the output of your 'ps' command)."
msgstr ""
-#: plugins/check_procs.c:714
+#: plugins/check_procs.c:723
msgid "Only scan for children of the parent process ID indicated."
msgstr ""
-#: plugins/check_procs.c:716
+#: plugins/check_procs.c:725
msgid "Only scan for processes with VSZ higher than indicated."
msgstr ""
-#: plugins/check_procs.c:718
+#: plugins/check_procs.c:727
msgid "Only scan for processes with RSS higher than indicated."
msgstr ""
-#: plugins/check_procs.c:720
+#: plugins/check_procs.c:729
msgid "Only scan for processes with PCPU higher than indicated."
msgstr ""
-#: plugins/check_procs.c:722
+#: plugins/check_procs.c:731
msgid "Only scan for processes with user name or ID indicated."
msgstr ""
-#: plugins/check_procs.c:724
+#: plugins/check_procs.c:733
msgid "Only scan for processes with args that contain STRING."
msgstr ""
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:735
msgid "Only scan for processes with args that contain the regex STRING."
msgstr ""
-#: plugins/check_procs.c:728
+#: plugins/check_procs.c:737
msgid "Only scan for exact matches of COMMAND (without path)."
msgstr ""
-#: plugins/check_procs.c:730
+#: plugins/check_procs.c:739
#, c-format
msgid ""
"\n"
@@ -3778,7 +3800,7 @@ msgid ""
"\n"
msgstr ""
-#: plugins/check_procs.c:735
+#: plugins/check_procs.c:744
#, c-format
msgid ""
"This plugin checks the number of currently running processes and\n"
@@ -3789,27 +3811,27 @@ msgid ""
"\n"
msgstr ""
-#: plugins/check_procs.c:744
+#: plugins/check_procs.c:753
msgid "Warning if not two processes with command name portsentry."
msgstr ""
-#: plugins/check_procs.c:745
+#: plugins/check_procs.c:754
msgid "Critical if < 2 or > 1024 processes"
msgstr ""
-#: plugins/check_procs.c:747
+#: plugins/check_procs.c:756
msgid "Warning alert if > 10 processes with command arguments containing"
msgstr ""
-#: plugins/check_procs.c:748
+#: plugins/check_procs.c:757
msgid "'/usr/local/bin/perl' and owned by root"
msgstr ""
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:759
msgid "Alert if VSZ of any processes over 50K or 100K"
msgstr ""
-#: plugins/check_procs.c:752
+#: plugins/check_procs.c:761
#, c-format
msgid "Alert if CPU of any processes over 10%% or 20%%"
msgstr ""
@@ -3972,7 +3994,7 @@ msgstr "Ung
msgid "Invalid REAL response received from host on port %d\n"
msgstr ""
-#: plugins/check_real.c:184 plugins/check_tcp.c:292
+#: plugins/check_real.c:184 plugins/check_tcp.c:289
#, c-format
msgid "No data received from host\n"
msgstr ""
@@ -3982,11 +4004,11 @@ msgstr ""
msgid "REAL %s - %d second response time\n"
msgstr ""
-#: plugins/check_real.c:336 plugins/check_smtp.c:576 plugins/check_ups.c:536
+#: plugins/check_real.c:336 plugins/check_smtp.c:578 plugins/check_ups.c:536
msgid "Warning time must be a positive integer"
msgstr "Warnung time muss ein positiver Integer sein"
-#: plugins/check_real.c:345 plugins/check_smtp.c:567 plugins/check_ups.c:527
+#: plugins/check_real.c:345 plugins/check_smtp.c:569 plugins/check_ups.c:527
msgid "Critical time must be a positive integer"
msgstr "Critical time muss ein positiver Integer sein"
@@ -4016,7 +4038,7 @@ msgstr ""
msgid "This plugin will attempt to open an RTSP connection with the host."
msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-#: plugins/check_real.c:438 plugins/check_smtp.c:808
+#: plugins/check_real.c:438 plugins/check_smtp.c:827
msgid "Successul connects return STATE_OK, refusals and timeouts return"
msgstr ""
@@ -4034,511 +4056,514 @@ msgstr ""
msgid "values."
msgstr ""
-#: plugins/check_smtp.c:146 plugins/check_swap.c:265 plugins/check_swap.c:271
+#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271
#, c-format
msgid "malloc() failed!\n"
msgstr ""
-#: plugins/check_smtp.c:150
+#: plugins/check_smtp.c:154
#, c-format
msgid "gethostname() failed!\n"
msgstr ""
-#: plugins/check_smtp.c:185 plugins/check_smtp.c:209
+#: plugins/check_smtp.c:189 plugins/check_smtp.c:213
#, c-format
msgid "recv() failed\n"
msgstr ""
-#: plugins/check_smtp.c:196
+#: plugins/check_smtp.c:200
#, fuzzy, c-format
msgid "Invalid SMTP response received from host: %s\n"
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_smtp.c:198
+#: plugins/check_smtp.c:202
#, fuzzy, c-format
msgid "Invalid SMTP response received from host on port %d: %s\n"
msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
-#: plugins/check_smtp.c:219
+#: plugins/check_smtp.c:223
#, c-format
msgid "WARNING - TLS not supported by server\n"
msgstr ""
-#: plugins/check_smtp.c:231
+#: plugins/check_smtp.c:235
#, c-format
msgid "Server does not support STARTTLS\n"
msgstr ""
-#: plugins/check_smtp.c:237
+#: plugins/check_smtp.c:241
#, c-format
msgid "CRITICAL - Cannot create SSL context.\n"
msgstr ""
-#: plugins/check_smtp.c:257
+#: plugins/check_smtp.c:261
msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
msgstr ""
-#: plugins/check_smtp.c:262
+#: plugins/check_smtp.c:266
#, c-format
msgid "sent %s"
msgstr ""
-#: plugins/check_smtp.c:264
+#: plugins/check_smtp.c:268
msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
msgstr ""
-#: plugins/check_smtp.c:276
-#, fuzzy
-msgid "CRITICAL - Cannot retrieve server certificate."
-msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:722
+#: plugins/check_smtp.c:312 plugins/check_snmp.c:718
#, c-format
msgid "Could Not Compile Regular Expression"
msgstr ""
-#: plugins/check_smtp.c:320
+#: plugins/check_smtp.c:321
#, c-format
msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
msgstr ""
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:453
+#: plugins/check_smtp.c:325 plugins/check_snmp.c:449
#, c-format
msgid "Execute Error: %s\n"
msgstr ""
-#: plugins/check_smtp.c:338
+#: plugins/check_smtp.c:339
#, c-format
msgid "no authuser specified, "
msgstr ""
-#: plugins/check_smtp.c:343
+#: plugins/check_smtp.c:344
#, c-format
msgid "no authpass specified, "
msgstr ""
-#: plugins/check_smtp.c:350 plugins/check_smtp.c:372 plugins/check_smtp.c:393
-#: plugins/check_smtp.c:668
+#: plugins/check_smtp.c:351 plugins/check_smtp.c:373 plugins/check_smtp.c:394
+#: plugins/check_smtp.c:685
#, c-format
msgid "sent %s\n"
msgstr ""
-#: plugins/check_smtp.c:353
+#: plugins/check_smtp.c:354
#, fuzzy, c-format
msgid "recv() failed after AUTH LOGIN, "
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_smtp.c:358 plugins/check_smtp.c:380 plugins/check_smtp.c:401
-#: plugins/check_smtp.c:679
+#: plugins/check_smtp.c:359 plugins/check_smtp.c:381 plugins/check_smtp.c:402
+#: plugins/check_smtp.c:696
#, fuzzy, c-format
msgid "received %s\n"
msgstr "Keine Daten empfangen %s\n"
-#: plugins/check_smtp.c:362
+#: plugins/check_smtp.c:363
#, fuzzy, c-format
msgid "invalid response received after AUTH LOGIN, "
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_smtp.c:376
+#: plugins/check_smtp.c:377
#, c-format
msgid "recv() failed after sending authuser, "
msgstr ""
-#: plugins/check_smtp.c:384
+#: plugins/check_smtp.c:385
#, fuzzy, c-format
msgid "invalid response received after authuser, "
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_smtp.c:397
+#: plugins/check_smtp.c:398
#, c-format
msgid "recv() failed after sending authpass, "
msgstr ""
-#: plugins/check_smtp.c:405
+#: plugins/check_smtp.c:406
#, fuzzy, c-format
msgid "invalid response received after authpass, "
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_smtp.c:412
+#: plugins/check_smtp.c:413
#, c-format
msgid "only authtype LOGIN is supported, "
msgstr ""
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:437
#, fuzzy, c-format
msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n"
-#: plugins/check_smtp.c:543 plugins/check_smtp.c:555
+#: plugins/check_smtp.c:545 plugins/check_smtp.c:557
#, c-format
msgid "Could not realloc() units [%d]\n"
msgstr ""
-#: plugins/check_smtp.c:603
+#: plugins/check_smtp.c:608
msgid "SSL support not available - install OpenSSL and recompile"
msgstr ""
-#: plugins/check_smtp.c:674
+#: plugins/check_smtp.c:676 plugins/check_smtp.c:681
+#, c-format
+msgid "Connection closed by server before sending QUIT command\n"
+msgstr ""
+
+#: plugins/check_smtp.c:691
#, fuzzy, c-format
msgid "recv() failed after QUIT."
msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-#: plugins/check_smtp.c:676
+#: plugins/check_smtp.c:693
#, c-format
msgid "Connection reset by peer."
msgstr ""
-#: plugins/check_smtp.c:764
+#: plugins/check_smtp.c:781
#, fuzzy
msgid "This plugin will attempt to open an SMTP connection with the host."
msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-#: plugins/check_smtp.c:778
+#: plugins/check_smtp.c:795
#, c-format
msgid " String to expect in first line of server response (default: '%s')\n"
msgstr ""
-#: plugins/check_smtp.c:780
+#: plugins/check_smtp.c:797
msgid "SMTP command (may be used repeatedly)"
msgstr ""
-#: plugins/check_smtp.c:782
+#: plugins/check_smtp.c:799
msgid "Expected response to command (may be used repeatedly)"
msgstr ""
-#: plugins/check_smtp.c:784
+#: plugins/check_smtp.c:801
msgid "FROM-address to include in MAIL command, required by Exchange 2000"
msgstr ""
-#: plugins/check_smtp.c:786
+#: plugins/check_smtp.c:803
msgid "FQDN used for HELO"
msgstr ""
-#: plugins/check_smtp.c:789 plugins/check_tcp.c:633
+#: plugins/check_smtp.c:806 plugins/check_tcp.c:630
msgid "Minimum number of days a certificate has to be valid."
msgstr ""
-#: plugins/check_smtp.c:791
+#: plugins/check_smtp.c:808
msgid "Use STARTTLS for the connection."
msgstr ""
-#: plugins/check_smtp.c:795
+#: plugins/check_smtp.c:812
msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
msgstr ""
-#: plugins/check_smtp.c:797
+#: plugins/check_smtp.c:814
msgid "SMTP AUTH username"
msgstr ""
-#: plugins/check_smtp.c:799
+#: plugins/check_smtp.c:816
msgid "SMTP AUTH password"
msgstr ""
-#: plugins/check_smtp.c:809
+#: plugins/check_smtp.c:818
+msgid "Ignore failure when sending QUIT command to server"
+msgstr ""
+
+#: plugins/check_smtp.c:828
msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful"
msgstr ""
-#: plugins/check_smtp.c:810
+#: plugins/check_smtp.c:829
msgid "connects, but incorrect reponse messages from the host result in"
msgstr ""
-#: plugins/check_smtp.c:811
+#: plugins/check_smtp.c:830
msgid "STATE_WARNING return values."
msgstr ""
-#: plugins/check_snmp.c:299
+#: plugins/check_snmp.c:298
#, fuzzy, c-format
msgid "External command error: %s\n"
msgstr "Papierfehler"
-#: plugins/check_snmp.c:304
+#: plugins/check_snmp.c:303
#, c-format
msgid "External command error with no output (return code: %d)\n"
msgstr ""
-#: plugins/check_snmp.c:410
+#: plugins/check_snmp.c:406
msgid "No valid data returned"
msgstr ""
-#: plugins/check_snmp.c:417
+#: plugins/check_snmp.c:413
msgid "Time duration between plugin calls is invalid"
msgstr ""
-#: plugins/check_snmp.c:513
+#: plugins/check_snmp.c:509
msgid "Cannot malloc"
msgstr ""
-#: plugins/check_snmp.c:519
+#: plugins/check_snmp.c:515
msgid "Cannot asprintf()"
msgstr ""
-#: plugins/check_snmp.c:525
+#: plugins/check_snmp.c:521
msgid "Cannot realloc()"
msgstr ""
-#: plugins/check_snmp.c:541
+#: plugins/check_snmp.c:537
msgid "No previous data to calculate rate - assume okay"
msgstr ""
-#: plugins/check_snmp.c:680
+#: plugins/check_snmp.c:676
#, fuzzy
msgid "Retries interval must be a positive integer"
msgstr "Time interval muss ein positiver Integer sein"
-#: plugins/check_snmp.c:742
+#: plugins/check_snmp.c:738
#, fuzzy, c-format
msgid "Could not reallocate labels[%d]"
msgstr "Konnte addr nicht zuweisen\n"
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:750
#, fuzzy
msgid "Could not reallocate labels\n"
msgstr "Konnte·url·nicht·zuweisen\n"
-#: plugins/check_snmp.c:771
+#: plugins/check_snmp.c:767
#, fuzzy, c-format
msgid "Could not reallocate units [%d]\n"
msgstr "Konnte·url·nicht·zuweisen\n"
-#: plugins/check_snmp.c:783
+#: plugins/check_snmp.c:779
msgid "Could not realloc() units\n"
msgstr ""
-#: plugins/check_snmp.c:800
+#: plugins/check_snmp.c:796
#, fuzzy
msgid "Rate multiplier must be a positive integer"
msgstr "Paketgröße muss ein positiver Integer sein"
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:848
#, fuzzy
msgid "No host specified\n"
msgstr ""
"Kein Hostname angegeben\n"
"\n"
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:852
#, fuzzy
msgid "No OIDs specified\n"
msgstr ""
"Kein Hostname angegeben\n"
"\n"
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:874
msgid "Invalid seclevel"
msgstr ""
-#: plugins/check_snmp.c:885 plugins/check_snmp.c:888 plugins/check_snmp.c:906
+#: plugins/check_snmp.c:881 plugins/check_snmp.c:884 plugins/check_snmp.c:902
#, c-format
msgid "Required parameter: %s\n"
msgstr ""
-#: plugins/check_snmp.c:927
+#: plugins/check_snmp.c:923
msgid "Invalid SNMP version"
msgstr ""
-#: plugins/check_snmp.c:944
+#: plugins/check_snmp.c:940
msgid "Unbalanced quotes\n"
msgstr ""
-#: plugins/check_snmp.c:993
+#: plugins/check_snmp.c:989
msgid "Check status of remote machines and obtain system information via SNMP"
msgstr ""
-#: plugins/check_snmp.c:1006
+#: plugins/check_snmp.c:1002
msgid "Use SNMP GETNEXT instead of SNMP GET"
msgstr ""
-#: plugins/check_snmp.c:1008
+#: plugins/check_snmp.c:1004
msgid "SNMP protocol version"
msgstr ""
-#: plugins/check_snmp.c:1010
+#: plugins/check_snmp.c:1006
msgid "SNMPv3 securityLevel"
msgstr ""
-#: plugins/check_snmp.c:1012
+#: plugins/check_snmp.c:1008
msgid "SNMPv3 auth proto"
msgstr ""
-#: plugins/check_snmp.c:1014
+#: plugins/check_snmp.c:1010
msgid "SNMPv3 priv proto (default DES)"
msgstr ""
-#: plugins/check_snmp.c:1018
+#: plugins/check_snmp.c:1014
msgid "Optional community string for SNMP communication"
msgstr ""
-#: plugins/check_snmp.c:1019
+#: plugins/check_snmp.c:1015
msgid "default is"
msgstr ""
-#: plugins/check_snmp.c:1021
+#: plugins/check_snmp.c:1017
msgid "SNMPv3 username"
msgstr ""
-#: plugins/check_snmp.c:1023
+#: plugins/check_snmp.c:1019
msgid "SNMPv3 authentication password"
msgstr ""
-#: plugins/check_snmp.c:1025
+#: plugins/check_snmp.c:1021
msgid "SNMPv3 privacy password"
msgstr ""
-#: plugins/check_snmp.c:1029
+#: plugins/check_snmp.c:1025
msgid "Object identifier(s) or SNMP variables whose value you wish to query"
msgstr ""
-#: plugins/check_snmp.c:1031
+#: plugins/check_snmp.c:1027
msgid ""
"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
msgstr ""
-#: plugins/check_snmp.c:1032
+#: plugins/check_snmp.c:1028
msgid "for symbolic OIDs.)"
msgstr ""
-#: plugins/check_snmp.c:1034
+#: plugins/check_snmp.c:1030
msgid "Delimiter to use when parsing returned data. Default is"
msgstr ""
-#: plugins/check_snmp.c:1035
+#: plugins/check_snmp.c:1031
msgid "Any data on the right hand side of the delimiter is considered"
msgstr ""
-#: plugins/check_snmp.c:1036
+#: plugins/check_snmp.c:1032
msgid "to be the data that should be used in the evaluation."
msgstr ""
-#: plugins/check_snmp.c:1040
+#: plugins/check_snmp.c:1036
#, fuzzy
msgid "Warning threshold range(s)"
msgstr "Warning threshold Integer sein"
-#: plugins/check_snmp.c:1042
+#: plugins/check_snmp.c:1038
#, fuzzy
msgid "Critical threshold range(s)"
msgstr "Critical threshold muss ein Integer sein"
-#: plugins/check_snmp.c:1044
+#: plugins/check_snmp.c:1040
msgid "Enable rate calculation. See 'Rate Calculation' below"
msgstr ""
-#: plugins/check_snmp.c:1046
+#: plugins/check_snmp.c:1042
msgid ""
"Converts rate per second. For example, set to 60 to convert to per minute"
msgstr ""
-#: plugins/check_snmp.c:1050
+#: plugins/check_snmp.c:1046
msgid "Return OK state (for that OID) if STRING is an exact match"
msgstr ""
-#: plugins/check_snmp.c:1052
+#: plugins/check_snmp.c:1048
msgid ""
"Return OK state (for that OID) if extended regular expression REGEX matches"
msgstr ""
-#: plugins/check_snmp.c:1054
+#: plugins/check_snmp.c:1050
msgid ""
"Return OK state (for that OID) if case-insensitive extended REGEX matches"
msgstr ""
-#: plugins/check_snmp.c:1056
+#: plugins/check_snmp.c:1052
msgid "Invert search result (CRITICAL if found)"
msgstr ""
-#: plugins/check_snmp.c:1060
+#: plugins/check_snmp.c:1056
msgid "Prefix label for output from plugin"
msgstr ""
-#: plugins/check_snmp.c:1062
+#: plugins/check_snmp.c:1058
msgid "Units label(s) for output data (e.g., 'sec.')."
msgstr ""
-#: plugins/check_snmp.c:1064
+#: plugins/check_snmp.c:1060
msgid "Separates output on multiple OID requests"
msgstr ""
-#: plugins/check_snmp.c:1068
+#: plugins/check_snmp.c:1064
msgid "Number of retries to be used in the requests"
msgstr ""
-#: plugins/check_snmp.c:1073
+#: plugins/check_snmp.c:1069
msgid ""
"This plugin uses the 'snmpget' command included with the NET-SNMP package."
msgstr ""
-#: plugins/check_snmp.c:1074
+#: plugins/check_snmp.c:1070
msgid ""
"if you don't have the package installed, you will need to download it from"
msgstr ""
-#: plugins/check_snmp.c:1075
+#: plugins/check_snmp.c:1071
msgid "http://net-snmp.sourceforge.net before you can use this plugin."
msgstr ""
-#: plugins/check_snmp.c:1079
+#: plugins/check_snmp.c:1075
msgid ""
-"- Multiple OIDs may be indicated by a comma or space-delimited list (lists "
-"with"
+"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited "
msgstr ""
-#: plugins/check_snmp.c:1080
-msgid "internal spaces must be quoted). Maximum:"
+#: plugins/check_snmp.c:1076
+msgid "list (lists with internal spaces must be quoted). Maximum:"
msgstr ""
-#: plugins/check_snmp.c:1080
+#: plugins/check_snmp.c:1076
msgid "OIDs."
msgstr ""
-#: plugins/check_snmp.c:1084
+#: plugins/check_snmp.c:1080
msgid ""
"- When checking multiple OIDs, separate ranges by commas like '-w "
"1:10,1:,:20'"
msgstr ""
-#: plugins/check_snmp.c:1085
+#: plugins/check_snmp.c:1081
msgid "- Note that only one string and one regex may be checked at present"
msgstr ""
-#: plugins/check_snmp.c:1086
+#: plugins/check_snmp.c:1082
msgid ""
"- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
msgstr ""
-#: plugins/check_snmp.c:1087
+#: plugins/check_snmp.c:1083
msgid "returned from the SNMP query is an unsigned integer."
msgstr ""
-#: plugins/check_snmp.c:1090
+#: plugins/check_snmp.c:1086
msgid "Rate Calculation:"
msgstr ""
-#: plugins/check_snmp.c:1091
+#: plugins/check_snmp.c:1087
msgid "In many places, SNMP returns counters that are only meaningful when"
msgstr ""
-#: plugins/check_snmp.c:1092
+#: plugins/check_snmp.c:1088
msgid "calculating the counter difference since the last check. check_snmp"
msgstr ""
-#: plugins/check_snmp.c:1093
+#: plugins/check_snmp.c:1089
msgid "saves the last state information in a file so that the rate per second"
msgstr ""
-#: plugins/check_snmp.c:1094
+#: plugins/check_snmp.c:1090
msgid "can be calculated. Use the --rate option to save state information."
msgstr ""
-#: plugins/check_snmp.c:1095
+#: plugins/check_snmp.c:1091
msgid ""
"On the first run, there will be no prior state - this will return with OK."
msgstr ""
-#: plugins/check_snmp.c:1096
+#: plugins/check_snmp.c:1092
msgid "The state is uniquely determined by the arguments to the plugin, so"
msgstr ""
-#: plugins/check_snmp.c:1097
+#: plugins/check_snmp.c:1093
msgid "changing the arguments will create a new state file."
msgstr ""
@@ -4547,26 +4572,26 @@ msgstr ""
msgid "Port number must be a positive integer"
msgstr "Port muss ein positiver Integer sein"
-#: plugins/check_ssh.c:228
+#: plugins/check_ssh.c:232
#, c-format
msgid "Server answer: %s"
msgstr ""
-#: plugins/check_ssh.c:247
+#: plugins/check_ssh.c:251
#, c-format
msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
msgstr ""
-#: plugins/check_ssh.c:254
+#: plugins/check_ssh.c:260
#, c-format
-msgid "SSH OK - %s (protocol %s)\n"
+msgid "SSH OK - %s (protocol %s) | %s\n"
msgstr ""
-#: plugins/check_ssh.c:274
+#: plugins/check_ssh.c:281
msgid "Try to connect to an SSH server at specified server and port"
msgstr ""
-#: plugins/check_ssh.c:290
+#: plugins/check_ssh.c:297
msgid ""
"Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
msgstr ""
@@ -4667,101 +4692,96 @@ msgstr ""
msgid "With UDP checks, a send/expect string must be specified."
msgstr ""
-#: plugins/check_tcp.c:240
-#, c-format
-msgid "CRITICAL - Cannot retrieve server certificate.\n"
-msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-
-#: plugins/check_tcp.c:418
+#: plugins/check_tcp.c:415
msgid "No arguments found"
msgstr ""
-#: plugins/check_tcp.c:519
+#: plugins/check_tcp.c:516
msgid "Maxbytes must be a positive integer"
msgstr "Maxbytes muss ein positiver Integer sein"
-#: plugins/check_tcp.c:537
+#: plugins/check_tcp.c:534
msgid "Refuse must be one of ok, warn, crit"
msgstr ""
-#: plugins/check_tcp.c:547
+#: plugins/check_tcp.c:544
msgid "Mismatch must be one of ok, warn, crit"
msgstr ""
-#: plugins/check_tcp.c:553
+#: plugins/check_tcp.c:550
msgid "Delay must be a positive integer"
msgstr "Delay muss ein positiver Integer sein"
-#: plugins/check_tcp.c:581
+#: plugins/check_tcp.c:578
#, fuzzy
msgid "You must provide a server address"
msgstr "%s: Hostname muss angegeben werden\n"
-#: plugins/check_tcp.c:583
+#: plugins/check_tcp.c:580
#, fuzzy
msgid "Invalid hostname, address or socket"
msgstr "Ungültige(r) Hostname/Adresse"
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:594
#, fuzzy, c-format
msgid ""
"This plugin tests %s connections with the specified host (or unix socket).\n"
"\n"
msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-#: plugins/check_tcp.c:610
+#: plugins/check_tcp.c:607
msgid ""
"Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
"quit option"
msgstr ""
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:608
msgid "Default: nothing added to send, \\r\\n added to end of quit"
msgstr ""
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:610
msgid "String to send to the server"
msgstr ""
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:612
msgid "String to expect in server response"
msgstr ""
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:612
msgid "(may be repeated)"
msgstr ""
-#: plugins/check_tcp.c:617
+#: plugins/check_tcp.c:614
msgid "All expect strings need to occur in server response. Default is any"
msgstr ""
-#: plugins/check_tcp.c:619
+#: plugins/check_tcp.c:616
msgid "String to send server to initiate a clean close of the connection"
msgstr ""
-#: plugins/check_tcp.c:621
+#: plugins/check_tcp.c:618
msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
msgstr ""
-#: plugins/check_tcp.c:623
+#: plugins/check_tcp.c:620
msgid ""
"Accept expected string mismatches with states ok, warn, crit (default: warn)"
msgstr ""
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:622
#, fuzzy
msgid "Hide output from TCP socket"
msgstr "Konnte TCP socket nicht öffnen\n"
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:624
msgid "Close connection once more than this number of bytes are received"
msgstr ""
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:626
msgid "Seconds to wait between sending string and polling for response"
msgstr ""
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:632
msgid "Use SSL for the connection."
msgstr ""
@@ -4999,21 +5019,16 @@ msgstr ""
msgid "http://www.networkupstools.org"
msgstr ""
-#: plugins/check_users.c:92
-#, c-format
-msgid "# users=%d"
-msgstr ""
-
-#: plugins/check_users.c:115
+#: plugins/check_users.c:90
msgid "Unable to read output"
msgstr ""
-#: plugins/check_users.c:122
+#: plugins/check_users.c:97
#, c-format
msgid "USERS %s - %d users currently logged in |%s\n"
msgstr ""
-#: plugins/check_users.c:207
+#: plugins/check_users.c:176
#, fuzzy
msgid "This plugin checks the number of users currently logged in on the local"
msgstr ""
@@ -5022,16 +5037,16 @@ msgstr ""
"unterschritten wird.\n"
"\n"
-#: plugins/check_users.c:208
+#: plugins/check_users.c:177
msgid ""
"system and generates an error if the number exceeds the thresholds specified."
msgstr ""
-#: plugins/check_users.c:218
+#: plugins/check_users.c:187
msgid "Set WARNING status if more than INTEGER users are logged in"
msgstr ""
-#: plugins/check_users.c:220
+#: plugins/check_users.c:189
msgid "Set CRITICAL status if more than INTEGER users are logged in"
msgstr ""
@@ -5876,6 +5891,19 @@ msgstr ""
msgid "The -v switch can be specified several times for increased verbosity."
msgstr ""
+#~ msgid "Critical threshold must be integer"
+#~ msgstr "Critical threshold muss ein Integer sein"
+
+#~ msgid "Warning threshold must be integer"
+#~ msgstr "Warning threshold Integer sein"
+
+#, fuzzy
+#~ msgid "CRITICAL - Cannot retrieve server certificate."
+#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
+
+#~ msgid "CRITICAL - Cannot retrieve server certificate.\n"
+#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
+
#~ msgid "Invalid HTTP response received from host\n"
#~ msgstr "Ungültige HTTP Antwort von Host empfangen\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 0740972..b84f979 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 125b51e..24ed8c3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-09 19:30-0400\n"
+"POT-Creation-Date: 2012-06-11 23:01+0100\n"
"PO-Revision-Date: 2010-04-21 23:38-0400\n"
"Last-Translator: Thomas Guyot-Sionnest \n"
"Language-Team: Nagios Plugin Development Mailing List argument with optional text"
msgstr "du paramètre avec un texte optionnel"
-#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:437
-#: plugins/check_swap.c:175 plugins/check_users.c:73 plugins/urlize.c:110
+#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:438
+#: plugins/check_swap.c:175 plugins/urlize.c:110
#, c-format
msgid "Could not open pipe: %s\n"
msgstr "Impossible d'ouvrir le pipe: %s\n"
#: plugins/check_fping.c:114 plugins/check_hpjd.c:134 plugins/check_load.c:153
-#: plugins/check_swap.c:181 plugins/check_users.c:79 plugins/urlize.c:116
+#: plugins/check_swap.c:181 plugins/urlize.c:116
#, c-format
msgid "Could not open stderr for %s\n"
msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n"
@@ -882,7 +887,7 @@ msgstr "FPING %s - %s (perte=%.0f%% )|%s\n"
#: plugins/check_ntp_peer.c:491 plugins/check_ntp_time.c:492
#: plugins/check_pgsql.c:268 plugins/check_ping.c:295 plugins/check_ping.c:418
#: plugins/check_radius.c:264 plugins/check_real.c:314
-#: plugins/check_real.c:376 plugins/check_smtp.c:507 plugins/check_smtp.c:633
+#: plugins/check_real.c:376 plugins/check_smtp.c:509 plugins/check_smtp.c:638
#: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315
#: plugins/check_ups.c:504 plugins/check_ups.c:573
msgid "Invalid hostname/address"
@@ -943,11 +948,11 @@ msgstr ""
"nom ou adresse IP des hôtes à pinger (l'indication d'un adresse IP évite une "
"recherche sur le nom, ce qui réduit la charge système)"
-#: plugins/check_fping.c:408 plugins/check_ping.c:573
+#: plugins/check_fping.c:408 plugins/check_ping.c:575
msgid "warning threshold pair"
msgstr "Valeurs pour le seuil d'avertissement"
-#: plugins/check_fping.c:410 plugins/check_ping.c:575
+#: plugins/check_fping.c:410 plugins/check_ping.c:577
msgid "critical threshold pair"
msgstr "Valeurs pour le seuil critique"
@@ -1116,460 +1121,476 @@ msgstr "Le nom de la communauté SNMP "
msgid "(default=%s)"
msgstr "(défaut=%s)"
-#: plugins/check_http.c:262
-msgid "Critical threshold must be integer"
-msgstr "le seuil critique doit être un entier positif"
-
-#: plugins/check_http.c:270
-msgid "Warning threshold must be integer"
-msgstr "Le seuil d'avertissement doit être un entier positif"
-
-#: plugins/check_http.c:296 plugins/check_tcp.c:559
+#: plugins/check_http.c:286 plugins/check_tcp.c:556
msgid "Invalid certificate expiration period"
msgstr "Période d'expiration du certificat invalide"
-#: plugins/check_http.c:305 plugins/check_tcp.c:571
+#: plugins/check_http.c:295 plugins/check_tcp.c:568
msgid "Invalid option - SSL is not available"
msgstr "Option invalide - SSL n'est pas disponible"
-#: plugins/check_http.c:329
+#: plugins/check_http.c:303
+msgid ""
+"Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 "
+"(SSLv3)"
+msgstr ""
+
+#: plugins/check_http.c:326
msgid "Invalid onredirect option"
msgstr ""
-#: plugins/check_http.c:331
+#: plugins/check_http.c:328
#, c-format
msgid "option f:%d \n"
msgstr "option f:%d \n"
-#: plugins/check_http.c:352
+#: plugins/check_http.c:349
msgid "Invalid port number"
msgstr "Numéro de port invalide"
-#: plugins/check_http.c:400
+#: plugins/check_http.c:397
#, c-format
msgid "Could Not Compile Regular Expression: %s"
msgstr "Impossible de compiler l'expression rationnelle: %s"
-#: plugins/check_http.c:414 plugins/check_ntp.c:718
+#: plugins/check_http.c:411 plugins/check_ntp.c:718
#: plugins/check_ntp_peer.c:507 plugins/check_ntp_time.c:508
-#: plugins/check_smtp.c:613 plugins/check_ssh.c:149 plugins/check_tcp.c:463
+#: plugins/check_smtp.c:618 plugins/check_ssh.c:149 plugins/check_tcp.c:460
msgid "IPv6 support not available"
msgstr "Support IPv6 non disponible"
-#: plugins/check_http.c:476 plugins/check_ping.c:422
+#: plugins/check_http.c:473 plugins/check_ping.c:422
msgid "You must specify a server address or host name"
msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
-#: plugins/check_http.c:609 plugins/check_http.c:777
+#: plugins/check_http.c:608 plugins/check_http.c:776
msgid "HTTP UNKNOWN - Memory allocation error\n"
msgstr "HTTP INCONNU - Impossible d'allouer la mémoire\n"
-#: plugins/check_http.c:681
+#: plugins/check_http.c:680
#, c-format
msgid "%sServer date unknown, "
msgstr "%sDate du serveur inconnue, "
-#: plugins/check_http.c:684
+#: plugins/check_http.c:683
#, c-format
msgid "%sDocument modification date unknown, "
msgstr "%sDate de modification du document inconnue, "
-#: plugins/check_http.c:691
+#: plugins/check_http.c:690
#, c-format
msgid "%sServer date \"%100s\" unparsable, "
msgstr "%sDate du serveur \"%100s\" illisible, "
-#: plugins/check_http.c:694
+#: plugins/check_http.c:693
#, c-format
msgid "%sDocument date \"%100s\" unparsable, "
msgstr "%sDate du document \"%100s\" illisible, "
-#: plugins/check_http.c:697
+#: plugins/check_http.c:696
#, c-format
msgid "%sDocument is %d seconds in the future, "
msgstr "%sLa date du document est %d secondes dans le futur, "
-#: plugins/check_http.c:702
+#: plugins/check_http.c:701
#, c-format
msgid "%sLast modified %.1f days ago, "
msgstr "%sDernière modification %.1f jours auparavant, "
-#: plugins/check_http.c:705
+#: plugins/check_http.c:704
#, c-format
msgid "%sLast modified %d:%02d:%02d ago, "
msgstr "%sDernière modification %d:%02d:%02d auparavant, "
-#: plugins/check_http.c:807
+#: plugins/check_http.c:806
msgid "HTTP CRITICAL - Unable to open TCP socket\n"
msgstr "HTTP CRITIQUE - Impossible d'ouvrir un socket TCP\n"
-#: plugins/check_http.c:910
+#: plugins/check_http.c:911
msgid "HTTP CRITICAL - Error on receive\n"
msgstr "HTTP CRITIQUE - Erreur dans la réception\n"
-#: plugins/check_http.c:920
+#: plugins/check_http.c:921
msgid "HTTP CRITICAL - No data received from host\n"
msgstr "HTTP CRITIQUE - Pas de données reçues de l'hôte\n"
-#: plugins/check_http.c:971
+#: plugins/check_http.c:972
#, c-format
msgid "Invalid HTTP response received from host: %s\n"
msgstr "Réponse HTTP reçue de l'hôte invalide: %s\n"
-#: plugins/check_http.c:975
+#: plugins/check_http.c:976
#, c-format
msgid "Invalid HTTP response received from host on port %d: %s\n"
msgstr "Réponse HTTP reçue de l'hôte sur le port %d invalide: %s\n"
-#: plugins/check_http.c:984
+#: plugins/check_http.c:985
#, c-format
msgid "Status line output matched \"%s\" - "
msgstr "La ligne d'état correspond à \"%s\" - "
-#: plugins/check_http.c:995
+#: plugins/check_http.c:996
#, c-format
msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n"
-#: plugins/check_http.c:1002
+#: plugins/check_http.c:1003
#, c-format
msgid "HTTP CRITICAL: Invalid Status (%s)\n"
msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n"
-#: plugins/check_http.c:1006 plugins/check_http.c:1011
-#: plugins/check_http.c:1021 plugins/check_http.c:1025
+#: plugins/check_http.c:1007 plugins/check_http.c:1012
+#: plugins/check_http.c:1022 plugins/check_http.c:1026
#, c-format
msgid "%s - "
msgstr ""
-#: plugins/check_http.c:1045
+#: plugins/check_http.c:1046
#, fuzzy, c-format
msgid "%sstring '%s' not found on '%s://%s:%d%s', "
msgstr "%schaîne non trouvée, "
-#: plugins/check_http.c:1058
+#: plugins/check_http.c:1059
#, c-format
msgid "%spattern not found, "
msgstr "%sexpression non trouvée, "
-#: plugins/check_http.c:1060
+#: plugins/check_http.c:1061
#, c-format
msgid "%spattern found, "
msgstr "%sexpression trouvée, "
-#: plugins/check_http.c:1066
+#: plugins/check_http.c:1067
#, c-format
msgid "%sExecute Error: %s, "
msgstr "%sErreur d'exécution: %s, "
-#: plugins/check_http.c:1082
+#: plugins/check_http.c:1083
#, c-format
msgid "%spage size %d too large, "
msgstr "%sla taille de la page est trop grande (%d), "
-#: plugins/check_http.c:1085
+#: plugins/check_http.c:1086
#, c-format
msgid "%spage size %d too small, "
msgstr "%sla taille de la page est trop petite (%d), "
-#: plugins/check_http.c:1097
+#: plugins/check_http.c:1098
#, c-format
msgid "%s - %d bytes in %.3f second response time %s|%s %s"
msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s"
-#: plugins/check_http.c:1137
+#: plugins/check_http.c:1135
msgid "HTTP UNKNOWN - Could not allocate addr\n"
msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n"
-#: plugins/check_http.c:1141 plugins/check_http.c:1172
+#: plugins/check_http.c:1139 plugins/check_http.c:1170
msgid "HTTP UNKNOWN - Could not allocate URL\n"
msgstr "HTTP INCONNU - Impossible d'allouer l'URL\n"
-#: plugins/check_http.c:1150
+#: plugins/check_http.c:1148
#, c-format
msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
msgstr ""
"HTTP INCONNU - Impossible de trouver l'endroit de la redirection - %s%s\n"
-#: plugins/check_http.c:1165
+#: plugins/check_http.c:1163
#, c-format
msgid "HTTP UNKNOWN - Empty redirect location%s\n"
msgstr "HTTP INCONNU - endroit de redirection vide%s\n"
-#: plugins/check_http.c:1215
+#: plugins/check_http.c:1213
#, c-format
msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
msgstr ""
"HTTP INCONNU - Impossible de définir l'endroit de la redirection - %s%s\n"
-#: plugins/check_http.c:1225
+#: plugins/check_http.c:1223
#, c-format
msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
msgstr ""
"HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - %"
"s://%s:%d%s%s\n"
-#: plugins/check_http.c:1233
+#: plugins/check_http.c:1231
#, c-format
msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
msgstr ""
"HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s%"
"s\n"
-#: plugins/check_http.c:1254
+#: plugins/check_http.c:1252
#, c-format
msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
msgstr "HTTP INCONNU - Redirection à un port supérieur à %d - %s://%s:%d%s%s\n"
-#: plugins/check_http.c:1259
+#: plugins/check_http.c:1257
#, c-format
msgid "Redirection to %s://%s:%d%s\n"
msgstr "Redirection vers %s://%s:%d%s\n"
-#: plugins/check_http.c:1310
+#: plugins/check_http.c:1308
msgid "This plugin tests the HTTP service on the specified host. It can test"
msgstr ""
"Ce plugin teste le service HTTP sur l'hôte spécifié. Il peut tester les"
-#: plugins/check_http.c:1311
+#: plugins/check_http.c:1309
msgid "normal (http) and secure (https) servers, follow redirects, search for"
msgstr ""
"serveurs normaux (http) et sécurisés (https), suivre les redirections, "
"rechercher des"
-#: plugins/check_http.c:1312
+#: plugins/check_http.c:1310
msgid "strings and regular expressions, check connection times, and report on"
msgstr ""
"chaînes de caractères et expressions rationnelles, vérifier le temps de "
"réponse"
-#: plugins/check_http.c:1313
+#: plugins/check_http.c:1311
msgid "certificate expiration times."
msgstr "et rapporter la date d'expiration du certificat."
-#: plugins/check_http.c:1319
+#: plugins/check_http.c:1317
#, c-format
msgid "NOTE: One or both of -H and -I must be specified"
msgstr "NOTE: les paramètres -H et -I peuvent être spécifiés"
-#: plugins/check_http.c:1327
+#: plugins/check_http.c:1325
msgid "Host name argument for servers using host headers (virtual host)"
msgstr ""
-#: plugins/check_http.c:1328
+#: plugins/check_http.c:1326
msgid "Append a port to include it in the header (eg: example.com:5000)"
msgstr ""
-#: plugins/check_http.c:1330
+#: plugins/check_http.c:1328
msgid ""
"IP address or name (use numeric address if possible to bypass DNS lookup)."
msgstr ""
-#: plugins/check_http.c:1332
+#: plugins/check_http.c:1330
msgid "Port number (default: "
msgstr "Numéro du port (défaut: "
-#: plugins/check_http.c:1339
-msgid "Connect via SSL. Port defaults to 443"
+#: plugins/check_http.c:1337
+msgid ""
+"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
msgstr ""
-#: plugins/check_http.c:1341
+#: plugins/check_http.c:1338
+msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."
+msgstr ""
+
+#: plugins/check_http.c:1340
msgid "Enable SSL/TLS hostname extension support (SNI)"
msgstr ""
-#: plugins/check_http.c:1343
+#: plugins/check_http.c:1342
msgid ""
"Minimum number of days a certificate has to be valid. Port defaults to 443"
msgstr ""
"Nombre de jours minimum pour que le certificat soit valide. Port par défaut "
"443"
-#: plugins/check_http.c:1344
+#: plugins/check_http.c:1343
msgid "(when this option is used the URL is not checked.)\n"
msgstr ""
-#: plugins/check_http.c:1348
+#: plugins/check_http.c:1347
msgid "Comma-delimited list of strings, at least one of them is expected in"
msgstr ""
"Liste the chaines de charactères séparées par des virgules, au moins une "
"d'elles"
-#: plugins/check_http.c:1349
+#: plugins/check_http.c:1348
msgid "the first (status) line of the server response (default: "
msgstr "est attendue dans la première ligne de réponse du serveur (défaut: "
-#: plugins/check_http.c:1351
+#: plugins/check_http.c:1350
msgid ""
"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
msgstr ""
"Si spécifié, surpasse toute autre logique de status (ex: 3xx, 4xx, 5xx)"
-#: plugins/check_http.c:1353
+#: plugins/check_http.c:1352
msgid "String to expect in the content"
msgstr "Chaîne de caractère attendue dans le contenu"
-#: plugins/check_http.c:1355
+#: plugins/check_http.c:1354
msgid "URL to GET or POST (default: /)"
msgstr "URL pour le GET ou le POST (défaut: /)"
-#: plugins/check_http.c:1357
+#: plugins/check_http.c:1356
msgid "URL encoded http POST data"
msgstr ""
-#: plugins/check_http.c:1359
+#: plugins/check_http.c:1358
msgid "Set HTTP method."
msgstr ""
-#: plugins/check_http.c:1361
+#: plugins/check_http.c:1360
msgid "Don't wait for document body: stop reading after headers."
msgstr ""
"Ne pas attendre pour le corps du document: arrêter de lire après les entêtes"
-#: plugins/check_http.c:1362
+#: plugins/check_http.c:1361
msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
msgstr "(Veuillez noter qu'un HTTP GET ou POST est effectué, pas un HEAD.)"
-#: plugins/check_http.c:1364
+#: plugins/check_http.c:1363
msgid "Warn if document is more than SECONDS old. the number can also be of"
msgstr ""
-#: plugins/check_http.c:1365
+#: plugins/check_http.c:1364
msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
msgstr ""
-#: plugins/check_http.c:1367
+#: plugins/check_http.c:1366
msgid "specify Content-Type header media type when POSTing\n"
msgstr ""
-#: plugins/check_http.c:1370
+#: plugins/check_http.c:1369
msgid "Allow regex to span newlines (must precede -r or -R)"
msgstr ""
-#: plugins/check_http.c:1372
+#: plugins/check_http.c:1371
msgid "Search page for regex STRING"
msgstr ""
-#: plugins/check_http.c:1374
+#: plugins/check_http.c:1373
msgid "Search page for case-insensitive regex STRING"
msgstr ""
-#: plugins/check_http.c:1376
+#: plugins/check_http.c:1375
msgid "Return CRITICAL if found, OK if not\n"
msgstr ""
-#: plugins/check_http.c:1379
+#: plugins/check_http.c:1378
msgid "Username:password on sites with basic authentication"
msgstr ""
-#: plugins/check_http.c:1381
+#: plugins/check_http.c:1380
msgid "Username:password on proxy-servers with basic authentication"
msgstr ""
-#: plugins/check_http.c:1383
+#: plugins/check_http.c:1382
msgid "String to be sent in http header as \"User Agent\""
msgstr ""
-#: plugins/check_http.c:1385
+#: plugins/check_http.c:1384
msgid ""
-" Any other tags to be sent in http header. Use multiple times for additional "
+"Any other tags to be sent in http header. Use multiple times for additional "
"headers"
msgstr ""
-#: plugins/check_http.c:1387
+#: plugins/check_http.c:1386
msgid "Wrap output in HTML link (obsoleted by urlize)"
msgstr ""
-#: plugins/check_http.c:1389
+#: plugins/check_http.c:1388
msgid "How to handle redirected pages. sticky is like follow but stick to the"
msgstr ""
-#: plugins/check_http.c:1390
-msgid "specified IP address. stickyport also ensure post stays the same."
+#: plugins/check_http.c:1389
+msgid "specified IP address. stickyport also ensures port stays the same."
msgstr ""
-#: plugins/check_http.c:1392
+#: plugins/check_http.c:1391
msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
msgstr ""
-#: plugins/check_http.c:1402
+#: plugins/check_http.c:1401
msgid "This plugin will attempt to open an HTTP connection with the host."
msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte."
-#: plugins/check_http.c:1403
+#: plugins/check_http.c:1402
msgid ""
"Successful connects return STATE_OK, refusals and timeouts return "
"STATE_CRITICAL"
msgstr ""
-#: plugins/check_http.c:1404
+#: plugins/check_http.c:1403
msgid ""
"other errors return STATE_UNKNOWN. Successful connects, but incorrect "
"reponse"
msgstr ""
-#: plugins/check_http.c:1405
+#: plugins/check_http.c:1404
msgid ""
"messages from the host result in STATE_WARNING return values. If you are"
msgstr ""
-#: plugins/check_http.c:1406
+#: plugins/check_http.c:1405
msgid ""
"checking a virtual server that uses 'host headers' you must supply the FQDN"
msgstr ""
-#: plugins/check_http.c:1407
+#: plugins/check_http.c:1406
msgid "(fully qualified domain name) as the [host_name] argument."
msgstr ""
-#: plugins/check_http.c:1411
+#: plugins/check_http.c:1410
msgid "This plugin can also check whether an SSL enabled web server is able to"
msgstr ""
-#: plugins/check_http.c:1412
+#: plugins/check_http.c:1411
msgid "serve content (optionally within a specified time) or whether the X509 "
msgstr ""
-#: plugins/check_http.c:1413
+#: plugins/check_http.c:1412
msgid "certificate is still valid for the specified number of days."
msgstr ""
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1414
+#, fuzzy
+msgid "Please note that this plugin does not check if the presented server"
+msgstr "Ce plugin vérifie le service ntp sur l'hôte"
+
+#: plugins/check_http.c:1415
+msgid "certificate matches the hostname of the server, or if the certificate"
+msgstr ""
+
+#: plugins/check_http.c:1416
+msgid "has a valid chain of trust to one of the locally installed CAs."
+msgstr ""
+
+#: plugins/check_http.c:1420
msgid ""
"When the 'www.verisign.com' server returns its content within 5 seconds,"
msgstr ""
-#: plugins/check_http.c:1418
+#: plugins/check_http.c:1421
msgid ""
"a STATE_OK will be returned. When the server returns its content but exceeds"
msgstr ""
-#: plugins/check_http.c:1419
+#: plugins/check_http.c:1422
msgid ""
"the 5-second threshold, a STATE_WARNING will be returned. When an error "
"occurs,"
msgstr ""
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1423
msgid "a STATE_CRITICAL will be returned."
msgstr ""
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1426
msgid ""
"When the certificate of 'www.verisign.com' is valid for more than 14 days,"
msgstr ""
-#: plugins/check_http.c:1424
+#: plugins/check_http.c:1427
msgid ""
"a STATE_OK is returned. When the certificate is still valid, but for less "
"than"
msgstr ""
-#: plugins/check_http.c:1425
+#: plugins/check_http.c:1428
msgid ""
"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
msgstr ""
-#: plugins/check_http.c:1426
+#: plugins/check_http.c:1429
msgid "the certificate is expired."
msgstr "le certificat est expiré."
@@ -1619,81 +1640,81 @@ msgstr "Impossible de chercher/trouver les objectclasses dans %s\n"
msgid "LDAP %s - %.3f seconds response time|%s\n"
msgstr "LDAP %s - %.3f secondes de temps de réponse|%s\n"
-#: plugins/check_ldap.c:339 plugins/check_ldap.c:346
+#: plugins/check_ldap.c:339 plugins/check_ldap.c:347
#, c-format
msgid "%s cannot be combined with %s"
msgstr ""
-#: plugins/check_ldap.c:352 plugins/check_ping.c:246
+#: plugins/check_ldap.c:353 plugins/check_ping.c:246
msgid "IPv6 support not available\n"
msgstr "Support IPv6 non disponible\n"
-#: plugins/check_ldap.c:375
+#: plugins/check_ldap.c:379
msgid "Please specify the host name\n"
msgstr "Veuillez spécifier le nom de l'hôte\n"
-#: plugins/check_ldap.c:378
+#: plugins/check_ldap.c:382
msgid "Please specify the LDAP base\n"
msgstr "Veuillez spécifier la base LDAP\n"
-#: plugins/check_ldap.c:407
+#: plugins/check_ldap.c:411
msgid "ldap attribute to search (default: \"(objectclass=*)\""
msgstr ""
-#: plugins/check_ldap.c:409
+#: plugins/check_ldap.c:413
msgid "ldap base (eg. ou=my unit, o=my org, c=at"
msgstr ""
-#: plugins/check_ldap.c:411
+#: plugins/check_ldap.c:415
msgid "ldap bind DN (if required)"
msgstr ""
-#: plugins/check_ldap.c:413
+#: plugins/check_ldap.c:417
msgid "ldap password (if required)"
msgstr ""
-#: plugins/check_ldap.c:415
+#: plugins/check_ldap.c:419
msgid "use starttls mechanism introduced in protocol version 3"
msgstr "utiliser le fonctionnement starttls du protocole version 3"
-#: plugins/check_ldap.c:417
+#: plugins/check_ldap.c:421
msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
msgstr ""
-#: plugins/check_ldap.c:421
+#: plugins/check_ldap.c:425
msgid "use ldap protocol version 2"
msgstr "utiliser le protocole ldap version 2"
-#: plugins/check_ldap.c:423
+#: plugins/check_ldap.c:427
msgid "use ldap protocol version 3"
msgstr "utiliser le protocole ldap version 3"
-#: plugins/check_ldap.c:424
+#: plugins/check_ldap.c:428
msgid "default protocol version:"
msgstr "version du protocole par défaut:"
-#: plugins/check_ldap.c:435
+#: plugins/check_ldap.c:439
msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
msgstr ""
-#: plugins/check_ldap.c:436
+#: plugins/check_ldap.c:440
#, c-format
msgid ""
" implied (using default port %i) unless --port=636 is specified. In that "
"case\n"
msgstr ""
-#: plugins/check_ldap.c:437
+#: plugins/check_ldap.c:441
msgid "'SSL on connect' will be used no matter how the plugin was called."
msgstr ""
-#: plugins/check_ldap.c:438
+#: plugins/check_ldap.c:442
msgid ""
"This detection is deprecated, please use 'check_ldap' with the '--starttls' "
"or '--ssl' flags"
msgstr ""
-#: plugins/check_ldap.c:439
+#: plugins/check_ldap.c:443
msgid "to define the behaviour explicitly instead."
msgstr ""
@@ -2206,7 +2227,7 @@ msgstr ""
msgid "Wrong client version - running: %s, required: %s"
msgstr "Mauvaise version du client utilisée: %s, nécessaire: %s"
-#: plugins/check_nt.c:152 plugins/check_nt.c:212
+#: plugins/check_nt.c:152 plugins/check_nt.c:217
msgid "missing -l parameters"
msgstr "Arguments -l manquants"
@@ -2237,30 +2258,30 @@ msgstr "pas assez de valeur pour l'argument -l"
msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)"
msgstr "Système démarré - %u jour(s) %u heure(s) %u minute(s)"
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:219
msgid "wrong -l argument"
msgstr "Argument -l erroné"
-#: plugins/check_nt.c:230
+#: plugins/check_nt.c:235
#, c-format
msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
msgstr ""
"%s:\\ - total: %.2f Gb - utilisé: %.2f Gb (%.0f%%) - libre %.2f Gb (%.0f%%)"
-#: plugins/check_nt.c:233
+#: plugins/check_nt.c:238
#, c-format
msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
msgstr "'%s:\\ Espace Utilisé'=%.2fGb;%.2f;%.2f;0.00;%.2f"
-#: plugins/check_nt.c:247
+#: plugins/check_nt.c:252
msgid "Free disk space : Invalid drive"
msgstr "Espace disque libre : Lecteur invalide"
-#: plugins/check_nt.c:257
+#: plugins/check_nt.c:262
msgid "No service/process specified"
msgstr "Pas de service/processus spécifié"
-#: plugins/check_nt.c:281
+#: plugins/check_nt.c:286
#, c-format
msgid ""
"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
@@ -2268,301 +2289,301 @@ msgstr ""
"Mémoire utilisée: total:%.2f Mb - utilisée: %.2f Mb (%.0f%%) - libre: %.2f "
"Mb (%.0f%%)"
-#: plugins/check_nt.c:284
+#: plugins/check_nt.c:289
#, c-format
msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
msgstr "'Mémoire utilisée'=%.2fMb;%.2f;%.2f;0.00;%.2f"
-#: plugins/check_nt.c:320 plugins/check_nt.c:405 plugins/check_nt.c:435
+#: plugins/check_nt.c:325 plugins/check_nt.c:410 plugins/check_nt.c:440
msgid "No counter specified"
msgstr "Pas de compteur spécifié"
-#: plugins/check_nt.c:352
+#: plugins/check_nt.c:357
msgid "Minimum value contains non-numbers"
msgstr "La valeur minimum contient des caractères non numériques"
-#: plugins/check_nt.c:356
+#: plugins/check_nt.c:361
msgid "Maximum value contains non-numbers"
msgstr "La valeur maximum contient des caractères non numériques"
-#: plugins/check_nt.c:363
+#: plugins/check_nt.c:368
msgid "No unit counter specified"
msgstr "Pas de compteur spécifié"
-#: plugins/check_nt.c:450
+#: plugins/check_nt.c:455
msgid "Please specify a variable to check"
msgstr "Veuillez préciser une variable a vérifier"
-#: plugins/check_nt.c:534
+#: plugins/check_nt.c:539
msgid "Server port must be an integer\n"
msgstr "Le port du serveur doit être un nombre entier\n"
-#: plugins/check_nt.c:588
+#: plugins/check_nt.c:593
msgid "You must provide a server address or host name"
msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
-#: plugins/check_nt.c:594
+#: plugins/check_nt.c:599
msgid "None"
msgstr "Aucun"
-#: plugins/check_nt.c:607
+#: plugins/check_nt.c:612
msgid "could not fetch information from server\n"
msgstr "Impossible d'obtenir l'information depuis le serveur\n"
-#: plugins/check_nt.c:651
+#: plugins/check_nt.c:656
msgid "This plugin collects data from the NSClient service running on a"
msgstr ""
"Ce plugin collecte les données depuis le service NSClient tournant sur un"
-#: plugins/check_nt.c:652
+#: plugins/check_nt.c:657
msgid "Windows NT/2000/XP/2003 server."
msgstr "Serveur Windows NT/2000/XP/2003."
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:668
msgid "Name of the host to check"
msgstr "Nom de l'hôte à vérifier"
-#: plugins/check_nt.c:665
+#: plugins/check_nt.c:670
msgid "Optional port number (default: "
msgstr "Numéro de port optionnel (défaut: "
-#: plugins/check_nt.c:668
+#: plugins/check_nt.c:673
msgid "Password needed for the request"
msgstr "Mot de passe nécessaire pour la requête"
-#: plugins/check_nt.c:670 plugins/check_nwstat.c:1661
+#: plugins/check_nt.c:675 plugins/check_nwstat.c:1661
#: plugins/check_overcr.c:432
msgid "Threshold which will result in a warning status"
msgstr ""
-#: plugins/check_nt.c:672 plugins/check_nwstat.c:1663
+#: plugins/check_nt.c:677 plugins/check_nwstat.c:1663
#: plugins/check_overcr.c:434
msgid "Threshold which will result in a critical status"
msgstr ""
-#: plugins/check_nt.c:674
+#: plugins/check_nt.c:679
msgid "Seconds before connection attempt times out (default: "
msgstr ""
-#: plugins/check_nt.c:676
+#: plugins/check_nt.c:681
msgid "Parameters passed to specified check (see below)"
msgstr ""
-#: plugins/check_nt.c:678
+#: plugins/check_nt.c:683
msgid "Display options (currently only SHOWALL works)"
msgstr ""
-#: plugins/check_nt.c:680
+#: plugins/check_nt.c:685
msgid "Return UNKNOWN on timeouts"
msgstr ""
-#: plugins/check_nt.c:683
+#: plugins/check_nt.c:688
msgid "Print this help screen"
msgstr "Afficher l'écran d'aide"
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:690
msgid "Print version information"
msgstr "Afficher la version"
-#: plugins/check_nt.c:687
+#: plugins/check_nt.c:692
msgid "Variable to check"
msgstr "Variable a vérifier"
-#: plugins/check_nt.c:688
+#: plugins/check_nt.c:693
msgid "Valid variables are:"
msgstr "Les variables valides sont"
-#: plugins/check_nt.c:690
+#: plugins/check_nt.c:695
msgid "Get the NSClient version"
msgstr "Obtenir la version de NSClient"
-#: plugins/check_nt.c:691
+#: plugins/check_nt.c:696
msgid "If -l is specified, will return warning if versions differ."
msgstr ""
"si l'argument -l est spécifié, une alerte AVERTISSEMENT sera "
"renvoyée, si les versions sont différentes."
-#: plugins/check_nt.c:693
+#: plugins/check_nt.c:698
msgid "Average CPU load on last x minutes."
msgstr "Moyenne de la charge CPU sur les dernières x minutes."
-#: plugins/check_nt.c:694
+#: plugins/check_nt.c:699
msgid "Request a -l parameter with the following syntax:"
msgstr "Demande un paramètre -l avec la syntaxe suivante:"
-#: plugins/check_nt.c:695
+#: plugins/check_nt.c:700
msgid "-l ,,."
msgstr "-l ,,."
-#: plugins/check_nt.c:696
+#: plugins/check_nt.c:701
msgid " should be less than 24*60."
msgstr " devrait être inférieur à 24*60."
-#: plugins/check_nt.c:697
+#: plugins/check_nt.c:702
msgid ""
"Thresholds are percentage and up to 10 requests can be done in one shot."
msgstr ""
"Les seuils sonts en pourcentage et un maximum de 10 requêtes peuvent être "
"effectuées à la fois."
-#: plugins/check_nt.c:700
+#: plugins/check_nt.c:705
msgid "Get the uptime of the machine."
msgstr "Obtenir le temps de service de la machine."
-#: plugins/check_nt.c:701
+#: plugins/check_nt.c:706
msgid "No specific parameters. No warning or critical threshold"
msgstr "Pas d'argument spécifique. Pas de seuil d'avertissement ou critique"
-#: plugins/check_nt.c:703
+#: plugins/check_nt.c:708
msgid "Size and percentage of disk use."
msgstr "Taille et pourcentage de l'utilisation disque."
-#: plugins/check_nt.c:704
+#: plugins/check_nt.c:709
msgid "Request a -l parameter containing the drive letter only."
msgstr "Demande un paramètre -l contennant uniquement la lettre du lecteur."
-#: plugins/check_nt.c:705 plugins/check_nt.c:708
+#: plugins/check_nt.c:710 plugins/check_nt.c:713
msgid "Warning and critical thresholds can be specified with -w and -c."
msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c."
-#: plugins/check_nt.c:707
+#: plugins/check_nt.c:712
msgid "Memory use."
msgstr "Mémoire utilisée."
-#: plugins/check_nt.c:710
+#: plugins/check_nt.c:715
msgid "Check the state of one or several services."
msgstr "Vérifier l'état d'un ou plusieurs services."
-#: plugins/check_nt.c:711 plugins/check_nt.c:720
+#: plugins/check_nt.c:716 plugins/check_nt.c:725
msgid "Request a -l parameters with the following syntax:"
msgstr "Demande un paramètre -l avec la syntaxe suivante:"
-#: plugins/check_nt.c:712
+#: plugins/check_nt.c:717
msgid "-l ,,,..."
msgstr "-l ,,,..."
-#: plugins/check_nt.c:713
+#: plugins/check_nt.c:718
msgid "You can specify -d SHOWALL in case you want to see working services"
msgstr "Vous pouvez spécifier -d SHOWALL pour voir les services fonctionnant"
-#: plugins/check_nt.c:714
+#: plugins/check_nt.c:719
msgid "in the returned string."
msgstr "dans la chaîne de caractère renvoyée."
-#: plugins/check_nt.c:716
+#: plugins/check_nt.c:721
msgid "Check if one or several process are running."
msgstr "Vérifie si un ou plusieurs processus sont démarrés."
-#: plugins/check_nt.c:717
+#: plugins/check_nt.c:722
msgid "Same syntax as SERVICESTATE."
msgstr "Même syntaxe que SERVICESTATE."
-#: plugins/check_nt.c:719
+#: plugins/check_nt.c:724
msgid "Check any performance counter of Windows NT/2000."
msgstr "Vérifier n'importe quel compteur de performance sur Windows NT/2000."
-#: plugins/check_nt.c:721
+#: plugins/check_nt.c:726
msgid "-l \"\\\\\\\\counter\",\""
msgstr "-l \"\\\\\\\\compteur\",\""
-#: plugins/check_nt.c:722
+#: plugins/check_nt.c:727
msgid "The parameter is optional and is given to a printf "
msgstr "Le paramètre est optionnel et est passé à la fonction "
-#: plugins/check_nt.c:723
+#: plugins/check_nt.c:728
msgid "output command which requires a float parameter."
msgstr "de sortie printf qui demande un paramètre de type float."
-#: plugins/check_nt.c:724
+#: plugins/check_nt.c:729
#, c-format
msgid "If does not include \"%%\", it is used as a label."
msgstr "Si n'inclus pas \"%%\", il est utilisé comme étiquette."
-#: plugins/check_nt.c:725 plugins/check_nt.c:740
+#: plugins/check_nt.c:730 plugins/check_nt.c:745
msgid "Some examples:"
msgstr "Exemples:"
-#: plugins/check_nt.c:729
+#: plugins/check_nt.c:734
msgid "Check any performance counter object of Windows NT/2000."
msgstr "Vérifie n'importe quel compteur de performance de Windows NT/2000."
-#: plugins/check_nt.c:730
+#: plugins/check_nt.c:735
msgid ""
"Syntax: check_nt -H -p -v INSTANCES -l "
msgstr ""
-#: plugins/check_nt.c:731
+#: plugins/check_nt.c:736
msgid " is a Windows Perfmon Counter object (eg. Process),"
msgstr ""
-#: plugins/check_nt.c:732
+#: plugins/check_nt.c:737
msgid "if it is two words, it should be enclosed in quotes"
msgstr ""
-#: plugins/check_nt.c:733
+#: plugins/check_nt.c:738
msgid "The returned results will be a comma-separated list of instances on "
msgstr ""
-#: plugins/check_nt.c:734
+#: plugins/check_nt.c:739
msgid " the selected computer for that object."
msgstr ""
-#: plugins/check_nt.c:735
+#: plugins/check_nt.c:740
msgid ""
"The purpose of this is to be run from command line to determine what "
"instances"
msgstr ""
-#: plugins/check_nt.c:736
+#: plugins/check_nt.c:741
msgid ""
" are available for monitoring without having to log onto the Windows server"
msgstr ""
-#: plugins/check_nt.c:737
+#: plugins/check_nt.c:742
msgid " to run Perfmon directly."
msgstr ""
-#: plugins/check_nt.c:738
+#: plugins/check_nt.c:743
msgid "It can also be used in scripts that automatically create Nagios service"
msgstr ""
-#: plugins/check_nt.c:739
+#: plugins/check_nt.c:744
msgid " configuration files."
msgstr ""
-#: plugins/check_nt.c:741
+#: plugins/check_nt.c:746
msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
msgstr ""
-#: plugins/check_nt.c:744
+#: plugins/check_nt.c:749
msgid ""
"- The NSClient service should be running on the server to get any information"
msgstr ""
"- Le service NSClient doit rouler sur le serveur pour obtenir les "
"informations"
-#: plugins/check_nt.c:746
+#: plugins/check_nt.c:751
msgid "- Critical thresholds should be lower than warning thresholds"
msgstr ""
"- Les seuils critiques doivent être plus bas que les seuils d'avertissement"
-#: plugins/check_nt.c:747
+#: plugins/check_nt.c:752
msgid "- Default port 1248 is sometimes in use by other services. The error"
msgstr ""
"- Le port par défaut 1248 est parfois utilisé par d'autres services. L'erreur"
-#: plugins/check_nt.c:748
+#: plugins/check_nt.c:753
msgid ""
"output when this happens contains \"Cannot map xxxxx to protocol number\"."
msgstr "qui en résulte contiens \"Cannot map xxxxx to protocol number\"."
-#: plugins/check_nt.c:749
+#: plugins/check_nt.c:754
msgid "One fix for this is to change the port to something else on check_nt "
msgstr ""
"Une possibilité pour corriger ce problème est de changer le port dans "
"check_nt "
-#: plugins/check_nt.c:750
+#: plugins/check_nt.c:755
msgid "and on the client service it's connecting to."
msgstr "et dans le service auquel il se connecte."
@@ -3338,13 +3359,13 @@ msgid " %s - database %s (%d sec.)|%s\n"
msgstr " %s - base de données %s (%d sec.)|%s\n"
#: plugins/check_pgsql.c:256 plugins/check_time.c:277 plugins/check_time.c:289
-#: plugins/check_users.c:166
+#: plugins/check_users.c:138
msgid "Critical threshold must be a positive integer"
msgstr "Le seuil critique doit être un entier positif"
#: plugins/check_pgsql.c:262 plugins/check_time.c:258 plugins/check_time.c:282
-#: plugins/check_users.c:172 plugins/check_users.c:182
-#: plugins/check_users.c:189
+#: plugins/check_users.c:144 plugins/check_users.c:154
+#: plugins/check_users.c:160
msgid "Warning threshold must be a positive integer"
msgstr "Le seuil d'avertissement doit être un entier positif"
@@ -3515,121 +3536,121 @@ msgstr " (%f) ne peut pas être plus large que (%f)\n"
msgid " (%d) cannot be larger than (%d)\n"
msgstr " (%d) ne peut pas être plus large que (%d)\n"
-#: plugins/check_ping.c:441
+#: plugins/check_ping.c:442
#, c-format
msgid "Cannot open stderr for %s\n"
msgstr "Impossible d'ouvrir le canal d'erreur standard pour %s\n"
-#: plugins/check_ping.c:490 plugins/check_ping.c:492
+#: plugins/check_ping.c:492 plugins/check_ping.c:494
msgid "System call sent warnings to stderr "
msgstr ""
"Les appel système enverront leurs messages d'avertissement vers le canal "
"d'erreur standard"
-#: plugins/check_ping.c:519
+#: plugins/check_ping.c:521
#, c-format
msgid "CRITICAL - Network Unreachable (%s)"
msgstr "CRITIQUE - Le réseau est inaccessible (%s)"
-#: plugins/check_ping.c:521
+#: plugins/check_ping.c:523
#, c-format
msgid "CRITICAL - Host Unreachable (%s)"
msgstr "CRITIQUE - Hôte inaccessible (%s)"
-#: plugins/check_ping.c:523
+#: plugins/check_ping.c:525
#, c-format
msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
msgstr "CRITIQUE - Paquet ICMP incorrect: Port inaccessible (%s)"
-#: plugins/check_ping.c:525
+#: plugins/check_ping.c:527
#, c-format
msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
msgstr "CRITIQUE - Paquet ICMP incorrect: Protocole inaccessible (%s)"
-#: plugins/check_ping.c:527
+#: plugins/check_ping.c:529
#, c-format
msgid "CRITICAL - Network Prohibited (%s)"
msgstr "CRITIQUE - L'accès au réseau est interdit (%s)"
-#: plugins/check_ping.c:529
+#: plugins/check_ping.c:531
#, c-format
msgid "CRITICAL - Host Prohibited (%s)"
msgstr "CRITIQUE - L'accès a l'hôte est interdit (%s)"
-#: plugins/check_ping.c:531
+#: plugins/check_ping.c:533
#, c-format
msgid "CRITICAL - Packet Filtered (%s)"
msgstr "CRITIQUE - Paquet filtré (%s)"
-#: plugins/check_ping.c:533
+#: plugins/check_ping.c:535
#, c-format
msgid "CRITICAL - Host not found (%s)"
msgstr "CRITIQUE - Hôte non trouvé (%s)"
-#: plugins/check_ping.c:535
+#: plugins/check_ping.c:537
#, c-format
msgid "CRITICAL - Time to live exceeded (%s)"
msgstr "CRITIQUE - La durée de vie du paquet est dépassée (%s)"
-#: plugins/check_ping.c:542
+#: plugins/check_ping.c:544
msgid "Unable to realloc warn_text"
msgstr "Impossible de réattribuer le texte d'avertissement"
-#: plugins/check_ping.c:559
+#: plugins/check_ping.c:561
#, c-format
msgid "Use ping to check connection statistics for a remote host."
msgstr ""
"Utilise ping pour vérifier les statistiques de connections d'un hôte distant."
-#: plugins/check_ping.c:571
+#: plugins/check_ping.c:573
msgid "host to ping"
msgstr "hôte à tester"
-#: plugins/check_ping.c:577
+#: plugins/check_ping.c:579
msgid "number of ICMP ECHO packets to send"
msgstr "nombre de paquets ICMP Ã envoyer"
-#: plugins/check_ping.c:578
+#: plugins/check_ping.c:580
#, c-format
msgid "(Default: %d)\n"
msgstr "(Défaut: %d)\n"
-#: plugins/check_ping.c:580
+#: plugins/check_ping.c:582
msgid "show HTML in the plugin output (obsoleted by urlize)"
msgstr ""
-#: plugins/check_ping.c:585
+#: plugins/check_ping.c:587
msgid "THRESHOLD is ,% where is the round trip average travel"
msgstr ""
"Le seuil est ,% où est le temps moyen pour l'aller retour (ms)"
-#: plugins/check_ping.c:586
+#: plugins/check_ping.c:588
msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the"
msgstr "qui déclenche un résultat AVERTISSEMENT ou CRITIQUE, et est le "
-#: plugins/check_ping.c:587
+#: plugins/check_ping.c:589
msgid "percentage of packet loss to trigger an alarm state."
msgstr "pourcentage de paquets perdus pour déclencher une alarme."
-#: plugins/check_ping.c:590
+#: plugins/check_ping.c:592
msgid ""
"This plugin uses the ping command to probe the specified host for packet loss"
msgstr ""
"Ce plugin utilise la commande ping pour vérifier l'hôte spécifié pour les "
"pertes de paquets"
-#: plugins/check_ping.c:591
+#: plugins/check_ping.c:593
msgid ""
"(percentage) and round trip average (milliseconds). It can produce HTML "
"output"
msgstr ""
-#: plugins/check_ping.c:592
+#: plugins/check_ping.c:594
msgid ""
"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
msgstr ""
-#: plugins/check_ping.c:593
+#: plugins/check_ping.c:595
msgid "the contrib area of the downloads section at http://www.nagios.org/"
msgstr ""
@@ -3668,160 +3689,160 @@ msgstr "%d crit, %d alertes sur "
msgid " with %s"
msgstr " avec %s"
-#: plugins/check_procs.c:378
+#: plugins/check_procs.c:380
msgid "Critical Process Count must be an integer!"
msgstr "Critique Le total des processus doit être un nombre entier!"
-#: plugins/check_procs.c:390
+#: plugins/check_procs.c:392
msgid "Warning Process Count must be an integer!"
msgstr "Avertissement Le total des processus doit être un nombre entier!"
-#: plugins/check_procs.c:398
+#: plugins/check_procs.c:400
msgid "Parent Process ID must be an integer!"
msgstr "L'identifiant du processus parent doit être un entier!"
-#: plugins/check_procs.c:404 plugins/check_procs.c:518
+#: plugins/check_procs.c:406 plugins/check_procs.c:527
#, c-format
msgid "%s%sSTATE = %s"
msgstr "%s%sETAT = %s"
-#: plugins/check_procs.c:413
+#: plugins/check_procs.c:415
msgid "UID was not found"
msgstr "L'UID n'a pas été trouvé"
-#: plugins/check_procs.c:419
+#: plugins/check_procs.c:421
msgid "User name was not found"
msgstr "L'utilisateur n'a pas été trouvé"
-#: plugins/check_procs.c:434
+#: plugins/check_procs.c:436
#, c-format
msgid "%s%scommand name '%s'"
msgstr "%s%snom de la commande '%s'"
-#: plugins/check_procs.c:462
+#: plugins/check_procs.c:471
msgid "RSS must be an integer!"
msgstr "RSS doit être un entier!"
-#: plugins/check_procs.c:469
+#: plugins/check_procs.c:478
msgid "VSZ must be an integer!"
msgstr "VSZ doit être un entier!"
-#: plugins/check_procs.c:477
+#: plugins/check_procs.c:486
msgid "PCPU must be a float!"
msgstr "PCPU doit être un nombre en virgule flottante!"
-#: plugins/check_procs.c:501
+#: plugins/check_procs.c:510
msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
msgstr "Metric doit être l'un des PROCS, VSZ, RSS, CPU, ELAPSED!"
-#: plugins/check_procs.c:537
+#: plugins/check_procs.c:546
#, c-format
msgid "wmax (%d) cannot be greater than cmax (%d)\n"
msgstr "wmax (%d) ne peut pas être plus grand que cmax (%d)\n"
-#: plugins/check_procs.c:541
+#: plugins/check_procs.c:550
#, c-format
msgid "wmin (%d) cannot be less than cmin (%d)\n"
msgstr "wmin (%d) ne peut pas être plus petit que cmin (%d)\n"
-#: plugins/check_procs.c:678
+#: plugins/check_procs.c:687
msgid ""
"Checks all processes and generates WARNING or CRITICAL states if the "
"specified"
msgstr ""
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:688
msgid ""
"metric is outside the required threshold ranges. The metric defaults to "
"number"
msgstr ""
-#: plugins/check_procs.c:680
+#: plugins/check_procs.c:689
msgid ""
"of processes. Search filters can be applied to limit the processes to check."
msgstr ""
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:698
msgid "Generate warning state if metric is outside this range"
msgstr ""
-#: plugins/check_procs.c:691
+#: plugins/check_procs.c:700
msgid "Generate critical state if metric is outside this range"
msgstr ""
-#: plugins/check_procs.c:693
+#: plugins/check_procs.c:702
msgid "Check thresholds against metric. Valid types:"
msgstr ""
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:703
msgid "PROCS - number of processes (default)"
msgstr "PROCS - nombre de processus (défaut)"
-#: plugins/check_procs.c:695
+#: plugins/check_procs.c:704
msgid "VSZ - virtual memory size"
msgstr "VSZ - taille mémoire virtuelle"
-#: plugins/check_procs.c:696
+#: plugins/check_procs.c:705
msgid "RSS - resident set memory size"
msgstr ""
-#: plugins/check_procs.c:697
+#: plugins/check_procs.c:706
msgid "CPU - percentage CPU"
msgstr "CPU - pourcentage du processeur"
-#: plugins/check_procs.c:700
+#: plugins/check_procs.c:709
msgid "ELAPSED - time elapsed in seconds"
msgstr "ELAPSED - temps écoulé en secondes"
-#: plugins/check_procs.c:705
+#: plugins/check_procs.c:714
msgid "Extra information. Up to 3 verbosity levels"
msgstr "informations supplémentaires. Jusqu'à 3 niveaux de verbosité"
-#: plugins/check_procs.c:710
+#: plugins/check_procs.c:719
msgid "Only scan for processes that have, in the output of `ps`, one or"
msgstr ""
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:720
msgid "more of the status flags you specify (for example R, Z, S, RS,"
msgstr ""
-#: plugins/check_procs.c:712
+#: plugins/check_procs.c:721
msgid "RSZDT, plus others based on the output of your 'ps' command)."
msgstr ""
-#: plugins/check_procs.c:714
+#: plugins/check_procs.c:723
msgid "Only scan for children of the parent process ID indicated."
msgstr ""
-#: plugins/check_procs.c:716
+#: plugins/check_procs.c:725
msgid "Only scan for processes with VSZ higher than indicated."
msgstr ""
-#: plugins/check_procs.c:718
+#: plugins/check_procs.c:727
msgid "Only scan for processes with RSS higher than indicated."
msgstr ""
-#: plugins/check_procs.c:720
+#: plugins/check_procs.c:729
msgid "Only scan for processes with PCPU higher than indicated."
msgstr ""
-#: plugins/check_procs.c:722
+#: plugins/check_procs.c:731
msgid "Only scan for processes with user name or ID indicated."
msgstr ""
-#: plugins/check_procs.c:724
+#: plugins/check_procs.c:733
msgid "Only scan for processes with args that contain STRING."
msgstr ""
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:735
msgid "Only scan for processes with args that contain the regex STRING."
msgstr ""
-#: plugins/check_procs.c:728
+#: plugins/check_procs.c:737
msgid "Only scan for exact matches of COMMAND (without path)."
msgstr ""
-#: plugins/check_procs.c:730
+#: plugins/check_procs.c:739
#, c-format
msgid ""
"\n"
@@ -3836,7 +3857,7 @@ msgstr ""
"est à l'intérieur du seuil\n"
"\n"
-#: plugins/check_procs.c:735
+#: plugins/check_procs.c:744
#, c-format
msgid ""
"This plugin checks the number of currently running processes and\n"
@@ -3853,27 +3874,27 @@ msgstr ""
"état actuel (ex: 'Z'), ou par le nombre de processus en cours d'exécution\n"
"\n"
-#: plugins/check_procs.c:744
+#: plugins/check_procs.c:753
msgid "Warning if not two processes with command name portsentry."
msgstr ""
-#: plugins/check_procs.c:745
+#: plugins/check_procs.c:754
msgid "Critical if < 2 or > 1024 processes"
msgstr ""
-#: plugins/check_procs.c:747
+#: plugins/check_procs.c:756
msgid "Warning alert if > 10 processes with command arguments containing"
msgstr ""
-#: plugins/check_procs.c:748
+#: plugins/check_procs.c:757
msgid "'/usr/local/bin/perl' and owned by root"
msgstr ""
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:759
msgid "Alert if VSZ of any processes over 50K or 100K"
msgstr ""
-#: plugins/check_procs.c:752
+#: plugins/check_procs.c:761
#, c-format
msgid "Alert if CPU of any processes over 10%% or 20%%"
msgstr ""
@@ -4034,7 +4055,7 @@ msgstr "Réponses REAL invalide reçue de l'hôte"
msgid "Invalid REAL response received from host on port %d\n"
msgstr "Réponses REAL invalide reçue de l'hôte sur le port %d\n"
-#: plugins/check_real.c:184 plugins/check_tcp.c:292
+#: plugins/check_real.c:184 plugins/check_tcp.c:289
#, c-format
msgid "No data received from host\n"
msgstr "Pas de données reçues de l'hôte\n"
@@ -4044,11 +4065,11 @@ msgstr "Pas de données reçues de l'hôte\n"
msgid "REAL %s - %d second response time\n"
msgstr "REAL %s - %d secondes de temps de réponse\n"
-#: plugins/check_real.c:336 plugins/check_smtp.c:576 plugins/check_ups.c:536
+#: plugins/check_real.c:336 plugins/check_smtp.c:578 plugins/check_ups.c:536
msgid "Warning time must be a positive integer"
msgstr "Le seuil d'avertissement doit être un entier positif"
-#: plugins/check_real.c:345 plugins/check_smtp.c:567 plugins/check_ups.c:527
+#: plugins/check_real.c:345 plugins/check_smtp.c:569 plugins/check_ups.c:527
msgid "Critical time must be a positive integer"
msgstr "Le seuil critique doit être un entier positif"
@@ -4074,7 +4095,7 @@ msgstr ""
msgid "This plugin will attempt to open an RTSP connection with the host."
msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte."
-#: plugins/check_real.c:438 plugins/check_smtp.c:808
+#: plugins/check_real.c:438 plugins/check_smtp.c:827
msgid "Successul connects return STATE_OK, refusals and timeouts return"
msgstr ""
@@ -4092,506 +4113,512 @@ msgstr ""
msgid "values."
msgstr ""
-#: plugins/check_smtp.c:146 plugins/check_swap.c:265 plugins/check_swap.c:271
+#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271
#, c-format
msgid "malloc() failed!\n"
msgstr "l'allocation mémoire à échoué!\n"
-#: plugins/check_smtp.c:150
+#: plugins/check_smtp.c:154
#, c-format
msgid "gethostname() failed!\n"
msgstr "La commande gethostname() à échoué\n"
-#: plugins/check_smtp.c:185 plugins/check_smtp.c:209
+#: plugins/check_smtp.c:189 plugins/check_smtp.c:213
#, c-format
msgid "recv() failed\n"
msgstr "La commande recv() à échoué\n"
-#: plugins/check_smtp.c:196
+#: plugins/check_smtp.c:200
#, c-format
msgid "Invalid SMTP response received from host: %s\n"
msgstr "Réponse SMTP reçue de l'hôte invalide: %s\n"
-#: plugins/check_smtp.c:198
+#: plugins/check_smtp.c:202
#, c-format
msgid "Invalid SMTP response received from host on port %d: %s\n"
msgstr "Réponse SMTP reçue de l'hôte sur le port %d invalide: %s\n"
-#: plugins/check_smtp.c:219
+#: plugins/check_smtp.c:223
#, c-format
msgid "WARNING - TLS not supported by server\n"
msgstr "AVERTISSEMENT: - TLS n'est pas supporté par ce serveur\n"
-#: plugins/check_smtp.c:231
+#: plugins/check_smtp.c:235
#, c-format
msgid "Server does not support STARTTLS\n"
msgstr "Le serveur ne supporte pas STARTTLS\n"
-#: plugins/check_smtp.c:237
+#: plugins/check_smtp.c:241
#, c-format
msgid "CRITICAL - Cannot create SSL context.\n"
msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n"
-#: plugins/check_smtp.c:257
+#: plugins/check_smtp.c:261
msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
msgstr ""
-#: plugins/check_smtp.c:262
+#: plugins/check_smtp.c:266
#, c-format
msgid "sent %s"
msgstr "envoyé %s"
-#: plugins/check_smtp.c:264
+#: plugins/check_smtp.c:268
msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
msgstr ""
-#: plugins/check_smtp.c:276
-msgid "CRITICAL - Cannot retrieve server certificate."
-msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur"
-
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:722
+#: plugins/check_smtp.c:312 plugins/check_snmp.c:718
#, c-format
msgid "Could Not Compile Regular Expression"
msgstr "Impossible de compiler l'expression rationnelle"
-#: plugins/check_smtp.c:320
+#: plugins/check_smtp.c:321
#, c-format
msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n"
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:453
+#: plugins/check_smtp.c:325 plugins/check_snmp.c:449
#, c-format
msgid "Execute Error: %s\n"
msgstr "Erreur d'exécution: %s\n"
-#: plugins/check_smtp.c:338
+#: plugins/check_smtp.c:339
#, c-format
msgid "no authuser specified, "
msgstr "Pas d'utilisateur pour l'authentification spécifié, "
-#: plugins/check_smtp.c:343
+#: plugins/check_smtp.c:344
#, c-format
msgid "no authpass specified, "
msgstr "pas de mot de passe spécifié, "
-#: plugins/check_smtp.c:350 plugins/check_smtp.c:372 plugins/check_smtp.c:393
-#: plugins/check_smtp.c:668
+#: plugins/check_smtp.c:351 plugins/check_smtp.c:373 plugins/check_smtp.c:394
+#: plugins/check_smtp.c:685
#, c-format
msgid "sent %s\n"
msgstr "envoyé %s\n"
-#: plugins/check_smtp.c:353
+#: plugins/check_smtp.c:354
#, c-format
msgid "recv() failed after AUTH LOGIN, "
msgstr "recv() à échoué après AUTH LOGIN, "
-#: plugins/check_smtp.c:358 plugins/check_smtp.c:380 plugins/check_smtp.c:401
-#: plugins/check_smtp.c:679
+#: plugins/check_smtp.c:359 plugins/check_smtp.c:381 plugins/check_smtp.c:402
+#: plugins/check_smtp.c:696
#, c-format
msgid "received %s\n"
msgstr "reçu %s\n"
-#: plugins/check_smtp.c:362
+#: plugins/check_smtp.c:363
#, c-format
msgid "invalid response received after AUTH LOGIN, "
msgstr "Réponse invalide reçue après AUTH LOGIN, "
-#: plugins/check_smtp.c:376
+#: plugins/check_smtp.c:377
#, c-format
msgid "recv() failed after sending authuser, "
msgstr "La commande recv() a échoué après authuser, "
-#: plugins/check_smtp.c:384
+#: plugins/check_smtp.c:385
#, c-format
msgid "invalid response received after authuser, "
msgstr "Réponse invalide reçue après authuser, "
-#: plugins/check_smtp.c:397
+#: plugins/check_smtp.c:398
#, c-format
msgid "recv() failed after sending authpass, "
msgstr "la commande recv() à échoué après authpass, "
-#: plugins/check_smtp.c:405
+#: plugins/check_smtp.c:406
#, c-format
msgid "invalid response received after authpass, "
msgstr "Réponse invalide reçue après authpass, "
-#: plugins/check_smtp.c:412
+#: plugins/check_smtp.c:413
#, c-format
msgid "only authtype LOGIN is supported, "
msgstr "seul la méthode d'authentification LOGIN est supportée, "
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:437
#, c-format
msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
msgstr "SMTP %s - %s%.3f sec. de temps de réponse%s%s|%s\n"
-#: plugins/check_smtp.c:543 plugins/check_smtp.c:555
+#: plugins/check_smtp.c:545 plugins/check_smtp.c:557
#, c-format
msgid "Could not realloc() units [%d]\n"
msgstr "Impossible de réallouer des unités [%d]\n"
-#: plugins/check_smtp.c:603
+#: plugins/check_smtp.c:608
msgid "SSL support not available - install OpenSSL and recompile"
msgstr "SSL n'est pas disponible - installer OpenSSL et recompilez"
-#: plugins/check_smtp.c:674
+#: plugins/check_smtp.c:676 plugins/check_smtp.c:681
+#, c-format
+msgid "Connection closed by server before sending QUIT command\n"
+msgstr ""
+
+#: plugins/check_smtp.c:691
#, c-format
msgid "recv() failed after QUIT."
msgstr "recv() à échoué après QUIT."
-#: plugins/check_smtp.c:676
+#: plugins/check_smtp.c:693
#, c-format
msgid "Connection reset by peer."
msgstr ""
-#: plugins/check_smtp.c:764
+#: plugins/check_smtp.c:781
msgid "This plugin will attempt to open an SMTP connection with the host."
msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte."
-#: plugins/check_smtp.c:778
+#: plugins/check_smtp.c:795
#, c-format
msgid " String to expect in first line of server response (default: '%s')\n"
msgstr ""
" Texte attendu dans la première ligne de réponse du serveur (défaut: '%"
"s')\n"
-#: plugins/check_smtp.c:780
+#: plugins/check_smtp.c:797
msgid "SMTP command (may be used repeatedly)"
msgstr "Commande SMTP (peut être utilisé plusieurs fois)"
-#: plugins/check_smtp.c:782
+#: plugins/check_smtp.c:799
msgid "Expected response to command (may be used repeatedly)"
msgstr ""
-#: plugins/check_smtp.c:784
+#: plugins/check_smtp.c:801
msgid "FROM-address to include in MAIL command, required by Exchange 2000"
msgstr ""
-#: plugins/check_smtp.c:786
+#: plugins/check_smtp.c:803
msgid "FQDN used for HELO"
msgstr ""
-#: plugins/check_smtp.c:789 plugins/check_tcp.c:633
+#: plugins/check_smtp.c:806 plugins/check_tcp.c:630
msgid "Minimum number of days a certificate has to be valid."
msgstr "Nombre de jours minimum pour que le certificat soit valide."
-#: plugins/check_smtp.c:791
+#: plugins/check_smtp.c:808
msgid "Use STARTTLS for the connection."
msgstr ""
-#: plugins/check_smtp.c:795
+#: plugins/check_smtp.c:812
msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
msgstr ""
-#: plugins/check_smtp.c:797
+#: plugins/check_smtp.c:814
msgid "SMTP AUTH username"
msgstr ""
-#: plugins/check_smtp.c:799
+#: plugins/check_smtp.c:816
msgid "SMTP AUTH password"
msgstr ""
-#: plugins/check_smtp.c:809
+#: plugins/check_smtp.c:818
+msgid "Ignore failure when sending QUIT command to server"
+msgstr ""
+
+#: plugins/check_smtp.c:828
msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful"
msgstr ""
-#: plugins/check_smtp.c:810
+#: plugins/check_smtp.c:829
msgid "connects, but incorrect reponse messages from the host result in"
msgstr ""
-#: plugins/check_smtp.c:811
+#: plugins/check_smtp.c:830
msgid "STATE_WARNING return values."
msgstr ""
-#: plugins/check_snmp.c:299
+#: plugins/check_snmp.c:298
#, c-format
msgid "External command error: %s\n"
msgstr "Erreur d'exécution de commande externe: %s\n"
-#: plugins/check_snmp.c:304
+#: plugins/check_snmp.c:303
#, c-format
msgid "External command error with no output (return code: %d)\n"
msgstr ""
-#: plugins/check_snmp.c:410
+#: plugins/check_snmp.c:406
msgid "No valid data returned"
msgstr "Pas de données valides reçues"
-#: plugins/check_snmp.c:417
+#: plugins/check_snmp.c:413
msgid "Time duration between plugin calls is invalid"
msgstr ""
-#: plugins/check_snmp.c:513
+#: plugins/check_snmp.c:509
msgid "Cannot malloc"
msgstr ""
-#: plugins/check_snmp.c:519
+#: plugins/check_snmp.c:515
msgid "Cannot asprintf()"
msgstr ""
-#: plugins/check_snmp.c:525
+#: plugins/check_snmp.c:521
#, fuzzy
msgid "Cannot realloc()"
msgstr "Impossible de réallouer des unités\n"
-#: plugins/check_snmp.c:541
+#: plugins/check_snmp.c:537
msgid "No previous data to calculate rate - assume okay"
msgstr ""
-#: plugins/check_snmp.c:680
+#: plugins/check_snmp.c:676
msgid "Retries interval must be a positive integer"
msgstr "L'intervalle pour les essais doit être un entier positif"
-#: plugins/check_snmp.c:742
+#: plugins/check_snmp.c:738
#, c-format
msgid "Could not reallocate labels[%d]"
msgstr "Impossible de réallouer des labels[%d]"
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:750
msgid "Could not reallocate labels\n"
msgstr "Impossible de réallouer des labels\n"
-#: plugins/check_snmp.c:771
+#: plugins/check_snmp.c:767
#, c-format
msgid "Could not reallocate units [%d]\n"
msgstr "Impossible de réallouer des unités [%d]\n"
-#: plugins/check_snmp.c:783
+#: plugins/check_snmp.c:779
msgid "Could not realloc() units\n"
msgstr "Impossible de réallouer des unités\n"
-#: plugins/check_snmp.c:800
+#: plugins/check_snmp.c:796
#, fuzzy
msgid "Rate multiplier must be a positive integer"
msgstr "La taille du paquet doit être un entier positif"
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:848
msgid "No host specified\n"
msgstr "Pas d'hôte spécifié\n"
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:852
msgid "No OIDs specified\n"
msgstr "Pas de compteur spécifié\n"
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:874
msgid "Invalid seclevel"
msgstr ""
-#: plugins/check_snmp.c:885 plugins/check_snmp.c:888 plugins/check_snmp.c:906
+#: plugins/check_snmp.c:881 plugins/check_snmp.c:884 plugins/check_snmp.c:902
#, c-format
msgid "Required parameter: %s\n"
msgstr ""
-#: plugins/check_snmp.c:927
+#: plugins/check_snmp.c:923
msgid "Invalid SNMP version"
msgstr "Version de SNMP invalide"
-#: plugins/check_snmp.c:944
+#: plugins/check_snmp.c:940
msgid "Unbalanced quotes\n"
msgstr "Guillemets manquants\n"
-#: plugins/check_snmp.c:993
+#: plugins/check_snmp.c:989
msgid "Check status of remote machines and obtain system information via SNMP"
msgstr ""
"Vérifie l'état des machines distantes et obtient l'information système via "
"SNMP"
-#: plugins/check_snmp.c:1006
+#: plugins/check_snmp.c:1002
msgid "Use SNMP GETNEXT instead of SNMP GET"
msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET"
-#: plugins/check_snmp.c:1008
+#: plugins/check_snmp.c:1004
msgid "SNMP protocol version"
msgstr "Version du protocole SNMP"
-#: plugins/check_snmp.c:1010
+#: plugins/check_snmp.c:1006
msgid "SNMPv3 securityLevel"
msgstr "Niveau de sécurité SNMPv3 (securityLevel)"
-#: plugins/check_snmp.c:1012
+#: plugins/check_snmp.c:1008
msgid "SNMPv3 auth proto"
msgstr "Protocole d'authentification SNMPv3"
-#: plugins/check_snmp.c:1014
+#: plugins/check_snmp.c:1010
msgid "SNMPv3 priv proto (default DES)"
msgstr ""
-#: plugins/check_snmp.c:1018
+#: plugins/check_snmp.c:1014
msgid "Optional community string for SNMP communication"
msgstr "Communauté optionnelle pour la communication SNMP"
-#: plugins/check_snmp.c:1019
+#: plugins/check_snmp.c:1015
msgid "default is"
msgstr "défaut:"
-#: plugins/check_snmp.c:1021
+#: plugins/check_snmp.c:1017
msgid "SNMPv3 username"
msgstr "Nom d'utilisateur SNMPv3"
-#: plugins/check_snmp.c:1023
+#: plugins/check_snmp.c:1019
msgid "SNMPv3 authentication password"
msgstr "Mot de passe d'authentification SNMPv3"
-#: plugins/check_snmp.c:1025
+#: plugins/check_snmp.c:1021
msgid "SNMPv3 privacy password"
msgstr "Mot de passe de confidentialité SNMPv3"
-#: plugins/check_snmp.c:1029
+#: plugins/check_snmp.c:1025
msgid "Object identifier(s) or SNMP variables whose value you wish to query"
msgstr ""
-#: plugins/check_snmp.c:1031
+#: plugins/check_snmp.c:1027
msgid ""
"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
msgstr ""
-#: plugins/check_snmp.c:1032
+#: plugins/check_snmp.c:1028
msgid "for symbolic OIDs.)"
msgstr ""
-#: plugins/check_snmp.c:1034
+#: plugins/check_snmp.c:1030
msgid "Delimiter to use when parsing returned data. Default is"
msgstr ""
-#: plugins/check_snmp.c:1035
+#: plugins/check_snmp.c:1031
msgid "Any data on the right hand side of the delimiter is considered"
msgstr ""
-#: plugins/check_snmp.c:1036
+#: plugins/check_snmp.c:1032
msgid "to be the data that should be used in the evaluation."
msgstr ""
-#: plugins/check_snmp.c:1040
+#: plugins/check_snmp.c:1036
msgid "Warning threshold range(s)"
msgstr "Valeurs pour le seuil d'avertissement"
-#: plugins/check_snmp.c:1042
+#: plugins/check_snmp.c:1038
msgid "Critical threshold range(s)"
msgstr "Valeurs pour le seuil critique"
-#: plugins/check_snmp.c:1044
+#: plugins/check_snmp.c:1040
msgid "Enable rate calculation. See 'Rate Calculation' below"
msgstr ""
-#: plugins/check_snmp.c:1046
+#: plugins/check_snmp.c:1042
msgid ""
"Converts rate per second. For example, set to 60 to convert to per minute"
msgstr ""
-#: plugins/check_snmp.c:1050
+#: plugins/check_snmp.c:1046
msgid "Return OK state (for that OID) if STRING is an exact match"
msgstr ""
-#: plugins/check_snmp.c:1052
+#: plugins/check_snmp.c:1048
msgid ""
"Return OK state (for that OID) if extended regular expression REGEX matches"
msgstr ""
-#: plugins/check_snmp.c:1054
+#: plugins/check_snmp.c:1050
msgid ""
"Return OK state (for that OID) if case-insensitive extended REGEX matches"
msgstr ""
-#: plugins/check_snmp.c:1056
+#: plugins/check_snmp.c:1052
msgid "Invert search result (CRITICAL if found)"
msgstr ""
-#: plugins/check_snmp.c:1060
+#: plugins/check_snmp.c:1056
msgid "Prefix label for output from plugin"
msgstr ""
-#: plugins/check_snmp.c:1062
+#: plugins/check_snmp.c:1058
msgid "Units label(s) for output data (e.g., 'sec.')."
msgstr ""
-#: plugins/check_snmp.c:1064
+#: plugins/check_snmp.c:1060
msgid "Separates output on multiple OID requests"
msgstr ""
-#: plugins/check_snmp.c:1068
+#: plugins/check_snmp.c:1064
msgid "Number of retries to be used in the requests"
msgstr "Le nombre d'essai pour les requêtes"
-#: plugins/check_snmp.c:1073
+#: plugins/check_snmp.c:1069
msgid ""
"This plugin uses the 'snmpget' command included with the NET-SNMP package."
msgstr ""
-#: plugins/check_snmp.c:1074
+#: plugins/check_snmp.c:1070
msgid ""
"if you don't have the package installed, you will need to download it from"
msgstr ""
"Si vous n'avez pas le programme installé, vous devrez le télécharger depuis"
-#: plugins/check_snmp.c:1075
+#: plugins/check_snmp.c:1071
msgid "http://net-snmp.sourceforge.net before you can use this plugin."
msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin."
-#: plugins/check_snmp.c:1079
+#: plugins/check_snmp.c:1075
+#, fuzzy
msgid ""
-"- Multiple OIDs may be indicated by a comma or space-delimited list (lists "
-"with"
+"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited "
msgstr ""
"- Des OIDs multiples peuvent être séparées par des virgules ou des espaces"
-#: plugins/check_snmp.c:1080
-msgid "internal spaces must be quoted). Maximum:"
+#: plugins/check_snmp.c:1076
+#, fuzzy
+msgid "list (lists with internal spaces must be quoted). Maximum:"
msgstr "(Les liste avec espaces doivent être entre guillemets). Max:"
-#: plugins/check_snmp.c:1080
+#: plugins/check_snmp.c:1076
msgid "OIDs."
msgstr "OIDs."
-#: plugins/check_snmp.c:1084
+#: plugins/check_snmp.c:1080
msgid ""
"- When checking multiple OIDs, separate ranges by commas like '-w "
"1:10,1:,:20'"
msgstr ""
-#: plugins/check_snmp.c:1085
+#: plugins/check_snmp.c:1081
msgid "- Note that only one string and one regex may be checked at present"
msgstr ""
-#: plugins/check_snmp.c:1086
+#: plugins/check_snmp.c:1082
msgid ""
"- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
msgstr ""
-#: plugins/check_snmp.c:1087
+#: plugins/check_snmp.c:1083
msgid "returned from the SNMP query is an unsigned integer."
msgstr ""
-#: plugins/check_snmp.c:1090
+#: plugins/check_snmp.c:1086
msgid "Rate Calculation:"
msgstr ""
-#: plugins/check_snmp.c:1091
+#: plugins/check_snmp.c:1087
msgid "In many places, SNMP returns counters that are only meaningful when"
msgstr ""
-#: plugins/check_snmp.c:1092
+#: plugins/check_snmp.c:1088
msgid "calculating the counter difference since the last check. check_snmp"
msgstr ""
-#: plugins/check_snmp.c:1093
+#: plugins/check_snmp.c:1089
msgid "saves the last state information in a file so that the rate per second"
msgstr ""
-#: plugins/check_snmp.c:1094
+#: plugins/check_snmp.c:1090
msgid "can be calculated. Use the --rate option to save state information."
msgstr ""
-#: plugins/check_snmp.c:1095
+#: plugins/check_snmp.c:1091
msgid ""
"On the first run, there will be no prior state - this will return with OK."
msgstr ""
-#: plugins/check_snmp.c:1096
+#: plugins/check_snmp.c:1092
msgid "The state is uniquely determined by the arguments to the plugin, so"
msgstr ""
-#: plugins/check_snmp.c:1097
+#: plugins/check_snmp.c:1093
msgid "changing the arguments will create a new state file."
msgstr ""
@@ -4599,27 +4626,27 @@ msgstr ""
msgid "Port number must be a positive integer"
msgstr "Le numéro du port doit être un nombre entier positif"
-#: plugins/check_ssh.c:228
+#: plugins/check_ssh.c:232
#, c-format
msgid "Server answer: %s"
msgstr "Réponse du serveur: %s"
-#: plugins/check_ssh.c:247
+#: plugins/check_ssh.c:251
#, c-format
msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
msgstr ""
"SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n"
-#: plugins/check_ssh.c:254
-#, c-format
-msgid "SSH OK - %s (protocol %s)\n"
+#: plugins/check_ssh.c:260
+#, fuzzy, c-format
+msgid "SSH OK - %s (protocol %s) | %s\n"
msgstr "SSH OK - %s (protocole %s)\n"
-#: plugins/check_ssh.c:274
+#: plugins/check_ssh.c:281
msgid "Try to connect to an SSH server at specified server and port"
msgstr "Essaye de se connecter à un serveur SSH précisé à un port précis"
-#: plugins/check_ssh.c:290
+#: plugins/check_ssh.c:297
msgid ""
"Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
msgstr ""
@@ -4738,40 +4765,35 @@ msgstr ""
"Avec la surveillance UDP, une chaîne d'envoi et un chaîne de réponse doit "
"être spécifiée."
-#: plugins/check_tcp.c:240
-#, c-format
-msgid "CRITICAL - Cannot retrieve server certificate.\n"
-msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
-
-#: plugins/check_tcp.c:418
+#: plugins/check_tcp.c:415
msgid "No arguments found"
msgstr "Pas de paramètres"
-#: plugins/check_tcp.c:519
+#: plugins/check_tcp.c:516
msgid "Maxbytes must be a positive integer"
msgstr "Maxbytes doit être un entier positif"
-#: plugins/check_tcp.c:537
+#: plugins/check_tcp.c:534
msgid "Refuse must be one of ok, warn, crit"
msgstr "Refuse doit être parmis ok, warn, crit"
-#: plugins/check_tcp.c:547
+#: plugins/check_tcp.c:544
msgid "Mismatch must be one of ok, warn, crit"
msgstr "Mismatch doit être parmis ok, warn, crit"
-#: plugins/check_tcp.c:553
+#: plugins/check_tcp.c:550
msgid "Delay must be a positive integer"
msgstr "Delay doit être un entier positif"
-#: plugins/check_tcp.c:581
+#: plugins/check_tcp.c:578
msgid "You must provide a server address"
msgstr "Vous devez fournir une adresse serveur"
-#: plugins/check_tcp.c:583
+#: plugins/check_tcp.c:580
msgid "Invalid hostname, address or socket"
msgstr "Adresse/Nom/Socket invalide"
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:594
#, c-format
msgid ""
"This plugin tests %s connections with the specified host (or unix socket).\n"
@@ -4780,7 +4802,7 @@ msgstr ""
"Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n"
"\n"
-#: plugins/check_tcp.c:610
+#: plugins/check_tcp.c:607
msgid ""
"Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
"quit option"
@@ -4788,55 +4810,55 @@ msgstr ""
"Permet d'utiliser \\n, \\r, \\t ou \\ dans la chaîne de caractères send ou "
"quit. Doit être placé avant ces dernières."
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:608
msgid "Default: nothing added to send, \\r\\n added to end of quit"
msgstr ""
"Par défaut: Rien n'est ajouté à send, \\r\\n est ajouté à la fin de quit"
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:610
msgid "String to send to the server"
msgstr "Chaîne de caractères à envoyer au serveur"
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:612
msgid "String to expect in server response"
msgstr "Chaîne de caractères à attendre en réponse"
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:612
msgid "(may be repeated)"
msgstr "(peut être utilisé plusieurs fois)"
-#: plugins/check_tcp.c:617
+#: plugins/check_tcp.c:614
msgid "All expect strings need to occur in server response. Default is any"
msgstr ""
"Toutes les chaînes attendus (expect) doivent être repérés dans la réponse. "
"Par défaut, n'importe laquelle suffit."
-#: plugins/check_tcp.c:619
+#: plugins/check_tcp.c:616
msgid "String to send server to initiate a clean close of the connection"
msgstr "Chaîne de caractères à envoyer pour fermer gracieusement la connection"
-#: plugins/check_tcp.c:621
+#: plugins/check_tcp.c:618
msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
msgstr ""
-#: plugins/check_tcp.c:623
+#: plugins/check_tcp.c:620
msgid ""
"Accept expected string mismatches with states ok, warn, crit (default: warn)"
msgstr ""
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:622
msgid "Hide output from TCP socket"
msgstr "Cacher la réponse provenant du socket TCP"
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:624
msgid "Close connection once more than this number of bytes are received"
msgstr ""
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:626
msgid "Seconds to wait between sending string and polling for response"
msgstr ""
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:632
msgid "Use SSL for the connection."
msgstr ""
@@ -5070,38 +5092,33 @@ msgstr ""
msgid "http://www.networkupstools.org"
msgstr ""
-#: plugins/check_users.c:92
-#, c-format
-msgid "# users=%d"
-msgstr "# utilisateurs=%d"
-
-#: plugins/check_users.c:115
+#: plugins/check_users.c:90
msgid "Unable to read output"
msgstr "Impossible de lire les données en entrée"
-#: plugins/check_users.c:122
+#: plugins/check_users.c:97
#, c-format
msgid "USERS %s - %d users currently logged in |%s\n"
msgstr "UTILISATEURS %s - %d utilisateurs actuellement connectés sur |%s\n"
-#: plugins/check_users.c:207
+#: plugins/check_users.c:176
msgid "This plugin checks the number of users currently logged in on the local"
msgstr ""
"Ce plugin vérifie le nombre d'utilisateurs actuellement connecté sur le "
"système local"
-#: plugins/check_users.c:208
+#: plugins/check_users.c:177
msgid ""
"system and generates an error if the number exceeds the thresholds specified."
msgstr "et génère une erreur si le nombre excède le seuil spécifié."
-#: plugins/check_users.c:218
+#: plugins/check_users.c:187
msgid "Set WARNING status if more than INTEGER users are logged in"
msgstr ""
"Sortir avec un résultat AVERTISSEMENT si plus de INTEGER utilisateurs sont "
"connectés"
-#: plugins/check_users.c:220
+#: plugins/check_users.c:189
msgid "Set CRITICAL status if more than INTEGER users are logged in"
msgstr ""
"Sortir avec un résultat CRITIQUE si plus de INTEGER utilisateurs sont "
@@ -6049,6 +6066,21 @@ msgstr ""
msgid "The -v switch can be specified several times for increased verbosity."
msgstr ""
+#~ msgid "Critical threshold must be integer"
+#~ msgstr "le seuil critique doit être un entier positif"
+
+#~ msgid "Warning threshold must be integer"
+#~ msgstr "Le seuil d'avertissement doit être un entier positif"
+
+#~ msgid "CRITICAL - Cannot retrieve server certificate."
+#~ msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur"
+
+#~ msgid "CRITICAL - Cannot retrieve server certificate.\n"
+#~ msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
+
+#~ msgid "# users=%d"
+#~ msgstr "# utilisateurs=%d"
+
#~ msgid "Usage: "
#~ msgstr "Utilisation: "
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index 7d92b58..7b81c9a 100644
--- a/po/nagios-plugins.pot
+++ b/po/nagios-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-09 19:30-0400\n"
+"POT-Creation-Date: 2012-06-11 23:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87
-#: plugins/check_disk.c:192 plugins/check_dns.c:102 plugins/check_dummy.c:52
+#: plugins/check_disk.c:190 plugins/check_dns.c:102 plugins/check_dummy.c:52
#: plugins/check_fping.c:89 plugins/check_game.c:82 plugins/check_hpjd.c:103
#: plugins/check_http.c:157 plugins/check_ldap.c:109 plugins/check_load.c:122
#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:85
@@ -26,8 +26,8 @@ msgstr ""
#: plugins/check_ntp_peer.c:569 plugins/check_ntp_time.c:548
#: plugins/check_nwstat.c:173 plugins/check_overcr.c:102
#: plugins/check_pgsql.c:154 plugins/check_ping.c:95 plugins/check_procs.c:147
-#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:140
-#: plugins/check_snmp.c:205 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
+#: plugins/check_snmp.c:204 plugins/check_ssh.c:73 plugins/check_swap.c:110
#: plugins/check_tcp.c:209 plugins/check_time.c:78 plugins/check_ups.c:122
#: plugins/check_users.c:68 plugins/negate.c:211 plugins-root/check_dhcp.c:270
msgid "Could not parse arguments"
@@ -59,179 +59,183 @@ msgstr ""
msgid "%s: Error parsing output\n"
msgstr ""
-#: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
+#: plugins/check_by_ssh.c:220 plugins/check_disk.c:467
#: plugins/check_http.c:256 plugins/check_ldap.c:293 plugins/check_pgsql.c:250
-#: plugins/check_procs.c:364 plugins/check_radius.c:308
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:665
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
+#: plugins/check_procs.c:366 plugins/check_radius.c:308
+#: plugins/check_real.c:356 plugins/check_smtp.c:592 plugins/check_snmp.c:661
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:487 plugins/check_time.c:302
#: plugins/check_ups.c:556 plugins/negate.c:161
msgid "Timeout interval must be a positive integer"
msgstr ""
-#: plugins/check_by_ssh.c:229 plugins/check_pgsql.c:274
+#: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:274
#: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:514 plugins/check_tcp.c:496 plugins/check_time.c:296
+#: plugins/check_smtp.c:516 plugins/check_tcp.c:493 plugins/check_time.c:296
#: plugins/check_ups.c:518
msgid "Port must be a positive integer"
msgstr ""
-#: plugins/check_by_ssh.c:290
+#: plugins/check_by_ssh.c:291
msgid "skip-stdout argument must be an integer"
msgstr ""
-#: plugins/check_by_ssh.c:298
+#: plugins/check_by_ssh.c:299
msgid "skip-stderr argument must be an integer"
msgstr ""
-#: plugins/check_by_ssh.c:317
+#: plugins/check_by_ssh.c:322
#, c-format
msgid "%s: You must provide a host name\n"
msgstr ""
-#: plugins/check_by_ssh.c:335
+#: plugins/check_by_ssh.c:340
msgid "No remotecmd"
msgstr ""
-#: plugins/check_by_ssh.c:349
+#: plugins/check_by_ssh.c:354
#, c-format
msgid "%s: Argument limit of %d exceeded\n"
msgstr ""
-#: plugins/check_by_ssh.c:352
+#: plugins/check_by_ssh.c:357
msgid "Can not (re)allocate 'commargv' buffer\n"
msgstr ""
-#: plugins/check_by_ssh.c:366
+#: plugins/check_by_ssh.c:371
#, c-format
msgid ""
"%s: In passive mode, you must provide a service name for each command.\n"
msgstr ""
-#: plugins/check_by_ssh.c:369
+#: plugins/check_by_ssh.c:374
#, c-format
msgid ""
"%s: In passive mode, you must provide the host short name from the nagios "
"configs.\n"
msgstr ""
-#: plugins/check_by_ssh.c:383
+#: plugins/check_by_ssh.c:388
#, c-format
msgid "This plugin uses SSH to execute commands on a remote host"
msgstr ""
-#: plugins/check_by_ssh.c:398
+#: plugins/check_by_ssh.c:403
msgid "tell ssh to use Protocol 1 [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:400
+#: plugins/check_by_ssh.c:405
msgid "tell ssh to use Protocol 2 [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:402
+#: plugins/check_by_ssh.c:407
msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:404
+#: plugins/check_by_ssh.c:409
msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:406
+#: plugins/check_by_ssh.c:411
msgid ""
"tells ssh to fork rather than create a tty [optional]. This will always "
"return OK if ssh is executed"
msgstr ""
-#: plugins/check_by_ssh.c:408
+#: plugins/check_by_ssh.c:413
msgid "command to execute on the remote machine"
msgstr ""
-#: plugins/check_by_ssh.c:410
+#: plugins/check_by_ssh.c:415
msgid "SSH user name on remote host [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:412
+#: plugins/check_by_ssh.c:417
msgid "identity of an authorized key [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:414
+#: plugins/check_by_ssh.c:419
msgid "external command file for nagios [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:416
+#: plugins/check_by_ssh.c:421
msgid "list of nagios service names, separated by ':' [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:418
+#: plugins/check_by_ssh.c:423
msgid "short name of host in nagios configuration [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:420
+#: plugins/check_by_ssh.c:425
msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:422
-msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
-msgstr ""
-
#: plugins/check_by_ssh.c:427
-msgid "The most common mode of use is to refer to a local identity file with"
-msgstr ""
-
-#: plugins/check_by_ssh.c:428
-msgid "the '-i' option. In this mode, the identity pair should have a null"
+msgid "Tell ssh to use this configfile [optional]"
msgstr ""
#: plugins/check_by_ssh.c:429
-msgid "passphrase and the public key should be listed in the authorized_keys"
+msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
msgstr ""
-#: plugins/check_by_ssh.c:430
-msgid "file of the remote host. Usually the key will be restricted to running"
-msgstr ""
-
-#: plugins/check_by_ssh.c:431
-msgid "only one command on the remote server. If the remote SSH server tracks"
-msgstr ""
-
-#: plugins/check_by_ssh.c:432
-msgid "invocation arguments, the one remote program may be an agent that can"
-msgstr ""
-
-#: plugins/check_by_ssh.c:433
-msgid "execute additional commands as proxy"
+#: plugins/check_by_ssh.c:434
+msgid "The most common mode of use is to refer to a local identity file with"
msgstr ""
#: plugins/check_by_ssh.c:435
-msgid "To use passive mode, provide multiple '-C' options, and provide"
+msgid "the '-i' option. In this mode, the identity pair should have a null"
msgstr ""
#: plugins/check_by_ssh.c:436
+msgid "passphrase and the public key should be listed in the authorized_keys"
+msgstr ""
+
+#: plugins/check_by_ssh.c:437
+msgid "file of the remote host. Usually the key will be restricted to running"
+msgstr ""
+
+#: plugins/check_by_ssh.c:438
+msgid "only one command on the remote server. If the remote SSH server tracks"
+msgstr ""
+
+#: plugins/check_by_ssh.c:439
+msgid "invocation arguments, the one remote program may be an agent that can"
+msgstr ""
+
+#: plugins/check_by_ssh.c:440
+msgid "execute additional commands as proxy"
+msgstr ""
+
+#: plugins/check_by_ssh.c:442
+msgid "To use passive mode, provide multiple '-C' options, and provide"
+msgstr ""
+
+#: plugins/check_by_ssh.c:443
msgid ""
"all of -O, -s, and -n options (servicelist order must match '-C'options)"
msgstr ""
-#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:261
-#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1415
+#: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261
+#: plugins/check_dig.c:342 plugins/check_disk.c:905 plugins/check_http.c:1418
#: plugins/check_nagios.c:302 plugins/check_ntp.c:864
#: plugins/check_ntp_peer.c:698 plugins/check_ntp_time.c:628
-#: plugins/check_procs.c:742 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_procs.c:751 plugins/negate.c:268 plugins/urlize.c:180
msgid "Examples:"
msgstr ""
-#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:274
-#: plugins/check_dig.c:354 plugins/check_disk.c:980 plugins/check_dns.c:486
+#: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274
+#: plugins/check_dig.c:354 plugins/check_disk.c:922 plugins/check_dns.c:486
#: plugins/check_dummy.c:122 plugins/check_fping.c:432
-#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1438
-#: plugins/check_ldap.c:452 plugins/check_load.c:325 plugins/check_mrtg.c:382
-#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:759
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1441
+#: plugins/check_ldap.c:456 plugins/check_load.c:325 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:764
#: plugins/check_ntp.c:883 plugins/check_ntp_peer.c:718
#: plugins/check_ntp_time.c:637 plugins/check_nwstat.c:1685
#: plugins/check_overcr.c:467 plugins/check_pgsql.c:477
-#: plugins/check_ping.c:601 plugins/check_procs.c:760
+#: plugins/check_ping.c:603 plugins/check_procs.c:769
#: plugins/check_radius.c:385 plugins/check_real.c:451
-#: plugins/check_smtp.c:821 plugins/check_snmp.c:1107 plugins/check_ssh.c:302
-#: plugins/check_swap.c:558 plugins/check_tcp.c:651 plugins/check_time.c:371
-#: plugins/check_ups.c:660 plugins/check_users.c:229
+#: plugins/check_smtp.c:840 plugins/check_snmp.c:1103 plugins/check_ssh.c:309
+#: plugins/check_swap.c:558 plugins/check_tcp.c:648 plugins/check_time.c:371
+#: plugins/check_ups.c:660 plugins/check_users.c:197
#: plugins/check_ide_smart.c:527 plugins/negate.c:292 plugins/urlize.c:197
#: plugins-root/check_dhcp.c:1421 plugins-root/check_icmp.c:1347
msgid "Usage:"
@@ -242,7 +246,7 @@ msgstr ""
msgid "Host/Service Cluster Plugin for Nagios 2"
msgstr ""
-#: plugins/check_cluster.c:236 plugins/check_nt.c:661
+#: plugins/check_cluster.c:236 plugins/check_nt.c:666
msgid "Options:"
msgstr ""
@@ -279,11 +283,11 @@ msgid "commas"
msgstr ""
#: plugins/check_cluster.c:257 plugins/check_game.c:318
-#: plugins/check_http.c:1401 plugins/check_ldap.c:434 plugins/check_mrtg.c:363
+#: plugins/check_http.c:1400 plugins/check_ldap.c:438 plugins/check_mrtg.c:363
#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:414
-#: plugins/check_nt.c:743 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
+#: plugins/check_nt.c:748 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
-#: plugins/check_overcr.c:456 plugins/check_snmp.c:1078
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:1074
#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
#: plugins-root/check_icmp.c:1322
msgid "Notes:"
@@ -365,12 +369,12 @@ msgstr ""
msgid "Pass STRING as argument(s) to dig"
msgstr ""
-#: plugins/check_disk.c:214
+#: plugins/check_disk.c:212
#, c-format
msgid "DISK %s: %s not found\n"
msgstr ""
-#: plugins/check_disk.c:214 plugins/check_disk.c:995 plugins/check_dns.c:241
+#: plugins/check_disk.c:212 plugins/check_disk.c:937 plugins/check_dns.c:241
#: plugins/check_dummy.c:74 plugins/check_mysql.c:212
#: plugins/check_nagios.c:104 plugins/check_nagios.c:168
#: plugins/check_nagios.c:172 plugins/check_procs.c:290
@@ -378,208 +382,208 @@ msgstr ""
msgid "CRITICAL"
msgstr ""
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:541
#, c-format
msgid "unit type %s not known\n"
msgstr ""
-#: plugins/check_disk.c:602
+#: plugins/check_disk.c:544
#, c-format
msgid "failed allocating storage for '%s'\n"
msgstr ""
-#: plugins/check_disk.c:626 plugins/check_disk.c:664 plugins/check_disk.c:669
-#: plugins/check_disk.c:676 plugins/check_disk.c:680 plugins/check_disk.c:720
-#: plugins/check_disk.c:726 plugins/check_disk.c:745 plugins/check_dummy.c:77
-#: plugins/check_dummy.c:80 plugins/check_procs.c:451
+#: plugins/check_disk.c:568 plugins/check_disk.c:606 plugins/check_disk.c:611
+#: plugins/check_disk.c:618 plugins/check_disk.c:622 plugins/check_disk.c:662
+#: plugins/check_disk.c:668 plugins/check_disk.c:687 plugins/check_dummy.c:77
+#: plugins/check_dummy.c:80 plugins/check_procs.c:453
#, c-format
msgid "UNKNOWN"
msgstr ""
-#: plugins/check_disk.c:626
+#: plugins/check_disk.c:568
msgid "Must set a threshold value before using -p\n"
msgstr ""
-#: plugins/check_disk.c:664
+#: plugins/check_disk.c:606
msgid "Must set -E before selecting paths\n"
msgstr ""
-#: plugins/check_disk.c:669
+#: plugins/check_disk.c:611
msgid "Must set group value before selecting paths\n"
msgstr ""
-#: plugins/check_disk.c:676
+#: plugins/check_disk.c:618
msgid ""
"Paths need to be selected before using -i/-I. Use -A to select all paths "
"explicitly"
msgstr ""
-#: plugins/check_disk.c:680 plugins/check_disk.c:726 plugins/check_procs.c:451
+#: plugins/check_disk.c:622 plugins/check_disk.c:668 plugins/check_procs.c:453
msgid "Could not compile regular expression"
msgstr ""
-#: plugins/check_disk.c:720
+#: plugins/check_disk.c:662
msgid "Must set a threshold value before using -r/-R\n"
msgstr ""
-#: plugins/check_disk.c:746
+#: plugins/check_disk.c:688
msgid "Regular expression did not match any path or disk"
msgstr ""
-#: plugins/check_disk.c:792
+#: plugins/check_disk.c:734
msgid "Unknown argument"
msgstr ""
-#: plugins/check_disk.c:826
+#: plugins/check_disk.c:768
#, c-format
msgid " for %s\n"
msgstr ""
-#: plugins/check_disk.c:900
+#: plugins/check_disk.c:842
msgid ""
"This plugin checks the amount of used disk space on a mounted file system"
msgstr ""
-#: plugins/check_disk.c:901
+#: plugins/check_disk.c:843
msgid ""
"and generates an alert if free space is less than one of the threshold values"
msgstr ""
-#: plugins/check_disk.c:911
+#: plugins/check_disk.c:853
msgid "Exit with WARNING status if less than INTEGER units of disk are free"
msgstr ""
-#: plugins/check_disk.c:913
+#: plugins/check_disk.c:855
msgid "Exit with WARNING status if less than PERCENT of disk space is free"
msgstr ""
-#: plugins/check_disk.c:915
+#: plugins/check_disk.c:857
msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
msgstr ""
-#: plugins/check_disk.c:917
+#: plugins/check_disk.c:859
msgid "Exit with CRITCAL status if less than PERCENT of disk space is free"
msgstr ""
-#: plugins/check_disk.c:919
+#: plugins/check_disk.c:861
msgid "Exit with WARNING status if less than PERCENT of inode space is free"
msgstr ""
-#: plugins/check_disk.c:921
+#: plugins/check_disk.c:863
msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
msgstr ""
-#: plugins/check_disk.c:923
+#: plugins/check_disk.c:865
msgid "Path or partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:925
+#: plugins/check_disk.c:867
msgid "Ignore device (only works if -p unspecified)"
msgstr ""
-#: plugins/check_disk.c:927
+#: plugins/check_disk.c:869
msgid "Clear thresholds"
msgstr ""
-#: plugins/check_disk.c:929
+#: plugins/check_disk.c:871
msgid "For paths or partitions specified with -p, only check for exact paths"
msgstr ""
-#: plugins/check_disk.c:931
+#: plugins/check_disk.c:873
msgid "Display only devices/mountpoints with errors"
msgstr ""
-#: plugins/check_disk.c:933
+#: plugins/check_disk.c:875
msgid ""
"Group paths. Thresholds apply to (free-)space of all partitions together"
msgstr ""
-#: plugins/check_disk.c:935
+#: plugins/check_disk.c:877
msgid "Same as '--units kB'"
msgstr ""
-#: plugins/check_disk.c:937
+#: plugins/check_disk.c:879
msgid "Only check local filesystems"
msgstr ""
-#: plugins/check_disk.c:939
+#: plugins/check_disk.c:881
msgid ""
"Only check local filesystems against thresholds. Yet call stat on remote "
"filesystems"
msgstr ""
-#: plugins/check_disk.c:940
+#: plugins/check_disk.c:882
msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
msgstr ""
-#: plugins/check_disk.c:942
+#: plugins/check_disk.c:884
msgid "Display the mountpoint instead of the partition"
msgstr ""
-#: plugins/check_disk.c:944
+#: plugins/check_disk.c:886
msgid "Same as '--units MB'"
msgstr ""
-#: plugins/check_disk.c:946
+#: plugins/check_disk.c:888
msgid "Explicitly select all paths. This is equivalent to -R '.*'"
msgstr ""
-#: plugins/check_disk.c:948
+#: plugins/check_disk.c:890
msgid ""
"Case insensitive regular expression for path/partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:950
+#: plugins/check_disk.c:892
msgid "Regular expression for path or partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:952
+#: plugins/check_disk.c:894
msgid ""
"Regular expression to ignore selected path/partition (case insensitive) (may "
"be repeated)"
msgstr ""
-#: plugins/check_disk.c:954
+#: plugins/check_disk.c:896
msgid ""
"Regular expression to ignore selected path or partition (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:957
+#: plugins/check_disk.c:899
msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
msgstr ""
-#: plugins/check_disk.c:960
+#: plugins/check_disk.c:902
msgid "Ignore all filesystems of indicated type (may be repeated)"
msgstr ""
-#: plugins/check_disk.c:965
+#: plugins/check_disk.c:907
msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
msgstr ""
-#: plugins/check_disk.c:967
+#: plugins/check_disk.c:909
msgid ""
"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
"r regex"
msgstr ""
-#: plugins/check_disk.c:968
+#: plugins/check_disk.c:910
msgid ""
"are grouped which means the freespace thresholds are applied to all disks "
"together"
msgstr ""
-#: plugins/check_disk.c:970
+#: plugins/check_disk.c:912
msgid ""
"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
"100M/50M"
msgstr ""
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:938
#, c-format
msgid "%s %s: %s\n"
msgstr ""
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:938
msgid "is not accessible"
msgstr ""
@@ -789,14 +793,14 @@ msgstr ""
msgid "of the argument with optional text"
msgstr ""
-#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:437
-#: plugins/check_swap.c:175 plugins/check_users.c:73 plugins/urlize.c:110
+#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:438
+#: plugins/check_swap.c:175 plugins/urlize.c:110
#, c-format
msgid "Could not open pipe: %s\n"
msgstr ""
#: plugins/check_fping.c:114 plugins/check_hpjd.c:134 plugins/check_load.c:153
-#: plugins/check_swap.c:181 plugins/check_users.c:79 plugins/urlize.c:116
+#: plugins/check_swap.c:181 plugins/urlize.c:116
#, c-format
msgid "Could not open stderr for %s\n"
msgstr ""
@@ -831,7 +835,7 @@ msgstr ""
#: plugins/check_ntp_peer.c:491 plugins/check_ntp_time.c:492
#: plugins/check_pgsql.c:268 plugins/check_ping.c:295 plugins/check_ping.c:418
#: plugins/check_radius.c:264 plugins/check_real.c:314
-#: plugins/check_real.c:376 plugins/check_smtp.c:507 plugins/check_smtp.c:633
+#: plugins/check_real.c:376 plugins/check_smtp.c:509 plugins/check_smtp.c:638
#: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315
#: plugins/check_ups.c:504 plugins/check_ups.c:573
msgid "Invalid hostname/address"
@@ -885,11 +889,11 @@ msgid ""
"reducing system load)"
msgstr ""
-#: plugins/check_fping.c:408 plugins/check_ping.c:573
+#: plugins/check_fping.c:408 plugins/check_ping.c:575
msgid "warning threshold pair"
msgstr ""
-#: plugins/check_fping.c:410 plugins/check_ping.c:575
+#: plugins/check_fping.c:410 plugins/check_ping.c:577
msgid "critical threshold pair"
msgstr ""
@@ -1049,443 +1053,458 @@ msgstr ""
msgid "(default=%s)"
msgstr ""
-#: plugins/check_http.c:262
-msgid "Critical threshold must be integer"
-msgstr ""
-
-#: plugins/check_http.c:270
-msgid "Warning threshold must be integer"
-msgstr ""
-
-#: plugins/check_http.c:296 plugins/check_tcp.c:559
+#: plugins/check_http.c:286 plugins/check_tcp.c:556
msgid "Invalid certificate expiration period"
msgstr ""
-#: plugins/check_http.c:305 plugins/check_tcp.c:571
+#: plugins/check_http.c:295 plugins/check_tcp.c:568
msgid "Invalid option - SSL is not available"
msgstr ""
-#: plugins/check_http.c:329
+#: plugins/check_http.c:303
+msgid ""
+"Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 "
+"(SSLv3)"
+msgstr ""
+
+#: plugins/check_http.c:326
msgid "Invalid onredirect option"
msgstr ""
-#: plugins/check_http.c:331
+#: plugins/check_http.c:328
#, c-format
msgid "option f:%d \n"
msgstr ""
-#: plugins/check_http.c:352
+#: plugins/check_http.c:349
msgid "Invalid port number"
msgstr ""
-#: plugins/check_http.c:400
+#: plugins/check_http.c:397
#, c-format
msgid "Could Not Compile Regular Expression: %s"
msgstr ""
-#: plugins/check_http.c:414 plugins/check_ntp.c:718
+#: plugins/check_http.c:411 plugins/check_ntp.c:718
#: plugins/check_ntp_peer.c:507 plugins/check_ntp_time.c:508
-#: plugins/check_smtp.c:613 plugins/check_ssh.c:149 plugins/check_tcp.c:463
+#: plugins/check_smtp.c:618 plugins/check_ssh.c:149 plugins/check_tcp.c:460
msgid "IPv6 support not available"
msgstr ""
-#: plugins/check_http.c:476 plugins/check_ping.c:422
+#: plugins/check_http.c:473 plugins/check_ping.c:422
msgid "You must specify a server address or host name"
msgstr ""
-#: plugins/check_http.c:609 plugins/check_http.c:777
+#: plugins/check_http.c:608 plugins/check_http.c:776
msgid "HTTP UNKNOWN - Memory allocation error\n"
msgstr ""
-#: plugins/check_http.c:681
+#: plugins/check_http.c:680
#, c-format
msgid "%sServer date unknown, "
msgstr ""
-#: plugins/check_http.c:684
+#: plugins/check_http.c:683
#, c-format
msgid "%sDocument modification date unknown, "
msgstr ""
-#: plugins/check_http.c:691
+#: plugins/check_http.c:690
#, c-format
msgid "%sServer date \"%100s\" unparsable, "
msgstr ""
-#: plugins/check_http.c:694
+#: plugins/check_http.c:693
#, c-format
msgid "%sDocument date \"%100s\" unparsable, "
msgstr ""
-#: plugins/check_http.c:697
+#: plugins/check_http.c:696
#, c-format
msgid "%sDocument is %d seconds in the future, "
msgstr ""
-#: plugins/check_http.c:702
+#: plugins/check_http.c:701
#, c-format
msgid "%sLast modified %.1f days ago, "
msgstr ""
-#: plugins/check_http.c:705
+#: plugins/check_http.c:704
#, c-format
msgid "%sLast modified %d:%02d:%02d ago, "
msgstr ""
-#: plugins/check_http.c:807
+#: plugins/check_http.c:806
msgid "HTTP CRITICAL - Unable to open TCP socket\n"
msgstr ""
-#: plugins/check_http.c:910
+#: plugins/check_http.c:911
msgid "HTTP CRITICAL - Error on receive\n"
msgstr ""
-#: plugins/check_http.c:920
+#: plugins/check_http.c:921
msgid "HTTP CRITICAL - No data received from host\n"
msgstr ""
-#: plugins/check_http.c:971
+#: plugins/check_http.c:972
#, c-format
msgid "Invalid HTTP response received from host: %s\n"
msgstr ""
-#: plugins/check_http.c:975
+#: plugins/check_http.c:976
#, c-format
msgid "Invalid HTTP response received from host on port %d: %s\n"
msgstr ""
-#: plugins/check_http.c:984
+#: plugins/check_http.c:985
#, c-format
msgid "Status line output matched \"%s\" - "
msgstr ""
-#: plugins/check_http.c:995
+#: plugins/check_http.c:996
#, c-format
msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
msgstr ""
-#: plugins/check_http.c:1002
+#: plugins/check_http.c:1003
#, c-format
msgid "HTTP CRITICAL: Invalid Status (%s)\n"
msgstr ""
-#: plugins/check_http.c:1006 plugins/check_http.c:1011
-#: plugins/check_http.c:1021 plugins/check_http.c:1025
+#: plugins/check_http.c:1007 plugins/check_http.c:1012
+#: plugins/check_http.c:1022 plugins/check_http.c:1026
#, c-format
msgid "%s - "
msgstr ""
-#: plugins/check_http.c:1045
+#: plugins/check_http.c:1046
#, c-format
msgid "%sstring '%s' not found on '%s://%s:%d%s', "
msgstr ""
-#: plugins/check_http.c:1058
+#: plugins/check_http.c:1059
#, c-format
msgid "%spattern not found, "
msgstr ""
-#: plugins/check_http.c:1060
+#: plugins/check_http.c:1061
#, c-format
msgid "%spattern found, "
msgstr ""
-#: plugins/check_http.c:1066
+#: plugins/check_http.c:1067
#, c-format
msgid "%sExecute Error: %s, "
msgstr ""
-#: plugins/check_http.c:1082
+#: plugins/check_http.c:1083
#, c-format
msgid "%spage size %d too large, "
msgstr ""
-#: plugins/check_http.c:1085
+#: plugins/check_http.c:1086
#, c-format
msgid "%spage size %d too small, "
msgstr ""
-#: plugins/check_http.c:1097
+#: plugins/check_http.c:1098
#, c-format
msgid "%s - %d bytes in %.3f second response time %s|%s %s"
msgstr ""
-#: plugins/check_http.c:1137
+#: plugins/check_http.c:1135
msgid "HTTP UNKNOWN - Could not allocate addr\n"
msgstr ""
-#: plugins/check_http.c:1141 plugins/check_http.c:1172
+#: plugins/check_http.c:1139 plugins/check_http.c:1170
msgid "HTTP UNKNOWN - Could not allocate URL\n"
msgstr ""
-#: plugins/check_http.c:1150
+#: plugins/check_http.c:1148
#, c-format
msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
msgstr ""
-#: plugins/check_http.c:1165
+#: plugins/check_http.c:1163
#, c-format
msgid "HTTP UNKNOWN - Empty redirect location%s\n"
msgstr ""
-#: plugins/check_http.c:1215
+#: plugins/check_http.c:1213
#, c-format
msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
msgstr ""
-#: plugins/check_http.c:1225
+#: plugins/check_http.c:1223
#, c-format
msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
msgstr ""
-#: plugins/check_http.c:1233
+#: plugins/check_http.c:1231
#, c-format
msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
msgstr ""
-#: plugins/check_http.c:1254
+#: plugins/check_http.c:1252
#, c-format
msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
msgstr ""
-#: plugins/check_http.c:1259
+#: plugins/check_http.c:1257
#, c-format
msgid "Redirection to %s://%s:%d%s\n"
msgstr ""
-#: plugins/check_http.c:1310
+#: plugins/check_http.c:1308
msgid "This plugin tests the HTTP service on the specified host. It can test"
msgstr ""
-#: plugins/check_http.c:1311
+#: plugins/check_http.c:1309
msgid "normal (http) and secure (https) servers, follow redirects, search for"
msgstr ""
-#: plugins/check_http.c:1312
+#: plugins/check_http.c:1310
msgid "strings and regular expressions, check connection times, and report on"
msgstr ""
-#: plugins/check_http.c:1313
+#: plugins/check_http.c:1311
msgid "certificate expiration times."
msgstr ""
-#: plugins/check_http.c:1319
+#: plugins/check_http.c:1317
#, c-format
msgid "NOTE: One or both of -H and -I must be specified"
msgstr ""
-#: plugins/check_http.c:1327
+#: plugins/check_http.c:1325
msgid "Host name argument for servers using host headers (virtual host)"
msgstr ""
-#: plugins/check_http.c:1328
+#: plugins/check_http.c:1326
msgid "Append a port to include it in the header (eg: example.com:5000)"
msgstr ""
-#: plugins/check_http.c:1330
+#: plugins/check_http.c:1328
msgid ""
"IP address or name (use numeric address if possible to bypass DNS lookup)."
msgstr ""
-#: plugins/check_http.c:1332
+#: plugins/check_http.c:1330
msgid "Port number (default: "
msgstr ""
-#: plugins/check_http.c:1339
-msgid "Connect via SSL. Port defaults to 443"
+#: plugins/check_http.c:1337
+msgid ""
+"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
msgstr ""
-#: plugins/check_http.c:1341
+#: plugins/check_http.c:1338
+msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."
+msgstr ""
+
+#: plugins/check_http.c:1340
msgid "Enable SSL/TLS hostname extension support (SNI)"
msgstr ""
-#: plugins/check_http.c:1343
+#: plugins/check_http.c:1342
msgid ""
"Minimum number of days a certificate has to be valid. Port defaults to 443"
msgstr ""
-#: plugins/check_http.c:1344
+#: plugins/check_http.c:1343
msgid "(when this option is used the URL is not checked.)\n"
msgstr ""
-#: plugins/check_http.c:1348
+#: plugins/check_http.c:1347
msgid "Comma-delimited list of strings, at least one of them is expected in"
msgstr ""
-#: plugins/check_http.c:1349
+#: plugins/check_http.c:1348
msgid "the first (status) line of the server response (default: "
msgstr ""
-#: plugins/check_http.c:1351
+#: plugins/check_http.c:1350
msgid ""
"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
msgstr ""
-#: plugins/check_http.c:1353
+#: plugins/check_http.c:1352
msgid "String to expect in the content"
msgstr ""
-#: plugins/check_http.c:1355
+#: plugins/check_http.c:1354
msgid "URL to GET or POST (default: /)"
msgstr ""
-#: plugins/check_http.c:1357
+#: plugins/check_http.c:1356
msgid "URL encoded http POST data"
msgstr ""
-#: plugins/check_http.c:1359
+#: plugins/check_http.c:1358
msgid "Set HTTP method."
msgstr ""
-#: plugins/check_http.c:1361
+#: plugins/check_http.c:1360
msgid "Don't wait for document body: stop reading after headers."
msgstr ""
-#: plugins/check_http.c:1362
+#: plugins/check_http.c:1361
msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
msgstr ""
-#: plugins/check_http.c:1364
+#: plugins/check_http.c:1363
msgid "Warn if document is more than SECONDS old. the number can also be of"
msgstr ""
-#: plugins/check_http.c:1365
+#: plugins/check_http.c:1364
msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
msgstr ""
-#: plugins/check_http.c:1367
+#: plugins/check_http.c:1366
msgid "specify Content-Type header media type when POSTing\n"
msgstr ""
-#: plugins/check_http.c:1370
+#: plugins/check_http.c:1369
msgid "Allow regex to span newlines (must precede -r or -R)"
msgstr ""
-#: plugins/check_http.c:1372
+#: plugins/check_http.c:1371
msgid "Search page for regex STRING"
msgstr ""
-#: plugins/check_http.c:1374
+#: plugins/check_http.c:1373
msgid "Search page for case-insensitive regex STRING"
msgstr ""
-#: plugins/check_http.c:1376
+#: plugins/check_http.c:1375
msgid "Return CRITICAL if found, OK if not\n"
msgstr ""
-#: plugins/check_http.c:1379
+#: plugins/check_http.c:1378
msgid "Username:password on sites with basic authentication"
msgstr ""
-#: plugins/check_http.c:1381
+#: plugins/check_http.c:1380
msgid "Username:password on proxy-servers with basic authentication"
msgstr ""
-#: plugins/check_http.c:1383
+#: plugins/check_http.c:1382
msgid "String to be sent in http header as \"User Agent\""
msgstr ""
-#: plugins/check_http.c:1385
+#: plugins/check_http.c:1384
msgid ""
-" Any other tags to be sent in http header. Use multiple times for additional "
+"Any other tags to be sent in http header. Use multiple times for additional "
"headers"
msgstr ""
-#: plugins/check_http.c:1387
+#: plugins/check_http.c:1386
msgid "Wrap output in HTML link (obsoleted by urlize)"
msgstr ""
-#: plugins/check_http.c:1389
+#: plugins/check_http.c:1388
msgid "How to handle redirected pages. sticky is like follow but stick to the"
msgstr ""
-#: plugins/check_http.c:1390
-msgid "specified IP address. stickyport also ensure post stays the same."
+#: plugins/check_http.c:1389
+msgid "specified IP address. stickyport also ensures port stays the same."
msgstr ""
-#: plugins/check_http.c:1392
+#: plugins/check_http.c:1391
msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
msgstr ""
-#: plugins/check_http.c:1402
+#: plugins/check_http.c:1401
msgid "This plugin will attempt to open an HTTP connection with the host."
msgstr ""
-#: plugins/check_http.c:1403
+#: plugins/check_http.c:1402
msgid ""
"Successful connects return STATE_OK, refusals and timeouts return "
"STATE_CRITICAL"
msgstr ""
-#: plugins/check_http.c:1404
+#: plugins/check_http.c:1403
msgid ""
"other errors return STATE_UNKNOWN. Successful connects, but incorrect "
"reponse"
msgstr ""
-#: plugins/check_http.c:1405
+#: plugins/check_http.c:1404
msgid ""
"messages from the host result in STATE_WARNING return values. If you are"
msgstr ""
-#: plugins/check_http.c:1406
+#: plugins/check_http.c:1405
msgid ""
"checking a virtual server that uses 'host headers' you must supply the FQDN"
msgstr ""
-#: plugins/check_http.c:1407
+#: plugins/check_http.c:1406
msgid "(fully qualified domain name) as the [host_name] argument."
msgstr ""
-#: plugins/check_http.c:1411
+#: plugins/check_http.c:1410
msgid "This plugin can also check whether an SSL enabled web server is able to"
msgstr ""
-#: plugins/check_http.c:1412
+#: plugins/check_http.c:1411
msgid "serve content (optionally within a specified time) or whether the X509 "
msgstr ""
-#: plugins/check_http.c:1413
+#: plugins/check_http.c:1412
msgid "certificate is still valid for the specified number of days."
msgstr ""
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1414
+msgid "Please note that this plugin does not check if the presented server"
+msgstr ""
+
+#: plugins/check_http.c:1415
+msgid "certificate matches the hostname of the server, or if the certificate"
+msgstr ""
+
+#: plugins/check_http.c:1416
+msgid "has a valid chain of trust to one of the locally installed CAs."
+msgstr ""
+
+#: plugins/check_http.c:1420
msgid ""
"When the 'www.verisign.com' server returns its content within 5 seconds,"
msgstr ""
-#: plugins/check_http.c:1418
+#: plugins/check_http.c:1421
msgid ""
"a STATE_OK will be returned. When the server returns its content but exceeds"
msgstr ""
-#: plugins/check_http.c:1419
+#: plugins/check_http.c:1422
msgid ""
"the 5-second threshold, a STATE_WARNING will be returned. When an error "
"occurs,"
msgstr ""
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1423
msgid "a STATE_CRITICAL will be returned."
msgstr ""
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1426
msgid ""
"When the certificate of 'www.verisign.com' is valid for more than 14 days,"
msgstr ""
-#: plugins/check_http.c:1424
+#: plugins/check_http.c:1427
msgid ""
"a STATE_OK is returned. When the certificate is still valid, but for less "
"than"
msgstr ""
-#: plugins/check_http.c:1425
+#: plugins/check_http.c:1428
msgid ""
"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
msgstr ""
-#: plugins/check_http.c:1426
+#: plugins/check_http.c:1429
msgid "the certificate is expired."
msgstr ""
@@ -1534,81 +1553,81 @@ msgstr ""
msgid "LDAP %s - %.3f seconds response time|%s\n"
msgstr ""
-#: plugins/check_ldap.c:339 plugins/check_ldap.c:346
+#: plugins/check_ldap.c:339 plugins/check_ldap.c:347
#, c-format
msgid "%s cannot be combined with %s"
msgstr ""
-#: plugins/check_ldap.c:352 plugins/check_ping.c:246
+#: plugins/check_ldap.c:353 plugins/check_ping.c:246
msgid "IPv6 support not available\n"
msgstr ""
-#: plugins/check_ldap.c:375
+#: plugins/check_ldap.c:379
msgid "Please specify the host name\n"
msgstr ""
-#: plugins/check_ldap.c:378
+#: plugins/check_ldap.c:382
msgid "Please specify the LDAP base\n"
msgstr ""
-#: plugins/check_ldap.c:407
+#: plugins/check_ldap.c:411
msgid "ldap attribute to search (default: \"(objectclass=*)\""
msgstr ""
-#: plugins/check_ldap.c:409
+#: plugins/check_ldap.c:413
msgid "ldap base (eg. ou=my unit, o=my org, c=at"
msgstr ""
-#: plugins/check_ldap.c:411
+#: plugins/check_ldap.c:415
msgid "ldap bind DN (if required)"
msgstr ""
-#: plugins/check_ldap.c:413
+#: plugins/check_ldap.c:417
msgid "ldap password (if required)"
msgstr ""
-#: plugins/check_ldap.c:415
+#: plugins/check_ldap.c:419
msgid "use starttls mechanism introduced in protocol version 3"
msgstr ""
-#: plugins/check_ldap.c:417
+#: plugins/check_ldap.c:421
msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
msgstr ""
-#: plugins/check_ldap.c:421
+#: plugins/check_ldap.c:425
msgid "use ldap protocol version 2"
msgstr ""
-#: plugins/check_ldap.c:423
+#: plugins/check_ldap.c:427
msgid "use ldap protocol version 3"
msgstr ""
-#: plugins/check_ldap.c:424
+#: plugins/check_ldap.c:428
msgid "default protocol version:"
msgstr ""
-#: plugins/check_ldap.c:435
+#: plugins/check_ldap.c:439
msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
msgstr ""
-#: plugins/check_ldap.c:436
+#: plugins/check_ldap.c:440
#, c-format
msgid ""
" implied (using default port %i) unless --port=636 is specified. In that "
"case\n"
msgstr ""
-#: plugins/check_ldap.c:437
+#: plugins/check_ldap.c:441
msgid "'SSL on connect' will be used no matter how the plugin was called."
msgstr ""
-#: plugins/check_ldap.c:438
+#: plugins/check_ldap.c:442
msgid ""
"This detection is deprecated, please use 'check_ldap' with the '--starttls' "
"or '--ssl' flags"
msgstr ""
-#: plugins/check_ldap.c:439
+#: plugins/check_ldap.c:443
msgid "to define the behaviour explicitly instead."
msgstr ""
@@ -2105,7 +2124,7 @@ msgstr ""
msgid "Wrong client version - running: %s, required: %s"
msgstr ""
-#: plugins/check_nt.c:152 plugins/check_nt.c:212
+#: plugins/check_nt.c:152 plugins/check_nt.c:217
msgid "missing -l parameters"
msgstr ""
@@ -2136,318 +2155,318 @@ msgstr ""
msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)"
msgstr ""
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:219
msgid "wrong -l argument"
msgstr ""
-#: plugins/check_nt.c:230
+#: plugins/check_nt.c:235
#, c-format
msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
msgstr ""
-#: plugins/check_nt.c:233
+#: plugins/check_nt.c:238
#, c-format
msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
msgstr ""
-#: plugins/check_nt.c:247
+#: plugins/check_nt.c:252
msgid "Free disk space : Invalid drive"
msgstr ""
-#: plugins/check_nt.c:257
+#: plugins/check_nt.c:262
msgid "No service/process specified"
msgstr ""
-#: plugins/check_nt.c:281
+#: plugins/check_nt.c:286
#, c-format
msgid ""
"Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
msgstr ""
-#: plugins/check_nt.c:284
+#: plugins/check_nt.c:289
#, c-format
msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
msgstr ""
-#: plugins/check_nt.c:320 plugins/check_nt.c:405 plugins/check_nt.c:435
+#: plugins/check_nt.c:325 plugins/check_nt.c:410 plugins/check_nt.c:440
msgid "No counter specified"
msgstr ""
-#: plugins/check_nt.c:352
+#: plugins/check_nt.c:357
msgid "Minimum value contains non-numbers"
msgstr ""
-#: plugins/check_nt.c:356
+#: plugins/check_nt.c:361
msgid "Maximum value contains non-numbers"
msgstr ""
-#: plugins/check_nt.c:363
+#: plugins/check_nt.c:368
msgid "No unit counter specified"
msgstr ""
-#: plugins/check_nt.c:450
+#: plugins/check_nt.c:455
msgid "Please specify a variable to check"
msgstr ""
-#: plugins/check_nt.c:534
+#: plugins/check_nt.c:539
msgid "Server port must be an integer\n"
msgstr ""
-#: plugins/check_nt.c:588
+#: plugins/check_nt.c:593
msgid "You must provide a server address or host name"
msgstr ""
-#: plugins/check_nt.c:594
+#: plugins/check_nt.c:599
msgid "None"
msgstr ""
-#: plugins/check_nt.c:607
+#: plugins/check_nt.c:612
msgid "could not fetch information from server\n"
msgstr ""
-#: plugins/check_nt.c:651
+#: plugins/check_nt.c:656
msgid "This plugin collects data from the NSClient service running on a"
msgstr ""
-#: plugins/check_nt.c:652
+#: plugins/check_nt.c:657
msgid "Windows NT/2000/XP/2003 server."
msgstr ""
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:668
msgid "Name of the host to check"
msgstr ""
-#: plugins/check_nt.c:665
+#: plugins/check_nt.c:670
msgid "Optional port number (default: "
msgstr ""
-#: plugins/check_nt.c:668
+#: plugins/check_nt.c:673
msgid "Password needed for the request"
msgstr ""
-#: plugins/check_nt.c:670 plugins/check_nwstat.c:1661
+#: plugins/check_nt.c:675 plugins/check_nwstat.c:1661
#: plugins/check_overcr.c:432
msgid "Threshold which will result in a warning status"
msgstr ""
-#: plugins/check_nt.c:672 plugins/check_nwstat.c:1663
+#: plugins/check_nt.c:677 plugins/check_nwstat.c:1663
#: plugins/check_overcr.c:434
msgid "Threshold which will result in a critical status"
msgstr ""
-#: plugins/check_nt.c:674
+#: plugins/check_nt.c:679
msgid "Seconds before connection attempt times out (default: "
msgstr ""
-#: plugins/check_nt.c:676
+#: plugins/check_nt.c:681
msgid "Parameters passed to specified check (see below)"
msgstr ""
-#: plugins/check_nt.c:678
+#: plugins/check_nt.c:683
msgid "Display options (currently only SHOWALL works)"
msgstr ""
-#: plugins/check_nt.c:680
+#: plugins/check_nt.c:685
msgid "Return UNKNOWN on timeouts"
msgstr ""
-#: plugins/check_nt.c:683
+#: plugins/check_nt.c:688
msgid "Print this help screen"
msgstr ""
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:690
msgid "Print version information"
msgstr ""
-#: plugins/check_nt.c:687
+#: plugins/check_nt.c:692
msgid "Variable to check"
msgstr ""
-#: plugins/check_nt.c:688
+#: plugins/check_nt.c:693
msgid "Valid variables are:"
msgstr ""
-#: plugins/check_nt.c:690
+#: plugins/check_nt.c:695
msgid "Get the NSClient version"
msgstr ""
-#: plugins/check_nt.c:691
+#: plugins/check_nt.c:696
msgid "If -l is specified, will return warning if versions differ."
msgstr ""
-#: plugins/check_nt.c:693
+#: plugins/check_nt.c:698
msgid "Average CPU load on last x minutes."
msgstr ""
-#: plugins/check_nt.c:694
+#: plugins/check_nt.c:699
msgid "Request a -l parameter with the following syntax:"
msgstr ""
-#: plugins/check_nt.c:695
+#: plugins/check_nt.c:700
msgid "-l ,,."
msgstr ""
-#: plugins/check_nt.c:696
+#: plugins/check_nt.c:701
msgid " should be less than 24*60."
msgstr ""
-#: plugins/check_nt.c:697
+#: plugins/check_nt.c:702
msgid ""
"Thresholds are percentage and up to 10 requests can be done in one shot."
msgstr ""
-#: plugins/check_nt.c:700
+#: plugins/check_nt.c:705
msgid "Get the uptime of the machine."
msgstr ""
-#: plugins/check_nt.c:701
+#: plugins/check_nt.c:706
msgid "No specific parameters. No warning or critical threshold"
msgstr ""
-#: plugins/check_nt.c:703
+#: plugins/check_nt.c:708
msgid "Size and percentage of disk use."
msgstr ""
-#: plugins/check_nt.c:704
+#: plugins/check_nt.c:709
msgid "Request a -l parameter containing the drive letter only."
msgstr ""
-#: plugins/check_nt.c:705 plugins/check_nt.c:708
+#: plugins/check_nt.c:710 plugins/check_nt.c:713
msgid "Warning and critical thresholds can be specified with -w and -c."
msgstr ""
-#: plugins/check_nt.c:707
+#: plugins/check_nt.c:712
msgid "Memory use."
msgstr ""
-#: plugins/check_nt.c:710
+#: plugins/check_nt.c:715
msgid "Check the state of one or several services."
msgstr ""
-#: plugins/check_nt.c:711 plugins/check_nt.c:720
+#: plugins/check_nt.c:716 plugins/check_nt.c:725
msgid "Request a -l parameters with the following syntax:"
msgstr ""
-#: plugins/check_nt.c:712
+#: plugins/check_nt.c:717
msgid "-l ,,,..."
msgstr ""
-#: plugins/check_nt.c:713
+#: plugins/check_nt.c:718
msgid "You can specify -d SHOWALL in case you want to see working services"
msgstr ""
-#: plugins/check_nt.c:714
+#: plugins/check_nt.c:719
msgid "in the returned string."
msgstr ""
-#: plugins/check_nt.c:716
+#: plugins/check_nt.c:721
msgid "Check if one or several process are running."
msgstr ""
-#: plugins/check_nt.c:717
+#: plugins/check_nt.c:722
msgid "Same syntax as SERVICESTATE."
msgstr ""
-#: plugins/check_nt.c:719
+#: plugins/check_nt.c:724
msgid "Check any performance counter of Windows NT/2000."
msgstr ""
-#: plugins/check_nt.c:721
+#: plugins/check_nt.c:726
msgid "-l \"\\\\\\\\counter\",\""
msgstr ""
-#: plugins/check_nt.c:722
+#: plugins/check_nt.c:727
msgid "The parameter is optional and is given to a printf "
msgstr ""
-#: plugins/check_nt.c:723
+#: plugins/check_nt.c:728
msgid "output command which requires a float parameter."
msgstr ""
-#: plugins/check_nt.c:724
+#: plugins/check_nt.c:729
#, c-format
msgid "If does not include \"%%\", it is used as a label."
msgstr ""
-#: plugins/check_nt.c:725 plugins/check_nt.c:740
+#: plugins/check_nt.c:730 plugins/check_nt.c:745
msgid "Some examples:"
msgstr ""
-#: plugins/check_nt.c:729
+#: plugins/check_nt.c:734
msgid "Check any performance counter object of Windows NT/2000."
msgstr ""
-#: plugins/check_nt.c:730
+#: plugins/check_nt.c:735
msgid ""
"Syntax: check_nt -H -p -v INSTANCES -l "
msgstr ""
-#: plugins/check_nt.c:731
+#: plugins/check_nt.c:736
msgid " is a Windows Perfmon Counter object (eg. Process),"
msgstr ""
-#: plugins/check_nt.c:732
+#: plugins/check_nt.c:737
msgid "if it is two words, it should be enclosed in quotes"
msgstr ""
-#: plugins/check_nt.c:733
+#: plugins/check_nt.c:738
msgid "The returned results will be a comma-separated list of instances on "
msgstr ""
-#: plugins/check_nt.c:734
+#: plugins/check_nt.c:739
msgid " the selected computer for that object."
msgstr ""
-#: plugins/check_nt.c:735
+#: plugins/check_nt.c:740
msgid ""
"The purpose of this is to be run from command line to determine what "
"instances"
msgstr ""
-#: plugins/check_nt.c:736
+#: plugins/check_nt.c:741
msgid ""
" are available for monitoring without having to log onto the Windows server"
msgstr ""
-#: plugins/check_nt.c:737
+#: plugins/check_nt.c:742
msgid " to run Perfmon directly."
msgstr ""
-#: plugins/check_nt.c:738
+#: plugins/check_nt.c:743
msgid "It can also be used in scripts that automatically create Nagios service"
msgstr ""
-#: plugins/check_nt.c:739
+#: plugins/check_nt.c:744
msgid " configuration files."
msgstr ""
-#: plugins/check_nt.c:741
+#: plugins/check_nt.c:746
msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
msgstr ""
-#: plugins/check_nt.c:744
+#: plugins/check_nt.c:749
msgid ""
"- The NSClient service should be running on the server to get any information"
msgstr ""
-#: plugins/check_nt.c:746
+#: plugins/check_nt.c:751
msgid "- Critical thresholds should be lower than warning thresholds"
msgstr ""
-#: plugins/check_nt.c:747
+#: plugins/check_nt.c:752
msgid "- Default port 1248 is sometimes in use by other services. The error"
msgstr ""
-#: plugins/check_nt.c:748
+#: plugins/check_nt.c:753
msgid ""
"output when this happens contains \"Cannot map xxxxx to protocol number\"."
msgstr ""
-#: plugins/check_nt.c:749
+#: plugins/check_nt.c:754
msgid "One fix for this is to change the port to something else on check_nt "
msgstr ""
-#: plugins/check_nt.c:750
+#: plugins/check_nt.c:755
msgid "and on the client service it's connecting to."
msgstr ""
@@ -3203,13 +3222,13 @@ msgid " %s - database %s (%d sec.)|%s\n"
msgstr ""
#: plugins/check_pgsql.c:256 plugins/check_time.c:277 plugins/check_time.c:289
-#: plugins/check_users.c:166
+#: plugins/check_users.c:138
msgid "Critical threshold must be a positive integer"
msgstr ""
#: plugins/check_pgsql.c:262 plugins/check_time.c:258 plugins/check_time.c:282
-#: plugins/check_users.c:172 plugins/check_users.c:182
-#: plugins/check_users.c:189
+#: plugins/check_users.c:144 plugins/check_users.c:154
+#: plugins/check_users.c:160
msgid "Warning threshold must be a positive integer"
msgstr ""
@@ -3378,115 +3397,115 @@ msgstr ""
msgid " (%d) cannot be larger than (%d)\n"
msgstr ""
-#: plugins/check_ping.c:441
+#: plugins/check_ping.c:442
#, c-format
msgid "Cannot open stderr for %s\n"
msgstr ""
-#: plugins/check_ping.c:490 plugins/check_ping.c:492
+#: plugins/check_ping.c:492 plugins/check_ping.c:494
msgid "System call sent warnings to stderr "
msgstr ""
-#: plugins/check_ping.c:519
-#, c-format
-msgid "CRITICAL - Network Unreachable (%s)"
-msgstr ""
-
#: plugins/check_ping.c:521
#, c-format
-msgid "CRITICAL - Host Unreachable (%s)"
+msgid "CRITICAL - Network Unreachable (%s)"
msgstr ""
#: plugins/check_ping.c:523
#, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
+msgid "CRITICAL - Host Unreachable (%s)"
msgstr ""
#: plugins/check_ping.c:525
#, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
+msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
msgstr ""
#: plugins/check_ping.c:527
#, c-format
-msgid "CRITICAL - Network Prohibited (%s)"
+msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
msgstr ""
#: plugins/check_ping.c:529
#, c-format
-msgid "CRITICAL - Host Prohibited (%s)"
+msgid "CRITICAL - Network Prohibited (%s)"
msgstr ""
#: plugins/check_ping.c:531
#, c-format
-msgid "CRITICAL - Packet Filtered (%s)"
+msgid "CRITICAL - Host Prohibited (%s)"
msgstr ""
#: plugins/check_ping.c:533
#, c-format
-msgid "CRITICAL - Host not found (%s)"
+msgid "CRITICAL - Packet Filtered (%s)"
msgstr ""
#: plugins/check_ping.c:535
#, c-format
+msgid "CRITICAL - Host not found (%s)"
+msgstr ""
+
+#: plugins/check_ping.c:537
+#, c-format
msgid "CRITICAL - Time to live exceeded (%s)"
msgstr ""
-#: plugins/check_ping.c:542
+#: plugins/check_ping.c:544
msgid "Unable to realloc warn_text"
msgstr ""
-#: plugins/check_ping.c:559
+#: plugins/check_ping.c:561
#, c-format
msgid "Use ping to check connection statistics for a remote host."
msgstr ""
-#: plugins/check_ping.c:571
+#: plugins/check_ping.c:573
msgid "host to ping"
msgstr ""
-#: plugins/check_ping.c:577
+#: plugins/check_ping.c:579
msgid "number of ICMP ECHO packets to send"
msgstr ""
-#: plugins/check_ping.c:578
+#: plugins/check_ping.c:580
#, c-format
msgid "(Default: %d)\n"
msgstr ""
-#: plugins/check_ping.c:580
+#: plugins/check_ping.c:582
msgid "show HTML in the plugin output (obsoleted by urlize)"
msgstr ""
-#: plugins/check_ping.c:585
+#: plugins/check_ping.c:587
msgid "THRESHOLD is ,% where is the round trip average travel"
msgstr ""
-#: plugins/check_ping.c:586
+#: plugins/check_ping.c:588
msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the"
msgstr ""
-#: plugins/check_ping.c:587
+#: plugins/check_ping.c:589
msgid "percentage of packet loss to trigger an alarm state."
msgstr ""
-#: plugins/check_ping.c:590
+#: plugins/check_ping.c:592
msgid ""
"This plugin uses the ping command to probe the specified host for packet loss"
msgstr ""
-#: plugins/check_ping.c:591
+#: plugins/check_ping.c:593
msgid ""
"(percentage) and round trip average (milliseconds). It can produce HTML "
"output"
msgstr ""
-#: plugins/check_ping.c:592
+#: plugins/check_ping.c:594
msgid ""
"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
msgstr ""
-#: plugins/check_ping.c:593
+#: plugins/check_ping.c:595
msgid "the contrib area of the downloads section at http://www.nagios.org/"
msgstr ""
@@ -3524,160 +3543,160 @@ msgstr ""
msgid " with %s"
msgstr ""
-#: plugins/check_procs.c:378
+#: plugins/check_procs.c:380
msgid "Critical Process Count must be an integer!"
msgstr ""
-#: plugins/check_procs.c:390
+#: plugins/check_procs.c:392
msgid "Warning Process Count must be an integer!"
msgstr ""
-#: plugins/check_procs.c:398
+#: plugins/check_procs.c:400
msgid "Parent Process ID must be an integer!"
msgstr ""
-#: plugins/check_procs.c:404 plugins/check_procs.c:518
+#: plugins/check_procs.c:406 plugins/check_procs.c:527
#, c-format
msgid "%s%sSTATE = %s"
msgstr ""
-#: plugins/check_procs.c:413
+#: plugins/check_procs.c:415
msgid "UID was not found"
msgstr ""
-#: plugins/check_procs.c:419
+#: plugins/check_procs.c:421
msgid "User name was not found"
msgstr ""
-#: plugins/check_procs.c:434
+#: plugins/check_procs.c:436
#, c-format
msgid "%s%scommand name '%s'"
msgstr ""
-#: plugins/check_procs.c:462
+#: plugins/check_procs.c:471
msgid "RSS must be an integer!"
msgstr ""
-#: plugins/check_procs.c:469
+#: plugins/check_procs.c:478
msgid "VSZ must be an integer!"
msgstr ""
-#: plugins/check_procs.c:477
+#: plugins/check_procs.c:486
msgid "PCPU must be a float!"
msgstr ""
-#: plugins/check_procs.c:501
+#: plugins/check_procs.c:510
msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
msgstr ""
-#: plugins/check_procs.c:537
+#: plugins/check_procs.c:546
#, c-format
msgid "wmax (%d) cannot be greater than cmax (%d)\n"
msgstr ""
-#: plugins/check_procs.c:541
+#: plugins/check_procs.c:550
#, c-format
msgid "wmin (%d) cannot be less than cmin (%d)\n"
msgstr ""
-#: plugins/check_procs.c:678
+#: plugins/check_procs.c:687
msgid ""
"Checks all processes and generates WARNING or CRITICAL states if the "
"specified"
msgstr ""
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:688
msgid ""
"metric is outside the required threshold ranges. The metric defaults to "
"number"
msgstr ""
-#: plugins/check_procs.c:680
+#: plugins/check_procs.c:689
msgid ""
"of processes. Search filters can be applied to limit the processes to check."
msgstr ""
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:698
msgid "Generate warning state if metric is outside this range"
msgstr ""
-#: plugins/check_procs.c:691
+#: plugins/check_procs.c:700
msgid "Generate critical state if metric is outside this range"
msgstr ""
-#: plugins/check_procs.c:693
+#: plugins/check_procs.c:702
msgid "Check thresholds against metric. Valid types:"
msgstr ""
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:703
msgid "PROCS - number of processes (default)"
msgstr ""
-#: plugins/check_procs.c:695
+#: plugins/check_procs.c:704
msgid "VSZ - virtual memory size"
msgstr ""
-#: plugins/check_procs.c:696
+#: plugins/check_procs.c:705
msgid "RSS - resident set memory size"
msgstr ""
-#: plugins/check_procs.c:697
+#: plugins/check_procs.c:706
msgid "CPU - percentage CPU"
msgstr ""
-#: plugins/check_procs.c:700
+#: plugins/check_procs.c:709
msgid "ELAPSED - time elapsed in seconds"
msgstr ""
-#: plugins/check_procs.c:705
+#: plugins/check_procs.c:714
msgid "Extra information. Up to 3 verbosity levels"
msgstr ""
-#: plugins/check_procs.c:710
+#: plugins/check_procs.c:719
msgid "Only scan for processes that have, in the output of `ps`, one or"
msgstr ""
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:720
msgid "more of the status flags you specify (for example R, Z, S, RS,"
msgstr ""
-#: plugins/check_procs.c:712
+#: plugins/check_procs.c:721
msgid "RSZDT, plus others based on the output of your 'ps' command)."
msgstr ""
-#: plugins/check_procs.c:714
+#: plugins/check_procs.c:723
msgid "Only scan for children of the parent process ID indicated."
msgstr ""
-#: plugins/check_procs.c:716
+#: plugins/check_procs.c:725
msgid "Only scan for processes with VSZ higher than indicated."
msgstr ""
-#: plugins/check_procs.c:718
+#: plugins/check_procs.c:727
msgid "Only scan for processes with RSS higher than indicated."
msgstr ""
-#: plugins/check_procs.c:720
+#: plugins/check_procs.c:729
msgid "Only scan for processes with PCPU higher than indicated."
msgstr ""
-#: plugins/check_procs.c:722
+#: plugins/check_procs.c:731
msgid "Only scan for processes with user name or ID indicated."
msgstr ""
-#: plugins/check_procs.c:724
+#: plugins/check_procs.c:733
msgid "Only scan for processes with args that contain STRING."
msgstr ""
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:735
msgid "Only scan for processes with args that contain the regex STRING."
msgstr ""
-#: plugins/check_procs.c:728
+#: plugins/check_procs.c:737
msgid "Only scan for exact matches of COMMAND (without path)."
msgstr ""
-#: plugins/check_procs.c:730
+#: plugins/check_procs.c:739
#, c-format
msgid ""
"\n"
@@ -3687,7 +3706,7 @@ msgid ""
"\n"
msgstr ""
-#: plugins/check_procs.c:735
+#: plugins/check_procs.c:744
#, c-format
msgid ""
"This plugin checks the number of currently running processes and\n"
@@ -3698,27 +3717,27 @@ msgid ""
"\n"
msgstr ""
-#: plugins/check_procs.c:744
+#: plugins/check_procs.c:753
msgid "Warning if not two processes with command name portsentry."
msgstr ""
-#: plugins/check_procs.c:745
+#: plugins/check_procs.c:754
msgid "Critical if < 2 or > 1024 processes"
msgstr ""
-#: plugins/check_procs.c:747
+#: plugins/check_procs.c:756
msgid "Warning alert if > 10 processes with command arguments containing"
msgstr ""
-#: plugins/check_procs.c:748
+#: plugins/check_procs.c:757
msgid "'/usr/local/bin/perl' and owned by root"
msgstr ""
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:759
msgid "Alert if VSZ of any processes over 50K or 100K"
msgstr ""
-#: plugins/check_procs.c:752
+#: plugins/check_procs.c:761
#, c-format
msgid "Alert if CPU of any processes over 10%% or 20%%"
msgstr ""
@@ -3877,7 +3896,7 @@ msgstr ""
msgid "Invalid REAL response received from host on port %d\n"
msgstr ""
-#: plugins/check_real.c:184 plugins/check_tcp.c:292
+#: plugins/check_real.c:184 plugins/check_tcp.c:289
#, c-format
msgid "No data received from host\n"
msgstr ""
@@ -3887,11 +3906,11 @@ msgstr ""
msgid "REAL %s - %d second response time\n"
msgstr ""
-#: plugins/check_real.c:336 plugins/check_smtp.c:576 plugins/check_ups.c:536
+#: plugins/check_real.c:336 plugins/check_smtp.c:578 plugins/check_ups.c:536
msgid "Warning time must be a positive integer"
msgstr ""
-#: plugins/check_real.c:345 plugins/check_smtp.c:567 plugins/check_ups.c:527
+#: plugins/check_real.c:345 plugins/check_smtp.c:569 plugins/check_ups.c:527
msgid "Critical time must be a positive integer"
msgstr ""
@@ -3916,7 +3935,7 @@ msgstr ""
msgid "This plugin will attempt to open an RTSP connection with the host."
msgstr ""
-#: plugins/check_real.c:438 plugins/check_smtp.c:808
+#: plugins/check_real.c:438 plugins/check_smtp.c:827
msgid "Successul connects return STATE_OK, refusals and timeouts return"
msgstr ""
@@ -3934,498 +3953,502 @@ msgstr ""
msgid "values."
msgstr ""
-#: plugins/check_smtp.c:146 plugins/check_swap.c:265 plugins/check_swap.c:271
+#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271
#, c-format
msgid "malloc() failed!\n"
msgstr ""
-#: plugins/check_smtp.c:150
+#: plugins/check_smtp.c:154
#, c-format
msgid "gethostname() failed!\n"
msgstr ""
-#: plugins/check_smtp.c:185 plugins/check_smtp.c:209
+#: plugins/check_smtp.c:189 plugins/check_smtp.c:213
#, c-format
msgid "recv() failed\n"
msgstr ""
-#: plugins/check_smtp.c:196
+#: plugins/check_smtp.c:200
#, c-format
msgid "Invalid SMTP response received from host: %s\n"
msgstr ""
-#: plugins/check_smtp.c:198
+#: plugins/check_smtp.c:202
#, c-format
msgid "Invalid SMTP response received from host on port %d: %s\n"
msgstr ""
-#: plugins/check_smtp.c:219
+#: plugins/check_smtp.c:223
#, c-format
msgid "WARNING - TLS not supported by server\n"
msgstr ""
-#: plugins/check_smtp.c:231
+#: plugins/check_smtp.c:235
#, c-format
msgid "Server does not support STARTTLS\n"
msgstr ""
-#: plugins/check_smtp.c:237
+#: plugins/check_smtp.c:241
#, c-format
msgid "CRITICAL - Cannot create SSL context.\n"
msgstr ""
-#: plugins/check_smtp.c:257
+#: plugins/check_smtp.c:261
msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
msgstr ""
-#: plugins/check_smtp.c:262
+#: plugins/check_smtp.c:266
#, c-format
msgid "sent %s"
msgstr ""
-#: plugins/check_smtp.c:264
+#: plugins/check_smtp.c:268
msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
msgstr ""
-#: plugins/check_smtp.c:276
-msgid "CRITICAL - Cannot retrieve server certificate."
-msgstr ""
-
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:722
+#: plugins/check_smtp.c:312 plugins/check_snmp.c:718
#, c-format
msgid "Could Not Compile Regular Expression"
msgstr ""
-#: plugins/check_smtp.c:320
+#: plugins/check_smtp.c:321
#, c-format
msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
msgstr ""
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:453
+#: plugins/check_smtp.c:325 plugins/check_snmp.c:449
#, c-format
msgid "Execute Error: %s\n"
msgstr ""
-#: plugins/check_smtp.c:338
+#: plugins/check_smtp.c:339
#, c-format
msgid "no authuser specified, "
msgstr ""
-#: plugins/check_smtp.c:343
+#: plugins/check_smtp.c:344
#, c-format
msgid "no authpass specified, "
msgstr ""
-#: plugins/check_smtp.c:350 plugins/check_smtp.c:372 plugins/check_smtp.c:393
-#: plugins/check_smtp.c:668
+#: plugins/check_smtp.c:351 plugins/check_smtp.c:373 plugins/check_smtp.c:394
+#: plugins/check_smtp.c:685
#, c-format
msgid "sent %s\n"
msgstr ""
-#: plugins/check_smtp.c:353
+#: plugins/check_smtp.c:354
#, c-format
msgid "recv() failed after AUTH LOGIN, "
msgstr ""
-#: plugins/check_smtp.c:358 plugins/check_smtp.c:380 plugins/check_smtp.c:401
-#: plugins/check_smtp.c:679
+#: plugins/check_smtp.c:359 plugins/check_smtp.c:381 plugins/check_smtp.c:402
+#: plugins/check_smtp.c:696
#, c-format
msgid "received %s\n"
msgstr ""
-#: plugins/check_smtp.c:362
+#: plugins/check_smtp.c:363
#, c-format
msgid "invalid response received after AUTH LOGIN, "
msgstr ""
-#: plugins/check_smtp.c:376
+#: plugins/check_smtp.c:377
#, c-format
msgid "recv() failed after sending authuser, "
msgstr ""
-#: plugins/check_smtp.c:384
+#: plugins/check_smtp.c:385
#, c-format
msgid "invalid response received after authuser, "
msgstr ""
-#: plugins/check_smtp.c:397
+#: plugins/check_smtp.c:398
#, c-format
msgid "recv() failed after sending authpass, "
msgstr ""
-#: plugins/check_smtp.c:405
+#: plugins/check_smtp.c:406
#, c-format
msgid "invalid response received after authpass, "
msgstr ""
-#: plugins/check_smtp.c:412
+#: plugins/check_smtp.c:413
#, c-format
msgid "only authtype LOGIN is supported, "
msgstr ""
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:437
#, c-format
msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
msgstr ""
-#: plugins/check_smtp.c:543 plugins/check_smtp.c:555
+#: plugins/check_smtp.c:545 plugins/check_smtp.c:557
#, c-format
msgid "Could not realloc() units [%d]\n"
msgstr ""
-#: plugins/check_smtp.c:603
+#: plugins/check_smtp.c:608
msgid "SSL support not available - install OpenSSL and recompile"
msgstr ""
-#: plugins/check_smtp.c:674
+#: plugins/check_smtp.c:676 plugins/check_smtp.c:681
+#, c-format
+msgid "Connection closed by server before sending QUIT command\n"
+msgstr ""
+
+#: plugins/check_smtp.c:691
#, c-format
msgid "recv() failed after QUIT."
msgstr ""
-#: plugins/check_smtp.c:676
+#: plugins/check_smtp.c:693
#, c-format
msgid "Connection reset by peer."
msgstr ""
-#: plugins/check_smtp.c:764
+#: plugins/check_smtp.c:781
msgid "This plugin will attempt to open an SMTP connection with the host."
msgstr ""
-#: plugins/check_smtp.c:778
+#: plugins/check_smtp.c:795
#, c-format
msgid " String to expect in first line of server response (default: '%s')\n"
msgstr ""
-#: plugins/check_smtp.c:780
+#: plugins/check_smtp.c:797
msgid "SMTP command (may be used repeatedly)"
msgstr ""
-#: plugins/check_smtp.c:782
+#: plugins/check_smtp.c:799
msgid "Expected response to command (may be used repeatedly)"
msgstr ""
-#: plugins/check_smtp.c:784
+#: plugins/check_smtp.c:801
msgid "FROM-address to include in MAIL command, required by Exchange 2000"
msgstr ""
-#: plugins/check_smtp.c:786
+#: plugins/check_smtp.c:803
msgid "FQDN used for HELO"
msgstr ""
-#: plugins/check_smtp.c:789 plugins/check_tcp.c:633
+#: plugins/check_smtp.c:806 plugins/check_tcp.c:630
msgid "Minimum number of days a certificate has to be valid."
msgstr ""
-#: plugins/check_smtp.c:791
+#: plugins/check_smtp.c:808
msgid "Use STARTTLS for the connection."
msgstr ""
-#: plugins/check_smtp.c:795
+#: plugins/check_smtp.c:812
msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
msgstr ""
-#: plugins/check_smtp.c:797
+#: plugins/check_smtp.c:814
msgid "SMTP AUTH username"
msgstr ""
-#: plugins/check_smtp.c:799
+#: plugins/check_smtp.c:816
msgid "SMTP AUTH password"
msgstr ""
-#: plugins/check_smtp.c:809
+#: plugins/check_smtp.c:818
+msgid "Ignore failure when sending QUIT command to server"
+msgstr ""
+
+#: plugins/check_smtp.c:828
msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful"
msgstr ""
-#: plugins/check_smtp.c:810
+#: plugins/check_smtp.c:829
msgid "connects, but incorrect reponse messages from the host result in"
msgstr ""
-#: plugins/check_smtp.c:811
+#: plugins/check_smtp.c:830
msgid "STATE_WARNING return values."
msgstr ""
-#: plugins/check_snmp.c:299
+#: plugins/check_snmp.c:298
#, c-format
msgid "External command error: %s\n"
msgstr ""
-#: plugins/check_snmp.c:304
+#: plugins/check_snmp.c:303
#, c-format
msgid "External command error with no output (return code: %d)\n"
msgstr ""
-#: plugins/check_snmp.c:410
+#: plugins/check_snmp.c:406
msgid "No valid data returned"
msgstr ""
-#: plugins/check_snmp.c:417
+#: plugins/check_snmp.c:413
msgid "Time duration between plugin calls is invalid"
msgstr ""
-#: plugins/check_snmp.c:513
+#: plugins/check_snmp.c:509
msgid "Cannot malloc"
msgstr ""
-#: plugins/check_snmp.c:519
+#: plugins/check_snmp.c:515
msgid "Cannot asprintf()"
msgstr ""
-#: plugins/check_snmp.c:525
+#: plugins/check_snmp.c:521
msgid "Cannot realloc()"
msgstr ""
-#: plugins/check_snmp.c:541
+#: plugins/check_snmp.c:537
msgid "No previous data to calculate rate - assume okay"
msgstr ""
-#: plugins/check_snmp.c:680
+#: plugins/check_snmp.c:676
msgid "Retries interval must be a positive integer"
msgstr ""
-#: plugins/check_snmp.c:742
+#: plugins/check_snmp.c:738
#, c-format
msgid "Could not reallocate labels[%d]"
msgstr ""
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:750
msgid "Could not reallocate labels\n"
msgstr ""
-#: plugins/check_snmp.c:771
+#: plugins/check_snmp.c:767
#, c-format
msgid "Could not reallocate units [%d]\n"
msgstr ""
-#: plugins/check_snmp.c:783
+#: plugins/check_snmp.c:779
msgid "Could not realloc() units\n"
msgstr ""
-#: plugins/check_snmp.c:800
+#: plugins/check_snmp.c:796
msgid "Rate multiplier must be a positive integer"
msgstr ""
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:848
msgid "No host specified\n"
msgstr ""
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:852
msgid "No OIDs specified\n"
msgstr ""
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:874
msgid "Invalid seclevel"
msgstr ""
-#: plugins/check_snmp.c:885 plugins/check_snmp.c:888 plugins/check_snmp.c:906
+#: plugins/check_snmp.c:881 plugins/check_snmp.c:884 plugins/check_snmp.c:902
#, c-format
msgid "Required parameter: %s\n"
msgstr ""
-#: plugins/check_snmp.c:927
+#: plugins/check_snmp.c:923
msgid "Invalid SNMP version"
msgstr ""
-#: plugins/check_snmp.c:944
+#: plugins/check_snmp.c:940
msgid "Unbalanced quotes\n"
msgstr ""
-#: plugins/check_snmp.c:993
+#: plugins/check_snmp.c:989
msgid "Check status of remote machines and obtain system information via SNMP"
msgstr ""
-#: plugins/check_snmp.c:1006
+#: plugins/check_snmp.c:1002
msgid "Use SNMP GETNEXT instead of SNMP GET"
msgstr ""
-#: plugins/check_snmp.c:1008
+#: plugins/check_snmp.c:1004
msgid "SNMP protocol version"
msgstr ""
-#: plugins/check_snmp.c:1010
+#: plugins/check_snmp.c:1006
msgid "SNMPv3 securityLevel"
msgstr ""
-#: plugins/check_snmp.c:1012
+#: plugins/check_snmp.c:1008
msgid "SNMPv3 auth proto"
msgstr ""
-#: plugins/check_snmp.c:1014
+#: plugins/check_snmp.c:1010
msgid "SNMPv3 priv proto (default DES)"
msgstr ""
-#: plugins/check_snmp.c:1018
+#: plugins/check_snmp.c:1014
msgid "Optional community string for SNMP communication"
msgstr ""
-#: plugins/check_snmp.c:1019
+#: plugins/check_snmp.c:1015
msgid "default is"
msgstr ""
-#: plugins/check_snmp.c:1021
+#: plugins/check_snmp.c:1017
msgid "SNMPv3 username"
msgstr ""
-#: plugins/check_snmp.c:1023
+#: plugins/check_snmp.c:1019
msgid "SNMPv3 authentication password"
msgstr ""
-#: plugins/check_snmp.c:1025
+#: plugins/check_snmp.c:1021
msgid "SNMPv3 privacy password"
msgstr ""
-#: plugins/check_snmp.c:1029
+#: plugins/check_snmp.c:1025
msgid "Object identifier(s) or SNMP variables whose value you wish to query"
msgstr ""
-#: plugins/check_snmp.c:1031
+#: plugins/check_snmp.c:1027
msgid ""
"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
msgstr ""
-#: plugins/check_snmp.c:1032
+#: plugins/check_snmp.c:1028
msgid "for symbolic OIDs.)"
msgstr ""
-#: plugins/check_snmp.c:1034
+#: plugins/check_snmp.c:1030
msgid "Delimiter to use when parsing returned data. Default is"
msgstr ""
-#: plugins/check_snmp.c:1035
+#: plugins/check_snmp.c:1031
msgid "Any data on the right hand side of the delimiter is considered"
msgstr ""
-#: plugins/check_snmp.c:1036
+#: plugins/check_snmp.c:1032
msgid "to be the data that should be used in the evaluation."
msgstr ""
-#: plugins/check_snmp.c:1040
+#: plugins/check_snmp.c:1036
msgid "Warning threshold range(s)"
msgstr ""
-#: plugins/check_snmp.c:1042
+#: plugins/check_snmp.c:1038
msgid "Critical threshold range(s)"
msgstr ""
-#: plugins/check_snmp.c:1044
+#: plugins/check_snmp.c:1040
msgid "Enable rate calculation. See 'Rate Calculation' below"
msgstr ""
-#: plugins/check_snmp.c:1046
+#: plugins/check_snmp.c:1042
msgid ""
"Converts rate per second. For example, set to 60 to convert to per minute"
msgstr ""
-#: plugins/check_snmp.c:1050
+#: plugins/check_snmp.c:1046
msgid "Return OK state (for that OID) if STRING is an exact match"
msgstr ""
-#: plugins/check_snmp.c:1052
+#: plugins/check_snmp.c:1048
msgid ""
"Return OK state (for that OID) if extended regular expression REGEX matches"
msgstr ""
-#: plugins/check_snmp.c:1054
+#: plugins/check_snmp.c:1050
msgid ""
"Return OK state (for that OID) if case-insensitive extended REGEX matches"
msgstr ""
-#: plugins/check_snmp.c:1056
+#: plugins/check_snmp.c:1052
msgid "Invert search result (CRITICAL if found)"
msgstr ""
-#: plugins/check_snmp.c:1060
+#: plugins/check_snmp.c:1056
msgid "Prefix label for output from plugin"
msgstr ""
-#: plugins/check_snmp.c:1062
+#: plugins/check_snmp.c:1058
msgid "Units label(s) for output data (e.g., 'sec.')."
msgstr ""
-#: plugins/check_snmp.c:1064
+#: plugins/check_snmp.c:1060
msgid "Separates output on multiple OID requests"
msgstr ""
-#: plugins/check_snmp.c:1068
+#: plugins/check_snmp.c:1064
msgid "Number of retries to be used in the requests"
msgstr ""
-#: plugins/check_snmp.c:1073
+#: plugins/check_snmp.c:1069
msgid ""
"This plugin uses the 'snmpget' command included with the NET-SNMP package."
msgstr ""
-#: plugins/check_snmp.c:1074
+#: plugins/check_snmp.c:1070
msgid ""
"if you don't have the package installed, you will need to download it from"
msgstr ""
-#: plugins/check_snmp.c:1075
+#: plugins/check_snmp.c:1071
msgid "http://net-snmp.sourceforge.net before you can use this plugin."
msgstr ""
-#: plugins/check_snmp.c:1079
+#: plugins/check_snmp.c:1075
msgid ""
-"- Multiple OIDs may be indicated by a comma or space-delimited list (lists "
-"with"
+"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited "
msgstr ""
-#: plugins/check_snmp.c:1080
-msgid "internal spaces must be quoted). Maximum:"
+#: plugins/check_snmp.c:1076
+msgid "list (lists with internal spaces must be quoted). Maximum:"
msgstr ""
-#: plugins/check_snmp.c:1080
+#: plugins/check_snmp.c:1076
msgid "OIDs."
msgstr ""
-#: plugins/check_snmp.c:1084
+#: plugins/check_snmp.c:1080
msgid ""
"- When checking multiple OIDs, separate ranges by commas like '-w "
"1:10,1:,:20'"
msgstr ""
-#: plugins/check_snmp.c:1085
+#: plugins/check_snmp.c:1081
msgid "- Note that only one string and one regex may be checked at present"
msgstr ""
-#: plugins/check_snmp.c:1086
+#: plugins/check_snmp.c:1082
msgid ""
"- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
msgstr ""
-#: plugins/check_snmp.c:1087
+#: plugins/check_snmp.c:1083
msgid "returned from the SNMP query is an unsigned integer."
msgstr ""
-#: plugins/check_snmp.c:1090
+#: plugins/check_snmp.c:1086
msgid "Rate Calculation:"
msgstr ""
-#: plugins/check_snmp.c:1091
+#: plugins/check_snmp.c:1087
msgid "In many places, SNMP returns counters that are only meaningful when"
msgstr ""
-#: plugins/check_snmp.c:1092
+#: plugins/check_snmp.c:1088
msgid "calculating the counter difference since the last check. check_snmp"
msgstr ""
-#: plugins/check_snmp.c:1093
+#: plugins/check_snmp.c:1089
msgid "saves the last state information in a file so that the rate per second"
msgstr ""
-#: plugins/check_snmp.c:1094
+#: plugins/check_snmp.c:1090
msgid "can be calculated. Use the --rate option to save state information."
msgstr ""
-#: plugins/check_snmp.c:1095
+#: plugins/check_snmp.c:1091
msgid ""
"On the first run, there will be no prior state - this will return with OK."
msgstr ""
-#: plugins/check_snmp.c:1096
+#: plugins/check_snmp.c:1092
msgid "The state is uniquely determined by the arguments to the plugin, so"
msgstr ""
-#: plugins/check_snmp.c:1097
+#: plugins/check_snmp.c:1093
msgid "changing the arguments will create a new state file."
msgstr ""
@@ -4433,26 +4456,26 @@ msgstr ""
msgid "Port number must be a positive integer"
msgstr ""
-#: plugins/check_ssh.c:228
+#: plugins/check_ssh.c:232
#, c-format
msgid "Server answer: %s"
msgstr ""
-#: plugins/check_ssh.c:247
+#: plugins/check_ssh.c:251
#, c-format
msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
msgstr ""
-#: plugins/check_ssh.c:254
+#: plugins/check_ssh.c:260
#, c-format
-msgid "SSH OK - %s (protocol %s)\n"
+msgid "SSH OK - %s (protocol %s) | %s\n"
msgstr ""
-#: plugins/check_ssh.c:274
+#: plugins/check_ssh.c:281
msgid "Try to connect to an SSH server at specified server and port"
msgstr ""
-#: plugins/check_ssh.c:290
+#: plugins/check_ssh.c:297
msgid ""
"Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
msgstr ""
@@ -4552,98 +4575,93 @@ msgstr ""
msgid "With UDP checks, a send/expect string must be specified."
msgstr ""
-#: plugins/check_tcp.c:240
-#, c-format
-msgid "CRITICAL - Cannot retrieve server certificate.\n"
-msgstr ""
-
-#: plugins/check_tcp.c:418
+#: plugins/check_tcp.c:415
msgid "No arguments found"
msgstr ""
-#: plugins/check_tcp.c:519
+#: plugins/check_tcp.c:516
msgid "Maxbytes must be a positive integer"
msgstr ""
-#: plugins/check_tcp.c:537
+#: plugins/check_tcp.c:534
msgid "Refuse must be one of ok, warn, crit"
msgstr ""
-#: plugins/check_tcp.c:547
+#: plugins/check_tcp.c:544
msgid "Mismatch must be one of ok, warn, crit"
msgstr ""
-#: plugins/check_tcp.c:553
+#: plugins/check_tcp.c:550
msgid "Delay must be a positive integer"
msgstr ""
-#: plugins/check_tcp.c:581
+#: plugins/check_tcp.c:578
msgid "You must provide a server address"
msgstr ""
-#: plugins/check_tcp.c:583
+#: plugins/check_tcp.c:580
msgid "Invalid hostname, address or socket"
msgstr ""
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:594
#, c-format
msgid ""
"This plugin tests %s connections with the specified host (or unix socket).\n"
"\n"
msgstr ""
-#: plugins/check_tcp.c:610
+#: plugins/check_tcp.c:607
msgid ""
"Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
"quit option"
msgstr ""
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:608
msgid "Default: nothing added to send, \\r\\n added to end of quit"
msgstr ""
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:610
msgid "String to send to the server"
msgstr ""
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:612
msgid "String to expect in server response"
msgstr ""
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:612
msgid "(may be repeated)"
msgstr ""
-#: plugins/check_tcp.c:617
+#: plugins/check_tcp.c:614
msgid "All expect strings need to occur in server response. Default is any"
msgstr ""
-#: plugins/check_tcp.c:619
+#: plugins/check_tcp.c:616
msgid "String to send server to initiate a clean close of the connection"
msgstr ""
-#: plugins/check_tcp.c:621
+#: plugins/check_tcp.c:618
msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
msgstr ""
-#: plugins/check_tcp.c:623
+#: plugins/check_tcp.c:620
msgid ""
"Accept expected string mismatches with states ok, warn, crit (default: warn)"
msgstr ""
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:622
msgid "Hide output from TCP socket"
msgstr ""
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:624
msgid "Close connection once more than this number of bytes are received"
msgstr ""
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:626
msgid "Seconds to wait between sending string and polling for response"
msgstr ""
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:632
msgid "Use SSL for the connection."
msgstr ""
@@ -4873,34 +4891,29 @@ msgstr ""
msgid "http://www.networkupstools.org"
msgstr ""
-#: plugins/check_users.c:92
-#, c-format
-msgid "# users=%d"
-msgstr ""
-
-#: plugins/check_users.c:115
+#: plugins/check_users.c:90
msgid "Unable to read output"
msgstr ""
-#: plugins/check_users.c:122
+#: plugins/check_users.c:97
#, c-format
msgid "USERS %s - %d users currently logged in |%s\n"
msgstr ""
-#: plugins/check_users.c:207
+#: plugins/check_users.c:176
msgid "This plugin checks the number of users currently logged in on the local"
msgstr ""
-#: plugins/check_users.c:208
+#: plugins/check_users.c:177
msgid ""
"system and generates an error if the number exceeds the thresholds specified."
msgstr ""
-#: plugins/check_users.c:218
+#: plugins/check_users.c:187
msgid "Set WARNING status if more than INTEGER users are logged in"
msgstr ""
-#: plugins/check_users.c:220
+#: plugins/check_users.c:189
msgid "Set CRITICAL status if more than INTEGER users are logged in"
msgstr ""
diff --git a/release b/release
index 8a3b8ac..e554700 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-1.4.15
+1.4.15-59-ga80e
diff --git a/tap/Makefile.in b/tap/Makefile.in
index bbddc0d..4cf370a 100644
--- a/tap/Makefile.in
+++ b/tap/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -141,7 +141,7 @@ am__libtap_la_SOURCES_DIST = tap.c tap.h
@USE_LIBTAP_LOCAL_TRUE@am_libtap_la_OBJECTS = tap.lo
libtap_la_OBJECTS = $(am_libtap_la_OBJECTS)
@USE_LIBTAP_LOCAL_TRUE@am_libtap_la_rpath =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -1097,8 +1097,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1110,8 +1110,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1121,13 +1121,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique